feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Version bump to 4.8 RC1

Browse Source 
Change-Id: I67dbd98002f270bc053f3680adcf51034cde4593
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Eike Ziller
2018-11-19 10:10:26 +01:00
parent e164717108
commit b8156fdfe0
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
qbs/modules/qtc/qtc.qbs
View File

@@ -4,16 +4,16 @@ import qbs.FileInfo
import "qtc.js" as HelperFunctions import "qtc.js" as HelperFunctions
Module { Module {
property string qtcreator_display_version: '4.8.0-beta2' property string qtcreator_display_version: '4.8.0-rc1'
property string ide_version_major: '4' property string ide_version_major: '4'
property string ide_version_minor: '7' property string ide_version_minor: '7'
property string ide_version_release: '83' property string ide_version_release: '84'
property string qtcreator_version: ide_version_major + '.' + ide_version_minor + '.' property string qtcreator_version: ide_version_major + '.' + ide_version_minor + '.'
+ ide_version_release + ide_version_release
property string ide_compat_version_major: '4' property string ide_compat_version_major: '4'
property string ide_compat_version_minor: '7' property string ide_compat_version_minor: '7'
property string ide_compat_version_release: '83' property string ide_compat_version_release: '84'
property string qtcreator_compat_version: ide_compat_version_major + '.' property string qtcreator_compat_version: ide_compat_version_major + '.'
+ ide_compat_version_minor + '.' + ide_compat_version_release + ide_compat_version_minor + '.' + ide_compat_version_release

8
qtcreator.pri
View File

@@ -1,12 +1,12 @@
!isEmpty(QTCREATOR_PRI_INCLUDED):error("qtcreator.pri already included") !isEmpty(QTCREATOR_PRI_INCLUDED):error("qtcreator.pri already included")
QTCREATOR_PRI_INCLUDED = 1 QTCREATOR_PRI_INCLUDED = 1
QTCREATOR_VERSION = 4.7.83 QTCREATOR_VERSION = 4.7.84
QTCREATOR_COMPAT_VERSION = 4.7.83 QTCREATOR_COMPAT_VERSION = 4.7.84
VERSION = $$QTCREATOR_VERSION VERSION = $$QTCREATOR_VERSION
QTCREATOR_DISPLAY_VERSION = 4.8.0-beta2 QTCREATOR_DISPLAY_VERSION = 4.8.0-rc1
QTCREATOR_COPYRIGHT_YEAR = 2018 QTCREATOR_COPYRIGHT_YEAR = 2018
BINARY_ARTIFACTS_BRANCH = master BINARY_ARTIFACTS_BRANCH = 4.8
isEmpty(IDE_DISPLAY_NAME): IDE_DISPLAY_NAME = Qt Creator isEmpty(IDE_DISPLAY_NAME): IDE_DISPLAY_NAME = Qt Creator
isEmpty(IDE_ID): IDE_ID = qtcreator isEmpty(IDE_ID): IDE_ID = qtcreator