diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2018-01-19 12:05:11 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2018-01-19 12:05:11 +0100 |
| commit | 0837f974da31bc7eace5f484b9857b026dbc14bb (patch) | |
| tree | 1465ef43717e9fe6e796546d6e1e34f0f8283462 /qbs | |
| parent | 052f8ae98a5892515a8b14c9c6f4563ab1b1228e (diff) | |
| parent | dd06a4188d375f990d7ef391b5b626d169a1d196 (diff) | |
Merge remote-tracking branch 'origin/4.6'
Conflicts:
qtcreator.pri
Change-Id: I7dcd8e067b7597144eb3b27d917cb7fe0279aad4
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 de49d790ad..416e27e4e8 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' |