Merge remote-tracking branch 'origin/1.2'

Change-Id: I19d714d5c860268aaed6d7b6cf254c0b55b159c6

6 files changed, 17 insertions, 5 deletions

diff --git a/share/qbs/modules/cpp/windows-msvc.qbs b/share/qbs/modules/cpp/windows-msvc.qbs
index d5c23c48d..96277066d 100644
--- a/share/qbs/modules/cpp/windows-msvc.qbs
+++ b/share/qbs/modules/cpp/windows-msvc.qbs
@@ -166,7 +166,7 @@ CppModule {
                 var result = []
                 for (var i in inputs.staticlibrary) {
                     var lib = inputs.staticlibrary[i]
-                    result.push(lib.fileName)
+                    result.push(lib.filePath)
                     var impliedLibs = ModUtils.moduleProperties(lib, 'staticLibraries')
                     result = result.uniqueConcat(impliedLibs);
                 }
diff --git a/src/lib/qtprofilesetup/qtprofilesetup.cpp b/src/lib/qtprofilesetup/qtprofilesetup.cpp
index d7672c9fd..ddaec6c8e 100644
--- a/src/lib/qtprofilesetup/qtprofilesetup.cpp
+++ b/src/lib/qtprofilesetup/qtprofilesetup.cpp
@@ -300,6 +300,8 @@ static void createModules(Profile &profile, Settings *settings,
             copyTemplateFile(QLatin1String("moc.js"), qbsQtModuleDir, profile.name());
         } else if (module.qbsName == QLatin1String("gui")) {
             copyTemplateFile(QLatin1String("gui.qbs"), qbsQtModuleDir, profile.name());
+        } else if (module.qbsName == QLatin1String("phonon")) {
+            copyTemplateFile(QLatin1String("phonon.qbs"), qbsQtModuleDir, profile.name());
         } else {
             copyTemplateFile(QLatin1String("module.qbs"), qbsQtModuleDir, profile.name());
             QFile moduleFile(qbsQtModuleDir + QLatin1String("/module.qbs"));
diff --git a/src/lib/qtprofilesetup/templates.qrc b/src/lib/qtprofilesetup/templates.qrc
index 66c228e5f..bc326c947 100644
--- a/src/lib/qtprofilesetup/templates.qrc
+++ b/src/lib/qtprofilesetup/templates.qrc
@@ -2,6 +2,7 @@
     <qresource prefix="/">
         <file>templates/core.qbs</file>
         <file>templates/gui.qbs</file>
+        <file>templates/phonon.qbs</file>
         <file>templates/module.qbs</file>
         <file>templates/QtModule.qbs</file>
         <file>templates/moc.js</file>
diff --git a/src/lib/qtprofilesetup/templates/QtModule.qbs b/src/lib/qtprofilesetup/templates/QtModule.qbs
index 4694dbcb1..2b9b92df4 100644
--- a/src/lib/qtprofilesetup/templates/QtModule.qbs
+++ b/src/lib/qtprofilesetup/templates/QtModule.qbs
@@ -7,13 +7,14 @@ Module {
     Depends { name: "Qt.core" }
 
     property string qtModuleName
+    property string qtModulePrefix: 'Qt'
     property path binPath: Qt.core.binPath
     property path incPath: Qt.core.incPath
     property path libPath: Qt.core.libPath
     property string qtLibInfix: Qt.core.libInfix
     property string repository: Qt.core.versionMajor === 5 ? 'qtbase' : undefined
-    property string includeDirName: 'Qt' + qtModuleName
-    property string internalLibraryName: QtFunctions.getQtLibraryName(qtModuleName + qtLibInfix, Qt.core, qbs)
+    property string includeDirName: qtModulePrefix + qtModuleName
+    property string internalLibraryName: QtFunctions.getQtLibraryName(qtModuleName + qtLibInfix, Qt.core, qbs, qtModulePrefix)
     property string qtVersion: Qt.core.version
     property bool hasLibrary: true
 
diff --git a/src/lib/qtprofilesetup/templates/phonon.qbs b/src/lib/qtprofilesetup/templates/phonon.qbs
new file mode 100644
index 000000000..aa191fbd7
--- /dev/null
+++ b/src/lib/qtprofilesetup/templates/phonon.qbs
@@ -0,0 +1,8 @@
+import qbs 1.0
+import '../QtModule.qbs' as QtModule
+
+QtModule {
+    qtModuleName: "phonon"
+    Depends { name: "Qt"; submodules: ['core'] }
+    qtModulePrefix: ''
+}
diff --git a/src/lib/qtprofilesetup/templates/qtfunctions.js b/src/lib/qtprofilesetup/templates/qtfunctions.js
index f50f847b4..144955d5e 100644
--- a/src/lib/qtprofilesetup/templates/qtfunctions.js
+++ b/src/lib/qtprofilesetup/templates/qtfunctions.js
@@ -18,9 +18,9 @@ function getPlatformLibraryName(name, qtcore, qbs)
     return libName;
 }
 
-function getQtLibraryName(qtModule, qtcore, qbs)
+function getQtLibraryName(qtModule, qtcore, qbs, prefix)
 {
-    var libName = "Qt";
+    var libName = (prefix === undefined) ? "Qt" : prefix;
     if (qtcore.versionMajor >= 5 && !qtcore.frameworkBuild)
         libName += qtcore.versionMajor;
     libName += qtModule;