aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIvan Komissarov <abbapoh@gmail.com>2021-05-29 15:03:06 +0200
committerIvan Komissarov <ABBAPOH@gmail.com>2021-05-31 10:40:35 +0000
commit0ff1cfe032b87b0f2032731c9da35db6a345883f (patch)
tree67237e27056591b250856ef669166f7a0d4a7d18
parentc64f40821e97bd463e7e518f6febffe200e20978 (diff)
Use qbs.hostOS instead of qbs.targetOS in qml.js
... to check for the dreaded Windows limit for maximum command line length. Amends bf0a3750e0845eeba3814a4f16c20d112181e280. Task-number: QBS-1633 Change-Id: I3735d4f327d440a261666f5722a5715b9a31b320 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
-rw-r--r--share/qbs/module-providers/Qt/templates/qml.js4
-rw-r--r--share/qbs/module-providers/Qt/templates/qml.qbs2
2 files changed, 3 insertions, 3 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 {