Register C++ types declaratively

Adapt to the new way of registering C++ types. The types need to be
seen at compile time so that code can be generated that invokes them.

This patch:

- Adds QML_* macros where applicable.
- Adapts the build system files to the new way of registering modules.
- Splits up the QtQuick.Controls[.*].impl files into their own plugins,
  as we can only register one QML module per .pro file.
- Removes C++ type registration calls in every plugin.
- Moves private types from src/quickcontrols2/quickcontrols2.pro
  to src/quickcontrols2/impl/quickcontrols2-impl.pro. Some of these
  types need to be exposed to QML, but quickcontrols2.pro is already in
  use to declare the QtQuick.Controls import (and also provides the
  public C++ QQuickStyle API), and the new QML_IMPORT_NAME/VERSION
  syntax only allows one module per project. As some of the types that
  need to be exposed to QML are also referenced by some C++ code (e.g.
  tests, etc.), we just move all of the private types to the new
  library.

Follow-up patches will register the QML types declaratively.

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

15 files changed, 109 insertions, 41 deletions

diff --git a/src/imports/controls/default/BusyIndicator.qml b/src/imports/controls/default/BusyIndicator.qml
index ff5c191c..c8b12732 100644
--- a/src/imports/controls/default/BusyIndicator.qml
+++ b/src/imports/controls/default/BusyIndicator.qml
@@ -36,7 +36,7 @@
 
 import QtQuick 2.12
 import QtQuick.Controls 2.12
