aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Ziller <eike.ziller@qt.io>2022-03-10 08:54:22 +0100
committerEike Ziller <eike.ziller@qt.io>2022-03-10 07:54:45 +0000
commite8e4aada5349c889914743dcff3bcbcc9fd838b4 (patch)
tree617bbf40835da44bd067f58cd14d18d7226017ed
parent1e8b81da96c2a529bb219eb1f79d73ade0412de7 (diff)
Bump version to 7.0-rc1v7.0.0-rc1
Change-Id: Ib643e8a7594fe12d0dab80963258cf7fc3b78d3c Reviewed-by: Eike Ziller <eike.ziller@qt.io>
-rw-r--r--cmake/QtCreatorIDEBranding.cmake6
-rw-r--r--qbs/modules/qtc/qtc.qbs6
-rw-r--r--qtcreator_ide_branding.pri6
3 files changed, 9 insertions, 9 deletions
diff --git a/cmake/QtCreatorIDEBranding.cmake b/cmake/QtCreatorIDEBranding.cmake
index 6d6b3caeeb..91d188b86a 100644
--- a/cmake/QtCreatorIDEBranding.cmake
+++ b/cmake/QtCreatorIDEBranding.cmake
@@ -1,6 +1,6 @@
-set(IDE_VERSION "6.83.0") # The IDE version.
-set(IDE_VERSION_COMPAT "6.83.0") # The IDE Compatibility version.
-set(IDE_VERSION_DISPLAY "7.0.0-beta2") # The IDE display version.
+set(IDE_VERSION "6.84.0") # The IDE version.
+set(IDE_VERSION_COMPAT "6.84.0") # The IDE Compatibility version.
+set(IDE_VERSION_DISPLAY "7.0.0-rc1") # The IDE display version.
set(IDE_COPYRIGHT_YEAR "2022") # 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 c15fdf8fdf..b584c8280f 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: '7.0.0-beta2'
+ property string qtcreator_display_version: '7.0.0-rc1'
property string ide_version_major: '6'
- property string ide_version_minor: '83'
+ property string ide_version_minor: '84'
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: '6'
- property string ide_compat_version_minor: '83'
+ property string ide_compat_version_minor: '84'
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 ae3677bb76..a3bbcd9fe4 100644
--- a/qtcreator_ide_branding.pri
+++ b/qtcreator_ide_branding.pri
@@ -1,6 +1,6 @@
-QTCREATOR_VERSION = 6.83.0
-QTCREATOR_COMPAT_VERSION = 6.83.0
-QTCREATOR_DISPLAY_VERSION = 7.0.0-beta2
+QTCREATOR_VERSION = 6.84.0
+QTCREATOR_COMPAT_VERSION = 6.84.0
+QTCREATOR_DISPLAY_VERSION = 7.0.0-rc1
QTCREATOR_COPYRIGHT_YEAR = 2022
IDE_DISPLAY_NAME = Qt Creator