Merge 1.10 into master

Change-Id: Iecddc2722d22d7c15d4b32efd676fa8e7c00e99f

3 files changed, 5 insertions, 6 deletions

diff --git a/src/lib/qtprofilesetup/templates/core.qbs b/src/lib/qtprofilesetup/templates/core.qbs
index aba097a6a..f18ee40b3 100644
--- a/src/lib/qtprofilesetup/templates/core.qbs
+++ b/src/lib/qtprofilesetup/templates/core.qbs
@@ -83,7 +83,7 @@ Module {
     property string libFilePath: qtBuildVariant === "debug"
                                       ? libFilePathDebug : libFilePathRelease
 
-    coreLibPaths: @libraryPaths@
+    property stringList coreLibPaths: @libraryPaths@
 
     // These are deliberately not path types
     // We don't want to resolve them against the source directory
@@ -299,7 +299,6 @@ Module {
     Rule {
         multiplex: true
         inputs: ["moc_cpp"]
-        outputs: ["cpp", "unmocable"]
         Artifact {
             filePath: "amalgamated_moc_" + product.targetName + ".cpp"
             fileTags: ["cpp", "unmocable"]
diff --git a/src/lib/qtprofilesetup/templates/quick.js b/src/lib/qtprofilesetup/templates/quick.js
index 0ab10606b..4f3da2fb0 100644
--- a/src/lib/qtprofilesetup/templates/quick.js
+++ b/src/lib/qtprofilesetup/templates/quick.js
@@ -53,7 +53,7 @@ function scanQrc(qrcFilePath) {
 }
 
 function qtQuickCompilerOutputName(filePath) {
-    var str = filePath.replace('/', '_');
+    var str = filePath.replace(/\//g, '_');
     var i = str.lastIndexOf('.');
     if (i != -1)
         str = str.substr(0, i) + '_' + str.substr(i + 1);
diff --git a/src/lib/qtprofilesetup/templates/quick.qbs b/src/lib/qtprofilesetup/templates/quick.qbs
index 6bac7ad27..539fbfee6 100644
--- a/src/lib/qtprofilesetup/templates/quick.qbs
+++ b/src/lib/qtprofilesetup/templates/quick.qbs
@@ -144,15 +144,15 @@ QtModule {
             var cmd;
             var loaderFlags = [];
 
-            function findOutput(relFilePath) {
+            function findOutput(fileName) {
                 for (var k in outputs) {
                     for (var i in outputs[k]) {
-                        if (outputs[k][i].filePath.endsWith(relFilePath))
+                        if (outputs[k][i].fileName === fileName)
                             return outputs[k][i];
                     }
                 }
                 throw new Error("Qt Quick compiler rule: Cannot find output artifact "
-                                + relFilePath + ".");
+                                + fileName + ".");
             }
 
             infos.forEach(function (info) {