forked from qt-creator/qt-creator
Merge remote-tracking branch 'origin/6.0'
Conflicts: cmake/QtCreatorIDEBranding.cmake qbs/modules/qtc/qtc.qbs qtcreator_ide_branding.pri Change-Id: I04ea68c9e20dc331b1f12b77c8b6f6b4db38c836
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
set(IDE_VERSION "6.82.0") # The IDE 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_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_DISPLAY_NAME "Qt Creator") # The IDE display name.
|
||||
|
||||
Reference in New Issue
Block a user