diff options
| author | Mitch Curtis <mitch.curtis@qt.io> | 2020-04-14 15:31:22 +0200 |
|---|---|---|
| committer | Mitch Curtis <mitch.curtis@qt.io> | 2020-08-26 11:46:05 +0200 |
| commit | 92879d8f6b8b840328813f29f758865a412af270 (patch) | |
| tree | d8bedfa8e978d21fb628d3e2dcb8e40f69a7f563 /src/imports/controls/universal | |
| parent | 27e2003f7bc6808e872ad22d5502233e7983ef1e (diff) | |
Convert remaining imperative type registration to declarative
Task-number: QTBUG-82922
Change-Id: I34e9f32d5f695aaac7acf6b4aac30e8a2311e0cf
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Diffstat (limited to 'src/imports/controls/universal')
| -rw-r--r-- | src/imports/controls/universal/qtquickcontrols2universalstyleplugin.cpp | 12 | ||||
| -rw-r--r-- | src/imports/controls/universal/universal.pro | 6 |
2 files changed, 3 insertions, 15 deletions
diff --git a/src/imports/controls/universal/qtquickcontrols2universalstyleplugin.cpp b/src/imports/controls/universal/qtquickcontrols2universalstyleplugin.cpp index bc0e6bb8..ac154911 100644 --- a/src/imports/controls/universal/qtquickcontrols2universalstyleplugin.cpp +++ b/src/imports/controls/universal/qtquickcontrols2universalstyleplugin.cpp @@ -49,8 +49,6 @@ class QtQuickControls2UniversalStylePlugin : public QQuickStylePlugin public: QtQuickControls2UniversalStylePlugin(QObject *parent = nullptr); - void registerTypes(const char *uri) override; - QString name() const override; void initializeTheme(QQuickTheme *theme) override; }; @@ -60,16 +58,6 @@ QtQuickControls2UniversalStylePlugin::QtQuickControls2UniversalStylePlugin(QObje QQuickUniversalStyle::initGlobals(); } -void QtQuickControls2UniversalStylePlugin::registerTypes(const char *uri) -{ - QByteArray import = QByteArray(uri) + ".impl"; - qmlRegisterModule(import, 2, 15); // Qt 5.12->2.12, 5.13->2.13... - - qmlRegisterType(resolvedUrl(QStringLiteral("CheckIndicator.qml")), import, 2, 0, "CheckIndicator"); - qmlRegisterType(resolvedUrl(QStringLiteral("RadioIndicator.qml")), import, 2, 0, "RadioIndicator"); - qmlRegisterType(resolvedUrl(QStringLiteral("SwitchIndicator.qml")), import, 2, 0, "SwitchIndicator"); -} - QString QtQuickControls2UniversalStylePlugin::name() const { return QStringLiteral("Universal"); diff --git a/src/imports/controls/universal/universal.pro b/src/imports/controls/universal/universal.pro index 33dd8f14..f41e37b7 100644 --- a/src/imports/controls/universal/universal.pro +++ b/src/imports/controls/universal/universal.pro @@ -1,8 +1,8 @@ TARGET = qtquickcontrols2universalstyleplugin TARGETPATH = QtQuick/Controls/Universal -IMPORT_NAME = QtQuick.Controls.Universal -IMPORT_VERSION = 2.$$QT_MINOR_VERSION +QML_IMPORT_NAME = QtQuick.Controls.Universal +QML_IMPORT_VERSION = 2.$$QT_MINOR_VERSION QT += qml quick QT_PRIVATE += core-private gui-private qml-private quick-private quicktemplates2-private quickcontrols2-private quickcontrols2impl-private @@ -21,7 +21,7 @@ SOURCES += \ RESOURCES += \ $$PWD/qtquickcontrols2universalstyleplugin.qrc -CONFIG += no_cxx_module install_qml_files builtin_resources qtquickcompiler +CONFIG += qmltypes no_cxx_module install_qml_files builtin_resources qtquickcompiler load(qml_plugin) requires(qtConfig(quickcontrols2-universal)) |