aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Ziller <eike.ziller@qt.io>2020-05-22 10:12:44 +0200
committerEike Ziller <eike.ziller@qt.io>2020-05-22 08:13:13 +0000
commit146d3dc7e34d126cce09f576264b5c774c3b4692 (patch)
treef47f1930d0fc2410905d07017b5a19117fdfcadb
parent90499d5a53a98b3374d876e2a7e2966278612002 (diff)
Bump version to 4.12.2
Change-Id: I734d8571ab672cbbccaebe6d3d1a97cd15f31831 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
-rw-r--r--cmake/QtCreatorIDEBranding.cmake4
-rw-r--r--qbs/modules/qtc/qtc.qbs4
-rw-r--r--qtcreator_ide_branding.pri4
3 files changed, 6 insertions, 6 deletions
diff --git a/cmake/QtCreatorIDEBranding.cmake b/cmake/QtCreatorIDEBranding.cmake
index 1e10d7f001..ca406149df 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.12.1") # The IDE version.
+set(IDE_VERSION "4.12.2") # The IDE version.
set(IDE_VERSION_COMPAT "4.12.0") # The IDE Compatibility version.
-set(IDE_VERSION_DISPLAY "4.12.1") # The IDE display version.
+set(IDE_VERSION_DISPLAY "4.12.2") # 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 aa30add4a8..93d08ab97f 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.12.1'
+ property string qtcreator_display_version: '4.12.2'
property string ide_version_major: '4'
property string ide_version_minor: '12'
- 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
diff --git a/qtcreator_ide_branding.pri b/qtcreator_ide_branding.pri
index f9031c5982..baed3a6626 100644
--- a/qtcreator_ide_branding.pri
+++ b/qtcreator_ide_branding.pri
@@ -1,6 +1,6 @@
-QTCREATOR_VERSION = 4.12.1
+QTCREATOR_VERSION = 4.12.2
QTCREATOR_COMPAT_VERSION = 4.12.0
-QTCREATOR_DISPLAY_VERSION = 4.12.1
+QTCREATOR_DISPLAY_VERSION = 4.12.2
QTCREATOR_COPYRIGHT_YEAR = 2020
BINARY_ARTIFACTS_BRANCH = 4.12