CMake: Regenerate projects before API change

Also adjust some incosistency introduced by
c8ec83b2851526530937ff1189575ad7b339d903

Task-number: QTBUG-86815
Change-Id: I87a52b34c8dad5af2258bf923ff4db99d64110ed
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>

2 files changed, 57 insertions, 72 deletions

diff --git a/src/compositor/.prev_CMakeLists.txt b/src/compositor/.prev_CMakeLists.txt
index 9d3d49b2e..1f4776c78 100644
--- a/src/compositor/.prev_CMakeLists.txt
+++ b/src/compositor/.prev_CMakeLists.txt
@@ -5,7 +5,6 @@
 #####################################################################
 
 qt_add_module(WaylandCompositor
-    GENERATE_METATYPES
     PLUGIN_TYPES wayland-graphics-integration-server wayland-hardware-layer-integration
     SOURCES
         ../shared/qwaylandinputmethodeventbuilder.cpp ../shared/qwaylandinputmethodeventbuilder_p.h
@@ -14,15 +13,12 @@ qt_add_module(WaylandCompositor
         compositor_api/qwaylandbufferref.cpp compositor_api/qwaylandbufferref.h
         compositor_api/qwaylandclient.cpp compositor_api/qwaylandclient.h
         compositor_api/qwaylandcompositor.cpp compositor_api/qwaylandcompositor.h compositor_api/qwaylandcompositor_p.h
-        compositor_api/qwaylandcompositorquickextensions_p.h
         compositor_api/qwaylanddestroylistener.cpp compositor_api/qwaylanddestroylistener.h compositor_api/qwaylanddestroylistener_p.h
         compositor_api/qwaylandkeyboard.cpp compositor_api/qwaylandkeyboard.h compositor_api/qwaylandkeyboard_p.h
         compositor_api/qwaylandkeymap.cpp compositor_api/qwaylandkeymap.h compositor_api/qwaylandkeymap_p.h
-        compositor_api/qwaylandmousetracker.cpp compositor_api/qwaylandmousetracker_p.h
         compositor_api/qwaylandoutput.cpp compositor_api/qwaylandoutput.h compositor_api/qwaylandoutput_p.h
         compositor_api/qwaylandoutputmode.cpp compositor_api/qwaylandoutputmode.h compositor_api/qwaylandoutputmode_p.h
         compositor_api/qwaylandpointer.cpp compositor_api/qwaylandpointer.h compositor_api/qwaylandpointer_p.h
-        compositor_api/qwaylandquickchildren.h
         compositor_api/qwaylandresource.cpp compositor_api/qwaylandresource.h
         compositor_api/qwaylandseat.cpp compositor_api/qwaylandseat.h compositor_api/qwaylandseat_p.h
         compositor_api/qwaylandsurface.cpp compositor_api/qwaylandsurface.h compositor_api/qwaylandsurface_p.h
@@ -47,6 +43,7 @@ qt_add_module(WaylandCompositor
         extensions/qwlqtkey.cpp extensions/qwlqtkey_p.h
         extensions/qwlqttouch.cpp extensions/qwlqttouch_p.h
         global/qtwaylandcompositorglobal.h
+        global/qtwaylandqmlinclude.h
         global/qwaylandcompositorextension.cpp global/qwaylandcompositorextension.h global/qwaylandcompositorextension_p.h
         global/qwaylandquickextension.h
         global/qwaylandutils_p.h
@@ -108,10 +105,6 @@ qt6_generate_wayland_protocol_server_sources(WaylandCompositor
 
 #### Keys ignored in scope 1:.:.:compositor.pro:<TRUE>:
 # MODULE = "waylandcompositor"
-# QMLTYPES_FILENAME = "plugins.qmltypes"
-# QMLTYPES_INSTALL_DIR = "$$[QT_INSTALL_QML]/QtWayland/Compositor"
-# QML_IMPORT_NAME = "QtWayland.Compositor"
-# QML_IMPORT_VERSION = "$$QT_VERSION"
 
 ## Scopes:
 #####################################################################
@@ -123,7 +116,6 @@ if(QT_FEATURE_opengl)
             ${CMAKE_CURRENT_SOURCE_DIR}/../extensions/hardware-integration.xml
             ${CMAKE_CURRENT_SOURCE_DIR}/../extensions/server-buffer-extension.xml
     )
-
 endif()
 
 qt_extend_target(WaylandCompositor CONDITION QT_FEATURE_opengl
@@ -143,7 +135,19 @@ qt_extend_target(WaylandCompositor CONDITION QT_FEATURE_opengl
 )
 
 qt_extend_target(WaylandCompositor CONDITION TARGET Qt::Quick
+    PUBLIC_LIBRARIES
+        Qt::Quick
+)
+
+qt_extend_target(WaylandCompositor CONDITION QT_FEATURE_wayland_compositor_quick
     SOURCES
+        compositor_api/qwaylandcompositorquickextensions_p.h
+        compositor_api/qwaylandmousetracker.cpp compositor_api/qwaylandmousetracker_p.h
+        compositor_api/qwaylandquickchildren.h
+        compositor_api/qwaylandquickcompositor.cpp compositor_api/qwaylandquickcompositor.h
+        compositor_api/qwaylandquickitem.cpp compositor_api/qwaylandquickitem.h compositor_api/qwaylandquickitem_p.h
+        compositor_api/qwaylandquickoutput.cpp compositor_api/qwaylandquickoutput.h
+        compositor_api/qwaylandquicksurface.cpp compositor_api/qwaylandquicksurface.h
         extensions/qwaylandivisurfaceintegration.cpp extensions/qwaylandivisurfaceintegration_p.h
         extensions/qwaylandquickshellintegration.cpp extensions/qwaylandquickshellintegration.h
         extensions/qwaylandquickshellsurfaceitem.cpp extensions/qwaylandquickshellsurfaceitem.h extensions/qwaylandquickshellsurfaceitem_p.h
@@ -151,13 +155,22 @@ qt_extend_target(WaylandCompositor CONDITION TARGET Qt::Quick
         extensions/qwaylandwlshellintegration.cpp extensions/qwaylandwlshellintegration_p.h
         extensions/qwaylandxdgshellintegration.cpp extensions/qwaylandxdgshellintegration_p.h
     LIBRARIES
+        Qt::QmlPrivate
         Qt::QuickPrivate
     PUBLIC_LIBRARIES
+        Qt::Qml
         Qt::Quick
     PRIVATE_MODULE_INTERFACE
+        Qt::QmlPrivate
         Qt::QuickPrivate
 )
 
+#### Keys ignored in scope 4:.:.:compositor.pro:QT_FEATURE_wayland_compositor_quick:
+# QMLTYPES_FILENAME = "plugins.qmltypes"
+# QMLTYPES_INSTALL_DIR = "$$[QT_INSTALL_QML]/QtWayland/Compositor"
+# QML_IMPORT_NAME = "QtWayland.Compositor"
+# QML_IMPORT_VERSION = "$$QT_VERSION"
+
 qt_extend_target(WaylandCompositor CONDITION QT_FEATURE_wayland_datadevice
     SOURCES
         wayland_wrapper/qwldatadevice.cpp wayland_wrapper/qwldatadevice_p.h
@@ -181,48 +194,20 @@ qt_extend_target(WaylandCompositor CONDITION QT_FEATURE_draganddrop
         compositor_api/qwaylanddrag.cpp compositor_api/qwaylanddrag.h
 )
 
-qt_extend_target(WaylandCompositor CONDITION QT_FEATURE_wayland_compositor_quick
-    SOURCES
-        compositor_api/qwaylandquickcompositor.cpp compositor_api/qwaylandquickcompositor.h
-        compositor_api/qwaylandquickitem.cpp compositor_api/qwaylandquickitem.h compositor_api/qwaylandquickitem_p.h
-        compositor_api/qwaylandquickoutput.cpp compositor_api/qwaylandquickoutput.h
-        compositor_api/qwaylandquicksurface.cpp compositor_api/qwaylandquicksurface.h
-    PUBLIC_LIBRARIES
-        Qt::Qml
-        Qt::QmlPrivate
-        Qt::Quick
-        Qt::QuickPrivate
-)
-
-qt_extend_target(WaylandCompositor CONDITION QT_FEATURE_opengl AND QT_FEATURE_wayland_compositor_quick
-    SOURCES
-        compositor_api/qwaylandquickhardwarelayer.cpp compositor_api/qwaylandquickhardwarelayer_p.h
-)
-
-if(QT_FEATURE_opengl AND TARGET Qt::Quick)
+if(QT_FEATURE_opengl AND QT_FEATURE_wayland_compositor_quick)
 
     qt6_generate_wayland_protocol_server_sources(WaylandCompositor
         FILES
             ${CMAKE_CURRENT_SOURCE_DIR}/../extensions/qt-texture-sharing-unstable-v1.xml
     )
-
 endif()
 
-qt_extend_target(WaylandCompositor CONDITION QT_FEATURE_opengl AND TARGET Qt::Quick
+qt_extend_target(WaylandCompositor CONDITION QT_FEATURE_opengl AND QT_FEATURE_wayland_compositor_quick
     SOURCES
+        compositor_api/qwaylandquickhardwarelayer.cpp compositor_api/qwaylandquickhardwarelayer_p.h
         extensions/qwltexturesharingextension.cpp extensions/qwltexturesharingextension_p.h
 )
 qt_add_docs(WaylandCompositor
     doc/qtwaylandcompositor.qdocconf
 )
 
-
-set_target_properties(WaylandCompositor PROPERTIES
-    QT_QML_MODULE_INSTALL_QMLTYPES TRUE
-    QT_QML_MODULE_VERSION ${CMAKE_PROJECT_VERSION}
-    QT_QML_MODULE_URI QtWayland.Compositor
-    QT_QMLTYPES_FILENAME plugins.qmltypes
-    QT_QML_MODULE_INSTALL_DIR "${INSTALL_QMLDIR}/QtWayland/Compositor"
-)
-
-qt6_qml_type_registration(WaylandCompositor)
diff --git a/src/compositor/CMakeLists.txt b/src/compositor/CMakeLists.txt
index 4c1e51509..2e5f1fc80 100644
--- a/src/compositor/CMakeLists.txt
+++ b/src/compositor/CMakeLists.txt
@@ -4,8 +4,15 @@
 ## WaylandCompositor Module:
 #####################################################################
 
+# special case begin
+set(__qt_wayland_compositor_module_args "")
+if(QT_FEATURE_wayland_compositor_quick)
+    list(APPEND __qt_wayland_compositor_module_args "GENERATE_METATYPES")
+endif()
+# special case end
+
 qt_add_module(WaylandCompositor
-    GENERATE_METATYPES
+    ${__qt_wayland_compositor_module_args} # special case
     PLUGIN_TYPES wayland-graphics-integration-server wayland-hardware-layer-integration
     SOURCES
         ../shared/qwaylandinputmethodeventbuilder.cpp ../shared/qwaylandinputmethodeventbuilder_p.h
@@ -106,10 +113,6 @@ qt6_generate_wayland_protocol_server_sources(WaylandCompositor
 
 #### Keys ignored in scope 1:.:.:compositor.pro:<TRUE>:
 # MODULE = "waylandcompositor"
-# QMLTYPES_FILENAME = "plugins.qmltypes"
-# QMLTYPES_INSTALL_DIR = "$$[QT_INSTALL_QML]/QtWayland/Compositor"
-# QML_IMPORT_NAME = "QtWayland.Compositor"
-# QML_IMPORT_VERSION = "$$QT_VERSION"
 
 ## Scopes:
 #####################################################################
@@ -121,7 +124,6 @@ if(QT_FEATURE_opengl)
             ${CMAKE_CURRENT_SOURCE_DIR}/../extensions/hardware-integration.xml
             ${CMAKE_CURRENT_SOURCE_DIR}/../extensions/server-buffer-extension.xml
     )
-
 endif()
 
 qt_extend_target(WaylandCompositor CONDITION QT_FEATURE_opengl
@@ -141,7 +143,19 @@ qt_extend_target(WaylandCompositor CONDITION QT_FEATURE_opengl
 )
 
 qt_extend_target(WaylandCompositor CONDITION TARGET Qt::Quick
+    PUBLIC_LIBRARIES
+        Qt::Quick
+)
+
+qt_extend_target(WaylandCompositor CONDITION QT_FEATURE_wayland_compositor_quick
     SOURCES
+        compositor_api/qwaylandcompositorquickextensions_p.h
+        compositor_api/qwaylandmousetracker.cpp compositor_api/qwaylandmousetracker_p.h
+        compositor_api/qwaylandquickchildren.h
+        compositor_api/qwaylandquickcompositor.cpp compositor_api/qwaylandquickcompositor.h
+        compositor_api/qwaylandquickitem.cpp compositor_api/qwaylandquickitem.h compositor_api/qwaylandquickitem_p.h
+        compositor_api/qwaylandquickoutput.cpp compositor_api/qwaylandquickoutput.h
+        compositor_api/qwaylandquicksurface.cpp compositor_api/qwaylandquicksurface.h
         extensions/qwaylandivisurfaceintegration.cpp extensions/qwaylandivisurfaceintegration_p.h
         extensions/qwaylandquickshellintegration.cpp extensions/qwaylandquickshellintegration.h
         extensions/qwaylandquickshellsurfaceitem.cpp extensions/qwaylandquickshellsurfaceitem.h extensions/qwaylandquickshellsurfaceitem_p.h
@@ -149,13 +163,22 @@ qt_extend_target(WaylandCompositor CONDITION TARGET Qt::Quick
         extensions/qwaylandwlshellintegration.cpp extensions/qwaylandwlshellintegration_p.h
         extensions/qwaylandxdgshellintegration.cpp extensions/qwaylandxdgshellintegration_p.h
     LIBRARIES
+        Qt::QmlPrivate
         Qt::QuickPrivate
     PUBLIC_LIBRARIES
+        Qt::Qml
         Qt::Quick
     PRIVATE_MODULE_INTERFACE
+        Qt::QmlPrivate
         Qt::QuickPrivate
 )
 
+#### Keys ignored in scope 4:.:.:compositor.pro:QT_FEATURE_wayland_compositor_quick:
+# QMLTYPES_FILENAME = "plugins.qmltypes"
+# QMLTYPES_INSTALL_DIR = "$$[QT_INSTALL_QML]/QtWayland/Compositor"
+# QML_IMPORT_NAME = "QtWayland.Compositor"
+# QML_IMPORT_VERSION = "$$QT_VERSION"
+
 qt_extend_target(WaylandCompositor CONDITION QT_FEATURE_wayland_datadevice
     SOURCES
         wayland_wrapper/qwldatadevice.cpp wayland_wrapper/qwldatadevice_p.h
@@ -184,38 +207,17 @@ qt_extend_target(WaylandCompositor CONDITION QT_FEATURE_draganddrop
         compositor_api/qwaylanddrag.cpp compositor_api/qwaylanddrag.h
 )
 
-qt_extend_target(WaylandCompositor CONDITION QT_FEATURE_wayland_compositor_quick
-    SOURCES
-        compositor_api/qwaylandcompositorquickextensions_p.h
-        compositor_api/qwaylandmousetracker.cpp compositor_api/qwaylandmousetracker_p.h
-        compositor_api/qwaylandquickchildren.h
-        compositor_api/qwaylandquickcompositor.cpp compositor_api/qwaylandquickcompositor.h
-        compositor_api/qwaylandquickitem.cpp compositor_api/qwaylandquickitem.h compositor_api/qwaylandquickitem_p.h
-        compositor_api/qwaylandquickoutput.cpp compositor_api/qwaylandquickoutput.h
-        compositor_api/qwaylandquicksurface.cpp compositor_api/qwaylandquicksurface.h
-    PUBLIC_LIBRARIES
-        Qt::Qml
-        Qt::QmlPrivate
-        Qt::Quick
-        Qt::QuickPrivate
-)
-
-qt_extend_target(WaylandCompositor CONDITION QT_FEATURE_opengl AND QT_FEATURE_wayland_compositor_quick
-    SOURCES
-        compositor_api/qwaylandquickhardwarelayer.cpp compositor_api/qwaylandquickhardwarelayer_p.h
-)
-
-if(QT_FEATURE_opengl AND TARGET Qt::Quick)
+if(QT_FEATURE_opengl AND QT_FEATURE_wayland_compositor_quick)
 
     qt6_generate_wayland_protocol_server_sources(WaylandCompositor
         FILES
             ${CMAKE_CURRENT_SOURCE_DIR}/../extensions/qt-texture-sharing-unstable-v1.xml
     )
-
 endif()
 
-qt_extend_target(WaylandCompositor CONDITION QT_FEATURE_opengl AND TARGET Qt::Quick
+qt_extend_target(WaylandCompositor CONDITION QT_FEATURE_opengl AND QT_FEATURE_wayland_compositor_quick
     SOURCES
+        compositor_api/qwaylandquickhardwarelayer.cpp compositor_api/qwaylandquickhardwarelayer_p.h
         extensions/qwltexturesharingextension.cpp extensions/qwltexturesharingextension_p.h
 )
 qt_add_docs(WaylandCompositor
@@ -234,9 +236,7 @@ if (TARGET Qt::Qml)
 
     qt6_qml_type_registration(WaylandCompositor)
 endif()
-# special case end
 
-# special case begin
 qt_record_extra_qt_main_tools_package_dependency(WaylandCompositor WaylandScannerTools "${PROJECT_VERSION}")
 # special case end