Make QtQuick.Controls::ButtonGroup a composite type

This is a backport (only the ButtonGroup part) of 1af7f8a59, which was
already pushed to dev. The main motivator for the original patch was to
cleanup the registration code, but this fixes also an issue with auto-
completion in Qt Creator.

Task-number: QTCREATORBUG-18321
Change-Id: I5e8e8122cb94c74f78445cce1a89f604634149b1
Reviewed-by: Marco Benelli <marco.benelli@qt.io>

4 files changed, 49 insertions, 4 deletions

diff --git a/src/imports/controls/ButtonGroup.qml b/src/imports/controls/ButtonGroup.qml
new file mode 100644
index 00000000..14a08361
--- /dev/null
+++ b/src/imports/controls/ButtonGroup.qml
@@ -0,0 +1,40 @@
+/****************************************************************************
+**
+** Copyright (C) 2017 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL3$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPLv3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or later as published by the Free
+** Software Foundation and appearing in the file LICENSE.GPL included in
+** the packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 2.0 requirements will be
+** met: http://www.gnu.org/licenses/gpl-2.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 2.9
+import QtQuick.Templates 2.2 as T
+
+T.ButtonGroup { }
diff --git a/src/imports/controls/controls.pri b/src/imports/controls/controls.pri
index 1dfe1911..d7aedb4a 100644
--- a/src/imports/controls/controls.pri
+++ b/src/imports/controls/controls.pri
@@ -15,6 +15,7 @@ QML_CONTROLS = \
     $$PWD/ApplicationWindow.qml \
     $$PWD/BusyIndicator.qml \
     $$PWD/Button.qml \
+    $$PWD/ButtonGroup.qml \
     $$PWD/CheckBox.qml \
     $$PWD/CheckDelegate.qml \
     $$PWD/CheckIndicator.qml \
diff --git a/src/imports/controls/plugins.qmltypes b/src/imports/controls/plugins.qmltypes
index 1e1b9d0f..a8bdb178 100644
--- a/src/imports/controls/plugins.qmltypes
+++ b/src/imports/controls/plugins.qmltypes
@@ -134,6 +134,13 @@ Module {
         defaultProperty: "data"
     }
     Component {
+        prototype: "QQuickButtonGroup"
+        name: "QtQuick.Controls/ButtonGroup 2.0"
+        exports: ["QtQuick.Controls/ButtonGroup 2.0"]
+        exportMetaObjectRevisions: [0]
+        isComposite: true
+    }
+    Component {
         prototype: "QQuickCheckBox"
         name: "QtQuick.Controls/CheckBox 2.0"
         exports: ["QtQuick.Controls/CheckBox 2.0"]
diff --git a/src/imports/controls/qtquickcontrols2plugin.cpp b/src/imports/controls/qtquickcontrols2plugin.cpp
index 848f55b5..32270be0 100644
--- a/src/imports/controls/qtquickcontrols2plugin.cpp
+++ b/src/imports/controls/qtquickcontrols2plugin.cpp
@@ -44,7 +44,6 @@
 #if QT_CONFIG(quick_listview) && QT_CONFIG(quick_pathview)
 #include <QtQuickControls2/private/qquicktumblerview_p.h>
 #endif
-#include <QtQuickTemplates2/private/qquickbuttongroup_p.h>
 
 #include "qquickdefaultbusyindicator_p.h"
 #include "qquickdefaultprogressbar_p.h"
@@ -94,8 +93,7 @@ void QtQuickControls2Plugin::registerTypes(const char *uri)
     qmlRegisterType(selector.select(QStringLiteral("ApplicationWindow.qml")), uri, 2, 0, "ApplicationWindow");
     qmlRegisterType(selector.select(QStringLiteral("BusyIndicator.qml")), uri, 2, 0, "BusyIndicator");
     qmlRegisterType(selector.select(QStringLiteral("Button.qml")), uri, 2, 0, "Button");
-    qmlRegisterType<QQuickButtonGroup>(uri, 2, 0, "ButtonGroup");
-    qmlRegisterType<QQuickButtonGroupAttached>();
+    qmlRegisterType(selector.select(QStringLiteral("ButtonGroup.qml")), uri, 2, 0, "ButtonGroup");
     qmlRegisterType(selector.select(QStringLiteral("CheckBox.qml")), uri, 2, 0, "CheckBox");
     qmlRegisterType(selector.select(QStringLiteral("CheckDelegate.qml")), uri, 2, 0, "CheckDelegate");
     qmlRegisterType(selector.select(QStringLiteral("ComboBox.qml")), uri, 2, 0, "ComboBox");
@@ -138,7 +136,6 @@ void QtQuickControls2Plugin::registerTypes(const char *uri)
 #endif
 
     // QtQuick.Controls 2.1 (new types in Qt 5.8)
-    qmlRegisterType<QQuickButtonGroup,1 >(uri, 2, 1, "ButtonGroup");
     qmlRegisterType(selector.select(QStringLiteral("Dialog.qml")), uri, 2, 1, "Dialog");
     qmlRegisterType(selector.select(QStringLiteral("DialogButtonBox.qml")), uri, 2, 1, "DialogButtonBox");
     qmlRegisterType(selector.select(QStringLiteral("MenuSeparator.qml")), uri, 2, 1, "MenuSeparator");