1 files changed, 35 insertions, 32 deletions
diff --git a/src/quickshapes/CMakeLists.txt b/src/quickshapes/CMakeLists.txt
index ac2615c47b..7b52826751 100644
--- a/src/quickshapes/CMakeLists.txt
+++ b/src/quickshapes/CMakeLists.txt
@@ -1,55 +1,58 @@
-# Generated from quickshapes.pro.
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
 
 #####################################################################
-## QuickShapes Module:
+## QuickShapesPrivate Module:
 #####################################################################
 
-qt_internal_add_module(QuickShapes
+qt_internal_add_qml_module(QuickShapesPrivate
+    URI "QtQuick.Shapes"
+    VERSION "${PROJECT_VERSION}"
+    PLUGIN_TARGET qmlshapesplugin
+    NO_PLUGIN_OPTIONAL
+    NO_GENERATE_PLUGIN_SOURCE
+    CLASS_NAME QmlShapesPlugin
+    DEPENDENCIES
+        QtQuick/auto
     INTERNAL_MODULE
-    GENERATE_METATYPES
     SOURCES
         qquickshape.cpp qquickshape_p.h
         qquickshape_p_p.h
         qquickshapegenericrenderer.cpp qquickshapegenericrenderer_p.h
         qquickshapesglobal.h qquickshapesglobal_p.h
+        qquickshapecurverenderer.cpp qquickshapecurverenderer_p.h qquickshapecurverenderer_p_p.h
         qquickshapesoftwarerenderer.cpp qquickshapesoftwarerenderer_p.h
     PUBLIC_LIBRARIES
         Qt::Core
         Qt::GuiPrivate
         Qt::Qml
         Qt::QuickPrivate
+    GENERATE_CPP_EXPORTS
+    )
+
+# We need to do additional initialization, so we have to provide our own
+# plugin class rather than using the generated one
+qt_internal_extend_target(qmlshapesplugin
+    SOURCES   qquickshapesplugin.cpp
+    LIBRARIES Qt::QuickShapesPrivate
 )
 
-# Resources:
-set(qtquickshapes_resource_files
-    "shaders_ng/conicalgradient.frag.qsb"
-    "shaders_ng/conicalgradient.vert.qsb"
-    "shaders_ng/lineargradient.frag.qsb"
-    "shaders_ng/lineargradient.vert.qsb"
-    "shaders_ng/radialgradient.frag.qsb"
-    "shaders_ng/radialgradient.vert.qsb"
-)
-
-qt_internal_add_resource(QuickShapes "qtquickshapes"
+qt_internal_add_shaders(QuickShapesPrivate "qtquickshapes_shaders"
+    SILENT
+    BATCHABLE
+    PRECOMPILE
+    OPTIMIZED
+    MULTIVIEW
     PREFIX
         "/qt-project.org/shapes"
     FILES
-        ${qtquickshapes_resource_files}
-)
-
-
-#### Keys ignored in scope 1:.:.:quickshapes.pro:<TRUE>:
-# QMLTYPES_FILENAME = "plugins.qmltypes"
-# QMLTYPES_INSTALL_DIR = "$$[QT_INSTALL_QML]/QtQuick/Shapes"
-# QML_IMPORT_NAME = "QtQuick.Shapes"
-# QML_IMPORT_VERSION = "$$QT_VERSION"
-
-set_target_properties(QuickShapes PROPERTIES
-    QT_QML_MODULE_INSTALL_QMLTYPES TRUE
-    QT_QML_MODULE_VERSION ${CMAKE_PROJECT_VERSION}
-    QT_QML_MODULE_URI QtQuick.Shapes
-    QT_QMLTYPES_FILENAME plugins.qmltypes
-    QT_QML_MODULE_INSTALL_DIR "${INSTALL_QMLDIR}/QtQuick/Shapes"
+        "shaders_ng/lineargradient.vert"
+        "shaders_ng/lineargradient.frag"
+        "shaders_ng/radialgradient.vert"
+        "shaders_ng/radialgradient.frag"
+        "shaders_ng/conicalgradient.vert"
+        "shaders_ng/conicalgradient.frag"
+        "shaders_ng/wireframe.frag"
+        "shaders_ng/wireframe.vert"
 )
 
-qt6_qml_type_registration(QuickShapes)