diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2016-11-22 12:28:00 +0100 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2016-11-23 09:12:05 +0000 |
| commit | c94e6e0dfc34740e7e1e80d8be7fb7b8d4fd2551 (patch) | |
| tree | 1ad3c40ee427a2f33d5150b9c82b9a48ab18fadd | |
| parent | eed525793aa22f24f9239f9953c95700ba972ef3 (diff) | |
qbs build: Don't use relative paths in product parent items
We should be explicit about where we assume the source files to be. The
base directory might change in the future.
Change-Id: Ia1668169e78ce8334d1807e54acf085756257a2e
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
| -rw-r--r-- | qbs-resources/imports/QbsApp.qbs | 3 | ||||
| -rw-r--r-- | qbs-resources/imports/QbsAutotest.qbs | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/qbs-resources/imports/QbsApp.qbs b/qbs-resources/imports/QbsApp.qbs index a6a53048e..f252b336c 100644 --- a/qbs-resources/imports/QbsApp.qbs +++ b/qbs-resources/imports/QbsApp.qbs @@ -1,4 +1,5 @@ import qbs +import qbs.FileInfo QbsProduct { Depends { name: "qbscore" } @@ -17,7 +18,7 @@ QbsProduct { } Group { name: "logging" - prefix: "../shared/logging/" + prefix: FileInfo.joinPaths(product.sourceDirectory, "../shared/logging") + '/' files: [ "coloredoutput.cpp", "coloredoutput.h", diff --git a/qbs-resources/imports/QbsAutotest.qbs b/qbs-resources/imports/QbsAutotest.qbs index e44429a69..66e076677 100644 --- a/qbs-resources/imports/QbsAutotest.qbs +++ b/qbs-resources/imports/QbsAutotest.qbs @@ -1,4 +1,5 @@ import qbs +import qbs.FileInfo QtApplication { type: ["application", "autotest"] @@ -13,7 +14,7 @@ QtApplication { destinationDirectory: "bin" Group { name: "logging" - prefix: "../../../src/app/shared/logging/" + prefix: FileInfo.joinPaths(product.sourceDirectory, "../../../src/app/shared/logging") + '/' files: [ "coloredoutput.cpp", "coloredoutput.h", |