summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEike Ziller <eike.ziller@qt.io>2019-11-04 12:58:32 +0100
committerEike Ziller <eike.ziller@qt.io>2019-11-04 11:59:19 +0000
commit715db5ada817822616433642193e7a394bbfe61c (patch)
treea43701b025728d19940df863d208d377a7e51202
parentba8b5378512d0d2c13d56a2cd75efd1a99b40965 (diff)
downloadqt-creator-715db5ada817822616433642193e7a394bbfe61c.tar.gz
Bump version -> 4.11.0-rc1
Change-Id: I495bd3961c718a2090ac1999f56c195e95cd53b1 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 172f2e6dcf..bdf9594e14 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.10.83") # The IDE version.
-set(IDE_VERSION_COMPAT "4.10.83") # The IDE Compatibility version.
-set(IDE_VERSION_DISPLAY "4.11.0-beta2") # The IDE display version.
+set(IDE_VERSION "4.10.84") # The IDE version.
+set(IDE_VERSION_COMPAT "4.10.84") # The IDE Compatibility version.
+set(IDE_VERSION_DISPLAY "4.11.0-rc1") # The IDE display version.
set(IDE_COPYRIGHT_YEAR "2019") # 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 696ccf90c1..d41a98f562 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.11.0-beta2'
+ property string qtcreator_display_version: '4.11.0-rc1'
property string ide_version_major: '4'
property string ide_version_minor: '10'
- 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: '10'
- 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 ddd9fd42c7..8a9090c90b 100644
--- a/qtcreator_ide_branding.pri
+++ b/qtcreator_ide_branding.pri
@@ -1,6 +1,6 @@
-QTCREATOR_VERSION = 4.10.83
-QTCREATOR_COMPAT_VERSION = 4.10.83
-QTCREATOR_DISPLAY_VERSION = 4.11.0-beta2
+QTCREATOR_VERSION = 4.10.84
+QTCREATOR_COMPAT_VERSION = 4.10.84
+QTCREATOR_DISPLAY_VERSION = 4.11.0-rc1
QTCREATOR_COPYRIGHT_YEAR = 2019
BINARY_ARTIFACTS_BRANCH = 4.11