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 /qtcreator.pri | |
| parent | 052f8ae98a5892515a8b14c9c6f4563ab1b1228e (diff) | |
| parent | dd06a4188d375f990d7ef391b5b626d169a1d196 (diff) | |
Merge remote-tracking branch 'origin/4.6'
Conflicts:
qtcreator.pri
Change-Id: I7dcd8e067b7597144eb3b27d917cb7fe0279aad4
Diffstat (limited to 'qtcreator.pri')
| -rw-r--r-- | qtcreator.pri | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qtcreator.pri b/qtcreator.pri index 1f8020b791..a53b1fe9ed 100644 --- a/qtcreator.pri +++ b/qtcreator.pri @@ -5,7 +5,7 @@ QTCREATOR_VERSION = 4.6.82 QTCREATOR_COMPAT_VERSION = 4.6.82 VERSION = $$QTCREATOR_VERSION QTCREATOR_DISPLAY_VERSION = 4.7.0-beta1 -QTCREATOR_COPYRIGHT_YEAR = 2017 +QTCREATOR_COPYRIGHT_YEAR = 2018 BINARY_ARTIFACTS_BRANCH = master isEmpty(IDE_DISPLAY_NAME): IDE_DISPLAY_NAME = Qt Creator |