diff options
| author | Joerg Bornemann <joerg.bornemann@digia.com> | 2013-07-22 14:15:18 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@digia.com> | 2013-07-23 10:28:19 +0200 |
| commit | 8ce7eae21371943e416a1e158718f9ad7f78ca78 (patch) | |
| tree | 4737a3aec9e0a1e1a0adbfe9550b9524b3ba5a4a | |
| parent | ce7d8494dcac8b763fa0045e8cb7183a01293d5f (diff) | |
| download | qbs-8ce7eae21371943e416a1e158718f9ad7f78ca78.tar.gz | |
don't link against QtConcurrent
Task-number: QBS-68
Task-number: QBS-307
Change-Id: I1da3c16f3e68d494664ff1f1bd2e354a48161303
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
| -rw-r--r-- | src/lib/lib.pro | 1 | ||||
| -rw-r--r-- | src/lib/lib.qbs | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/src/lib/lib.pro b/src/lib/lib.pro index 5fb366954..f228e1f94 100644 --- a/src/lib/lib.pro +++ b/src/lib/lib.pro @@ -1,7 +1,6 @@ QT = core script all_tests:QT += testlib -greaterThan(QT_MAJOR_VERSION, 4): QT += concurrent TEMPLATE = lib !isEmpty(QBS_DLLDESTDIR):DLLDESTDIR = $${QBS_DLLDESTDIR} else:DLLDESTDIR = ../../bin diff --git a/src/lib/lib.qbs b/src/lib/lib.qbs index ac768636b..ce6c47c4f 100644 --- a/src/lib/lib.qbs +++ b/src/lib/lib.qbs @@ -5,7 +5,6 @@ Product { Depends { name: "cpp" } 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" targetName: (qbs.enableDebugCode && qbs.targetOS.contains("windows")) ? (name + 'd') : name |