Fix reporting of Qt detection method used on OSX

Ensure that from_text is set to the name of the qmake executable we used,
rather than the return value of _framework_detect(), which is always 'None'
pull/3165/head
Jon Turney 7 years ago
parent 02def38741
commit 590b6dec97
  1. 3
      mesonbuild/dependencies/ui.py

@ -281,7 +281,8 @@ class QtBaseDependency(ExternalDependency):
(k, v) = tuple(line.split(':', 1))
qvars[k] = v
if mesonlib.is_osx():
return self._framework_detect(qvars, mods, kwargs)
self._framework_detect(qvars, mods, kwargs)
return qmake
incdir = qvars['QT_INSTALL_HEADERS']
self.compile_args.append('-I' + incdir)
libdir = qvars['QT_INSTALL_LIBS']

Loading…
Cancel
Save