From f4b13dc77ce1839b5cbc69ab52b63f69f3cd8dd2 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Fri, 16 Mar 2018 13:18:28 +0100 Subject: Version bump to 4.6.0 Change-Id: Ibf3dd86a654080cb9b5ab2a4fd790f8f59879787 Reviewed-by: Eike Ziller --- qbs/modules/qtc/qtc.qbs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'qbs') diff --git a/qbs/modules/qtc/qtc.qbs b/qbs/modules/qtc/qtc.qbs index e637ce81118..77b27dc5856 100644 --- a/qbs/modules/qtc/qtc.qbs +++ b/qbs/modules/qtc/qtc.qbs @@ -4,16 +4,16 @@ import qbs.FileInfo import "qtc.js" as HelperFunctions Module { - property string qtcreator_display_version: '4.6.0-rc1' + property string qtcreator_display_version: '4.6.0' property string ide_version_major: '4' - property string ide_version_minor: '5' - property string ide_version_release: '83' + property string ide_version_minor: '6' + property string ide_version_release: '0' property string qtcreator_version: ide_version_major + '.' + ide_version_minor + '.' + ide_version_release property string ide_compat_version_major: '4' - property string ide_compat_version_minor: '5' - property string ide_compat_version_release: '83' + property string ide_compat_version_minor: '6' + property string ide_compat_version_release: '0' property string qtcreator_compat_version: ide_compat_version_major + '.' + ide_compat_version_minor + '.' + ide_compat_version_release -- cgit v1.2.3 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 cb914f7ef1c..4e47b528abc 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.3