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>

1 files changed, 8 insertions, 17 deletions

diff --git a/src/imports/controls/universal/universal.pri b/src/imports/controls/universal/universal.pri
index 8f1b905c..983fcf10 100644
--- a/src/imports/controls/universal/universal.pri
+++ b/src/imports/controls/universal/universal.pri
@@ -1,10 +1,17 @@
+HEADERS += \
+    $$PWD/qquickuniversalstyle_p.h \
+    $$PWD/qquickuniversaltheme_p.h
+
+SOURCES += \
+    $$PWD/qquickuniversalstyle.cpp \
+    $$PWD/qquickuniversaltheme.cpp
+
 QML_FILES += \
     $$PWD/ApplicationWindow.qml \
     $$PWD/BusyIndicator.qml \
     $$PWD/Button.qml \
     $$PWD/CheckBox.qml \
     $$PWD/CheckDelegate.qml \
-    $$PWD/CheckIndicator.qml \
     $$PWD/ComboBox.qml \
     $$PWD/DelayButton.qml \
     $$PWD/Dial.qml \
@@ -28,7 +35,6 @@ QML_FILES += \
     $$PWD/ProgressBar.qml \
     $$PWD/RadioButton.qml \
     $$PWD/RadioDelegate.qml \
-    $$PWD/RadioIndicator.qml \
     $$PWD/RangeSlider.qml \
     $$PWD/RoundButton.qml \
     $$PWD/ScrollBar.qml \
@@ -39,7 +45,6 @@ QML_FILES += \
     $$PWD/StackView.qml \
     $$PWD/SwipeDelegate.qml \
     $$PWD/SwitchDelegate.qml \
-    $$PWD/SwitchIndicator.qml \
     $$PWD/Switch.qml \
     $$PWD/TabBar.qml \
     $$PWD/TabButton.qml \
@@ -51,17 +56,3 @@ QML_FILES += \
     $$PWD/ToolTip.qml \
     $$PWD/Tumbler.qml \
     $$PWD/VerticalHeaderView.qml
-
-HEADERS += \
-    $$PWD/qquickuniversalbusyindicator_p.h \
-    $$PWD/qquickuniversalfocusrectangle_p.h \
-    $$PWD/qquickuniversalprogressbar_p.h \
-    $$PWD/qquickuniversalstyle_p.h \
-    $$PWD/qquickuniversaltheme_p.h
-
-SOURCES += \
-    $$PWD/qquickuniversalbusyindicator.cpp \
-    $$PWD/qquickuniversalfocusrectangle.cpp \
-    $$PWD/qquickuniversalprogressbar.cpp \
-    $$PWD/qquickuniversalstyle.cpp \
-    $$PWD/qquickuniversaltheme.cpp