diff options
| author | Christian Kandeler <christian.kandeler@nokia.com> | 2012-09-05 11:01:43 +0200 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@nokia.com> | 2012-09-13 10:46:51 +0200 |
| commit | 40d919eed8897f0806879274ee298eaed65514b6 (patch) | |
| tree | 165831238e897d8ac3d11be1b54ddbe11f723e8c /qtcreator.qbp | |
| parent | 405217c111d22ea2b2913fd08b4f870e4e43aa38 (diff) | |
| download | qt-creator-40d919eed8897f0806879274ee298eaed65514b6.tar.gz | |
Support built-in testing infrastructure with qbs build.
I.e. define WITH_TESTS for debug builds or if the respective
environment variable is set.
Change-Id: I2764ece50d0783e8cb030b1695e6f59cf6063248
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Diffstat (limited to 'qtcreator.qbp')
| -rw-r--r-- | qtcreator.qbp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/qtcreator.qbp b/qtcreator.qbp index 4098134617..fdb73058e7 100644 --- a/qtcreator.qbp +++ b/qtcreator.qbp @@ -1,12 +1,12 @@ import qbs.base 1.0 import qbs.fileinfo 1.0 as FileInfo +import "qbs/defaults.js" as Defaults Project { property string ide_version_major: '2' property string ide_version_minor: '6' property string ide_version_release: '81' property string qtcreator_version: ide_version_major + '.' + ide_version_minor + '.' + ide_version_release - property var additionalCppDefines: [ 'IDE_LIBRARY_BASENAME="lib"' ] moduleSearchPaths: "qbs" references: [ @@ -135,7 +135,7 @@ Project { consoleApplication: qbs.debugInformation cpp.rpaths: ["$ORIGIN/../lib/qtcreator"] - cpp.defines: project.additionalCppDefines + cpp.defines: Defaults.defines(qbs) cpp.linkerFlags: { if (qbs.buildVariant == "release" && (qbs.toolchain == "gcc" || qbs.toolchain == "mingw")) return ["-Wl,-s"] |