diff options
| author | Dylan Baker <dylan@pnwbakers.com> | 2020-01-21 09:09:14 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-21 09:09:14 -0800 |
| commit | 04c4bbccb797936071644c9348ab80af9f2e4b00 (patch) | |
| tree | 58688939db0bee18599bd827cfe2e0fb1b75e596 /mesonbuild | |
| parent | b44501b02d7841e6b659c02f869bcfe2ea22248f (diff) | |
| parent | d2e5a82fb515bb025222a22b5d52e01cd16b4dd5 (diff) | |
| download | meson-04c4bbccb797936071644c9348ab80af9f2e4b00.zip meson-04c4bbccb797936071644c9348ab80af9f2e4b00.tar.gz meson-04c4bbccb797936071644c9348ab80af9f2e4b00.tar.bz2 | |
Merge pull request #6481 from jon-turney/osx-qt-dep-crash
Fix dependency('qt') crash with old Qt on OSX
Diffstat (limited to 'mesonbuild')
| -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 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 |