diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2017-12-15 11:14:54 +0100 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2017-12-15 11:14:54 +0100 |
| commit | a9ac384513cc2c39b2005ee5651c34a49e801641 (patch) | |
| tree | 830bf2b3bad36fec9b9fa0fa76f9dfa488f22da4 /src/lib/qtprofilesetup | |
| parent | 126ce8cd2b2c0c10525e23c9900ec25b0bade601 (diff) | |
| parent | 8815e0007006e996bc145a91970d71b9b4ae86d0 (diff) | |
Merge 1.10 into master
Change-Id: Iab942ed25d06038cf8c172eb70dcd8e9a720e1c8
Diffstat (limited to 'src/lib/qtprofilesetup')
| -rw-r--r-- | src/lib/qtprofilesetup/templates/core.qbs | 2 | ||||
| -rw-r--r-- | src/lib/qtprofilesetup/templates/quick.qbs | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/qtprofilesetup/templates/core.qbs b/src/lib/qtprofilesetup/templates/core.qbs index 5a2225123..aba097a6a 100644 --- a/src/lib/qtprofilesetup/templates/core.qbs +++ b/src/lib/qtprofilesetup/templates/core.qbs @@ -188,7 +188,7 @@ Module { // Universal Windows Platform support cpp.windowsApiFamily: mkspecName.startsWith("winrt-") ? "pc" : undefined - cpp.windowsApiFamilyAdditionalPartitions: mkspecPath.startsWith("winrt-") ? ["phone"] : undefined + cpp.windowsApiAdditionalPartitions: mkspecPath.startsWith("winrt-") ? ["phone"] : undefined cpp.requireAppContainer: mkspecName.startsWith("winrt-") additionalProductTypes: ["qm"] diff --git a/src/lib/qtprofilesetup/templates/quick.qbs b/src/lib/qtprofilesetup/templates/quick.qbs index 539fbfee6..6bac7ad27 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(fileName) { + function findOutput(relFilePath) { for (var k in outputs) { for (var i in outputs[k]) { - if (outputs[k][i].fileName === fileName) + if (outputs[k][i].filePath.endsWith(relFilePath)) return outputs[k][i]; } } throw new Error("Qt Quick compiler rule: Cannot find output artifact " - + fileName + "."); + + relFilePath + "."); } infos.forEach(function (info) { |