diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2020-03-20 08:21:05 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2020-03-20 07:21:45 +0000 |
| commit | af297678579290fd692b0ae67e4184097aede859 (patch) | |
| tree | 8afdc640e585a8226672567b52fd2d10e8dd72f1 | |
| parent | d80f3972a4efe996f3df6d27d689ea2646c1d9bb (diff) | |
Bump master->4.13.0-beta1
Change-Id: Ia25db16341e45f75c893c21c159775fd3428b538
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
| -rw-r--r-- | cmake/QtCreatorIDEBranding.cmake | 6 | ||||
| -rw-r--r-- | qbs/modules/qtc/qtc.qbs | 10 | ||||
| -rw-r--r-- | qtcreator_ide_branding.pri | 8 |
3 files changed, 12 insertions, 12 deletions
diff --git a/cmake/QtCreatorIDEBranding.cmake b/cmake/QtCreatorIDEBranding.cmake index 402acabfb86..4182c1c611d 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.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_VERSION "4.12.82") # The IDE version. +set(IDE_VERSION_COMPAT "4.12.82") # The IDE Compatibility version. +set(IDE_VERSION_DISPLAY "4.13.0-beta1") # 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 2d7502469c3..92245dfc170 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-rc1' + property string qtcreator_display_version: '4.13.0-beta1' property string ide_version_major: '4' - property string ide_version_minor: '11' - property string ide_version_release: '84' + property string ide_version_minor: '12' + property string ide_version_release: '82' 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: '84' + property string ide_compat_version_minor: '12' + property string ide_compat_version_release: '82' 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 d31ffb4762a..e13aab6bf0f 100644 --- a/qtcreator_ide_branding.pri +++ b/qtcreator_ide_branding.pri @@ -1,8 +1,8 @@ -QTCREATOR_VERSION = 4.11.84 -QTCREATOR_COMPAT_VERSION = 4.11.84 -QTCREATOR_DISPLAY_VERSION = 4.12.0-rc1 +QTCREATOR_VERSION = 4.12.82 +QTCREATOR_COMPAT_VERSION = 4.12.82 +QTCREATOR_DISPLAY_VERSION = 4.13.0-beta1 QTCREATOR_COPYRIGHT_YEAR = 2020 -BINARY_ARTIFACTS_BRANCH = 4.12 +BINARY_ARTIFACTS_BRANCH = master IDE_DISPLAY_NAME = Qt Creator IDE_ID = qtcreator |