diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2017-12-14 12:43:08 +0100 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2017-12-15 09:40:16 +0000 |
| commit | 193f3f02aae324ba7273e368b528b437da46caac (patch) | |
| tree | 39c436f0a6ca7c7b3fcfd71febc4dfb941c11ed2 /src/lib/qtprofilesetup | |
| parent | 8eaef2035c2af7205e823eb9503721c29b0136a1 (diff) | |
Fix qtquickcompiler support for QML files in subdirectories
The input to the look-up function is a relative file path, not
necessarily just a file name as the code assumed.
Task-number: QBS-1261
Change-Id: Iaad4629ea92f327edc3dca7f012d82a00669994f
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
Diffstat (limited to 'src/lib/qtprofilesetup')
| -rw-r--r-- | src/lib/qtprofilesetup/templates/quick.qbs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/qtprofilesetup/templates/quick.qbs b/src/lib/qtprofilesetup/templates/quick.qbs index 5358a684f..8079c9af9 100644 --- a/src/lib/qtprofilesetup/templates/quick.qbs +++ b/src/lib/qtprofilesetup/templates/quick.qbs @@ -143,15 +143,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) { |