feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Synchronize autotest defines in qmake and qbs build

Browse Source 
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>
This commit is contained in:
Joerg Bornemann
2018-03-16 07:57:22 +01:00
parent 62007d922c
commit cabbeb1c54
4 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/auto/utils/stringutils/stringutils.qbs
+4
View File
@@ -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"
}