diff options
author | Eike Ziller <eike.ziller@theqtcompany.com> | 2015-07-10 14:08:29 +0200 |
---|---|---|
committer | Eike Ziller <eike.ziller@theqtcompany.com> | 2015-07-10 14:08:29 +0200 |
commit | d6da70916d566bec517aedeeae3f224b8d0489a1 (patch) | |
tree | 55c20439f5c65a81647eb7999a25c472d20c7fc5 /qtcreator.pri | |
parent | c69d3ded6b67b5501b9caf0d6f29148f389007ad (diff) | |
parent | a32a9b3d2a82d38edde1b4b55cbdececd7f5333d (diff) |
Merge remote-tracking branch 'origin/3.5'
Diffstat (limited to 'qtcreator.pri')
-rw-r--r-- | qtcreator.pri | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/qtcreator.pri b/qtcreator.pri index f68fa435d5..71e7d4477e 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 |