Merge remote-tracking branch 'origin/1.3'

Change-Id: I1a98b360957e0c8caa6b97bc32e6bc51745f1a10

5 files changed, 18 insertions, 4 deletions

diff --git a/src/lib/qtprofilesetup/templates/QtModule.qbs b/src/lib/qtprofilesetup/templates/QtModule.qbs
index 0aba7d398..6c088555d 100644
--- a/src/lib/qtprofilesetup/templates/QtModule.qbs
+++ b/src/lib/qtprofilesetup/templates/QtModule.qbs
@@ -14,6 +14,10 @@ Module {
     property string libNameForLinkerRelease
     property string libNameForLinker: qbs.buildVariant === "debug"
                                       ? libNameForLinkerDebug : libNameForLinkerRelease
+    property string libFilePathDebug
+    property string libFilePathRelease
+    property string libFilePath: qbs.buildVariant === "debug"
+                                 ? libFilePathDebug : libFilePathRelease
     property string qtVersion: Qt.core.version
     property bool hasLibrary: true
     property bool isStaticLibrary: false
@@ -42,9 +46,9 @@ Module {
 
     Properties {
         condition: qtModuleName != undefined && hasLibrary
-        cpp.staticLibraries: (isStaticLibrary ? [libNameForLinker] : []).concat(staticLibs)
+        cpp.staticLibraries: (isStaticLibrary ? [libFilePath] : []).concat(staticLibs)
         cpp.dynamicLibraries: (!isStaticLibrary && !Qt.core.frameworkBuild
-                               ? [libNameForLinker] : []).concat(dynamicLibs)
+                               ? [libFilePath] : []).concat(dynamicLibs)
         cpp.frameworks: mFrameworks.concat(!isStaticLibrary && Qt.core.frameworkBuild
                         ? [libNameForLinker] : [])
         cpp.frameworkPaths: mFrameworkPaths
diff --git a/src/lib/qtprofilesetup/templates/core.qbs b/src/lib/qtprofilesetup/templates/core.qbs
index e88eb121a..04e0ab2b2 100644
--- a/src/lib/qtprofilesetup/templates/core.qbs
+++ b/src/lib/qtprofilesetup/templates/core.qbs
@@ -55,6 +55,10 @@ Module {
     property string libNameForLinkerRelease: @libNameForLinkerRelease@
     property string libNameForLinker: qbs.buildVariant === "debug"
                                       ? libNameForLinkerDebug : libNameForLinkerRelease
+    property string libFilePathDebug: @libFilePathDebug@
+    property string libFilePathRelease: @libFilePathRelease@
+    property string libFilePath: qbs.buildVariant === "debug"
+                                      ? libFilePathDebug : libFilePathRelease
 
     coreLibPaths: @libraryPaths@
 
@@ -92,7 +96,7 @@ Module {
     cpp.staticLibraries: {
         var libs = [];
         if (staticBuild)
-            libs.push(libNameForLinker);
+            libs.push(libFilePath);
         if (qbs.targetOS.contains('windows') && !product.consoleApplication)
             libs.push("qtmain" + libInfix + (cpp.debugInformation ? "d" : "") + (!qbs.toolchain.contains("mingw") ? ".lib" : ""));
         libs = libs.concat(staticLibs);
@@ -101,7 +105,7 @@ Module {
     cpp.dynamicLibraries: {
         var libs = [];
         if (!staticBuild && !frameworkBuild)
-            libs.push(libNameForLinker);
+            libs.push(libFilePath);
         libs = libs.concat(dynamicLibs);
         return libs;
     }
diff --git a/src/lib/qtprofilesetup/templates/gui.qbs b/src/lib/qtprofilesetup/templates/gui.qbs
index 58b9b7152..bd751e85a 100644
--- a/src/lib/qtprofilesetup/templates/gui.qbs
+++ b/src/lib/qtprofilesetup/templates/gui.qbs
@@ -44,6 +44,8 @@ QtModule {
     frameworkPathsRelease: @frameworkPathsRelease@
     libNameForLinkerDebug: @libNameForLinkerDebug@
     libNameForLinkerRelease: @libNameForLinkerRelease@
+    libFilePathDebug: @libFilePathDebug@
+    libFilePathRelease: @libFilePathRelease@
 
     cpp.defines: @defines@
     cpp.includePaths: @includes@
diff --git a/src/lib/qtprofilesetup/templates/module.qbs b/src/lib/qtprofilesetup/templates/module.qbs
index 8e791c2ad..4d5b80219 100644
--- a/src/lib/qtprofilesetup/templates/module.qbs
+++ b/src/lib/qtprofilesetup/templates/module.qbs
@@ -18,6 +18,8 @@ QtModule {
     frameworkPathsRelease: @frameworkPathsRelease@
     libNameForLinkerDebug: @libNameForLinkerDebug@
     libNameForLinkerRelease: @libNameForLinkerRelease@
+    libFilePathDebug: @libFilePathDebug@
+    libFilePathRelease: @libFilePathRelease@
     cpp.defines: @defines@
     cpp.includePaths: @includes@
     cpp.libraryPaths: @libraryPaths@
diff --git a/src/lib/qtprofilesetup/templates/plugin.qbs b/src/lib/qtprofilesetup/templates/plugin.qbs
index 7149b3898..3a07a363b 100644
--- a/src/lib/qtprofilesetup/templates/plugin.qbs
+++ b/src/lib/qtprofilesetup/templates/plugin.qbs
@@ -18,6 +18,8 @@ QtPlugin {
     frameworkPathsRelease: @frameworkPathsRelease@
     libNameForLinkerDebug: @libNameForLinkerDebug@
     libNameForLinkerRelease: @libNameForLinkerRelease@
+    libFilePathDebug: @libFilePathDebug@
+    libFilePathRelease: @libFilePathRelease@
     cpp.libraryPaths: @libraryPaths@
     @special_properties@
 }