fix getQtLibraryName for static Qt4 modules

Static Qt4 modules don't have the major version in their name.

Task-number: QBS-598
Change-Id: I279b4c36fb13d863d2490537cfb12692fb6cb655
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>

3 files changed, 12 insertions, 9 deletions

diff --git a/src/lib/qtprofilesetup/templates/QtModule.qbs b/src/lib/qtprofilesetup/templates/QtModule.qbs
index 2b9b92df4..4445a58cf 100644
--- a/src/lib/qtprofilesetup/templates/QtModule.qbs
+++ b/src/lib/qtprofilesetup/templates/QtModule.qbs
@@ -14,9 +14,12 @@ Module {
     property string qtLibInfix: Qt.core.libInfix
     property string repository: Qt.core.versionMajor === 5 ? 'qtbase' : undefined
     property string includeDirName: qtModulePrefix + qtModuleName
-    property string internalLibraryName: QtFunctions.getQtLibraryName(qtModuleName + qtLibInfix, Qt.core, qbs, qtModulePrefix)
+    property string internalLibraryName: QtFunctions.getQtLibraryName(qtModuleName + qtLibInfix,
+                                                                      Qt.core, qbs, isStaticLibrary,
+                                                                      qtModulePrefix)
     property string qtVersion: Qt.core.version
     property bool hasLibrary: true
+    property bool isStaticLibrary: false
 
     Properties {
         condition: qtModuleName != undefined
diff --git a/src/lib/qtprofilesetup/templates/core.qbs b/src/lib/qtprofilesetup/templates/core.qbs
index 0d706b255..c1b173fc2 100644
--- a/src/lib/qtprofilesetup/templates/core.qbs
+++ b/src/lib/qtprofilesetup/templates/core.qbs
@@ -78,22 +78,22 @@ Module {
     cpp.dynamicLibraries: {
         var libs = [];
         if (!frameworkBuild)
-            libs=[QtFunctions.getQtLibraryName('Core' + libInfix, qtcore, qbs)];
+            libs=[QtFunctions.getQtLibraryName('Core' + libInfix, qtcore, qbs, staticBuild)];
         if (qbs.targetOS.contains('ios') && staticBuild)
             libs = libs.concat(["z", "m",
-                                QtFunctions.getQtLibraryName("PlatformSupport", qtcore, qbs)]);
+                                QtFunctions.getQtLibraryName("PlatformSupport", qtcore, qbs, true)]);
         if (libs.length === 0)
             return undefined;
         return libs;
     }
     cpp.linkerFlags: ((qbs.targetOS.contains('ios') && staticBuild) ?
                           ["-force_load", pluginPath + "/platforms/" +
-                           QtFunctions.getPlatformLibraryName("libqios", qtcore, qbs) + ".a"] : undefined)
+                           QtFunctions.getPlatformLibraryName("libqios", qtcore, qbs, true) + ".a"] : undefined)
     cpp.frameworkPaths: frameworkBuild ? [libPath] : undefined
     cpp.frameworks: {
         var frameworks = [];
         if (frameworkBuild)
-            frameworks = [QtFunctions.getQtLibraryName('Core' + libInfix, qtcore, qbs)]
+            frameworks = [QtFunctions.getQtLibraryName('Core' + libInfix, qtcore, qbs, false)]
         if (qbs.targetOS.contains('ios') && staticBuild)
             frameworks = frameworks.concat(["Foundation", "CoreFoundation"]);
         if (frameworks.length === 0)
diff --git a/src/lib/qtprofilesetup/templates/qtfunctions.js b/src/lib/qtprofilesetup/templates/qtfunctions.js
index 144955d5e..8a667ee58 100644
--- a/src/lib/qtprofilesetup/templates/qtfunctions.js
+++ b/src/lib/qtprofilesetup/templates/qtfunctions.js
@@ -1,11 +1,11 @@
 // helper functions for the Qt modules
 
-function getPlatformLibraryName(name, qtcore, qbs)
+function getPlatformLibraryName(name, qtcore, qbs, isStaticLibrary)
 {
     var libName = name;
     if (qbs.targetOS.contains('windows')) {
         libName += (qbs.enableDebugCode ? 'd' : '');
-        if (qtcore.versionMajor < 5)
+        if (!isStaticLibrary && qtcore.versionMajor < 5)
             libName += qtcore.versionMajor;
         if (!qbs.toolchain.contains("mingw"))
             libName += '.lib';
@@ -18,11 +18,11 @@ function getPlatformLibraryName(name, qtcore, qbs)
     return libName;
 }
 
-function getQtLibraryName(qtModule, qtcore, qbs, prefix)
+function getQtLibraryName(qtModule, qtcore, qbs, isStaticLibrary, prefix)
 {
     var libName = (prefix === undefined) ? "Qt" : prefix;
     if (qtcore.versionMajor >= 5 && !qtcore.frameworkBuild)
         libName += qtcore.versionMajor;
     libName += qtModule;
-    return getPlatformLibraryName(libName, qtcore, qbs);
+    return getPlatformLibraryName(libName, qtcore, qbs, isStaticLibrary);
 }