aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Ziller <eike.ziller@qt.io>2019-11-29 14:35:56 +0100
committerEike Ziller <eike.ziller@qt.io>2019-11-29 13:43:54 +0000
commit50fad4f0f914d99f14806cb3d7ea1b3c6959c355 (patch)
treebb339db174b4b8ad51eb657dac56d52439c872f2
parenta40af1a4f0f6be982e519ae7e9e2caa37b1e9a28 (diff)
Bump version to 4.11.0
Change-Id: I167a84606f707529e21c208d019241ed8d7c0ce0 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
-rw-r--r--cmake/QtCreatorIDEBranding.cmake6
-rw-r--r--qbs/modules/qtc/qtc.qbs10
-rw-r--r--qtcreator_ide_branding.pri6
3 files changed, 11 insertions, 11 deletions
diff --git a/cmake/QtCreatorIDEBranding.cmake b/cmake/QtCreatorIDEBranding.cmake
index bdf9594e146..98e03e99768 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.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_VERSION "4.11.0") # The IDE version.
+set(IDE_VERSION_COMPAT "4.11.0") # The IDE Compatibility version.
+set(IDE_VERSION_DISPLAY "4.11.0") # 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 3c6c30f8c75..4bc792960d4 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-rc1'
+ property string qtcreator_display_version: '4.11.0'
property string ide_version_major: '4'
- property string ide_version_minor: '10'
- property string ide_version_release: '84'
+ property string ide_version_minor: '11'
+ 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: '4'
- property string ide_compat_version_minor: '10'
- property string ide_compat_version_release: '84'
+ property string ide_compat_version_minor: '11'
+ 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 8a9090c90bb..86022e56208 100644
--- a/qtcreator_ide_branding.pri
+++ b/qtcreator_ide_branding.pri
@@ -1,6 +1,6 @@
-QTCREATOR_VERSION = 4.10.84
-QTCREATOR_COMPAT_VERSION = 4.10.84
-QTCREATOR_DISPLAY_VERSION = 4.11.0-rc1
+QTCREATOR_VERSION = 4.11.0
+QTCREATOR_COMPAT_VERSION = 4.11.0
+QTCREATOR_DISPLAY_VERSION = 4.11.0
QTCREATOR_COPYRIGHT_YEAR = 2019
BINARY_ARTIFACTS_BRANCH = 4.11