aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Ziller <eike.ziller@qt.io>2020-07-07 08:43:16 +0200
committerEike Ziller <eike.ziller@qt.io>2020-07-07 06:44:20 +0000
commit88b9ef5c5bb1c777c53a2680f762d9a0bb4eda66 (patch)
tree1d8efd0c1f1f4451ea65c2e79dc4232cf545f977
parentd35cf4b846a914303675a21300b79dc860e6f73f (diff)
Bump version to 4.12.4v4.12.44.12
Change-Id: I8175830fb3a6f006ebd6f71441452ac04587ce44 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
-rw-r--r--cmake/QtCreatorIDEBranding.cmake6
-rw-r--r--qbs/modules/qtc/qtc.qbs4
-rw-r--r--qtcreator_ide_branding.pri4
3 files changed, 7 insertions, 7 deletions
diff --git a/cmake/QtCreatorIDEBranding.cmake b/cmake/QtCreatorIDEBranding.cmake
index c00fc47db2..ea1244bb43 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.3") # The IDE version.
-set(IDE_VERSION_COMPAT "4.12.0") # The IDE Compatibility version.
-set(IDE_VERSION_DISPLAY "4.12.3") # The IDE display version.
+set(IDE_VERSION "4.12.4") # The IDE version.
+set(IDE_VERSION_COMPAT "4.12.0") # The IDE Compatibility version.
+set(IDE_VERSION_DISPLAY "4.12.4") # 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 cd19264093..0198de6466 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.3'
+ property string qtcreator_display_version: '4.12.4'
property string ide_version_major: '4'
property string ide_version_minor: '12'
- property string ide_version_release: '3'
+ property string ide_version_release: '4'
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 1825278315..894a9e0b62 100644
--- a/qtcreator_ide_branding.pri
+++ b/qtcreator_ide_branding.pri
@@ -1,6 +1,6 @@
-QTCREATOR_VERSION = 4.12.3
+QTCREATOR_VERSION = 4.12.4
QTCREATOR_COMPAT_VERSION = 4.12.0
-QTCREATOR_DISPLAY_VERSION = 4.12.3
+QTCREATOR_DISPLAY_VERSION = 4.12.4
QTCREATOR_COPYRIGHT_YEAR = 2020
BINARY_ARTIFACTS_BRANCH = 4.12