4 files changed, 15 insertions, 9 deletions
diff --git a/src/imports/shapes/CMakeLists.txt b/src/imports/shapes/CMakeLists.txt
index 78f6d9f448..bc25b33e14 100644
--- a/src/imports/shapes/CMakeLists.txt
+++ b/src/imports/shapes/CMakeLists.txt
@@ -9,6 +9,7 @@ qt_internal_add_qml_module(qmlshapesplugin
     VERSION "${CMAKE_PROJECT_VERSION}"
     CLASSNAME QmlShapesPlugin
     SKIP_TYPE_REGISTRATION
+    PLUGIN_OPTIONAL
     SOURCES
         plugin.cpp
     PUBLIC_LIBRARIES
diff --git a/src/imports/shapes/plugin.cpp b/src/imports/shapes/plugin.cpp
index 48eecbd8f1..9a7f5dc77f 100644
--- a/src/imports/shapes/plugin.cpp
+++ b/src/imports/shapes/plugin.cpp
@@ -43,23 +43,19 @@
 
 QT_BEGIN_NAMESPACE
 
-class QmlShapesPlugin : public QQmlExtensionPlugin
+class QmlShapesPlugin : public QQmlEngineExtensionPlugin
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid)
+    Q_PLUGIN_METADATA(IID QQmlEngineExtensionInterface_iid)
 
 public:
     QmlShapesPlugin(QObject *parent = nullptr)
-        : QQmlExtensionPlugin(parent)
+        : QQmlEngineExtensionPlugin(parent)
     {
         volatile auto registration = &qml_register_types_QtQuick_Shapes;
+        volatile auto initialize = &QQuickShapes_initializeModule;
         Q_UNUSED(registration);
-    }
-
-    void registerTypes(const char *uri) override
-    {
-        Q_UNUSED(uri);
-        QQuickShapesModule::defineModule();
+        Q_UNUSED(initialize);
     }
 };
 
diff --git a/src/quickshapes/qquickshape.cpp b/src/quickshapes/qquickshape.cpp
index 6f1087737b..50e995f07e 100644
--- a/src/quickshapes/qquickshape.cpp
+++ b/src/quickshapes/qquickshape.cpp
@@ -72,6 +72,13 @@ Q_LOGGING_CATEGORY(QQSHAPE_LOG_TIME_DIRTY_SYNC, "qt.shape.time.sync")
     \endqml
 */
 
+void QQuickShapes_initializeModule()
+{
+    QQuickShapesModule::defineModule();
+}
+
+Q_CONSTRUCTOR_FUNCTION(QQuickShapes_initializeModule)
+
 void QQuickShapesModule::defineModule()
 {
     initResources();
diff --git a/src/quickshapes/qquickshape_p.h b/src/quickshapes/qquickshape_p.h
index ca72c628c5..85d6c3231b 100644
--- a/src/quickshapes/qquickshape_p.h
+++ b/src/quickshapes/qquickshape_p.h
@@ -63,6 +63,8 @@ QT_BEGIN_NAMESPACE
 class QQuickShapePathPrivate;
 class QQuickShapePrivate;
 
+void Q_QUICKSHAPES_PRIVATE_EXPORT QQuickShapes_initializeModule();
+
 class Q_QUICKSHAPES_PRIVATE_EXPORT QQuickShapesModule
 {
 public: