aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKai Koehne <kai.koehne@qt.io>2018-03-12 16:52:21 +0100
committerKai Koehne <kai.koehne@qt.io>2018-03-13 09:32:43 +0000
commit139ca28122099bd9565dfa66277ff9a445e0952d (patch)
tree6f50a19fd550d3dc7a11ef14e6450a19bd0c1759
parentb0c009774c77b872715b695b01a05ae44600f8f7 (diff)
Make Qt Concurrent dependency optional
Change-Id: Ifd7cac3f646ecef2e8b12079771c01af410691bb Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
-rw-r--r--tests/benchmarker/benchmarker.qbs6
-rw-r--r--tests/tests.pro4
2 files changed, 8 insertions, 2 deletions
diff --git a/tests/benchmarker/benchmarker.qbs b/tests/benchmarker/benchmarker.qbs
index 8dec56d60..7fd3b48b5 100644
--- a/tests/benchmarker/benchmarker.qbs
+++ b/tests/benchmarker/benchmarker.qbs
@@ -6,7 +6,11 @@ QtApplication {
type: "application"
consoleApplication: true
cpp.cxxLanguageVersion: "c++11"
- Depends { name: "Qt.concurrent" }
+ condition: Qt.concurrent.present
+ Depends {
+ name: "Qt.concurrent"
+ required: false
+ }
files: [
"activities.h",
"benchmarker-main.cpp",
diff --git a/tests/tests.pro b/tests/tests.pro
index 2ababcb8c..e454771e4 100644
--- a/tests/tests.pro
+++ b/tests/tests.pro
@@ -1,2 +1,4 @@
TEMPLATE = subdirs
-SUBDIRS = auto fuzzy-test benchmarker
+SUBDIRS = auto fuzzy-test
+
+qtHaveModule(concurrent): SUBDIRS += benchmarker