diff options
author | Eike Ziller <eike.ziller@qt.io> | 2022-01-19 13:36:24 +0100 |
---|---|---|
committer | Eike Ziller <eike.ziller@qt.io> | 2022-01-19 13:36:24 +0100 |
commit | d8e393953db0df03934c75ce81ba55954f9dea39 (patch) | |
tree | 1ec9f5b7d1d98d660fea62cb842cd4c9bb3bd257 /qtcreator_ide_branding.pri | |
parent | 704f239b55c7de7066d4577528f999aa554250a3 (diff) | |
parent | f708e0e70c144400f5582dacd6123c4f3cf777cc (diff) | |
download | qt-creator-d8e393953db0df03934c75ce81ba55954f9dea39.tar.gz |
Merge remote-tracking branch 'origin/6.0'
Conflicts:
cmake/QtCreatorIDEBranding.cmake
qbs/modules/qtc/qtc.qbs
qtcreator_ide_branding.pri
Change-Id: I04ea68c9e20dc331b1f12b77c8b6f6b4db38c836
Diffstat (limited to 'qtcreator_ide_branding.pri')
-rw-r--r-- | qtcreator_ide_branding.pri | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qtcreator_ide_branding.pri b/qtcreator_ide_branding.pri index 37776f5187..e74a6bdc14 100644 --- a/qtcreator_ide_branding.pri +++ b/qtcreator_ide_branding.pri @@ -1,7 +1,7 @@ QTCREATOR_VERSION = 6.82.0 QTCREATOR_COMPAT_VERSION = 6.82.0 QTCREATOR_DISPLAY_VERSION = 7.0.0-beta1 -QTCREATOR_COPYRIGHT_YEAR = 2021 +QTCREATOR_COPYRIGHT_YEAR = 2022 IDE_DISPLAY_NAME = Qt Creator IDE_ID = qtcreator |