diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2018-07-06 12:30:27 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2018-07-06 10:30:50 +0000 |
| commit | 21ac38aca9ccd246051992c5266aa2f4021c3c20 (patch) | |
| tree | aec147646d93f1cf9210b1d6428de5af702b5a70 | |
| parent | a7fba990f4ecd592f479340d10fe60c2e34ba187 (diff) | |
Version bump to 4.7.0
Change-Id: I339097aa2a0deeeea4bd81a9a8b74c6732bb217d
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
| -rw-r--r-- | qbs/modules/qtc/qtc.qbs | 10 | ||||
| -rw-r--r-- | qtcreator.pri | 6 |
2 files changed, 8 insertions, 8 deletions
diff --git a/qbs/modules/qtc/qtc.qbs b/qbs/modules/qtc/qtc.qbs index fd2cd3f2da..3c673abf01 100644 --- a/qbs/modules/qtc/qtc.qbs +++ b/qbs/modules/qtc/qtc.qbs @@ -4,16 +4,16 @@ import qbs.FileInfo import "qtc.js" as HelperFunctions Module { - property string qtcreator_display_version: '4.7.0-rc1' + property string qtcreator_display_version: '4.7.0' property string ide_version_major: '4' - property string ide_version_minor: '6' - property string ide_version_release: '84' + property string ide_version_minor: '7' + property string ide_version_release: '0' property string qtcreator_version: ide_version_major + '.' + ide_version_minor + '.' + ide_version_release property string ide_compat_version_major: '4' - property string ide_compat_version_minor: '6' - property string ide_compat_version_release: '84' + property string ide_compat_version_minor: '7' + property string ide_compat_version_release: '0' property string qtcreator_compat_version: ide_compat_version_major + '.' + ide_compat_version_minor + '.' + ide_compat_version_release diff --git a/qtcreator.pri b/qtcreator.pri index b79249c045..cf24edeb91 100644 --- a/qtcreator.pri +++ b/qtcreator.pri @@ -1,10 +1,10 @@ !isEmpty(QTCREATOR_PRI_INCLUDED):error("qtcreator.pri already included") QTCREATOR_PRI_INCLUDED = 1 -QTCREATOR_VERSION = 4.6.84 -QTCREATOR_COMPAT_VERSION = 4.6.84 +QTCREATOR_VERSION = 4.7.0 +QTCREATOR_COMPAT_VERSION = 4.7.0 VERSION = $$QTCREATOR_VERSION -QTCREATOR_DISPLAY_VERSION = 4.7.0-rc1 +QTCREATOR_DISPLAY_VERSION = 4.7.0 QTCREATOR_COPYRIGHT_YEAR = 2018 BINARY_ARTIFACTS_BRANCH = 4.7 |