Convert remaining imperative type registration to declarative

Task-number: QTBUG-82922
Change-Id: I34e9f32d5f695aaac7acf6b4aac30e8a2311e0cf
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>

9 files changed, 16 insertions, 111 deletions

diff --git a/src/imports/controls/default/default.pro b/src/imports/controls/default/default.pro
index ae6761a5..037cf2f7 100644
--- a/src/imports/controls/default/default.pro
+++ b/src/imports/controls/default/default.pro
@@ -1,8 +1,8 @@
 TARGET = qtquickcontrols2defaultstyleplugin
 TARGETPATH = QtQuick/Controls/Default
 
-IMPORT_NAME = QtQuick.Controls.Default
-IMPORT_VERSION = 2.$$QT_MINOR_VERSION
+QML_IMPORT_NAME = QtQuick.Controls.Default
+QML_IMPORT_VERSION = 2.$$QT_MINOR_VERSION
 
 QT += qml quick
 QT_PRIVATE += core-private gui-private qml-private quick-private quicktemplates2-private quickcontrols2-private
@@ -21,7 +21,7 @@ SOURCES += \
 RESOURCES += \
     $$PWD/qtquickcontrols2defaultstyleplugin.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-default))
diff --git a/src/imports/controls/fusion/fusion.pro b/src/imports/controls/fusion/fusion.pro
index 49585212..bb27b3f1 100644
--- a/src/imports/controls/fusion/fusion.pro
+++ b/src/imports/controls/fusion/fusion.pro
@@ -1,8 +1,8 @@
 TARGET = qtquickcontrols2fusionstyleplugin
 TARGETPATH = QtQuick/Controls/Fusion
 
-IMPORT_NAME = QtQuick.Controls.Fusion
-IMPORT_VERSION = 2.$$QT_MINOR_VERSION
+QML_IMPORT_NAME = QtQuick.Controls.Fusion
+QML_IMPORT_VERSION = 2.$$QT_MINOR_VERSION
 
 QT += qml quick
 QT_PRIVATE += core-private gui-private qml-private quick-private quicktemplates2-private quickcontrols2-private
@@ -21,7 +21,7 @@ SOURCES += \
 RESOURCES += \
     $$PWD/qtquickcontrols2fusionstyle.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-fusion))
diff --git a/src/imports/controls/fusion/qtquickcontrols2fusionstyleplugin.cpp b/src/imports/controls/fusion/qtquickcontrols2fusionstyleplugin.cpp
index 1f9b4a1b..b9df2e7d 100644
--- a/src/imports/controls/fusion/qtquickcontrols2fusionstyleplugin.cpp
+++ b/src/imports/controls/fusion/qtquickcontrols2fusionstyleplugin.cpp
@@ -50,8 +50,6 @@ class QtQuickControls2FusionStylePlugin : public QQuickStylePlugin
 public:
     QtQuickControls2FusionStylePlugin(QObject *parent = nullptr);
 
-    void registerTypes(const char *uri) override;
-
     QString name() const override;
     void initializeTheme(QQuickTheme *theme) override;
 };
