qt: Only look for a framework on macOS if building for macOS

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
pull/4864/head
Nirbheek Chauhan 6 years ago committed by Nirbheek Chauhan
parent 8821c0aadc
commit 8a7537ce24
  1. 4
      mesonbuild/dependencies/ui.py

@ -373,7 +373,9 @@ class QtBaseDependency(ExternalDependency):
continue continue
(k, v) = tuple(line.split(':', 1)) (k, v) = tuple(line.split(':', 1))
qvars[k] = v 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) self._framework_detect(qvars, mods, kwargs)
return qmake return qmake
incdir = qvars['QT_INSTALL_HEADERS'] incdir = qvars['QT_INSTALL_HEADERS']

Loading…
Cancel
Save