diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2018-01-17 16:28:18 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2018-01-17 16:28:18 +0100 |
| commit | 47ad489b97200c66819687bee08aef47877aaa16 (patch) | |
| tree | 6be01c32023e634ce8f485e6fd31d2eae1a21698 /qbs | |
| parent | fdc88939d6f4e19c5bb4613bf5f84d6629e5398d (diff) | |
| parent | e8f0c99f12e805de8231819fab91bd2e0c7d7288 (diff) | |
Merge remote-tracking branch 'origin/4.5' into 4.6
Conflicts:
qbs/modules/qtc/qtc.qbs
qtcreator.pri
Change-Id: I52986bd2557490431bae48f9db86c848a95592d2
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 0177c20564..a710ad05ab 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: '2017' + property string qtcreator_copyright_year: '2018' property string qtcreator_copyright_string: "(C) " + qtcreator_copyright_year + " The Qt Company Ltd" property string ide_display_name: 'Qt Creator' |