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 /qbs | |
| 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 'qbs')
| -rw-r--r-- | qbs/modules/qtc/qtc.qbs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qbs/modules/qtc/qtc.qbs b/qbs/modules/qtc/qtc.qbs index 02f932daf0..4a6da581d3 100644 --- a/qbs/modules/qtc/qtc.qbs +++ b/qbs/modules/qtc/qtc.qbs @@ -16,7 +16,7 @@ Module { property string qtcreator_compat_version: ide_compat_version_major + '.' + 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 ide_display_name: 'Qt Creator' |