From 25f1efc2b68fad176eea8330ca914d5394674404 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Thu, 11 Nov 2021 15:43:12 +0100 Subject: [PATCH] Bump version to 6.0.0 Change-Id: I68af70325909705107b2e880011c72d0b75000ae Reviewed-by: Eike Ziller --- cmake/QtCreatorIDEBranding.cmake | 6 +++--- qbs/modules/qtc/qtc.qbs | 10 +++++----- qtcreator_ide_branding.pri | 6 +++--- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/cmake/QtCreatorIDEBranding.cmake b/cmake/QtCreatorIDEBranding.cmake index cced80b3e20..270e0fe174c 100644 --- a/cmake/QtCreatorIDEBranding.cmake +++ b/cmake/QtCreatorIDEBranding.cmake @@ -1,6 +1,6 @@ -set(IDE_VERSION "5.84.0") # The IDE version. -set(IDE_VERSION_COMPAT "5.84.0") # The IDE Compatibility version. -set(IDE_VERSION_DISPLAY "6.0.0-rc1") # The IDE display version. +set(IDE_VERSION "6.0.0") # The IDE version. +set(IDE_VERSION_COMPAT "6.0.0") # The IDE Compatibility version. +set(IDE_VERSION_DISPLAY "6.0.0") # The IDE display version. set(IDE_COPYRIGHT_YEAR "2021") # The IDE current copyright year. set(IDE_SETTINGSVARIANT "QtProject") # The IDE settings variation. diff --git a/qbs/modules/qtc/qtc.qbs b/qbs/modules/qtc/qtc.qbs index ea2dedef4bf..925d7d615f6 100644 --- a/qbs/modules/qtc/qtc.qbs +++ b/qbs/modules/qtc/qtc.qbs @@ -3,15 +3,15 @@ import qbs.Environment import qbs.FileInfo Module { - property string qtcreator_display_version: '6.0.0-rc1' - property string ide_version_major: '5' - property string ide_version_minor: '84' + property string qtcreator_display_version: '6.0.0' + property string ide_version_major: '6' + property string ide_version_minor: '0' 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: '5' - property string ide_compat_version_minor: '84' + property string ide_compat_version_major: '6' + property string ide_compat_version_minor: '0' property string ide_compat_version_release: '0' property string qtcreator_compat_version: ide_compat_version_major + '.' + ide_compat_version_minor + '.' + ide_compat_version_release diff --git a/qtcreator_ide_branding.pri b/qtcreator_ide_branding.pri index a47d5c24928..364f1a70691 100644 --- a/qtcreator_ide_branding.pri +++ b/qtcreator_ide_branding.pri @@ -1,6 +1,6 @@ -QTCREATOR_VERSION = 5.84.0 -QTCREATOR_COMPAT_VERSION = 5.84.0 -QTCREATOR_DISPLAY_VERSION = 6.0.0-rc1 +QTCREATOR_VERSION = 6.0.0 +QTCREATOR_COMPAT_VERSION = 6.0.0 +QTCREATOR_DISPLAY_VERSION = 6.0.0 QTCREATOR_COPYRIGHT_YEAR = 2021 IDE_DISPLAY_NAME = Qt Creator