diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2017-05-31 22:10:11 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2017-06-08 07:59:35 +0000 |
| commit | 6d32604fd1560fd0dbf10eac702bbf3e9c448875 (patch) | |
| tree | 8ba7b40869c60504cb5501b91f2c4a964cc96c3c /src/imports/controls/qtquickcontrols2plugin.cpp | |
| parent | a5f8ceee8547c3447675d1c4e70f5706bbd2bd99 (diff) | |
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>
Diffstat (limited to 'src/imports/controls/qtquickcontrols2plugin.cpp')
| -rw-r--r-- | src/imports/controls/qtquickcontrols2plugin.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
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"); |