feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Version bump

Browse Source 
Change-Id: I3176d21a40001779bf6c19b05a3f9ff068695a8e
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
This commit is contained in:
Eike Ziller
2015-07-10 14:21:50 +02:00
parent d6da70916d
commit 26eca3d15a
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
qtcreator.pri
View File

@@ -1,9 +1,9 @@
!isEmpty(QTCREATOR_PRI_INCLUDED):error("qtcreator.pri already included") !isEmpty(QTCREATOR_PRI_INCLUDED):error("qtcreator.pri already included")
QTCREATOR_PRI_INCLUDED = 1 QTCREATOR_PRI_INCLUDED = 1
QTCREATOR_VERSION = 3.4.82 QTCREATOR_VERSION = 3.5.81
QTCREATOR_COMPAT_VERSION = 3.4.82 QTCREATOR_COMPAT_VERSION = 3.5.81
BINARY_ARTIFACTS_BRANCH = 3.5 BINARY_ARTIFACTS_BRANCH = master
# enable c++11 # enable c++11
CONFIG += c++11 CONFIG += c++11

8
qtcreator.qbs
View File

@@ -5,12 +5,12 @@ Project {
minimumQbsVersion: "1.4" minimumQbsVersion: "1.4"
property bool withAutotests: qbs.buildVariant === "debug" property bool withAutotests: qbs.buildVariant === "debug"
property string ide_version_major: '3' property string ide_version_major: '3'
property string ide_version_minor: '4' property string ide_version_minor: '5'
property string ide_version_release: '82' property string ide_version_release: '81'
property string qtcreator_version: ide_version_major + '.' + ide_version_minor + '.' + ide_version_release 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_major: '3'
property string ide_compat_version_minor: '4' property string ide_compat_version_minor: '5'
property string ide_compat_version_release: '82' 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 string qtcreator_compat_version: ide_compat_version_major + '.' + ide_compat_version_minor + '.' + ide_compat_version_release
property path ide_source_tree: path property path ide_source_tree: path
property string ide_app_path: qbs.targetOS.contains("osx") ? "" : "bin" property string ide_app_path: qbs.targetOS.contains("osx") ? "" : "bin"