@@ -60,19 +58,6 @@ QtQuickControls2FusionStylePlugin::QtQuickControls2FusionStylePlugin(QObject *pa
 {
 }
 
-void QtQuickControls2FusionStylePlugin::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("ButtonPanel.qml")), import, 2, 3, "ButtonPanel");
-    qmlRegisterType(resolvedUrl(QStringLiteral("CheckIndicator.qml")), import, 2, 3, "CheckIndicator");
-    qmlRegisterType(resolvedUrl(QStringLiteral("RadioIndicator.qml")), import, 2, 3, "RadioIndicator");
-    qmlRegisterType(resolvedUrl(QStringLiteral("SliderGroove.qml")), import, 2, 3, "SliderGroove");
-    qmlRegisterType(resolvedUrl(QStringLiteral("SliderHandle.qml")), import, 2, 3, "SliderHandle");
-    qmlRegisterType(resolvedUrl(QStringLiteral("SwitchIndicator.qml")), import, 2, 3, "SwitchIndicator");
-}
-
 QString QtQuickControls2FusionStylePlugin::name() const
 {
     return QStringLiteral("Fusion");
diff --git a/src/imports/controls/imagine/imagine.pro b/src/imports/controls/imagine/imagine.pro
index 9bb6afd4..4dcd080c 100644
--- a/src/imports/controls/imagine/imagine.pro
+++ b/src/imports/controls/imagine/imagine.pro
@@ -1,8 +1,8 @@
 TARGET = qtquickcontrols2imaginestyleplugin
 TARGETPATH = QtQuick/Controls/Imagine
 
-IMPORT_NAME = QtQuick.Controls.Imagine
-IMPORT_VERSION = 2.$$QT_MINOR_VERSION
+QML_IMPORT_NAME = QtQuick.Controls.Imagine
+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
@@ -24,7 +24,7 @@ qtquickcontrols2imaginestyle.files += \
     $$files($$PWD/images/*.webp)
 RESOURCES += qtquickcontrols2imaginestyle
 
-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-imagine))
diff --git a/src/imports/controls/material/material.pro b/src/imports/controls/material/material.pro
index ce96924e..7ff3ea07 100644
--- a/src/imports/controls/material/material.pro
+++ b/src/imports/controls/material/material.pro
@@ -1,8 +1,8 @@
 TARGET = qtquickcontrols2materialstyleplugin
 TARGETPATH = QtQuick/Controls/Material
 
-IMPORT_NAME = QtQuick.Controls.Material
-IMPORT_VERSION = 2.$$QT_MINOR_VERSION
+QML_IMPORT_NAME = QtQuick.Controls.Material
+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/qtquickcontrols2materialstyleplugin.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-material))
diff --git a/src/imports/controls/material/qtquickcontrols2materialstyleplugin.cpp b/src/imports/controls/material/qtquickcontrols2materialstyleplugin.cpp
index c0dc5721..dc6873bb 100644
--- a/src/imports/controls/material/qtquickcontrols2materialstyleplugin.cpp
+++ b/src/imports/controls/material/qtquickcontrols2materialstyleplugin.cpp
@@ -51,8 +51,6 @@ class QtQuickControls2MaterialStylePlugin : public QQuickStylePlugin
 public:
     QtQuickControls2MaterialStylePlugin(QObject *parent = nullptr);
 
-    void registerTypes(const char *uri) override;
-
     QString name() const override;
     void initializeTheme(QQuickTheme *theme) override;
 };
@@ -62,21 +60,6 @@ QtQuickControls2MaterialStylePlugin::QtQuickControls2MaterialStylePlugin(QObject
     QQuickMaterialStyle::initGlobals();
 }
 
-void QtQuickControls2MaterialStylePlugin::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("BoxShadow.qml")), import, 2, 0, "BoxShadow");
-    qmlRegisterType(resolvedUrl(QStringLiteral("CheckIndicator.qml")), import, 2, 0, "CheckIndicator");
-    qmlRegisterType(resolvedUrl(QStringLiteral("CursorDelegate.qml")), import, 2, 0, "CursorDelegate");
-    qmlRegisterType(resolvedUrl(QStringLiteral("ElevationEffect.qml")), import, 2, 0, "ElevationEffect");
-    qmlRegisterType(resolvedUrl(QStringLiteral("RadioIndicator.qml")), import, 2, 0, "RadioIndicator");
-    qmlRegisterType(resolvedUrl(QStringLiteral("RectangularGlow.qml")), import, 2, 0, "RectangularGlow");
-    qmlRegisterType(resolvedUrl(QStringLiteral("SliderHandle.qml")), import, 2, 0, "SliderHandle");
-    qmlRegisterType(resolvedUrl(QStringLiteral("SwitchIndicator.qml")), import, 2, 0, "SwitchIndicator");
-}
-
 QString QtQuickControls2MaterialStylePlugin::name() const
 {
     return QStringLiteral("Material");
diff --git a/src/imports/controls/qtquickcontrols2plugin.cpp b/src/imports/controls/qtquickcontrols2plugin.cpp
index 483e6d0c..17eb2be9 100644
--- a/src/imports/controls/qtquickcontrols2plugin.cpp
+++ b/src/imports/controls/qtquickcontrols2plugin.cpp
@@ -46,20 +46,6 @@
 #include <QtQuickControls2/qquickstyle.h>
 #include <QtQuickControls2/private/qquickstyle_p.h>
 #include <QtQuickControls2/private/qquickstyleplugin_p.h>
-#include <QtQuickControls2Impl/private/qquickchecklabel_p.h>
-#include <QtQuickControls2Impl/private/qquickcolor_p.h>
-#include <QtQuickControls2Impl/private/qquickcolorimage_p.h>
-#include <QtQuickControls2Impl/private/qquickiconimage_p.h>
-#include <QtQuickControls2Impl/private/qquickmnemoniclabel_p.h>
-#include <QtQuickControls2Impl/private/qquickpaddedrectangle_p.h>
-#include <QtQuickControls2Impl/private/qquickplaceholdertext_p.h>
-#include <QtQuickControls2Impl/private/qquickiconlabel_p.h>
-#if QT_CONFIG(quick_listview) && QT_CONFIG(quick_pathview)
-#include <QtQuickControls2Impl/private/qquicktumblerview_p.h>
-#endif
-#include <QtQuickTemplates2/private/qquickoverlay_p.h>
-#include <QtQuickControls2Impl/private/qquickclippedtext_p.h>
-#include <QtQuickControls2Impl/private/qquickitemgroup_p.h>
 #include <QtQuickTemplates2/private/qquicktheme_p_p.h>
 
 QT_BEGIN_NAMESPACE
@@ -100,50 +86,13 @@ void QtQuickControls2Plugin::initializeEngine(QQmlEngine *engine, const char */*
     init();
 }
 
-void QtQuickControls2Plugin::registerTypes(const char *uri)
+void QtQuickControls2Plugin::registerTypes(const char */*uri*/)
 {
     QQuickStylePrivate::init(baseUrl());
 
     const QString style = QQuickStyle::name();
     if (!style.isEmpty())
         QFileSelectorPrivate::addStatics(QStringList() << style.toLower());
-
-    // The minor version used to be the current Qt 5 minor. For compatibility it is the last
-    // Qt 5 release.
-    qmlRegisterModule(uri, 2, 15);
-
-    qmlRegisterTypesAndRevisions<QtQuickControls2Plugin>(uri, 2);
-
-    // The minor version used to be the current Qt 5 minor. For compatibility it is the last
-    // Qt 5 release.
-    const QByteArray import = QByteArray(uri) + ".impl";
-    qmlRegisterModule(import, 2, 15);
-
-    // QtQuick.Controls.impl 2.0 (Qt 5.7)
-    qmlRegisterType<QQuickPaddedRectangle>(import, 2, 0, "PaddedRectangle");
-
-    // QtQuick.Controls.impl 2.1 (Qt 5.8)
-#if QT_CONFIG(quick_listview) && QT_CONFIG(quick_pathview)
-    qmlRegisterType<QQuickTumblerView>(import, 2, 1, "TumblerView");
-#endif
-
-    // QtQuick.Controls.impl 2.2 (Qt 5.9)
-    qmlRegisterType<QQuickClippedText>(import, 2, 2, "ClippedText");
-    qmlRegisterType<QQuickItemGroup>(import, 2, 2, "ItemGroup");
-    qmlRegisterType<QQuickPlaceholderText>(import, 2, 2, "PlaceholderText");
-
-    // QtQuick.Controls.impl 2.3 (Qt 5.10)
-    qmlRegisterType<QQuickColorImage>(import, 2, 3, "ColorImage");
-    qmlRegisterType<QQuickIconImage>(import, 2, 3, "IconImage");
-    qmlRegisterSingletonType<QQuickColor>(import, 2, 3, "Color", [](QQmlEngine *engine, QJSEngine *scriptEngine) -> QObject* {
-            Q_UNUSED(engine);
-            Q_UNUSED(scriptEngine);
-            return new QQuickColor;
-    });
-    qmlRegisterType<QQuickIconLabel>(import, 2, 3, "IconLabel");
-    qmlRegisterType<QQuickCheckLabel>(import, 2, 3, "CheckLabel");
-    qmlRegisterType<QQuickMnemonicLabel>(import, 2, 3, "MnemonicLabel");
-    qmlRegisterRevision<QQuickText, 6>(import, 2, 3);
 }
 
 void QtQuickControls2Plugin::unregisterTypes()
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))