diff options
| author | Christian Kandeler <christian.kandeler@digia.com> | 2013-07-08 14:18:09 +0200 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@digia.com> | 2013-07-11 13:30:18 +0200 |
| commit | fa7546a4539f753b01fe2738a5001ce65744346e (patch) | |
| tree | 47ab9b26b96c394d4dc0eaa3596a4d3c261cc119 | |
| parent | fcbadb61401daf3256e81659d8e84a42d9cd8cd4 (diff) | |
| download | qbs-fa7546a4539f753b01fe2738a5001ce65744346e.tar.gz | |
Only add QtTest dependency to lib if the unit tests are enabled.
Change-Id: Iaf89c1db04bd44107c166f10cd933854bade8a6e
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| -rw-r--r-- | src/lib/lib.pro | 4 | ||||
| -rw-r--r-- | src/lib/lib.qbs | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/lib/lib.pro b/src/lib/lib.pro index cd5edb4dd..5fb366954 100644 --- a/src/lib/lib.pro +++ b/src/lib/lib.pro @@ -1,4 +1,6 @@ -QT = core script testlib +QT = core script +all_tests:QT += testlib + greaterThan(QT_MAJOR_VERSION, 4): QT += concurrent TEMPLATE = lib !isEmpty(QBS_DLLDESTDIR):DLLDESTDIR = $${QBS_DLLDESTDIR} diff --git a/src/lib/lib.qbs b/src/lib/lib.qbs index ac4c23777..ac768636b 100644 --- a/src/lib/lib.qbs +++ b/src/lib/lib.qbs @@ -3,7 +3,8 @@ import "../../version.js" as Version Product { Depends { name: "cpp" } - Depends { name: "Qt"; submodules: ["core", "script", "xml", "test"] } + Depends { name: "Qt"; submodules: ["core", "script", "xml"] } + Depends { condition: project.enableUnitTests; name: "Qt.test" } Depends { condition: Qt.core.versionMajor >= 5; name: "Qt.concurrent" } name: "qbscore" type: Qt.core.staticBuild ? "staticlibrary" : "dynamiclibrary" |