From cabbeb1c5450b67ba649d77474b892d5acb0d622 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Fri, 16 Mar 2018 07:57:22 +0100 Subject: 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 --- qbs/imports/QtcAutotest.qbs | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'qbs') 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 { -- cgit v1.2.1