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

Conflicts: qtcreator_ide_branding.pri Change-Id: I9d9beb7b842800ac37bc628695fb01dc91923eb9
2021-03-11 14:00:57 +01:00
parent 8f68cb9e75 e2112d6831
commit e2b0547519
3 changed files with 3 additions and 3 deletions
--- 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: '2020'
+    property string qtcreator_copyright_year: '2021'
    property string qtcreator_copyright_string: "(C) " + qtcreator_copyright_year + " The Qt Company Ltd"

    property string ide_display_name: 'Qt Creator'
--- a/qtcreator_ide_branding.pri
+++ b/qtcreator_ide_branding.pri
@@ -1,7 +1,7 @@
 QTCREATOR_VERSION = 4.14.82
 QTCREATOR_COMPAT_VERSION = 4.14.82
 QTCREATOR_DISPLAY_VERSION = 4.15.0-beta1
-QTCREATOR_COPYRIGHT_YEAR = 2020
+QTCREATOR_COPYRIGHT_YEAR = 2021

 IDE_DISPLAY_NAME = Qt Creator
 IDE_ID = qtcreator
--- a/src/shared/qbs
+++ b/src/shared/qbs