From c1a0e9d638db0342e541560e49500dad34a3df82 Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Tue, 8 Dec 2020 11:52:02 +0200 Subject: [PATCH] Bump version to 4.15 beta Change-Id: I39f45b880649323f71ebf3bd3a6bb3677ca33fd2 Reviewed-by: Eike Ziller --- cmake/QtCreatorIDEBranding.cmake | 6 +++--- qbs/modules/qtc/qtc.qbs | 6 +++--- qtcreator_ide_branding.pri | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/cmake/QtCreatorIDEBranding.cmake b/cmake/QtCreatorIDEBranding.cmake index 9ae08876d36..12053377e6e 100644 --- a/cmake/QtCreatorIDEBranding.cmake +++ b/cmake/QtCreatorIDEBranding.cmake @@ -1,6 +1,6 @@ -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_VERSION "4.14.82") # The IDE version. +set(IDE_VERSION_COMPAT "4.14.82") # The IDE Compatibility version. +set(IDE_VERSION_DISPLAY "4.15.0-beta1") # 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 57b00a53cae..20ea8ddd775 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' + property string qtcreator_display_version: '4.15.0-beta1' property string ide_version_major: '4' property string ide_version_minor: '14' - property string ide_version_release: '0' + property string ide_version_release: '82' 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: '14' - property string ide_compat_version_release: '0' + property string ide_compat_version_release: '82' 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 99c5f152382..41950b97464 100644 --- a/qtcreator_ide_branding.pri +++ b/qtcreator_ide_branding.pri @@ -1,6 +1,6 @@ -QTCREATOR_VERSION = 4.14.0 -QTCREATOR_COMPAT_VERSION = 4.14.0 -QTCREATOR_DISPLAY_VERSION = 4.14.0 +QTCREATOR_VERSION = 4.14.82 +QTCREATOR_COMPAT_VERSION = 4.14.82 +QTCREATOR_DISPLAY_VERSION = 4.15.0-beta1 QTCREATOR_COPYRIGHT_YEAR = 2020 IDE_DISPLAY_NAME = Qt Creator