diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2018-03-15 10:13:56 +0100 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2018-03-15 10:13:56 +0100 |
| commit | 72f4a0051549907f9ea335ce773889ac8d159243 (patch) | |
| tree | 7930c83e3fd86d1239df1a09bd006a9951e929cd /tests/benchmarker | |
| parent | cfe33211cc48199b2b69ac37972d58d5d141ef07 (diff) | |
| parent | 2c0962017e24574b3d92599229384b2e7beb1794 (diff) | |
Merge 1.11 into master
Change-Id: I15cdc5c73a13c36cf073d01aff0406e539bb507b
Diffstat (limited to 'tests/benchmarker')
| -rw-r--r-- | tests/benchmarker/benchmarker.qbs | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/tests/benchmarker/benchmarker.qbs b/tests/benchmarker/benchmarker.qbs index a3ad96f7e..200ab3189 100644 --- a/tests/benchmarker/benchmarker.qbs +++ b/tests/benchmarker/benchmarker.qbs @@ -6,7 +6,11 @@ QtApplication { type: "application" consoleApplication: true cpp.cxxLanguageVersion: "c++14" - Depends { name: "Qt.concurrent" } + condition: Qt.concurrent.present + Depends { + name: "Qt.concurrent" + required: false + } files: [ "activities.h", "benchmarker-main.cpp", |