From 65cb6852aedc355a00a9de00ef39372c985608c3 Mon Sep 17 00:00:00 2001 From: Jon Turney Date: Fri, 17 Jan 2020 00:53:17 +0000 Subject: Fix dependency('qt') crash with old Qt on OSX Don't fail with 'KeyError: QMAKE_XSPEC' if `qmake -query` doesn't report QMAKE_XSPEC. (Seen with 4.8.7) --- mesonbuild/dependencies/ui.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'mesonbuild') diff --git a/mesonbuild/dependencies/ui.py b/mesonbuild/dependencies/ui.py index bdcc4a7..da411ef 100644 --- a/mesonbuild/dependencies/ui.py +++ b/mesonbuild/dependencies/ui.py @@ -373,7 +373,8 @@ class QtBaseDependency(ExternalDependency): (k, v) = tuple(line.split(':', 1)) qvars[k] = v # Qt on macOS uses a framework, but Qt for iOS/tvOS does not - if self.env.machines.host.is_darwin() and 'ios' not in qvars['QMAKE_XSPEC'] and 'tvos' not in qvars['QMAKE_XSPEC']: + xspec = qvars.get('QMAKE_XSPEC', '') + if self.env.machines.host.is_darwin() and not any(s in xspec for s in ['ios', 'tvos']): mlog.debug("Building for macOS, looking for framework") self._framework_detect(qvars, mods, kwargs) return qmake -- cgit v1.1