summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEike Ziller <eike.ziller@qt.io>2020-12-03 15:21:16 +0100
committerEike Ziller <eike.ziller@qt.io>2020-12-03 14:21:43 +0000
commited23cecc44d26b45f19b9fa5000d25df2e80d9ad (patch)
tree9d374f4ae750d9250a4adbf3804bd2a857359f60
parentb7628865fb7365b78761242c626e8dfb6ebf7b6c (diff)
downloadqt-creator-ed23cecc44d26b45f19b9fa5000d25df2e80d9ad.tar.gz
Bump version to 4.14.0
Change-Id: I419bf8e73519be8f796dbf4399ebebedf3d74ffb 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 8fcd5862e7..9ae08876d3 100644
--- a/cmake/QtCreatorIDEBranding.cmake
+++ b/cmake/QtCreatorIDEBranding.cmake
@@ -1,6 +1,6 @@
-set(IDE_VERSION "4.13.84") # The IDE version.
-set(IDE_VERSION_COMPAT "4.13.84") # The IDE Compatibility version.
-set(IDE_VERSION_DISPLAY "4.14.0-rc1") # The IDE display version.
+set(IDE_VERSION "4.14.0") # The IDE version.
+set(IDE_VERSION_COMPAT "4.14.0") # The IDE Compatibility version.
+set(IDE_VERSION_DISPLAY "4.14.0") # 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 395258316a..57b00a53ca 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.14.0-rc1'
+ property string qtcreator_display_version: '4.14.0'
property string ide_version_major: '4'
- property string ide_version_minor: '13'
- property string ide_version_release: '84'
+ property string ide_version_minor: '14'
+ 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: '13'
- property string ide_compat_version_release: '84'
+ property string ide_compat_version_minor: '14'
+ 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 adcd8adf21..99c5f15238 100644
--- a/qtcreator_ide_branding.pri
+++ b/qtcreator_ide_branding.pri
@@ -1,6 +1,6 @@
-QTCREATOR_VERSION = 4.13.84
-QTCREATOR_COMPAT_VERSION = 4.13.84
-QTCREATOR_DISPLAY_VERSION = 4.14.0-rc1
+QTCREATOR_VERSION = 4.14.0
+QTCREATOR_COMPAT_VERSION = 4.14.0
+QTCREATOR_DISPLAY_VERSION = 4.14.0
QTCREATOR_COPYRIGHT_YEAR = 2020
IDE_DISPLAY_NAME = Qt Creator