summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEike Ziller <eike.ziller@qt.io>2020-02-06 12:40:57 +0100
committerEike Ziller <eike.ziller@qt.io>2020-02-06 11:41:42 +0000
commitca42bf7696cc95bb3a8d397d8e46c054c055ee6b (patch)
tree181c2ecbff28c06af4ecdb39fb59ef7d1d478430
parent055bfb9339451be244114c2ca563b62e9a73811b (diff)
downloadqt-creator-ca42bf7696cc95bb3a8d397d8e46c054c055ee6b.tar.gz
Bump version to 4.11.2 and copyright year to 2020
Change-Id: I8e97c8f3e38dd1a6fe64e47cd30d73d3d5622425 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 c5a2c1b9e7..a4494c1b35 100644
--- a/cmake/QtCreatorIDEBranding.cmake
+++ b/cmake/QtCreatorIDEBranding.cmake
@@ -1,10 +1,10 @@
#BINARY_ARTIFACTS_BRANCH = master
#PROJECT_USER_FILE_EXTENSION = .user
-set(IDE_VERSION "4.11.1") # The IDE version.
+set(IDE_VERSION "4.11.2") # The IDE version.
set(IDE_VERSION_COMPAT "4.11.0") # The IDE Compatibility version.
-set(IDE_VERSION_DISPLAY "4.11.1") # The IDE display version.
-set(IDE_COPYRIGHT_YEAR "2019") # The IDE current copyright year.
+set(IDE_VERSION_DISPLAY "4.11.2") # The IDE display version.
+set(IDE_COPYRIGHT_YEAR "2020") # The IDE current copyright year.
set(IDE_SETTINGSVARIANT "QtProject") # The IDE settings variation.
set(IDE_COPY_SETTINGSVARIANT "Nokia") # The IDE settings to initially import.
diff --git a/qbs/modules/qtc/qtc.qbs b/qbs/modules/qtc/qtc.qbs
index 7fddce99d9..0bad5ce3f9 100644
--- a/qbs/modules/qtc/qtc.qbs
+++ b/qbs/modules/qtc/qtc.qbs
@@ -4,10 +4,10 @@ import qbs.FileInfo
import "qtc.js" as HelperFunctions
Module {
- property string qtcreator_display_version: '4.11.1'
+ property string qtcreator_display_version: '4.11.2'
property string ide_version_major: '4'
property string ide_version_minor: '11'
- property string ide_version_release: '1'
+ property string ide_version_release: '2'
property string qtcreator_version: ide_version_major + '.' + ide_version_minor + '.'
+ ide_version_release
@@ -17,7 +17,7 @@ Module {
property string qtcreator_compat_version: ide_compat_version_major + '.'
+ ide_compat_version_minor + '.' + ide_compat_version_release
- property string qtcreator_copyright_year: '2019'
+ property string qtcreator_copyright_year: '2020'
property string qtcreator_copyright_string: "(C) " + qtcreator_copyright_year + " The Qt Company Ltd"
property string ide_display_name: 'Qt Creator'
diff --git a/qtcreator_ide_branding.pri b/qtcreator_ide_branding.pri
index 8cd55ff770..8663c29b1e 100644
--- a/qtcreator_ide_branding.pri
+++ b/qtcreator_ide_branding.pri
@@ -1,7 +1,7 @@
-QTCREATOR_VERSION = 4.11.1
+QTCREATOR_VERSION = 4.11.2
QTCREATOR_COMPAT_VERSION = 4.11.0
-QTCREATOR_DISPLAY_VERSION = 4.11.1
-QTCREATOR_COPYRIGHT_YEAR = 2019
+QTCREATOR_DISPLAY_VERSION = 4.11.2
+QTCREATOR_COPYRIGHT_YEAR = 2020
BINARY_ARTIFACTS_BRANCH = 4.11
IDE_DISPLAY_NAME = Qt Creator