diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2020-04-14 09:47:38 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2020-04-14 09:47:38 +0200 |
| commit | deb0eaf7950e4aa4067af730367e61cbd732d178 (patch) | |
| tree | 4c393e8a00b4e4ef3e2cdba9a99b755f59a6b8ba /src/plugins/boot2qt | |
| parent | e86a2bfdd2d3778456c828efbf1265804908815c (diff) | |
| parent | af061c81b7ea9e4b8e75ac63a2e172b5653f9037 (diff) | |
Merge remote-tracking branch 'origin/4.12'
Conflicts:
cmake/QtCreatorIDEBranding.cmake
qbs/modules/qtc/qtc.qbs
qtcreator_ide_branding.pri
src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp
Change-Id: I34c3d1fd5be90537e37d15e00b1a0d455d1bf81d
Diffstat (limited to 'src/plugins/boot2qt')
| -rw-r--r-- | src/plugins/boot2qt/Boot2Qt.json.in | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/plugins/boot2qt/Boot2Qt.json.in b/src/plugins/boot2qt/Boot2Qt.json.in index a459d6b298..13b22578e2 100644 --- a/src/plugins/boot2qt/Boot2Qt.json.in +++ b/src/plugins/boot2qt/Boot2Qt.json.in @@ -2,7 +2,6 @@ \"Name\" : \"Boot2Qt\", \"Version\" : \"$$QTCREATOR_VERSION\", \"CompatVersion\" : \"$$QTCREATOR_COMPAT_VERSION\", - \"Revision\" : \"$$QTC_PLUGIN_REVISION\", \"DisabledByDefault\" : true, \"Vendor\" : \"The Qt Company Ltd\", \"Copyright\" : \"(C) $$QTCREATOR_COPYRIGHT_YEAR The Qt Company Ltd\", |