From 6753bb2f611428bfc88dba72e6fdcb98cda66a16 Mon Sep 17 00:00:00 2001
From: Eike Ziller <eike.ziller@digia.com>
Date: Sun, 17 Aug 2014 22:53:06 +0200
Subject: [PATCH] version bump
Change-Id: Iaacd1793497a836ae7ddab7f7f6de34b89cf51d8
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
---
qtcreator.pri | 4 ++--
qtcreator.qbs | 8 ++++----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/qtcreator.pri b/qtcreator.pri
index 0ebe56f8429..a9dd72f8b33 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.1.85
-QTCREATOR_COMPAT_VERSION = 3.1.85
+QTCREATOR_VERSION = 3.2.0
+QTCREATOR_COMPAT_VERSION = 3.2.0
BINARY_ARTIFACTS_BRANCH = 3.2
# enable c++11
diff --git a/qtcreator.qbs b/qtcreator.qbs
index d68e8d7cf2c..efdf665efd3 100644
--- a/qtcreator.qbs
+++ b/qtcreator.qbs
@@ -4,12 +4,12 @@ Project {
minimumQbsVersion: "1.3"
property bool withAutotests: qbs.buildVariant === "debug"
property string ide_version_major: '3'
- property string ide_version_minor: '1'
- property string ide_version_release: '85'
+ property string ide_version_minor: '2'
+ 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: '1'
- property string ide_compat_version_release: '85'
+ property string ide_compat_version_minor: '2'
+ 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"
--
GitLab