summaryrefslogtreecommitdiff
path: root/qbs
diff options
context:
space:
mode:
authorEike Ziller <eike.ziller@qt.io>2019-02-08 12:44:49 +0100
committerEike Ziller <eike.ziller@qt.io>2019-02-08 12:44:49 +0100
commitd07d75a08af17305d317b363a7d3044ebeb54a2c (patch)
treea86b3526c7b77794e0fd14f231337558e7dd2f0e /qbs
parentdbf7c9f658ce9a0984bd4704b73f02803b062eb2 (diff)
parente27744e966d7c689b69f515b60972b0a17acc4ed (diff)
downloadqt-creator-d07d75a08af17305d317b363a7d3044ebeb54a2c.tar.gz
Merge remote-tracking branch 'origin/4.8' into 4.9
Conflicts: qtcreator.pri Change-Id: I84dc8b9c7a029f2f40c4fa3ef78eef338247a6c0
Diffstat (limited to 'qbs')
-rw-r--r--qbs/modules/qtc/qtc.qbs2
1 files changed, 1 insertions, 1 deletions
diff --git a/qbs/modules/qtc/qtc.qbs b/qbs/modules/qtc/qtc.qbs
index 9e26c4caa0..b87523a9c3 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: '2018'
+ property string qtcreator_copyright_year: '2019'
property string qtcreator_copyright_string: "(C) " + qtcreator_copyright_year + " The Qt Company Ltd"
property string ide_display_name: 'Qt Creator'