Merge branch '1.19' into master

Change-Id: If67803997308ac02ce75daa2f22f12e3426079c8

5 files changed, 15 insertions, 8 deletions

diff --git a/share/qbs/module-providers/Qt/templates/qml.js b/share/qbs/module-providers/Qt/templates/qml.js
index e48c9230e..ea8293f2d 100644
--- a/share/qbs/module-providers/Qt/templates/qml.js
+++ b/share/qbs/module-providers/Qt/templates/qml.js
@@ -3,12 +3,12 @@ var FileInfo = require("qbs.FileInfo");
 var Process = require("qbs.Process");
 var TextFile = require("qbs.TextFile");
 
-function scannerData(scannerFilePath, qmlFiles, qmlPath, targetOS)
+function scannerData(scannerFilePath, qmlFiles, qmlPath, hostOS)
 {
     var p;
     try {
         p = new Process();
-        if (!targetOS.contains("windows")) {
+        if (!hostOS.contains("windows")) {
             p.exec(scannerFilePath, ["-qmlFiles"].concat(qmlFiles).concat(["-importPath", qmlPath]),
                     true);
             return JSON.parse(p.readStdOut());
diff --git a/share/qbs/module-providers/Qt/templates/qml.qbs b/share/qbs/module-providers/Qt/templates/qml.qbs
index af7b0fb5f..104e6848f 100644
--- a/share/qbs/module-providers/Qt/templates/qml.qbs
+++ b/share/qbs/module-providers/Qt/templates/qml.qbs
@@ -144,7 +144,7 @@ QtModule {
                     qmlInputs = [];
                 var scannerData = Qml.scannerData(product.Qt.qml.qmlImportScannerFilePath,
                         qmlInputs.map(function(inp) { return inp.filePath; }),
-                        product.Qt.qml.qmlPath, product.qbs.targetOS);
+                        product.Qt.qml.qmlPath, product.qbs.hostOS);
                 var cppFile;
                 var listFile;
                 try {
diff --git a/share/qbs/modules/cpp/darwin.js b/share/qbs/modules/cpp/darwin.js
index 7f7e9a05d..98497a050 100644
--- a/share/qbs/modules/cpp/darwin.js
+++ b/share/qbs/modules/cpp/darwin.js
@@ -179,17 +179,19 @@ function prepareLipo(project, product, inputs, outputs, input, output) {
         if (outputs.debuginfo_bundle && outputs.debuginfo_bundle[0])
             dsymPath = outputs.debuginfo_bundle[0].filePath;
         var flags = ModUtils.moduleProperty(product, "dsymutilFlags") || [];
+        var files = outputs.primary.map(function (f) { return f.filePath; });
         cmd = new Command(ModUtils.moduleProperty(product, "dsymutilPath"), flags.concat([
             "-o", dsymPath
-        ]).concat(outputs.primary.map(function (f) { return f.filePath; })));
+        ]).concat(files));
         cmd.description = "generating dSYM for " + product.name;
         commands.push(cmd);
+
+        // strip debug info
+        cmd = new Command(ModUtils.moduleProperty(product, "stripPath"), ["-S"].concat(files));
+        cmd.silent = true;
+        commands.push(cmd);
     }
 
-    cmd = new Command(ModUtils.moduleProperty(product, "stripPath"),
-                      ["-S", outputs.primary[0].filePath]);
-    cmd.silent = true;
-    commands.push(cmd);
     if (outputs.dynamiclibrary_symbols)
         Array.prototype.push.apply(commands, Gcc.createSymbolCheckingCommands(product, outputs));
 
diff --git a/share/qbs/modules/cpp/gcc.js b/share/qbs/modules/cpp/gcc.js
index 09ff4981d..010878d18 100644
--- a/share/qbs/modules/cpp/gcc.js
+++ b/share/qbs/modules/cpp/gcc.js
@@ -1289,6 +1289,7 @@ function prepareLinker(project, product, inputs, outputs, input, output) {
                 cmd.description = "generating dSYM for " + product.name;
                 commands.push(cmd);
 
+                // strip debug info
                 cmd = new Command(product.cpp.stripPath,
                                   ["-S", primaryOutput.filePath]);
                 cmd.silent = true;
diff --git a/share/qbs/modules/cpp/msvc.js b/share/qbs/modules/cpp/msvc.js
index d912a7f8c..b27bb23c9 100644
--- a/share/qbs/modules/cpp/msvc.js
+++ b/share/qbs/modules/cpp/msvc.js
@@ -207,6 +207,10 @@ function prepareCompiler(project, product, inputs, outputs, input, output, expli
     var includeFlag = input.cpp.includeFlag;
     if (supportsExternalIncludesOption(input)) {
         args.push("/experimental:external");
+        var enforcesSlashW =
+                Utilities.versionCompare(input.cpp.compilerVersion, "19.29.30037") >= 0
+        if (enforcesSlashW)
+            args.push("/external:W0")
         includeFlag = input.cpp.systemIncludeFlag;
     }
     var systemIncludePaths = Cpp.collectSystemIncludePaths(input);