From 26eca3d15a535b2e2830d0a1120b4932430ca8b8 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Fri, 10 Jul 2015 14:21:50 +0200 Subject: Version bump Change-Id: I3176d21a40001779bf6c19b05a3f9ff068695a8e 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 71e7d4477e..8d0dae6a3d 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.4.82 -QTCREATOR_COMPAT_VERSION = 3.4.82 -BINARY_ARTIFACTS_BRANCH = 3.5 +QTCREATOR_VERSION = 3.5.81 +QTCREATOR_COMPAT_VERSION = 3.5.81 +BINARY_ARTIFACTS_BRANCH = master # enable c++11 CONFIG += c++11 diff --git a/qtcreator.qbs b/qtcreator.qbs index e9295856bb..824935b2ba 100644 --- a/qtcreator.qbs +++ b/qtcreator.qbs @@ -5,12 +5,12 @@ Project { minimumQbsVersion: "1.4" property bool withAutotests: qbs.buildVariant === "debug" property string ide_version_major: '3' - property string ide_version_minor: '4' - property string ide_version_release: '82' + property string ide_version_minor: '5' + 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: '4' - property string ide_compat_version_release: '82' + property string ide_compat_version_minor: '5' + 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" -- cgit v1.2.3