aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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 20672d3f0d..3b3810bd85 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.5.82
-QTCREATOR_COMPAT_VERSION = 3.5.82
+QTCREATOR_VERSION = 3.6.0
+QTCREATOR_COMPAT_VERSION = 3.6.0
BINARY_ARTIFACTS_BRANCH = 3.6
# enable c++11
diff --git a/qtcreator.qbs b/qtcreator.qbs
index f793768824..9efbfa251e 100644
--- a/qtcreator.qbs
+++ b/qtcreator.qbs
@@ -5,12 +5,12 @@ Project {
minimumQbsVersion: "1.4"
property bool withAutotests: qbs.buildVariant === "debug"
property string ide_version_major: '3'
- property string ide_version_minor: '5'
- property string ide_version_release: '82'
+ property string ide_version_minor: '6'
+ 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: '3'
- property string ide_compat_version_minor: '5'
- property string ide_compat_version_release: '82'
+ property string ide_compat_version_minor: '6'
+ property string ide_compat_version_release: '0'
property string qtcreator_compat_version: ide_compat_version_major + '.' + ide_compat_version_minor + '.' + ide_compat_version_release
property path ide_source_tree: path
property string ide_app_path: qbs.targetOS.contains("osx") ? "" : "bin"