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 /cmake | |
| parent | 11c242427caa71eefde2fd2ffe9f108a6e52fbca (diff) | |
| parent | ee579b5bf3fc1407685afb78404baa593d2fc6f7 (diff) | |
| download | qt-creator-0795a5ae6fabff901f53912040673b1d149d6821.tar.gz | |
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 'cmake')
| -rw-r--r-- | cmake/QtCreatorIDEBranding.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cmake/QtCreatorIDEBranding.cmake b/cmake/QtCreatorIDEBranding.cmake index ba2c61c790..b8c8f560b8 100644 --- a/cmake/QtCreatorIDEBranding.cmake +++ b/cmake/QtCreatorIDEBranding.cmake @@ -4,7 +4,7 @@ set(IDE_VERSION "4.11.82") # The IDE version. set(IDE_VERSION_COMPAT "4.11.82") # The IDE Compatibility version. set(IDE_VERSION_DISPLAY "4.12.0-beta1") # The IDE display version. -set(IDE_COPYRIGHT_YEAR "2019") # The IDE current copyright year. +set(IDE_COPYRIGHT_YEAR "2020") # The IDE current copyright year. set(IDE_SETTINGSVARIANT "QtProject") # The IDE settings variation. set(IDE_COPY_SETTINGSVARIANT "Nokia") # The IDE settings to initially import. |