-import QtQuick.Controls.impl 2.12
+import QtQuick.Controls.Default.impl 2.12
 import QtQuick.Templates 2.12 as T
 
 T.BusyIndicator {
diff --git a/src/imports/controls/default/Dial.qml b/src/imports/controls/default/Dial.qml
index 457016d3..daae1e64 100644
--- a/src/imports/controls/default/Dial.qml
+++ b/src/imports/controls/default/Dial.qml
@@ -37,6 +37,7 @@
 import QtQuick 2.12
 import QtQuick.Controls 2.12
 import QtQuick.Controls.impl 2.12
+import QtQuick.Controls.Default.impl 2.12
 import QtQuick.Templates 2.12 as T
 
 T.Dial {
diff --git a/src/imports/controls/default/ProgressBar.qml b/src/imports/controls/default/ProgressBar.qml
index 61cdea43..218cc442 100644
--- a/src/imports/controls/default/ProgressBar.qml
+++ b/src/imports/controls/default/ProgressBar.qml
@@ -37,7 +37,7 @@
 import QtQuick 2.12
 import QtQuick.Templates 2.12 as T
 import QtQuick.Controls 2.12
-import QtQuick.Controls.impl 2.12
+import QtQuick.Controls.Default.impl 2.12
 
 T.ProgressBar {
     id: control
diff --git a/src/imports/controls/default/default.pri b/src/imports/controls/default/default.pri
index 03fc0f4b..e7147af4 100644
--- a/src/imports/controls/default/default.pri
+++ b/src/imports/controls/default/default.pri
@@ -1,14 +1,8 @@
 HEADERS += \
-    $$PWD/qquickdefaultbusyindicator_p.h \
-    $$PWD/qquickdefaultdial_p.h \
-    $$PWD/qquickdefaultprogressbar_p.h \
     $$PWD/qquickdefaultstyle_p.h \
     $$PWD/qquickdefaulttheme_p.h
 
 SOURCES += \
-    $$PWD/qquickdefaultbusyindicator.cpp \
-    $$PWD/qquickdefaultdial.cpp \
-    $$PWD/qquickdefaultprogressbar.cpp \
     $$PWD/qquickdefaultstyle.cpp \
     $$PWD/qquickdefaulttheme.cpp
 
diff --git a/src/imports/controls/default/impl/default-impl.pro b/src/imports/controls/default/impl/default-impl.pro
new file mode 100644
index 00000000..88ec2077
--- /dev/null
+++ b/src/imports/controls/default/impl/default-impl.pro
@@ -0,0 +1,30 @@
+TARGET = qtquickcontrols2defaultstyleimplplugin
+TARGETPATH = QtQuick/Controls.2/Default/impl
+
+QML_IMPORT_NAME = QtQuick.Controls.Default.impl
+QML_IMPORT_VERSION = 2.$$QT_MINOR_VERSION
+
+QT += qml quick
+QT_PRIVATE += core-private gui qml-private quick-private quicktemplates2-private quickcontrols2impl-private
+QT_FOR_CONFIG = quickcontrols2-private
+
+DEFINES += QT_NO_CAST_TO_ASCII QT_NO_CAST_FROM_ASCII
+
+OTHER_FILES += \
+    qmldir
+
+HEADERS += \
+    $$PWD/qquickdefaultbusyindicator_p.h \
+    $$PWD/qquickdefaultdial_p.h \
+    $$PWD/qquickdefaultprogressbar_p.h
+
+SOURCES += \
+    $$PWD/qquickdefaultbusyindicator.cpp \
+    $$PWD/qquickdefaultdial.cpp \
+    $$PWD/qquickdefaultprogressbar.cpp \
+    $$PWD/qtquickcontrols2defaultstyleimplplugin.cpp
+
+CONFIG += qmltypes install_qmltypes no_cxx_module
+load(qml_plugin)
+
+requires(qtConfig(quickcontrols2-default))
diff --git a/src/imports/controls/default/impl/qmldir b/src/imports/controls/default/impl/qmldir
new file mode 100644
index 00000000..95deed07
--- /dev/null
+++ b/src/imports/controls/default/impl/qmldir
@@ -0,0 +1,5 @@
+module QtQuick.Controls.Default.impl
+plugin qtquickcontrols2defaultstyleimplplugin
+classname QtQuickControls2DefaultStyleImplPlugin
+depends QtQuick.Templates 6.0
+depends QtQuick.Controls 6.0
diff --git a/src/imports/controls/default/qquickdefaultbusyindicator.cpp b/src/imports/controls/default/impl/qquickdefaultbusyindicator.cpp
index aca795d9..880d869b 100644
--- a/src/imports/controls/default/qquickdefaultbusyindicator.cpp
+++ b/src/imports/controls/default/impl/qquickdefaultbusyindicator.cpp
@@ -38,7 +38,7 @@
 
 #include <QtQuick/private/qquickitem_p.h>
 #include <QtQuick/private/qsgadaptationlayer_p.h>
-#include <QtQuickControls2/private/qquickanimatednode_p.h>
+#include <QtQuickControls2Impl/private/qquickanimatednode_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/imports/controls/default/qquickdefaultbusyindicator_p.h b/src/imports/controls/default/impl/qquickdefaultbusyindicator_p.h
index eedaf09a..5cd60ff5 100644
--- a/src/imports/controls/default/qquickdefaultbusyindicator_p.h
+++ b/src/imports/controls/default/impl/qquickdefaultbusyindicator_p.h
@@ -59,6 +59,8 @@ class QQuickDefaultBusyIndicator : public QQuickItem
     Q_PROPERTY(QColor pen READ pen WRITE setPen FINAL)
     Q_PROPERTY(QColor fill READ fill WRITE setFill FINAL)
     Q_PROPERTY(bool running READ isRunning WRITE setRunning)
+    QML_NAMED_ELEMENT(BusyIndicatorImpl)
+    QML_ADDED_IN_VERSION(2, 0)
 
 public:
     explicit QQuickDefaultBusyIndicator(QQuickItem *parent = nullptr);
diff --git a/src/imports/controls/default/qquickdefaultdial.cpp b/src/imports/controls/default/impl/qquickdefaultdial.cpp
index 1653def7..1653def7 100644
--- a/src/imports/controls/default/qquickdefaultdial.cpp
+++ b/src/imports/controls/default/impl/qquickdefaultdial.cpp
diff --git a/src/imports/controls/default/qquickdefaultdial_p.h b/src/imports/controls/default/impl/qquickdefaultdial_p.h
index 73e14321..7cdc5e9a 100644
--- a/src/imports/controls/default/qquickdefaultdial_p.h
+++ b/src/imports/controls/default/impl/qquickdefaultdial_p.h
@@ -58,6 +58,8 @@ class QQuickDefaultDial : public QQuickPaintedItem
     Q_OBJECT
     Q_PROPERTY(qreal progress READ progress WRITE setProgress FINAL)
     Q_PROPERTY(QColor color READ color WRITE setColor FINAL)
+    QML_NAMED_ELEMENT(DialImpl)
+    QML_ADDED_IN_VERSION(2, 0)
 
 public:
     explicit QQuickDefaultDial(QQuickItem *parent = nullptr);
diff --git a/src/imports/controls/default/qquickdefaultprogressbar.cpp b/src/imports/controls/default/impl/qquickdefaultprogressbar.cpp
index f44065e4..fcaada94 100644
--- a/src/imports/controls/default/qquickdefaultprogressbar.cpp
+++ b/src/imports/controls/default/impl/qquickdefaultprogressbar.cpp
@@ -39,7 +39,7 @@
 #include <QtCore/qeasingcurve.h>
 #include <QtQuick/private/qquickitem_p.h>
 #include <QtQuick/private/qsgadaptationlayer_p.h>
-#include <QtQuickControls2/private/qquickanimatednode_p.h>
+#include <QtQuickControls2Impl/private/qquickanimatednode_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/imports/controls/default/qquickdefaultprogressbar_p.h b/src/imports/controls/default/impl/qquickdefaultprogressbar_p.h
index 241d0b3b..3e4955c4 100644
--- a/src/imports/controls/default/qquickdefaultprogressbar_p.h
+++ b/src/imports/controls/default/impl/qquickdefaultprogressbar_p.h
@@ -59,6 +59,8 @@ class QQuickDefaultProgressBar : public QQuickItem
     Q_PROPERTY(bool indeterminate READ isIndeterminate WRITE setIndeterminate FINAL)
     Q_PROPERTY(qreal progress READ progress WRITE setProgress FINAL)
     Q_PROPERTY(QColor color READ color WRITE setColor FINAL)
+    QML_NAMED_ELEMENT(ProgressBarImpl)
+    QML_ADDED_IN_VERSION(2, 0)
 
 public:
     explicit QQuickDefaultProgressBar(QQuickItem *parent = nullptr);
diff --git a/src/imports/controls/default/impl/qtquickcontrols2defaultstyleimplplugin.cpp b/src/imports/controls/default/impl/qtquickcontrols2defaultstyleimplplugin.cpp
new file mode 100644
index 00000000..734d32de
--- /dev/null
+++ b/src/imports/controls/default/impl/qtquickcontrols2defaultstyleimplplugin.cpp
@@ -0,0 +1,57 @@
+/****************************************************************************
+**
+** Copyright (C) 2020 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$
+**
+****************************************************************************/
+
+#include <QtQml/qqmlextensionplugin.h>
+
+QT_BEGIN_NAMESPACE
+
+class QtQuickControls2DefaultStyleImplPlugin : public QQmlEngineExtensionPlugin
+{
+    Q_OBJECT
+    Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid)
+
+public:
+    QtQuickControls2DefaultStyleImplPlugin(QObject *parent = nullptr);
+};
+
+QtQuickControls2DefaultStyleImplPlugin::QtQuickControls2DefaultStyleImplPlugin(QObject *parent)
+    : QQmlEngineExtensionPlugin(parent)
+{
+}
+
+QT_END_NAMESPACE
+
+#include "qtquickcontrols2defaultstyleimplplugin.moc"
diff --git a/src/imports/controls/default/qquickdefaultstyle_p.h b/src/imports/controls/default/qquickdefaultstyle_p.h
index fcd489a0..fa4e77a8 100644
--- a/src/imports/controls/default/qquickdefaultstyle_p.h
+++ b/src/imports/controls/default/qquickdefaultstyle_p.h
@@ -50,6 +50,7 @@
 
 #include <QtCore/qobject.h>
 #include <QtGui/qcolor.h>
+#include <QtQml/qqml.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -96,6 +97,9 @@ class QQuickDefaultStyle : public QObject
     Q_PROPERTY(QColor separatorColor READ separatorColor CONSTANT FINAL)
     Q_PROPERTY(QColor disabledDarkColor READ disabledDarkColor CONSTANT FINAL)
     Q_PROPERTY(QColor disabledLightColor READ disabledLightColor CONSTANT FINAL)
+    QML_NAMED_ELEMENT(Default)
+    QML_SINGLETON
+    QML_ADDED_IN_VERSION(2, 1)
 
 public:
     explicit QQuickDefaultStyle(QObject *parent = nullptr);
diff --git a/src/imports/controls/default/qtquickcontrols2defaultstyleplugin.cpp b/src/imports/controls/default/qtquickcontrols2defaultstyleplugin.cpp
index 6e396dcf..0ed33d12 100644
--- a/src/imports/controls/default/qtquickcontrols2defaultstyleplugin.cpp
+++ b/src/imports/controls/default/qtquickcontrols2defaultstyleplugin.cpp
@@ -34,14 +34,11 @@
 **
 ****************************************************************************/
 
-#include <QtQuickControls2/private/qquickstyleplugin_p.h>
-
-#include "qquickdefaultbusyindicator_p.h"
-#include "qquickdefaultdial_p.h"
-#include "qquickdefaultprogressbar_p.h"
 #include "qquickdefaultstyle_p.h"
 #include "qquickdefaulttheme_p.h"
 
+#include <QtQuickControls2/private/qquickstyleplugin_p.h>
+
 QT_BEGIN_NAMESPACE
 
 class QtQuickControls2DefaultStylePlugin: public QQuickStylePlugin
@@ -52,8 +49,6 @@ class QtQuickControls2DefaultStylePlugin: public QQuickStylePlugin
 public:
     QtQuickControls2DefaultStylePlugin(QObject *parent = nullptr);
 
-    void registerTypes(const char *uri) override;
-
     QString name() const override;
     void initializeTheme(QQuickTheme *theme) override;
 };
@@ -62,30 +57,6 @@ QtQuickControls2DefaultStylePlugin::QtQuickControls2DefaultStylePlugin(QObject *
 {
 }
 
-void QtQuickControls2DefaultStylePlugin::registerTypes(const char *uri)
-{
-    // The minor version used to be the current Qt 5 minor. For compatibility it is the last
-    // Qt 5 release.
-    qmlRegisterModule(uri, 2, 15);
-
-    // 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<QQuickDefaultBusyIndicator>(import, 2, 0, "BusyIndicatorImpl");
-    qmlRegisterType<QQuickDefaultDial>(import, 2, 0, "DialImpl");
-    qmlRegisterType<QQuickDefaultProgressBar>(import, 2, 0, "ProgressBarImpl");
-
-    // QtQuick.Controls.impl 2.1 (Qt 5.8)
-    qmlRegisterSingletonType<QQuickDefaultStyle>(import, 2, 1, "Default", [](QQmlEngine *engine, QJSEngine *scriptEngine) -> QObject* {
-            Q_UNUSED(engine);
-            Q_UNUSED(scriptEngine);
-            return new QQuickDefaultStyle;
-    });
-}
-
 QString QtQuickControls2DefaultStylePlugin::name() const
 {
     return QStringLiteral("Default");