diff --git a/qtcreator.pri b/qtcreator.pri index 4728785fa2d65be5b42bd077bf2f5fccf746264c..45b90c9f02cd49e0a6aa97eae5ee8c1dec13bd37 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.6.82 -QTCREATOR_COMPAT_VERSION = 3.6.82 -BINARY_ARTIFACTS_BRANCH = master +QTCREATOR_VERSION = 3.6.83 +QTCREATOR_COMPAT_VERSION = 3.6.83 +BINARY_ARTIFACTS_BRANCH = 4.0 # enable c++11 CONFIG += c++11 diff --git a/qtcreator.qbs b/qtcreator.qbs index e096281d50384dd85ff4471a6594a9729d9833b9..340478437375ea78b744dacb09e5e8eb3f6674a4 100644 --- a/qtcreator.qbs +++ b/qtcreator.qbs @@ -7,11 +7,11 @@ Project { property bool withAutotests: qbs.buildVariant === "debug" property string ide_version_major: '3' property string ide_version_minor: '6' - property string ide_version_release: '82' + property string ide_version_release: '83' 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: '6' - property string ide_compat_version_release: '82' + property string ide_compat_version_release: '83' 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"