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

Merge remote-tracking branch 'origin/6.0'

Browse Source 
Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri

Change-Id: I04ea68c9e20dc331b1f12b77c8b6f6b4db38c836
This commit is contained in:
Eike Ziller
2022-01-19 13:36:24 +01:00
parent 704f239b55 f708e0e70c
commit d8e393953d
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/QtCreatorIDEBranding.cmake
View File

@@ -1,7 +1,7 @@
set(IDE_VERSION "6.82.0") # The IDE version. set(IDE_VERSION "6.82.0") # The IDE version.
set(IDE_VERSION_COMPAT "6.82.0") # The IDE Compatibility version. set(IDE_VERSION_COMPAT "6.82.0") # The IDE Compatibility version.
set(IDE_VERSION_DISPLAY "7.0.0-beta1") # The IDE display version. set(IDE_VERSION_DISPLAY "7.0.0-beta1") # The IDE display version.
set(IDE_COPYRIGHT_YEAR "2021") # The IDE current copyright year. set(IDE_COPYRIGHT_YEAR "2022") # The IDE current copyright year.
set(IDE_SETTINGSVARIANT "QtProject") # The IDE settings variation. set(IDE_SETTINGSVARIANT "QtProject") # The IDE settings variation.
set(IDE_DISPLAY_NAME "Qt Creator") # The IDE display name. set(IDE_DISPLAY_NAME "Qt Creator") # The IDE display name.

2
qbs/modules/qtc/qtc.qbs
View File

@@ -16,7 +16,7 @@ Module {
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
property string qtcreator_copyright_year: '2021' property string qtcreator_copyright_year: '2022'
property string qtcreator_copyright_string: "(C) " + qtcreator_copyright_year + " The Qt Company Ltd" property string qtcreator_copyright_string: "(C) " + qtcreator_copyright_year + " The Qt Company Ltd"
property string ide_display_name: 'Qt Creator' property string ide_display_name: 'Qt Creator'

2
qtcreator_ide_branding.pri
View File

@@ -1,7 +1,7 @@
QTCREATOR_VERSION = 6.82.0 QTCREATOR_VERSION = 6.82.0
QTCREATOR_COMPAT_VERSION = 6.82.0 QTCREATOR_COMPAT_VERSION = 6.82.0
QTCREATOR_DISPLAY_VERSION = 7.0.0-beta1 QTCREATOR_DISPLAY_VERSION = 7.0.0-beta1
QTCREATOR_COPYRIGHT_YEAR = 2021 QTCREATOR_COPYRIGHT_YEAR = 2022
IDE_DISPLAY_NAME = Qt Creator IDE_DISPLAY_NAME = Qt Creator
IDE_ID = qtcreator IDE_ID = qtcreator