feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Bump version to 4.14.0-rc1

Browse Source 
Change-Id: Ifcb361437d1cac7d69e871a980a1824dc94b4c22
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Eike Ziller
2020-11-24 15:24:49 +01:00
parent d04355dfb0
commit 471892deb0
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cmake/QtCreatorIDEBranding.cmake
View File

@@ -1,6 +1,6 @@
set(IDE_VERSION "4.13.83") # The IDE version. set(IDE_VERSION "4.13.84") # The IDE version.
set(IDE_VERSION_COMPAT "4.13.83") # The IDE Compatibility version. set(IDE_VERSION_COMPAT "4.13.84") # The IDE Compatibility version.
set(IDE_VERSION_DISPLAY "4.14.0-beta2") # The IDE display version. set(IDE_VERSION_DISPLAY "4.14.0-rc1") # The IDE display version.
set(IDE_COPYRIGHT_YEAR "2020") # The IDE current copyright year. set(IDE_COPYRIGHT_YEAR "2020") # The IDE current copyright year.
set(IDE_SETTINGSVARIANT "QtProject") # The IDE settings variation. set(IDE_SETTINGSVARIANT "QtProject") # The IDE settings variation.

6
qbs/modules/qtc/qtc.qbs
View File

@@ -4,16 +4,16 @@ import qbs.FileInfo
import "qtc.js" as HelperFunctions import "qtc.js" as HelperFunctions
Module { Module {
property string qtcreator_display_version: '4.14.0-beta2' property string qtcreator_display_version: '4.14.0-rc1'
property string ide_version_major: '4' property string ide_version_major: '4'
property string ide_version_minor: '13' property string ide_version_minor: '13'
property string ide_version_release: '83' property string ide_version_release: '84'
property string qtcreator_version: ide_version_major + '.' + ide_version_minor + '.' property string qtcreator_version: ide_version_major + '.' + ide_version_minor + '.'
+ ide_version_release + ide_version_release
property string ide_compat_version_major: '4' property string ide_compat_version_major: '4'
property string ide_compat_version_minor: '13' property string ide_compat_version_minor: '13'
property string ide_compat_version_release: '83' property string ide_compat_version_release: '84'
property string qtcreator_compat_version: ide_compat_version_major + '.' property string qtcreator_compat_version: ide_compat_version_major + '.'
+ ide_compat_version_minor + '.' + ide_compat_version_release + ide_compat_version_minor + '.' + ide_compat_version_release

6
qtcreator_ide_branding.pri
View File

@@ -1,6 +1,6 @@
QTCREATOR_VERSION = 4.13.83 QTCREATOR_VERSION = 4.13.84
QTCREATOR_COMPAT_VERSION = 4.13.83 QTCREATOR_COMPAT_VERSION = 4.13.84
QTCREATOR_DISPLAY_VERSION = 4.14.0-beta2 QTCREATOR_DISPLAY_VERSION = 4.14.0-rc1
QTCREATOR_COPYRIGHT_YEAR = 2020 QTCREATOR_COPYRIGHT_YEAR = 2020
IDE_DISPLAY_NAME = Qt Creator IDE_DISPLAY_NAME = Qt Creator