aboutsummaryrefslogtreecommitdiffstats
path: root/qtcreator.qbs
diff options
context:
space:
mode:
authorEike Ziller <eike.ziller@theqtcompany.com>2015-12-07 15:55:17 +0100
committerEike Ziller <eike.ziller@theqtcompany.com>2015-12-07 15:55:35 +0100
commit9554495bb1741f2a40ae92bbfbdf4140a822efd9 (patch)
treed9eb1449efbe5536d938c18f2b97c4d8b3bfd497 /qtcreator.qbs
parent11cb55a21faaf5a8503c2fa176251682d5515db4 (diff)
parent89d8693107e55800e466a5edf5d9454ad1f87c6d (diff)
Merge remote-tracking branch 'origin/3.6'
Conflicts: src/plugins/baremetal/gdbserverproviderprocess.cpp Change-Id: I1ba618db9db6669edada6477c05a1b56b7b5b430
Diffstat (limited to 'qtcreator.qbs')
-rw-r--r--qtcreator.qbs8
1 files changed, 4 insertions, 4 deletions
diff --git a/qtcreator.qbs b/qtcreator.qbs
index 8124346447..9d53e63e80 100644
--- a/qtcreator.qbs
+++ b/qtcreator.qbs
@@ -5,12 +5,12 @@ Project {
minimumQbsVersion: "1.4.3"
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"