From f42358a16e19bdbb39293960f6fbfb1b54d24f98 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Tue, 22 Jul 2014 16:34:43 +0200 Subject: [PATCH] Fix version number. Change-Id: I657277feb77f33b345f58729cdc1c05b1fdb5528 Reviewed-by: Eike Ziller --- qtcreator.pri | 6 +++--- qtcreator.qbs | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/qtcreator.pri b/qtcreator.pri index ec48dbed5aa..249f5cf80b9 100644 --- a/qtcreator.pri +++ b/qtcreator.pri @@ -1,9 +1,9 @@ !isEmpty(QTCREATOR_PRI_INCLUDED):error("qtcreator.pri already included") QTCREATOR_PRI_INCLUDED = 1 -QTCREATOR_VERSION = 3.1.83 -QTCREATOR_COMPAT_VERSION = 3.1.83 -BINARY_ARTIFACTS_BRANCH = 3.2 +QTCREATOR_VERSION = 3.2.81 +QTCREATOR_COMPAT_VERSION = 3.2.81 +BINARY_ARTIFACTS_BRANCH = master # enable c++11 isEqual(QT_MAJOR_VERSION, 5) { diff --git a/qtcreator.qbs b/qtcreator.qbs index 34be1f66c3b..e0ee270736d 100644 --- a/qtcreator.qbs +++ b/qtcreator.qbs @@ -3,12 +3,12 @@ import qbs 1.0 Project { property bool withAutotests: qbs.buildVariant === "debug" property string ide_version_major: '3' - property string ide_version_minor: '1' - property string ide_version_release: '83' + property string ide_version_minor: '2' + property string ide_version_release: '81' 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: '1' - property string ide_compat_version_release: '83' + property string ide_compat_version_minor: '2' + property string ide_compat_version_release: '81' 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"