From e492d63aa33cec45042dfc025eec801c6b0fe3a8 Mon Sep 17 00:00:00 2001
From: Eike Ziller <eike.ziller@theqtcompany.com>
Date: Tue, 15 Dec 2015 11:57:10 +0100
Subject: [PATCH] Version bump
Change-Id: Ie9cfae74f7566a171de5fd281c8b2f7885f5a5b2
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
---
qtcreator.pri | 6 +++---
qtcreator.qbs | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/qtcreator.pri b/qtcreator.pri
index 3b3810bd85..4728785fa2 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.6.0
-QTCREATOR_COMPAT_VERSION = 3.6.0
-BINARY_ARTIFACTS_BRANCH = 3.6
+QTCREATOR_VERSION = 3.6.82
+QTCREATOR_COMPAT_VERSION = 3.6.82
+BINARY_ARTIFACTS_BRANCH = master
# enable c++11
CONFIG += c++11
diff --git a/qtcreator.qbs b/qtcreator.qbs
index 9d53e63e80..0813a2d511 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: '6'
- property string ide_version_release: '0'
+ 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: '6'
- property string ide_compat_version_release: '0'
+ 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"
--
GitLab