libqtprofilesetup: Set up ios-specific flags at setup time.

This enables us to get rid of qtfunctions.js.

Change-Id: I4cf593742f7afcfb9caa8e2984b11b80d4fb6265
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>

2 files changed, 1 insertions, 35 deletions

diff --git a/src/lib/qtprofilesetup/templates/core.qbs b/src/lib/qtprofilesetup/templates/core.qbs
index 4eb31295c..ded719e5b 100644
--- a/src/lib/qtprofilesetup/templates/core.qbs
+++ b/src/lib/qtprofilesetup/templates/core.qbs
@@ -2,7 +2,6 @@ import qbs 1.0
 import qbs.FileInfo
 import qbs.ModUtils
 import "moc.js" as Moc
-import '../qtfunctions.js' as QtFunctions
 
 Module {
     id: qtcore
@@ -103,15 +102,10 @@ Module {
         var libs = [];
         if (!staticBuild && !frameworkBuild)
             libs.push(libNameForLinker);
-        if (qbs.targetOS.contains('ios') && staticBuild)
-            libs = libs.concat(["z", "m",
-                                QtFunctions.getQtLibraryName("PlatformSupport", qtcore, qbs, true)]);
         libs = libs.concat(dynamicLibs);
         return libs;
     }
-    cpp.linkerFlags: coreLinkerFlags.concat((qbs.targetOS.contains('ios') && staticBuild) ?
-                          ["-force_load", pluginPath + "/platforms/" +
-                           QtFunctions.getPlatformLibraryName("libqios", qtcore, qbs, true) + ".a"] : [])
+    cpp.linkerFlags: coreLinkerFlags
     cpp.frameworkPaths: coreFrameworkPaths.concat(frameworkBuild ? [libPath] : [])
     cpp.frameworks: {
         var frameworks = coreFrameworks
diff --git a/src/lib/qtprofilesetup/templates/qtfunctions.js b/src/lib/qtprofilesetup/templates/qtfunctions.js
deleted file mode 100644
index 7058026f3..000000000
--- a/src/lib/qtprofilesetup/templates/qtfunctions.js
+++ /dev/null
@@ -1,28 +0,0 @@
-// helper functions for the Qt modules
-
-function getPlatformLibraryName(name, qtcore, qbs, isStaticLibrary)
-{
-    var libName = name;
-    if (qbs.targetOS.contains('windows')) {
-        libName += (qbs.enableDebugCode ? 'd' : '');
-        if (!isStaticLibrary && qtcore.versionMajor < 5)
-            libName += qtcore.versionMajor;
-        if (!qbs.toolchain.contains("mingw"))
-            libName += '.lib';
-    }
-    if (qbs.targetOS.contains("darwin")) {
-        if (!qtcore.frameworkBuild && qtcore.buildVariant.contains("debug") &&
-                (!qtcore.buildVariant.contains("release") || qbs.enableDebugCode))
-            libName += '_debug';
-    }
-    return libName;
-}
-
-function getQtLibraryName(qtModule, qtcore, qbs, isStaticLibrary, prefix)
-{
-    var libName = (prefix === undefined) ? "Qt" : prefix;
-    if (qtcore.versionMajor >= 5 && (!qtcore.frameworkBuild || isStaticLibrary))
-        libName += qtcore.versionMajor;
-    libName += qtModule;
-    return getPlatformLibraryName(libName, qtcore, qbs, isStaticLibrary);
-}