diff options
author | Ivan Komissarov <ABBAPOH@gmail.com> | 2021-06-02 01:09:53 +0300 |
---|---|---|
committer | Ivan Komissarov <ABBAPOH@gmail.com> | 2021-06-02 01:09:53 +0300 |
commit | d0f63ec37d0eda23ddbab1dcd0ba0139dd29c074 (patch) | |
tree | 25303240ba36ef5fb888093a811fafa98dc6ffff /share/qbs/module-providers | |
parent | 528df572421e81349e7400d30aa0fdea4bfeb79e (diff) | |
parent | f5a13789ee53426f64ccb254a464949cf6276f01 (diff) |
Merge branch '1.19' into master
Change-Id: If67803997308ac02ce75daa2f22f12e3426079c8
Diffstat (limited to 'share/qbs/module-providers')
-rw-r--r-- | share/qbs/module-providers/Qt/templates/qml.js | 4 | ||||
-rw-r--r-- | share/qbs/module-providers/Qt/templates/qml.qbs | 2 |
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 { |