diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2020-03-19 17:26:15 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2020-03-19 16:26:44 +0000 |
| commit | c6e03959d8ca5bc9019cc468e1278860eb7d0eaf (patch) | |
| tree | 2fc20d3058583dd6118dd1528ed46adba2de1c0e | |
| parent | 4f9d1a045427dc8ed2118497dc4ea9181ce32dc4 (diff) | |
Bump version
Change-Id: I1139e1c10311fda9f46367dcb397fa674050f7da
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
| -rw-r--r-- | cmake/QtCreatorIDEBranding.cmake | 6 | ||||
| -rw-r--r-- | qbs/modules/qtc/qtc.qbs | 6 | ||||
| -rw-r--r-- | qtcreator_ide_branding.pri | 8 |
3 files changed, 10 insertions, 10 deletions
diff --git a/cmake/QtCreatorIDEBranding.cmake b/cmake/QtCreatorIDEBranding.cmake index 8f1bd0fb0e5..402acabfb86 100644 --- a/cmake/QtCreatorIDEBranding.cmake +++ b/cmake/QtCreatorIDEBranding.cmake @@ -1,9 +1,9 @@ #BINARY_ARTIFACTS_BRANCH = master #PROJECT_USER_FILE_EXTENSION = .user -set(IDE_VERSION "4.11.83") # The IDE version. -set(IDE_VERSION_COMPAT "4.11.83") # The IDE Compatibility version. -set(IDE_VERSION_DISPLAY "4.12.0-beta2") # The IDE display version. +set(IDE_VERSION "4.11.84") # The IDE version. +set(IDE_VERSION_COMPAT "4.11.84") # The IDE Compatibility version. +set(IDE_VERSION_DISPLAY "4.12.0-rc1") # The IDE display version. set(IDE_COPYRIGHT_YEAR "2020") # 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 0232974e056..2d7502469c3 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.12.0-beta2' + property string qtcreator_display_version: '4.12.0-rc1' property string ide_version_major: '4' property string ide_version_minor: '11' - property string ide_version_release: '83' + property string ide_version_release: '84' 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: '11' - property string ide_compat_version_release: '83' + property string ide_compat_version_release: '84' 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 074242599e2..d31ffb4762a 100644 --- a/qtcreator_ide_branding.pri +++ b/qtcreator_ide_branding.pri @@ -1,8 +1,8 @@ -QTCREATOR_VERSION = 4.11.83 -QTCREATOR_COMPAT_VERSION = 4.11.83 -QTCREATOR_DISPLAY_VERSION = 4.12.0-beta2 +QTCREATOR_VERSION = 4.11.84 +QTCREATOR_COMPAT_VERSION = 4.11.84 +QTCREATOR_DISPLAY_VERSION = 4.12.0-rc1 QTCREATOR_COPYRIGHT_YEAR = 2020 -BINARY_ARTIFACTS_BRANCH = master +BINARY_ARTIFACTS_BRANCH = 4.12 IDE_DISPLAY_NAME = Qt Creator IDE_ID = qtcreator |