Generate registrations for all imports

Now that we can generate all QML type information at build time, we
should also use it.

Move the types for QtTest into the testlib import plugin. They don't
need to be exported from QtQuickTest.

Trigger the resource initialization of the shapes library from the
plugin so that we retain a dependency and the linker doesn't optimize
the module initialization away.

Change-Id: Icc8cb338aa03ef1e3085e29356a5db7b73ba0a01
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>

1 files changed, 1 insertions, 198 deletions

diff --git a/src/quick/items/qquickitemsmodule.cpp b/src/quick/items/qquickitemsmodule.cpp
index d65a5cf6ba..162f772250 100644
--- a/src/quick/items/qquickitemsmodule.cpp
+++ b/src/quick/items/qquickitemsmodule.cpp
@@ -177,9 +177,6 @@ static QQmlPrivate::AutoParentResult qquickitem_autoParent(QObject *obj, QObject
 
 static void qt_quickitems_defineModule()
 {
-    const char *uri = "QtQuick";
-    const int major = 2;
-
     QQmlPrivate::RegisterAutoParent autoparent = { 0, &qquickitem_autoParent };
     QQmlPrivate::qmlregister(QQmlPrivate::AutoParentRegistration, &autoparent);
 
@@ -187,206 +184,12 @@ static void qt_quickitems_defineModule()
     qRegisterMetaType<QPointingDeviceUniqueId>("QPointingDeviceUniqueId");
     qRegisterMetaType<QQuickHandlerPoint>();
 
-    // Register the latest version, even if there are no new types or new revisions for existing types yet.
-    qmlRegisterModule(uri, major, QT_VERSION_MINOR);
-
-    // Core QtQuick types
-    qmlRegisterTypesAndRevisions<
-            QPointingDeviceUniqueIdForeign,
-            QQuickAnchorAnimation,
-            QQuickAnchorChanges,
-            QQuickAnchors,
-            QQuickAnchorSet,
-            QQuickBorderImage,
-            QQuickEnterKeyAttached,
-            QQuickEventPoint,
-            QQuickEventTouchPoint,
-            QQuickFlickable,
-            QQuickFlickableVisibleArea,
-            QQuickFocusScope,
-            QQuickGradient,
-            QQuickGradientStop,
-            QQuickGraphicsInfo,
-            QQuickImage,
-            QQuickImageBase,
-            QQuickItem,
-            QQuickItemGrabResult,
-            QQuickKeyNavigationAttached,
-            QQuickKeysAttached,
-            QQuickLayoutMirroringAttached,
-            QQuickLoader,
-            QQuickMatrix4x4,
-            QQuickMouseArea,
-            QQuickMultiPointTouchArea,
-            QQuickPaintedItem,
-            QQuickParentAnimation,
-            QQuickParentChange,
-            QQuickPen,
-            QQuickPinch,
-            QQuickPinchArea,
-            QQuickPointerDevice,
-            QQuickRectangle,
-            QQuickRotation,
-            QQuickScale,
-            QQuickScaleGrid,
-            QQuickTouchPoint,
-            QQuickTransform,
-            QQuickTranslate
-    >(uri, major);
-
-    // text-related types
-    qmlRegisterTypesAndRevisions<
-            QQuickText,
-            QQuickTextDocument,
-            QQuickTextEdit,
-            QQuickTextInput,
-            QQuickTextLine
-    >(uri, major);
-
-    // events
-    qmlRegisterTypesAndRevisions<
-            QQuickCloseEvent,
-            QQuickGrabGestureEvent,
-            QQuickKeyEvent,
-            QQuickMouseEvent,
-            QQuickPinchEvent,
-            QQuickPointerEvent,
-            QQuickPointerMouseEvent,
-            QQuickPointerTouchEvent,
-            QQuickWheelEvent
-    >(uri, major);
-
-    // Input Handlers are part of QtQuick, not a separate module, since 5.12
-    qmlRegisterTypesAndRevisions<
-            QQuickDragHandler,
-            QQuickHoverHandler,
-            QQuickPinchHandler,
-            QQuickPointerHandler,
-            QQuickPointHandler,
-            QQuickTapHandler
-    >(uri, major);
-
-#if QT_CONFIG(accessibility)
-    qmlRegisterTypesAndRevisions<QQuickAccessibleAttached>(uri, major);
-#endif
-
-#if QT_CONFIG(opengl)
-    qmlRegisterTypesAndRevisions<QQuickOpenGLInfo>(uri, major);
-#endif
-
-#if QT_CONFIG(quick_animatedimage)
-    qmlRegisterTypesAndRevisions<QQuickAnimatedImage>(uri, major);
-#else
+#if !QT_CONFIG(quick_animatedimage)
     qmlRegisterTypeNotAvailable(
                 uri, major, 15, "AnimatedImage",
                 QCoreApplication::translate("QQuickAnimatedImage",
                                             "Qt was built without support for QMovie"));
 #endif
-
-#if QT_CONFIG(quick_canvas)
-    qmlRegisterTypesAndRevisions<QQuickCanvasItem>(uri, major);
-#endif
-
-#if QT_CONFIG(quick_draganddrop)
-    qmlRegisterTypesAndRevisions<
-            QQuickDropEvent,
-            QQuickDrag,
-            QQuickDropArea,
-            QQuickDropAreaDrag,
-            QQuickDragAttached,
-            QQuickDragAxis
-    >(uri, major);
-#endif
-
-#if QT_CONFIG(quick_flipable)
-    qmlRegisterTypesAndRevisions<QQuickFlipable>(uri, major);
-#endif
-
-#if QT_CONFIG(quick_positioners)
-    qmlRegisterTypesAndRevisions<
-            QQuickBasePositioner,
-            QQuickColumn,
-            QQuickFlow,
-            QQuickGrid,
-            QQuickRow
-    >(uri, major);
-#endif
-
-#if QT_CONFIG(quick_gridview)
-    qmlRegisterTypesAndRevisions<QQuickGridView>(uri, major);
-#endif
-
-#if QT_CONFIG(quick_itemview)
-    qmlRegisterTypesAndRevisions<QQuickItemView>(uri, major);
-#endif
-
-#if QT_CONFIG(quick_listview)
-    qmlRegisterTypesAndRevisions<
-            QQuickViewSection,
-            QQuickListView
-    >(uri, major);
-#endif
-
-#if QT_CONFIG(quick_path)
-    qmlRegisterTypesAndRevisions<
-            QQuickCurve,
-            QQuickPath,
-            QQuickPathAngleArc,
-            QQuickPathAnimation,
-            QQuickPathArc,
-            QQuickPathAttribute,
-            QQuickPathCatmullRomCurve,
-            QQuickPathCubic,
-            QQuickPathElement,
-            QQuickPathInterpolator,
-            QQuickPathLine,
-            QQuickPathMove,
-            QQuickPathMultiline,
-            QQuickPathPercent,
-            QQuickPathPolyline,
-            QQuickPathQuad,
-            QQuickPathSvg
-    >(uri, major);
-#endif
-
-#if QT_CONFIG(quick_pathview)
-    qmlRegisterTypesAndRevisions<QQuickPathView>(uri, major);
-#endif
-
-#if QT_CONFIG(quick_repeater)
-    qmlRegisterTypesAndRevisions<QQuickRepeater>(uri, major);
-#endif
-
-#if QT_CONFIG(quick_shadereffect)
-    qmlRegisterTypesAndRevisions<
-            QQuickBorderImageMesh,
-            QQuickGridMesh,
-            QQuickItemLayer,
-            QQuickShaderEffect,
-            QQuickShaderEffectMesh,
-            QQuickShaderEffectSource
-    >(uri, major);
-#endif
-
-#if QT_CONFIG(quick_sprite)
-    qmlRegisterTypesAndRevisions<
-            QQuickAnimatedSprite,
-            QQuickSprite,
-            QQuickSpriteSequence
-    >(uri, major);
-#endif
-
-#if QT_CONFIG(quick_tableview)
-    qmlRegisterTypesAndRevisions<QQuickTableView>(uri, major);
-#endif
-
-#if QT_CONFIG(quick_viewtransitions)
-    qmlRegisterTypesAndRevisions<QQuickViewTransitionAttached>(uri, major);
-#endif
-
-#if QT_CONFIG(wheelevent)
-    qmlRegisterTypesAndRevisions<QQuickWheelHandler>(uri, major);
-#endif
 }
 
 static void initResources()