diff options
| author | Eike Ziller <eike.ziller@theqtcompany.com> | 2015-07-09 15:49:41 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@theqtcompany.com> | 2015-07-09 13:50:05 +0000 |
| commit | 387e4917a655da4c26cbe800aeab849c9973f5af (patch) | |
| tree | 3b8ca0a78474e775dd82eef65c9b41b24f6deee5 | |
| parent | f9cb5d265d385c51dd5f069011617b586a4cdc40 (diff) | |
Version bump
Change-Id: I9f8d177d34cc277fdea51da5224fbc4c7ee8a589
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
| -rw-r--r-- | qtcreator.pri | 6 | ||||
| -rw-r--r-- | qtcreator.qbs | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/qtcreator.pri b/qtcreator.pri index 1e0a984a1d..75bd7c2a59 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.81 -QTCREATOR_COMPAT_VERSION = 3.4.81 -BINARY_ARTIFACTS_BRANCH = master +QTCREATOR_VERSION = 3.4.82 +QTCREATOR_COMPAT_VERSION = 3.4.82 +BINARY_ARTIFACTS_BRANCH = 3.5 # enable c++11 CONFIG += c++11 diff --git a/qtcreator.qbs b/qtcreator.qbs index 9bd047c860..d8b3e05e93 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: '4' - property string ide_version_release: '81' + 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: '4' - property string ide_compat_version_release: '81' + 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" |