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

Version bump

Browse Source 
Change-Id: If27d07243cb96a35b8ada5f3137c0edc61d60fc5
This commit is contained in:
Eike Ziller
2014-06-03 15:58:38 +02:00
parent bd197fbb77
commit 88c1b4ecdb
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
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.1.1 QTCREATOR_VERSION = 3.1.2
QTCREATOR_COMPAT_VERSION = 3.1.0 QTCREATOR_COMPAT_VERSION = 3.1.0
BINARY_ARTIFACTS_BRANCH = 3.1 BINARY_ARTIFACTS_BRANCH = 3.2
# enable c++11 on everything but mac/release (breaks 10.6) # enable c++11 on everything but mac/release (breaks 10.6)
!macx|CONFIG(debug, debug|release): CONFIG += c++11 !macx|CONFIG(debug, debug|release): CONFIG += c++11

2
qtcreator.qbs
View File

@@ -4,7 +4,7 @@ Project {
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: '1' property string ide_version_minor: '1'
property string ide_version_release: '1' property string ide_version_release: '2'
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: '1' property string ide_compat_version_minor: '1'