diff options
author | Eike Ziller <eike.ziller@theqtcompany.com> | 2015-12-04 09:57:47 +0100 |
---|---|---|
committer | Eike Ziller <eike.ziller@theqtcompany.com> | 2015-12-04 08:58:32 +0000 |
commit | fb1e9bc7859a4bd76cdad66ee8320498ec782579 (patch) | |
tree | a851adf3151c20a241257e7c11d57802851940b3 | |
parent | cbb3aee07662b59a71e6bd0db43cc1fd1d1e792e (diff) |
Version bump
Change-Id: Ibca6fcaf2eeb997179fc9dda0f1dc94dd333d973
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
-rw-r--r-- | qtcreator.pri | 4 | ||||
-rw-r--r-- | qtcreator.qbs | 8 |
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" |