aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Ziller <eike.ziller@qt.io>2018-06-06 09:51:01 +0200
committerEike Ziller <eike.ziller@qt.io>2018-06-06 07:51:30 +0000
commit5921376573bf57b09fa89fa788b94f2a5a1fdda9 (patch)
tree00901a18af01733ca381611a124f40a7cf779ab6
parent97fadb5c7fae1afec11d019371d55ab8972e8062 (diff)
Bump version to 4.7.0-rc1
Change-Id: I8be1dbdc726ec2b5520dbceb19973337afb71583 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
-rw-r--r--qbs/modules/qtc/qtc.qbs6
-rw-r--r--qtcreator.pri6
2 files changed, 6 insertions, 6 deletions
diff --git a/qbs/modules/qtc/qtc.qbs b/qbs/modules/qtc/qtc.qbs
index f3f3bf7827..49be0d8697 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.7.0-beta1'
+ property string qtcreator_display_version: '4.7.0-rc1'
property string ide_version_major: '4'
property string ide_version_minor: '6'
- property string ide_version_release: '82'
+ property string ide_version_release: '83'
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: '6'
- property string ide_compat_version_release: '82'
+ property string ide_compat_version_release: '83'
property string qtcreator_compat_version: ide_compat_version_major + '.'
+ ide_compat_version_minor + '.' + ide_compat_version_release
diff --git a/qtcreator.pri b/qtcreator.pri
index d7600b4c32..6dfad0081d 100644
--- a/qtcreator.pri
+++ b/qtcreator.pri
@@ -1,10 +1,10 @@
!isEmpty(QTCREATOR_PRI_INCLUDED):error("qtcreator.pri already included")
QTCREATOR_PRI_INCLUDED = 1
-QTCREATOR_VERSION = 4.6.82
-QTCREATOR_COMPAT_VERSION = 4.6.82
+QTCREATOR_VERSION = 4.6.83
+QTCREATOR_COMPAT_VERSION = 4.6.83
VERSION = $$QTCREATOR_VERSION
-QTCREATOR_DISPLAY_VERSION = 4.7.0-beta1
+QTCREATOR_DISPLAY_VERSION = 4.7.0-rc1
QTCREATOR_COPYRIGHT_YEAR = 2018
BINARY_ARTIFACTS_BRANCH = 4.6