diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2020-02-07 10:41:09 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2020-02-07 10:41:09 +0100 |
| commit | 0795a5ae6fabff901f53912040673b1d149d6821 (patch) | |
| tree | c5a124fdff36863f5616deb57354cfb3a7af9e46 /qbs | |
| parent | 11c242427caa71eefde2fd2ffe9f108a6e52fbca (diff) | |
| parent | ee579b5bf3fc1407685afb78404baa593d2fc6f7 (diff) | |
Merge remote-tracking branch 'origin/4.11'
Conflicts:
cmake/QtCreatorIDEBranding.cmake
qbs/modules/qtc/qtc.qbs
qtcreator_ide_branding.pri
Change-Id: I4e339410b17df4098f17e3bb621e1c02e3f8026b
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 658362f87f..d4dffaa4e6 100644 --- a/qbs/modules/qtc/qtc.qbs +++ b/qbs/modules/qtc/qtc.qbs @@ -17,7 +17,7 @@ Module { property string qtcreator_compat_version: ide_compat_version_major + '.' + ide_compat_version_minor + '.' + ide_compat_version_release - property string qtcreator_copyright_year: '2019' + property string qtcreator_copyright_year: '2020' property string qtcreator_copyright_string: "(C) " + qtcreator_copyright_year + " The Qt Company Ltd" property string ide_display_name: 'Qt Creator' |