diff options
| author | Jake Petroules <jake.petroules@qt.io> | 2017-08-12 23:47:30 -0700 |
|---|---|---|
| committer | Jake Petroules <jake.petroules@qt.io> | 2017-08-16 18:19:22 +0000 |
| commit | 69c900b3a7800f12bb8017ef7e72b4bc39807379 (patch) | |
| tree | d59b2a97be54baa470d4c232fc95716496bd98dd | |
| parent | adc28c434853cf0fa17e95cc207e5a1c6eb761de (diff) | |
Fix iOS linked libraries for Qt 5.8+
Task-number: QBS-1155
Change-Id: Ifba12c84d8d803706ac27406bec8f9696ccb9c64
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| -rw-r--r-- | src/lib/qtprofilesetup/qtmoduleinfo.cpp | 10 | ||||
| -rw-r--r-- | src/lib/qtprofilesetup/templates/gui.qbs | 2 |
2 files changed, 7 insertions, 5 deletions
diff --git a/src/lib/qtprofilesetup/qtmoduleinfo.cpp b/src/lib/qtprofilesetup/qtmoduleinfo.cpp index b54937da0..63624fd53 100644 --- a/src/lib/qtprofilesetup/qtmoduleinfo.cpp +++ b/src/lib/qtprofilesetup/qtmoduleinfo.cpp @@ -201,10 +201,12 @@ void QtModuleInfo::setupLibraries(const QtEnvironment &qtEnv, bool debugBuild, QString &libFilePath = debugBuild ? libFilePathDebug : libFilePathRelease; if (qtEnv.mkspecName.contains(QLatin1String("ios")) && isStaticLibrary) { - const QtModuleInfo platformSupportModule(QLatin1String("QtPlatformSupport"), - QLatin1String("platformsupport")); - libs << QLatin1String("z") << QLatin1String("m") - << platformSupportModule.libNameForLinker(qtEnv, debugBuild); + libs << QLatin1String("z") << QLatin1String("m"); + if (qtEnv.qtMajorVersion == 5 && qtEnv.qtMinorVersion < 8) { + const QtModuleInfo platformSupportModule(QLatin1String("QtPlatformSupport"), + QLatin1String("platformsupport")); + libs << platformSupportModule.libNameForLinker(qtEnv, debugBuild); + } flags << QLatin1String("-force_load") << qtEnv.pluginPath + QLatin1String("/platforms/") + libBaseName(QLatin1String("libqios"), debugBuild, qtEnv) diff --git a/src/lib/qtprofilesetup/templates/gui.qbs b/src/lib/qtprofilesetup/templates/gui.qbs index 0598cd1eb..ba23dba37 100644 --- a/src/lib/qtprofilesetup/templates/gui.qbs +++ b/src/lib/qtprofilesetup/templates/gui.qbs @@ -56,7 +56,7 @@ QtModule { Properties { condition: Qt.core.staticBuild && qbs.targetOS.contains("ios") cpp.frameworks: base.concat(["UIKit", "QuartzCore", "CoreText", "CoreGraphics", - "Foundation", "CoreFoundation"]) + "Foundation", "CoreFoundation", "AudioToolbox"]) } cpp.frameworks: base @special_properties@ |