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

Version bump for after 4.2-beta

Browse Source 
Change-Id: Ide9a51c899914531e9d23a2adf614d424a2746d8
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Eike Ziller
2016-10-27 13:44:47 +02:00
parent 4f374d4bbf
commit 51e755d413
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
qbs/modules/qtc/qtc.qbs
View File

@@ -5,13 +5,13 @@ import "qtc.js" as HelperFunctions
Module { Module {
property string ide_version_major: '4' property string ide_version_major: '4'
property string ide_version_minor: '1' property string ide_version_minor: '1'
property string ide_version_release: '82' property string ide_version_release: '83'
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: '1' property string ide_compat_version_minor: '1'
property string ide_compat_version_release: '82' property string ide_compat_version_release: '83'
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

4
qtcreator.pri
View File

@@ -1,8 +1,8 @@
!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.1.82 QTCREATOR_VERSION = 4.1.83
QTCREATOR_COMPAT_VERSION = 4.1.82 QTCREATOR_COMPAT_VERSION = 4.1.83
VERSION = $$QTCREATOR_VERSION VERSION = $$QTCREATOR_VERSION
BINARY_ARTIFACTS_BRANCH = master BINARY_ARTIFACTS_BRANCH = master