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-02 07:17:00 +0000 |
commit | 1af7f8a597138d57e4ea932572f0dd5c0832bcf0 (patch) | |
tree | dfb926db2cf12fc0e3f0f715a5421ffbce1624f2 /src/imports/controls/qtquickcontrols2plugin.cpp | |
parent | c70ffcd0f1c21338df36bcfe276b57c8dbad0d50 (diff) |
Add .qml files for the non-visual types
This makes the registration code in qtquickcontrols2plugin.cpp clean,
consistent, and a bit less error-prone. I can't think of anything style
specific in Action, ActionGroup, or ButtonGroup, but in theory, this
mechanism would allow styles to even specify their own default values
for certain properties if they wanted.
Change-Id: I57e1c256d442f2383146808d0fe77355717b0ff2
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/imports/controls/qtquickcontrols2plugin.cpp')
-rw-r--r-- | src/imports/controls/qtquickcontrols2plugin.cpp | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/src/imports/controls/qtquickcontrols2plugin.cpp b/src/imports/controls/qtquickcontrols2plugin.cpp index 8457125e..a7bf096f 100644 --- a/src/imports/controls/qtquickcontrols2plugin.cpp +++ b/src/imports/controls/qtquickcontrols2plugin.cpp @@ -48,10 +48,6 @@ #if QT_CONFIG(quick_listview) && QT_CONFIG(quick_pathview) #include <QtQuickControls2/private/qquicktumblerview_p.h> #endif -#include <QtQuickTemplates2/private/qquickaction_p.h> -#include <QtQuickTemplates2/private/qquickactiongroup_p.h> -#include <QtQuickTemplates2/private/qquickbuttongroup_p.h> -#include <QtQuickTemplates2/private/qquickicon_p.h> #include "qquickdefaultbusyindicator_p.h" #include "qquickdefaultdial_p.h" @@ -105,8 +101,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"); @@ -149,7 +144,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"); @@ -161,10 +155,8 @@ void QtQuickControls2Plugin::registerTypes(const char *uri) qmlRegisterType(selector.select(QStringLiteral("ScrollView.qml")), uri, 2, 2, "ScrollView"); // QtQuick.Controls 2.3 (new types in Qt 5.10) - qmlRegisterType<QQuickAction>(uri, 2, 3, "Action"); - qmlRegisterType<QQuickActionGroup>(uri, 2, 3, "ActionGroup"); - qmlRegisterType<QQuickButtonGroup, 3>(uri, 2, 3, "ButtonGroup"); - qRegisterMetaType<QQuickIcon>(); + qmlRegisterType(selector.select(QStringLiteral("Action.qml")), uri, 2, 3, "Action"); + qmlRegisterType(selector.select(QStringLiteral("ActionGroup.qml")), uri, 2, 3, "ActionGroup"); } static QObject *styleSingleton(QQmlEngine *engine, QJSEngine *scriptEngine) |