diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2021-03-25 12:14:19 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2021-03-25 11:15:10 +0000 |
| commit | 2b521506f3b2a2e0a5c5eb1fb86672a6ce6e1ed7 (patch) | |
| tree | a5ed26cd1b2f6313ca9fb3c369149ad3dee37953 | |
| parent | 9a95611e5417b7da92ee49534df9855442814b1a (diff) | |
Bump version to 4.15.0-rc1
Change-Id: I522a8c88d636bcc09de2be0b2aa4f47a1c080ac9
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 | 6 |
3 files changed, 9 insertions, 9 deletions
diff --git a/cmake/QtCreatorIDEBranding.cmake b/cmake/QtCreatorIDEBranding.cmake index d34d26a90a..6138756b21 100644 --- a/cmake/QtCreatorIDEBranding.cmake +++ b/cmake/QtCreatorIDEBranding.cmake @@ -1,6 +1,6 @@ -set(IDE_VERSION "4.14.83") # The IDE version. -set(IDE_VERSION_COMPAT "4.14.83") # The IDE Compatibility version. -set(IDE_VERSION_DISPLAY "4.15.0-beta2") # The IDE display version. +set(IDE_VERSION "4.14.84") # The IDE version. +set(IDE_VERSION_COMPAT "4.14.84") # The IDE Compatibility version. +set(IDE_VERSION_DISPLAY "4.15.0-rc1") # 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 c96195ce75..b9454481f5 100644 --- a/qbs/modules/qtc/qtc.qbs +++ b/qbs/modules/qtc/qtc.qbs @@ -3,16 +3,16 @@ import qbs.Environment import qbs.FileInfo Module { - property string qtcreator_display_version: '4.15.0-beta2' + property string qtcreator_display_version: '4.15.0-rc1' property string ide_version_major: '4' property string ide_version_minor: '14' - 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: '14' - 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 35fa061c2b..65ab190190 100644 --- a/qtcreator_ide_branding.pri +++ b/qtcreator_ide_branding.pri @@ -1,6 +1,6 @@ -QTCREATOR_VERSION = 4.14.83 -QTCREATOR_COMPAT_VERSION = 4.14.83 -QTCREATOR_DISPLAY_VERSION = 4.15.0-beta2 +QTCREATOR_VERSION = 4.14.84 +QTCREATOR_COMPAT_VERSION = 4.14.84 +QTCREATOR_DISPLAY_VERSION = 4.15.0-rc1 QTCREATOR_COPYRIGHT_YEAR = 2021 IDE_DISPLAY_NAME = Qt Creator |