aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Ziller <eike.ziller@theqtcompany.com>2016-03-07 11:36:35 +0100
committerEike Ziller <eike.ziller@theqtcompany.com>2016-03-08 11:52:10 +0000
commitca6fa3260619095c16223377d27662df46a0795b (patch)
tree386c7fcd45217f5210ccec5cd9b350796e31a4b2
parentb2c8d76156904fafbd7b4193cbcb763b4cf1d8ca (diff)
Version bump
Change-Id: If3aaffb25f71082194e21c4ce00119957a33d363 Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
-rw-r--r--qtcreator.pri4
-rw-r--r--qtcreator.qbs8
2 files changed, 6 insertions, 6 deletions
diff --git a/qtcreator.pri b/qtcreator.pri
index 4728785fa2..3447d8ce71 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 = 3.6.82
-QTCREATOR_COMPAT_VERSION = 3.6.82
+QTCREATOR_VERSION = 4.0.82
+QTCREATOR_COMPAT_VERSION = 4.0.82
BINARY_ARTIFACTS_BRANCH = master
# enable c++11
diff --git a/qtcreator.qbs b/qtcreator.qbs
index e096281d50..cafc911189 100644
--- a/qtcreator.qbs
+++ b/qtcreator.qbs
@@ -5,12 +5,12 @@ Project {
name: "Qt Creator"
minimumQbsVersion: "1.4.3"
property bool withAutotests: qbs.buildVariant === "debug"
- property string ide_version_major: '3'
- property string ide_version_minor: '6'
+ property string ide_version_major: '4'
+ property string ide_version_minor: '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: '3'
- property string ide_compat_version_minor: '6'
+ property string ide_compat_version_major: '4'
+ property string ide_compat_version_minor: '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
property path ide_source_tree: path