diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2016-11-26 16:56:00 +0100 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@theqtcompany.com> | 2016-11-26 17:03:54 +0100 |
| commit | 6493349ce6c0387c95756a986ed4a92b07ae0b9e (patch) | |
| tree | 3d08bf1d30a2f3d4d2be74f9a83b279a989416aa /qbs-resources | |
| parent | 1b3b13fd65ff8d4741947b06948c2d2ccd6d2a45 (diff) | |
| parent | 7f530b028d1bba66ec75b441813e89aacbcababe (diff) | |
Merge 1.7 into master
Change-Id: I4942dca52ff7920ec0363343dc938948833568cc
Diffstat (limited to 'qbs-resources')
| -rw-r--r-- | qbs-resources/imports/QbsApp.qbs | 3 | ||||
| -rw-r--r-- | qbs-resources/imports/QbsAutotest.qbs | 5 |
2 files changed, 5 insertions, 3 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 6e955971c..66e076677 100644 --- a/qbs-resources/imports/QbsAutotest.qbs +++ b/qbs-resources/imports/QbsAutotest.qbs @@ -1,11 +1,12 @@ import qbs +import qbs.FileInfo QtApplication { type: ["application", "autotest"] consoleApplication: true property string testName name: "tst_" + testName - Depends { name: "Qt.test" } + Depends { name: "Qt.testlib" } Depends { name: "qbscore" } Depends { name: "qbsbuildconfig" } cpp.includePaths: "../../../src" @@ -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", |