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, 30 insertions, 20 deletions

diff --git a/src/quicktemplates2/qquicktextarea_p.h b/src/quicktemplates2/qquicktextarea_p.h
index 7424770340..fed0eb5924 100644
--- a/src/quicktemplates2/qquicktextarea_p.h
+++ b/src/quicktemplates2/qquicktextarea_p.h
@@ -69,17 +69,19 @@ class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickTextArea : public QQuickTextEdit
     Q_PROPERTY(QString placeholderText READ placeholderText WRITE setPlaceholderText NOTIFY placeholderTextChanged FINAL)
     Q_PROPERTY(Qt::FocusReason focusReason READ focusReason WRITE setFocusReason NOTIFY focusReasonChanged FINAL)
     // 2.1 (Qt 5.8)
-    Q_PROPERTY(bool hovered READ isHovered NOTIFY hoveredChanged FINAL REVISION 1)
-    Q_PROPERTY(bool hoverEnabled READ isHoverEnabled WRITE setHoverEnabled RESET resetHoverEnabled NOTIFY hoverEnabledChanged FINAL REVISION 1)
+    Q_PROPERTY(bool hovered READ isHovered NOTIFY hoveredChanged FINAL REVISION(2, 1))
+    Q_PROPERTY(bool hoverEnabled READ isHoverEnabled WRITE setHoverEnabled RESET resetHoverEnabled NOTIFY hoverEnabledChanged FINAL REVISION(2, 1))
     // 2.5 (Qt 5.12)
-    Q_PROPERTY(QColor placeholderTextColor READ placeholderTextColor WRITE setPlaceholderTextColor NOTIFY placeholderTextColorChanged FINAL REVISION 5)
-    Q_PROPERTY(qreal implicitBackgroundWidth READ implicitBackgroundWidth NOTIFY implicitBackgroundWidthChanged FINAL REVISION 5)
-    Q_PROPERTY(qreal implicitBackgroundHeight READ implicitBackgroundHeight NOTIFY implicitBackgroundHeightChanged FINAL REVISION 5)
-    Q_PROPERTY(qreal topInset READ topInset WRITE setTopInset RESET resetTopInset NOTIFY topInsetChanged FINAL REVISION 5)
-    Q_PROPERTY(qreal leftInset READ leftInset WRITE setLeftInset RESET resetLeftInset NOTIFY leftInsetChanged FINAL REVISION 5)
-    Q_PROPERTY(qreal rightInset READ rightInset WRITE setRightInset RESET resetRightInset NOTIFY rightInsetChanged FINAL REVISION 5)
-    Q_PROPERTY(qreal bottomInset READ bottomInset WRITE setBottomInset RESET resetBottomInset NOTIFY bottomInsetChanged FINAL REVISION 5)
+    Q_PROPERTY(QColor placeholderTextColor READ placeholderTextColor WRITE setPlaceholderTextColor NOTIFY placeholderTextColorChanged FINAL REVISION(2, 5))
+    Q_PROPERTY(qreal implicitBackgroundWidth READ implicitBackgroundWidth NOTIFY implicitBackgroundWidthChanged FINAL REVISION(2, 5))
+    Q_PROPERTY(qreal implicitBackgroundHeight READ implicitBackgroundHeight NOTIFY implicitBackgroundHeightChanged FINAL REVISION(2, 5))
+    Q_PROPERTY(qreal topInset READ topInset WRITE setTopInset RESET resetTopInset NOTIFY topInsetChanged FINAL REVISION(2, 5))
+    Q_PROPERTY(qreal leftInset READ leftInset WRITE setLeftInset RESET resetLeftInset NOTIFY leftInsetChanged FINAL REVISION(2, 5))
+    Q_PROPERTY(qreal rightInset READ rightInset WRITE setRightInset RESET resetRightInset NOTIFY rightInsetChanged FINAL REVISION(2, 5))
+    Q_PROPERTY(qreal bottomInset READ bottomInset WRITE setBottomInset RESET resetBottomInset NOTIFY bottomInsetChanged FINAL REVISION(2, 5))
     Q_CLASSINFO("DeferredPropertyNames", "background")
+    QML_NAMED_ELEMENT(TextArea)
+    QML_ADDED_IN_VERSION(2, 0)
 
 public:
     explicit QQuickTextArea(QQuickItem *parent = nullptr);
@@ -141,18 +143,18 @@ Q_SIGNALS:
     void focusReasonChanged();
     void pressAndHold(QQuickMouseEvent *event);
     // 2.1 (Qt 5.8)
-    Q_REVISION(1) void pressed(QQuickMouseEvent *event);
-    Q_REVISION(1) void released(QQuickMouseEvent *event);
-    Q_REVISION(1) void hoveredChanged();
-    Q_REVISION(1) void hoverEnabledChanged();
+    Q_REVISION(2, 1) void pressed(QQuickMouseEvent *event);
+    Q_REVISION(2, 1) void released(QQuickMouseEvent *event);
+    Q_REVISION(2, 1) void hoveredChanged();
+    Q_REVISION(2, 1) void hoverEnabledChanged();
     // 2.5 (Qt 5.12)
-    Q_REVISION(5) void placeholderTextColorChanged();
-    Q_REVISION(5) void implicitBackgroundWidthChanged();
-    Q_REVISION(5) void implicitBackgroundHeightChanged();
-    Q_REVISION(5) void topInsetChanged();
-    Q_REVISION(5) void leftInsetChanged();
-    Q_REVISION(5) void rightInsetChanged();
-    Q_REVISION(5) void bottomInsetChanged();
+    Q_REVISION(2, 5) void placeholderTextColorChanged();
+    Q_REVISION(2, 5) void implicitBackgroundWidthChanged();
+    Q_REVISION(2, 5) void implicitBackgroundHeightChanged();
+    Q_REVISION(2, 5) void topInsetChanged();
+    Q_REVISION(2, 5) void leftInsetChanged();
+    Q_REVISION(2, 5) void rightInsetChanged();
+    Q_REVISION(2, 5) void bottomInsetChanged();
 
 protected:
     friend struct QQuickPressHandler;
@@ -204,6 +206,14 @@ private:
     Q_DECLARE_PRIVATE(QQuickTextAreaAttached)
 };
 
+struct QQuickTextEditForeign
+{
+    Q_GADGET
+    QML_ANONYMOUS
+    QML_FOREIGN(QQuickTextEdit)
+    QML_ADDED_IN_VERSION(2, 3)
+};
+
 QT_END_NAMESPACE
 
 QML_DECLARE_TYPE(QQuickTextArea)