From 527594bb838efd5663b99577323756ebec6a3d70 Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Wed, 18 Oct 2017 13:41:55 +0200 Subject: 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 --- qbs/imports/QtcAutotest.qbs | 6 +++++- qbs/modules/qtc/qtc.qbs | 2 ++ 2 files changed, 7 insertions(+), 1 deletion(-) (limited to 'qbs') diff --git a/qbs/imports/QtcAutotest.qbs b/qbs/imports/QtcAutotest.qbs index bbef04d1751..cb914f7ef1c 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 2d863115100..18951cb2d39 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 { -- cgit v1.2.3