diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2018-03-16 07:57:22 +0100 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2018-03-19 11:50:38 +0000 |
| commit | cabbeb1c5450b67ba649d77474b892d5acb0d622 (patch) | |
| tree | 24f9a51edc8c591d66dc81ba39726ea843054cd5 | |
| parent | 62007d922c78175235d887a473eddf865b25bc39 (diff) | |
| download | qt-creator-cabbeb1c5450b67ba649d77474b892d5acb0d622.tar.gz | |
Synchronize autotest defines in qmake and qbs build
Do not remove QT_USE_FAST_OPERATOR_PLUS and QT_USE_FAST_CONCATENATION
in QtcAutotest, but in the two tests that won't build with it.
In the qmake build the defines are not removed from json.pro, because
this file does not include qttest.pri.
Change-Id: I97d173528ca2a02bac1bfae30709a959e6b69375
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
| -rw-r--r-- | qbs/imports/QtcAutotest.qbs | 4 | ||||
| -rw-r--r-- | tests/auto/json/json.qbs | 5 | ||||
| -rw-r--r-- | tests/auto/utils/stringutils/stringutils.qbs | 4 | ||||
| -rw-r--r-- | tests/auto/utils/templateengine/templateengine.qbs | 4 |
4 files changed, 14 insertions, 3 deletions
diff --git a/qbs/imports/QtcAutotest.qbs b/qbs/imports/QtcAutotest.qbs index cb914f7ef1..4e47b528ab 100644 --- a/qbs/imports/QtcAutotest.qbs +++ b/qbs/imports/QtcAutotest.qbs @@ -16,9 +16,7 @@ QtcProduct { project.buildDirectory + '/' + qtc.ide_plugin_path ] cpp.defines: base.filter(function(d) { - return d !== "QT_RESTRICTED_CAST_FROM_ASCII" - && d !== "QT_USE_FAST_OPERATOR_PLUS" - && d !== "QT_USE_FAST_CONCATENATION"; + return d !== "QT_RESTRICTED_CAST_FROM_ASCII"; }) Group { diff --git a/tests/auto/json/json.qbs b/tests/auto/json/json.qbs index 3b0a36e141..6ebb9ce438 100644 --- a/tests/auto/json/json.qbs +++ b/tests/auto/json/json.qbs @@ -7,6 +7,11 @@ QtcAutotest { consoleApplication: true + cpp.defines: base.filter(function(d) { + return d !== "QT_USE_FAST_OPERATOR_PLUS" + && d !== "QT_USE_FAST_CONCATENATION"; + }) + Group { name: "test data" files: [ diff --git a/tests/auto/utils/stringutils/stringutils.qbs b/tests/auto/utils/stringutils/stringutils.qbs index 4a36fe9cb1..67dae5f643 100644 --- a/tests/auto/utils/stringutils/stringutils.qbs +++ b/tests/auto/utils/stringutils/stringutils.qbs @@ -3,5 +3,9 @@ import qbs QtcAutotest { name: "StringUtils autotest" Depends { name: "Utils" } + cpp.defines: base.filter(function(d) { + return d !== "QT_USE_FAST_OPERATOR_PLUS" + && d !== "QT_USE_FAST_CONCATENATION"; + }) files: "tst_stringutils.cpp" } diff --git a/tests/auto/utils/templateengine/templateengine.qbs b/tests/auto/utils/templateengine/templateengine.qbs index b31ebdcd1b..f3c719a168 100644 --- a/tests/auto/utils/templateengine/templateengine.qbs +++ b/tests/auto/utils/templateengine/templateengine.qbs @@ -3,5 +3,9 @@ import qbs QtcAutotest { name: "TemplateEngine autotest" Depends { name: "Utils" } + cpp.defines: base.filter(function(d) { + return d !== "QT_USE_FAST_OPERATOR_PLUS" + && d !== "QT_USE_FAST_CONCATENATION"; + }) files: "tst_templateengine.cpp" } |