diff options
author | Eike Ziller <eike.ziller@theqtcompany.com> | 2015-10-30 16:07:56 +0100 |
---|---|---|
committer | Eike Ziller <eike.ziller@theqtcompany.com> | 2015-10-30 16:08:03 +0100 |
commit | 310ae099967d40a059d607e93c536757195477a1 (patch) | |
tree | 98dbefbc43ac1f996b246de75db831cd4662a914 /qtcreator.qbs | |
parent | e60f62c131f7596c858553868fb459a931cfde13 (diff) | |
parent | 9fc4396e118a6013a30f1bc32e6814cd72071106 (diff) |
Merge remote-tracking branch 'origin/3.6'
Change-Id: I68512c775ed25b51c8b0abe1818c9c7c5955874c
Diffstat (limited to 'qtcreator.qbs')
-rw-r--r-- | qtcreator.qbs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/qtcreator.qbs b/qtcreator.qbs index f051ab2db3c..81243464472 100644 --- a/qtcreator.qbs +++ b/qtcreator.qbs @@ -6,11 +6,11 @@ Project { property bool withAutotests: qbs.buildVariant === "debug" property string ide_version_major: '3' property string ide_version_minor: '5' - property string ide_version_release: '81' + 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: '5' - property string ide_compat_version_release: '81' + 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 property string ide_app_path: qbs.targetOS.contains("osx") ? "" : "bin" |