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 /qtcreator.pri | |
| parent | fdc88939d6f4e19c5bb4613bf5f84d6629e5398d (diff) | |
| parent | e8f0c99f12e805de8231819fab91bd2e0c7d7288 (diff) | |
| download | qt-creator-47ad489b97200c66819687bee08aef47877aaa16.tar.gz | |
Merge remote-tracking branch 'origin/4.5' into 4.6
Conflicts:
qbs/modules/qtc/qtc.qbs
qtcreator.pri
Change-Id: I52986bd2557490431bae48f9db86c848a95592d2
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 8ef4e06e2b..0e1879419c 100644 --- a/qtcreator.pri +++ b/qtcreator.pri @@ -5,7 +5,7 @@ QTCREATOR_VERSION = 4.5.82 QTCREATOR_COMPAT_VERSION = 4.5.82 VERSION = $$QTCREATOR_VERSION QTCREATOR_DISPLAY_VERSION = 4.6.0-beta1 -QTCREATOR_COPYRIGHT_YEAR = 2017 +QTCREATOR_COPYRIGHT_YEAR = 2018 BINARY_ARTIFACTS_BRANCH = master isEmpty(IDE_DISPLAY_NAME): IDE_DISPLAY_NAME = Qt Creator |