diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2017-10-18 13:41:55 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2017-10-18 14:18:41 +0000 |
| commit | 527594bb838efd5663b99577323756ebec6a3d70 (patch) | |
| tree | a36d25677665fbeb2b9d932cbee36fec3429aa39 /qbs | |
| parent | 668c87ffd9765689598394a92d7f986055431aa9 (diff) | |
qbs build: Add missing defines
The string concatenation macros were not set, as opposed to the qmake
build.
Change-Id: I32e2c72c891419ef8352cb7b46e3b7f9b82b6312
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
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 2d86311510..18951cb2d3 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 { |