diff options
author | Eike Ziller <eike.ziller@qt.io> | 2019-02-08 12:44:49 +0100 |
---|---|---|
committer | Eike Ziller <eike.ziller@qt.io> | 2019-02-08 12:44:49 +0100 |
commit | d07d75a08af17305d317b363a7d3044ebeb54a2c (patch) | |
tree | a86b3526c7b77794e0fd14f231337558e7dd2f0e /qtcreator.pri | |
parent | dbf7c9f658ce9a0984bd4704b73f02803b062eb2 (diff) | |
parent | e27744e966d7c689b69f515b60972b0a17acc4ed (diff) | |
download | qt-creator-d07d75a08af17305d317b363a7d3044ebeb54a2c.tar.gz |
Merge remote-tracking branch 'origin/4.8' into 4.9
Conflicts:
qtcreator.pri
Change-Id: I84dc8b9c7a029f2f40c4fa3ef78eef338247a6c0
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 3b77cc86a7..e222ab79b3 100644 --- a/qtcreator.pri +++ b/qtcreator.pri @@ -5,7 +5,7 @@ QTCREATOR_VERSION = 4.8.82 QTCREATOR_COMPAT_VERSION = 4.8.82 VERSION = $$QTCREATOR_VERSION QTCREATOR_DISPLAY_VERSION = 4.9.0-beta1 -QTCREATOR_COPYRIGHT_YEAR = 2018 +QTCREATOR_COPYRIGHT_YEAR = 2019 BINARY_ARTIFACTS_BRANCH = master isEmpty(IDE_DISPLAY_NAME): IDE_DISPLAY_NAME = Qt Creator |