Skip to content

Commit

Permalink
Fix reporting of Qt detection method used on OSX
Browse files Browse the repository at this point in the history
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'
  • Loading branch information
jon-turney committed Mar 4, 2018
1 parent 02def38 commit 590b6de
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion mesonbuild/dependencies/ui.py
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,8 @@ def _qmake_detect(self, mods, kwargs):
(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']
Expand Down

0 comments on commit 590b6de

Please sign in to comment.