diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2014-06-03 15:58:38 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2014-06-03 15:58:38 +0200 |
| commit | 88c1b4ecdbd5e1145e48652856187cdccf591548 (patch) | |
| tree | d516862fae5e744dd256fd72f7fcbfc899aab90e | |
| parent | bd197fbb77c5cfcf3b80951cb6f07f8579306084 (diff) | |
| download | qt-creator-88c1b4ecdbd5e1145e48652856187cdccf591548.tar.gz | |
Version bump
Change-Id: If27d07243cb96a35b8ada5f3137c0edc61d60fc5
| -rw-r--r-- | qtcreator.pri | 4 | ||||
| -rw-r--r-- | qtcreator.qbs | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/qtcreator.pri b/qtcreator.pri index 2d985c60e0..5a821c4753 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.1.1 +QTCREATOR_VERSION = 3.1.2 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) !macx|CONFIG(debug, debug|release): CONFIG += c++11 diff --git a/qtcreator.qbs b/qtcreator.qbs index 52fa9feb85..ad3d9defb7 100644 --- a/qtcreator.qbs +++ b/qtcreator.qbs @@ -4,7 +4,7 @@ Project { property bool withAutotests: qbs.buildVariant === "debug" property string ide_version_major: '3' 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 ide_compat_version_major: '3' property string ide_compat_version_minor: '1' |