diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2019-01-29 16:16:45 +0530 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek@centricular.com> | 2019-01-31 14:26:16 +0530 |
| commit | 5ea061ccacb43f81939d8665eb26012c16420c09 (patch) | |
| tree | 44ab18d8721e404c5bc90df85c1df6ecf0daf857 | |
| parent | d28b75a500e0478deea0a4089c2d4bd334f197c8 (diff) | |
| download | meson-nirbheek/fix-qt-ios.tar.gz | |
qt: Only look for a framework on macOS if building for macOSnirbheek/fix-qt-ios
When building for iOS, the Qt binaries only contain static libraries
and headers. No framework.
With this, Meson can successfully compile and link to Qt on iOS
| -rw-r--r-- | mesonbuild/dependencies/ui.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/mesonbuild/dependencies/ui.py b/mesonbuild/dependencies/ui.py index e23124cc4..3f3b75c80 100644 --- a/mesonbuild/dependencies/ui.py +++ b/mesonbuild/dependencies/ui.py @@ -371,7 +371,9 @@ class QtBaseDependency(ExternalDependency): continue (k, v) = tuple(line.split(':', 1)) qvars[k] = v - if mesonlib.is_osx(): + # Qt on macOS uses a framework, but Qt for iOS does not + if self.env.machines.host.is_darwin() and 'ios' not in qvars['QMAKE_XSPEC']: + mlog.debug("Building for macOS, looking for framework") self._framework_detect(qvars, mods, kwargs) return qmake incdir = qvars['QT_INSTALL_HEADERS'] |