diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2018-03-19 13:13:31 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2018-03-19 13:13:31 +0100 |
| commit | 7ba225cb79c2d83bf7ed5dd249747541dd27a963 (patch) | |
| tree | 7afe909d92805ab0233dddb4bc796596a74df878 /qtcreator.pri | |
| parent | 67e5eabc4af630c02ab15700f596b131c70b6ed8 (diff) | |
| parent | cabbeb1c5450b67ba649d77474b892d5acb0d622 (diff) | |
| download | qt-creator-7ba225cb79c2d83bf7ed5dd249747541dd27a963.tar.gz | |
Merge remote-tracking branch 'origin/4.6'
Conflicts:
qbs/modules/qtc/qtc.qbs
qtcreator.pri
Change-Id: Ifd9524b0155067faf9d8a90858cc5f7da6b651bf
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 de815b131e..9e681b65cb 100644 --- a/qtcreator.pri +++ b/qtcreator.pri @@ -6,7 +6,7 @@ QTCREATOR_COMPAT_VERSION = 4.6.82 VERSION = $$QTCREATOR_VERSION QTCREATOR_DISPLAY_VERSION = 4.7.0-beta1 QTCREATOR_COPYRIGHT_YEAR = 2018 -BINARY_ARTIFACTS_BRANCH = master +BINARY_ARTIFACTS_BRANCH = 4.6 isEmpty(IDE_DISPLAY_NAME): IDE_DISPLAY_NAME = Qt Creator isEmpty(IDE_ID): IDE_ID = qtcreator |