diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2017-10-19 13:01:12 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2017-10-19 13:01:12 +0200 |
| commit | bb9663529beec0530f227cb196907d8a87593a3d (patch) | |
| tree | bd772de7f00d73086e1d0c0a051b9fefafdeefb2 /qbs | |
| parent | 7208ef1ff51e766ae5af64c95436b74a6535d811 (diff) | |
| parent | 38d307ffb84e4c945682263e2e006ddf23aed857 (diff) | |
Merge remote-tracking branch 'origin/4.5'
Change-Id: Ie83666bd18e899dabf5190c360027bf02abecdaf
Diffstat (limited to 'qbs')
| -rw-r--r-- | qbs/imports/QtcAutotest.qbs | 6 | ||||
| -rw-r--r-- | qbs/modules/qtc/qtc.qbs | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/qbs/imports/QtcAutotest.qbs b/qbs/imports/QtcAutotest.qbs index bbef04d175..cb914f7ef1 100644 --- a/qbs/imports/QtcAutotest.qbs +++ b/qbs/imports/QtcAutotest.qbs @@ -15,7 +15,11 @@ QtcProduct { project.buildDirectory + '/' + qtc.ide_library_path, project.buildDirectory + '/' + qtc.ide_plugin_path ] - cpp.defines: base.filter(function(d) { return d != "QT_RESTRICTED_CAST_FROM_ASCII"; }) + cpp.defines: base.filter(function(d) { + return d !== "QT_RESTRICTED_CAST_FROM_ASCII" + && d !== "QT_USE_FAST_OPERATOR_PLUS" + && d !== "QT_USE_FAST_CONCATENATION"; + }) Group { fileTagsFilter: product.type diff --git a/qbs/modules/qtc/qtc.qbs b/qbs/modules/qtc/qtc.qbs index 4b8058d3a6..60816c0eb0 100644 --- a/qbs/modules/qtc/qtc.qbs +++ b/qbs/modules/qtc/qtc.qbs @@ -76,6 +76,8 @@ Module { "QT_NO_CAST_TO_ASCII", "QT_RESTRICTED_CAST_FROM_ASCII", "QT_DISABLE_DEPRECATED_BEFORE=0x050600", + "QT_USE_FAST_OPERATOR_PLUS", + "QT_USE_FAST_CONCATENATION", ].concat(testsEnabled ? ["WITH_TESTS"] : []) Rule { |