diff options
| author | Jon Turney <jon.turney@dronecode.org.uk> | 2018-03-02 13:59:02 +0000 |
|---|---|---|
| committer | Jon Turney <jon.turney@dronecode.org.uk> | 2018-03-04 22:28:47 +0000 |
| commit | 590b6dec9723a9f2c7f11acb7c3a7701370bb72a (patch) | |
| tree | b05085b09ce44434ae35bee6a91897567faf4d8c | |
| parent | 02def38741d5bf9701b463a77accce37e679cc9e (diff) | |
| download | meson-590b6dec9723a9f2c7f11acb7c3a7701370bb72a.zip meson-590b6dec9723a9f2c7f11acb7c3a7701370bb72a.tar.gz meson-590b6dec9723a9f2c7f11acb7c3a7701370bb72a.tar.bz2 | |
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'
| -rw-r--r-- | mesonbuild/dependencies/ui.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mesonbuild/dependencies/ui.py b/mesonbuild/dependencies/ui.py index 8960d50..9758cc5 100644 --- a/mesonbuild/dependencies/ui.py +++ b/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'] |