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

Merge remote-tracking branch 'origin/4.14' into 4.15

Browse Source 
Conflicts:
	cmake/QtCreatorIDEBranding.cmake

Change-Id: I70c4cc83197f089e5d92303a6d434fe28d63a187
This commit is contained in:
Eike Ziller
2021-03-10 17:41:34 +01:00
parent 50c0f0952d 0af4f5152e
commit b6164e7b72
1 changed files with 1 additions and 1 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 "4.14.82") # The IDE version.
set(IDE_VERSION_COMPAT "4.14.82") # The IDE Compatibility version.
set(IDE_VERSION_DISPLAY "4.15.0-beta1") # The IDE display version.
set(IDE_COPYRIGHT_YEAR "2020") # The IDE current copyright year.
set(IDE_COPYRIGHT_YEAR "2021") # The IDE current copyright year.
set(IDE_SETTINGSVARIANT "QtProject") # The IDE settings variation.
set(IDE_COPY_SETTINGSVARIANT "Nokia") # The IDE settings to initially import.