summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEike Ziller <eike.ziller@qt.io>2016-12-01 12:23:20 +0100
committerEike Ziller <eike.ziller@qt.io>2016-12-01 11:23:43 +0000
commit6b0495d997c40a2326a5f9700ec41d57395dde06 (patch)
tree4db6577d1f43a72bc7f3a95cae46a7d7ad620d6a
parent0b02891b1d5b343883c545c32e37866028329fde (diff)
downloadqt-creator-6b0495d997c40a2326a5f9700ec41d57395dde06.tar.gz
Version bump
Change-Id: I25f835a66200a1f578deff65ca83aeb02c217790 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
-rw-r--r--qbs/modules/qtc/qtc.qbs8
-rw-r--r--qtcreator.pri4
2 files changed, 6 insertions, 6 deletions
diff --git a/qbs/modules/qtc/qtc.qbs b/qbs/modules/qtc/qtc.qbs
index d2c7cc3bf7..c689ae2e05 100644
--- a/qbs/modules/qtc/qtc.qbs
+++ b/qbs/modules/qtc/qtc.qbs
@@ -4,14 +4,14 @@ import "qtc.js" as HelperFunctions
Module {
property string ide_version_major: '4'
- property string ide_version_minor: '1'
- property string ide_version_release: '83'
+ property string ide_version_minor: '2'
+ 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: '1'
- property string ide_compat_version_release: '83'
+ property string ide_compat_version_minor: '2'
+ 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.pri b/qtcreator.pri
index 12fc225f40..36badac775 100644
--- a/qtcreator.pri
+++ b/qtcreator.pri
@@ -1,8 +1,8 @@
!isEmpty(QTCREATOR_PRI_INCLUDED):error("qtcreator.pri already included")
QTCREATOR_PRI_INCLUDED = 1
-QTCREATOR_VERSION = 4.1.83
-QTCREATOR_COMPAT_VERSION = 4.1.83
+QTCREATOR_VERSION = 4.2.0
+QTCREATOR_COMPAT_VERSION = 4.2.0
VERSION = $$QTCREATOR_VERSION
BINARY_ARTIFACTS_BRANCH = 4.2