CMake: Regenerate and adjust projects after merge

Some of the changes that were needed
- adjusted wayland macros due to changed target names for plugins
- a few direct moc file includes, to get rid of compilation errors
- Threads::Threads linking for a few tests
- a few special cases for QT_FOR_PRIVATE handling because pro2cmake
  doesn't handle those correctly at the moment (they map to
  PRIVATE_MODULE_INTERFACE rather than PRIVATE_LIBRARIES)
- just regenerating all projects

Change-Id: I418ce91b1c69c7388d41eb22b94a93a9e80fa732
Reviewed-by: Leander Beernaert <leander.beernaert@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>

9 files changed, 264 insertions, 27 deletions

diff --git a/src/compositor/.prev_CMakeLists.txt b/src/compositor/.prev_CMakeLists.txt
new file mode 100644
index 000000000..35bae5ef0
--- /dev/null
+++ b/src/compositor/.prev_CMakeLists.txt
@@ -0,0 +1,216 @@
+# Generated from compositor.pro.
+
+#####################################################################
+## WaylandCompositor Module:
+#####################################################################
+
+qt_add_module(WaylandCompositor
+    PLUGIN_TYPES wayland-graphics-integration-server wayland-hardware-layer-integration
+    SOURCES
+        ../shared/qwaylandinputmethodeventbuilder.cpp ../shared/qwaylandinputmethodeventbuilder_p.h
+        ../shared/qwaylandmimehelper.cpp ../shared/qwaylandmimehelper_p.h
+        ../shared/qwaylandsharedmemoryformathelper_p.h
+        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/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/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
+        compositor_api/qwaylandsurfacegrabber.cpp compositor_api/qwaylandsurfacegrabber.h
+        compositor_api/qwaylandtouch.cpp compositor_api/qwaylandtouch.h compositor_api/qwaylandtouch_p.h
+        compositor_api/qwaylandview.cpp compositor_api/qwaylandview.h compositor_api/qwaylandview_p.h
+        extensions/pregenerated/3rdparty/qwayland-server-xdg-shell-unstable-v5.cpp extensions/pregenerated/3rdparty/qwayland-server-xdg-shell-unstable-v5_p.h
+        extensions/pregenerated/3rdparty/wayland-xdg-shell-unstable-v5-protocol.c
+        extensions/pregenerated/3rdparty/wayland-xdg-shell-unstable-v5-server-protocol_p.h
+        extensions/qwaylandidleinhibitv1.cpp extensions/qwaylandidleinhibitv1.h extensions/qwaylandidleinhibitv1_p.h
+        extensions/qwaylandiviapplication.cpp extensions/qwaylandiviapplication.h extensions/qwaylandiviapplication_p.h
+        extensions/qwaylandivisurface.cpp extensions/qwaylandivisurface.h extensions/qwaylandivisurface_p.h
+        extensions/qwaylandqtwindowmanager.cpp extensions/qwaylandqtwindowmanager.h extensions/qwaylandqtwindowmanager_p.h
+        extensions/qwaylandshell.cpp extensions/qwaylandshell.h extensions/qwaylandshell_p.h
+        extensions/qwaylandshellsurface.cpp extensions/qwaylandshellsurface.h
+        extensions/qwaylandtextinput.cpp extensions/qwaylandtextinput.h extensions/qwaylandtextinput_p.h
+        extensions/qwaylandtextinputmanager.cpp extensions/qwaylandtextinputmanager.h extensions/qwaylandtextinputmanager_p.h
+        extensions/qwaylandviewporter.cpp extensions/qwaylandviewporter.h extensions/qwaylandviewporter_p.h
+        extensions/qwaylandwlscaler.cpp extensions/qwaylandwlscaler.h extensions/qwaylandwlscaler_p.h
+        extensions/qwaylandwlshell.cpp extensions/qwaylandwlshell.h extensions/qwaylandwlshell_p.h
+        extensions/qwaylandxdgdecorationv1.cpp extensions/qwaylandxdgdecorationv1.h extensions/qwaylandxdgdecorationv1_p.h
+        extensions/qwaylandxdgoutputv1.cpp extensions/qwaylandxdgoutputv1.h extensions/qwaylandxdgoutputv1_p.h
+        extensions/qwaylandxdgshell.cpp extensions/qwaylandxdgshell.h extensions/qwaylandxdgshell_p.h
+        extensions/qwaylandxdgshellv5.cpp extensions/qwaylandxdgshellv5.h extensions/qwaylandxdgshellv5_p.h
+        extensions/qwaylandxdgshellv6.cpp extensions/qwaylandxdgshellv6.h extensions/qwaylandxdgshellv6_p.h
+        extensions/qwlqtkey.cpp extensions/qwlqtkey_p.h
+        extensions/qwlqttouch.cpp extensions/qwlqttouch_p.h
+        global/qtwaylandcompositorglobal.h
+        global/qwaylandcompositorextension.cpp global/qwaylandcompositorextension.h global/qwaylandcompositorextension_p.h
+        global/qwaylandquickextension.h
+        global/qwaylandutils_p.h
+        wayland_wrapper/qwlbuffermanager.cpp wayland_wrapper/qwlbuffermanager_p.h
+        wayland_wrapper/qwlclientbuffer.cpp wayland_wrapper/qwlclientbuffer_p.h
+        wayland_wrapper/qwlregion.cpp wayland_wrapper/qwlregion_p.h
+    INCLUDE_DIRECTORIES
+        ../shared
+        compositor_api
+        extensions
+        global
+        wayland_wrapper
+    LIBRARIES
+        Qt::CorePrivate
+        Qt::GuiPrivate
+    PUBLIC_LIBRARIES
+        Qt::Core
+        Qt::Gui
+        Wayland::Server
+    PRIVATE_MODULE_INTERFACE
+        Qt::CorePrivate
+        Qt::GuiPrivate
+)
+
+# Resources:
+set(compositor_resource_files
+    "shaders/surface.vert"
+    "shaders/surface_oes_external.frag"
+    "shaders/surface_rgba.frag"
+    "shaders/surface_rgbx.frag"
+    "shaders/surface_y_u_v.frag"
+    "shaders/surface_y_uv.frag"
+    "shaders/surface_y_xuxv.frag"
+)
+
+qt_add_resource(WaylandCompositor "compositor"
+    PREFIX
+        "/qt-project.org/wayland/compositor"
+    FILES
+        ${compositor_resource_files}
+)
+
+
+qt6_generate_wayland_protocol_server_sources(WaylandCompositor
+    FILES
+        ${CMAKE_CURRENT_SOURCE_DIR}/../3rdparty/protocol/idle-inhibit-unstable-v1.xml
+        ${CMAKE_CURRENT_SOURCE_DIR}/../3rdparty/protocol/ivi-application.xml
+        ${CMAKE_CURRENT_SOURCE_DIR}/../3rdparty/protocol/scaler.xml
+        ${CMAKE_CURRENT_SOURCE_DIR}/../3rdparty/protocol/text-input-unstable-v2.xml
+        ${CMAKE_CURRENT_SOURCE_DIR}/../3rdparty/protocol/viewporter.xml
+        ${CMAKE_CURRENT_SOURCE_DIR}/../3rdparty/protocol/wayland.xml
+        ${CMAKE_CURRENT_SOURCE_DIR}/../3rdparty/protocol/xdg-decoration-unstable-v1.xml
+        ${CMAKE_CURRENT_SOURCE_DIR}/../3rdparty/protocol/xdg-output-unstable-v1.xml
+        ${CMAKE_CURRENT_SOURCE_DIR}/../3rdparty/protocol/xdg-shell.xml
+        ${CMAKE_CURRENT_SOURCE_DIR}/../3rdparty/protocol/xdg-shell-unstable-v6.xml
+        ${CMAKE_CURRENT_SOURCE_DIR}/../extensions/qt-key-unstable-v1.xml
+        ${CMAKE_CURRENT_SOURCE_DIR}/../extensions/qt-windowmanager.xml
+        ${CMAKE_CURRENT_SOURCE_DIR}/../extensions/touch-extension.xml
+)
+
+#### Keys ignored in scope 1:.:.:compositor.pro:<TRUE>:
+# MODULE = "waylandcompositor"
+
+## Scopes:
+#####################################################################
+
+if(QT_FEATURE_opengl)
+
+    qt6_generate_wayland_protocol_server_sources(WaylandCompositor
+        FILES
+            ${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
+    SOURCES
+        hardware_integration/qwlclientbufferintegration.cpp hardware_integration/qwlclientbufferintegration_p.h
+        hardware_integration/qwlclientbufferintegrationfactory.cpp hardware_integration/qwlclientbufferintegrationfactory_p.h
+        hardware_integration/qwlclientbufferintegrationplugin.cpp hardware_integration/qwlclientbufferintegrationplugin_p.h
+        hardware_integration/qwlhardwarelayerintegration.cpp hardware_integration/qwlhardwarelayerintegration_p.h
+        hardware_integration/qwlhardwarelayerintegrationfactory.cpp hardware_integration/qwlhardwarelayerintegrationfactory_p.h
+        hardware_integration/qwlhardwarelayerintegrationplugin.cpp hardware_integration/qwlhardwarelayerintegrationplugin_p.h
+        hardware_integration/qwlhwintegration.cpp hardware_integration/qwlhwintegration_p.h
+        hardware_integration/qwlserverbufferintegration.cpp hardware_integration/qwlserverbufferintegration_p.h
+        hardware_integration/qwlserverbufferintegrationfactory.cpp hardware_integration/qwlserverbufferintegrationfactory_p.h
+        hardware_integration/qwlserverbufferintegrationplugin.cpp hardware_integration/qwlserverbufferintegrationplugin_p.h
+    PUBLIC_LIBRARIES
+        Qt::OpenGL
+)
+
+qt_extend_target(WaylandCompositor CONDITION QT_FEATURE_xkbcommon
+    LIBRARIES
+        Qt::XkbCommonSupportPrivate
+    PUBLIC_LIBRARIES
+        XKB::XKB
+)
+
+qt_extend_target(WaylandCompositor CONDITION TARGET Qt::Quick
+    SOURCES
+        extensions/qwaylandivisurfaceintegration.cpp extensions/qwaylandivisurfaceintegration_p.h
+        extensions/qwaylandquickshellintegration.cpp extensions/qwaylandquickshellintegration.h
+        extensions/qwaylandquickshellsurfaceitem.cpp extensions/qwaylandquickshellsurfaceitem.h extensions/qwaylandquickshellsurfaceitem_p.h
+        extensions/qwaylandquickxdgoutputv1.cpp extensions/qwaylandquickxdgoutputv1.h
+        extensions/qwaylandwlshellintegration.cpp extensions/qwaylandwlshellintegration_p.h
+        extensions/qwaylandxdgshellintegration.cpp extensions/qwaylandxdgshellintegration_p.h
+        extensions/qwaylandxdgshellv5integration.cpp extensions/qwaylandxdgshellv5integration_p.h
+        extensions/qwaylandxdgshellv6integration.cpp extensions/qwaylandxdgshellv6integration_p.h
+    PUBLIC_LIBRARIES
+        Qt::Quick
+)
+
+qt_extend_target(WaylandCompositor CONDITION QT_FEATURE_wayland_datadevice
+    SOURCES
+        wayland_wrapper/qwldatadevice.cpp wayland_wrapper/qwldatadevice_p.h
+        wayland_wrapper/qwldatadevicemanager.cpp wayland_wrapper/qwldatadevicemanager_p.h
+        wayland_wrapper/qwldataoffer.cpp wayland_wrapper/qwldataoffer_p.h
+        wayland_wrapper/qwldatasource.cpp wayland_wrapper/qwldatasource_p.h
+)
+
+qt_extend_target(WaylandCompositor CONDITION QT_FEATURE_im
+    SOURCES
+        compositor_api/qwaylandinputmethodcontrol.cpp compositor_api/qwaylandinputmethodcontrol.h compositor_api/qwaylandinputmethodcontrol_p.h
+)
+
+qt_extend_target(WaylandCompositor CONDITION QT_FEATURE_draganddrop
+    SOURCES
+        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)
+
+    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
+    SOURCES
+        extensions/qwltexturesharingextension.cpp extensions/qwltexturesharingextension_p.h
+)
+qt_add_docs(WaylandCompositor
+    doc/qtwaylandcompositor.qdocconf
+)
+
diff --git a/src/compositor/CMakeLists.txt b/src/compositor/CMakeLists.txt
index 734fb8433..79095147f 100644
--- a/src/compositor/CMakeLists.txt
+++ b/src/compositor/CMakeLists.txt
@@ -67,6 +67,9 @@ qt_add_module(WaylandCompositor
         Qt::Core
         Qt::Gui
         Wayland::Server
+    PRIVATE_MODULE_INTERFACE
+        Qt::CorePrivate
+        Qt::GuiPrivate
 )
 
 # Resources:
@@ -111,11 +114,39 @@ qt6_generate_wayland_protocol_server_sources(WaylandCompositor
 ## Scopes:
 #####################################################################
 
+if(QT_FEATURE_opengl)
+
+    qt6_generate_wayland_protocol_server_sources(WaylandCompositor
+        FILES
+            ${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
+    SOURCES
+        hardware_integration/qwlclientbufferintegration.cpp hardware_integration/qwlclientbufferintegration_p.h
+        hardware_integration/qwlclientbufferintegrationfactory.cpp hardware_integration/qwlclientbufferintegrationfactory_p.h
+        hardware_integration/qwlclientbufferintegrationplugin.cpp hardware_integration/qwlclientbufferintegrationplugin_p.h
+        hardware_integration/qwlhardwarelayerintegration.cpp hardware_integration/qwlhardwarelayerintegration_p.h
+        hardware_integration/qwlhardwarelayerintegrationfactory.cpp hardware_integration/qwlhardwarelayerintegrationfactory_p.h
+        hardware_integration/qwlhardwarelayerintegrationplugin.cpp hardware_integration/qwlhardwarelayerintegrationplugin_p.h
+        hardware_integration/qwlhwintegration.cpp hardware_integration/qwlhwintegration_p.h
+        hardware_integration/qwlserverbufferintegration.cpp hardware_integration/qwlserverbufferintegration_p.h
+        hardware_integration/qwlserverbufferintegrationfactory.cpp hardware_integration/qwlserverbufferintegrationfactory_p.h
+        hardware_integration/qwlserverbufferintegrationplugin.cpp hardware_integration/qwlserverbufferintegrationplugin_p.h
+    PUBLIC_LIBRARIES
+        Qt::OpenGL
+)
+
 qt_extend_target(WaylandCompositor CONDITION QT_FEATURE_xkbcommon
     LIBRARIES
         Qt::XkbCommonSupportPrivate
     PUBLIC_LIBRARIES
         XKB::XKB
+    PRIVATE_MODULE_INTERFACE # special case QTBUG-83063
+        Qt::XkbCommonSupportPrivate # special case
 )
 
 qt_extend_target(WaylandCompositor CONDITION TARGET Qt::Quick
@@ -140,30 +171,6 @@ qt_extend_target(WaylandCompositor CONDITION QT_FEATURE_wayland_datadevice
         wayland_wrapper/qwldatasource.cpp wayland_wrapper/qwldatasource_p.h
 )
 
-if(QT_FEATURE_opengl)
-
-    qt6_generate_wayland_protocol_server_sources(WaylandCompositor
-        FILES
-            ${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
-    SOURCES
-        hardware_integration/qwlclientbufferintegration.cpp hardware_integration/qwlclientbufferintegration_p.h
-        hardware_integration/qwlclientbufferintegrationfactory.cpp hardware_integration/qwlclientbufferintegrationfactory_p.h
-        hardware_integration/qwlclientbufferintegrationplugin.cpp hardware_integration/qwlclientbufferintegrationplugin_p.h
-        hardware_integration/qwlhardwarelayerintegration.cpp hardware_integration/qwlhardwarelayerintegration_p.h
-        hardware_integration/qwlhardwarelayerintegrationfactory.cpp hardware_integration/qwlhardwarelayerintegrationfactory_p.h
-        hardware_integration/qwlhardwarelayerintegrationplugin.cpp hardware_integration/qwlhardwarelayerintegrationplugin_p.h
-        hardware_integration/qwlhwintegration.cpp hardware_integration/qwlhwintegration_p.h
-        hardware_integration/qwlserverbufferintegration.cpp hardware_integration/qwlserverbufferintegration_p.h
-        hardware_integration/qwlserverbufferintegrationfactory.cpp hardware_integration/qwlserverbufferintegrationfactory_p.h
-        hardware_integration/qwlserverbufferintegrationplugin.cpp hardware_integration/qwlserverbufferintegrationplugin_p.h
-)
-
 qt_extend_target(WaylandCompositor CONDITION QT_FEATURE_im
     SOURCES
         compositor_api/qwaylandinputmethodcontrol.cpp compositor_api/qwaylandinputmethodcontrol.h compositor_api/qwaylandinputmethodcontrol_p.h
@@ -180,12 +187,11 @@ qt_extend_target(WaylandCompositor CONDITION QT_FEATURE_wayland_compositor_quick
         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
-    LIBRARIES
-        Qt::QmlPrivate
-        Qt::QuickPrivate
     PUBLIC_LIBRARIES
         Qt::Qml
+        Qt::QmlPrivate
         Qt::Quick
+        Qt::QuickPrivate
 )
 
 qt_extend_target(WaylandCompositor CONDITION QT_FEATURE_opengl AND QT_FEATURE_wayland_compositor_quick
diff --git a/src/compositor/compositor_api/qwaylandclient.cpp b/src/compositor/compositor_api/qwaylandclient.cpp
index 2dba85faf..950424adb 100644
--- a/src/compositor/compositor_api/qwaylandclient.cpp
+++ b/src/compositor/compositor_api/qwaylandclient.cpp
@@ -273,3 +273,6 @@ void QWaylandClient::close()
 }
 
 QT_END_NAMESPACE
+
+#include "moc_qwaylandclient.cpp"
+
diff --git a/src/compositor/compositor_api/qwaylandcompositor.cpp b/src/compositor/compositor_api/qwaylandcompositor.cpp
index 83833991f..2701837c4 100644
--- a/src/compositor/compositor_api/qwaylandcompositor.cpp
+++ b/src/compositor/compositor_api/qwaylandcompositor.cpp
@@ -1044,3 +1044,5 @@ void QWaylandCompositor::grabSurface(QWaylandSurfaceGrabber *grabber, const QWay
 }
 
 QT_END_NAMESPACE
+
+#include "moc_qwaylandcompositor.cpp"
diff --git a/src/compositor/compositor_api/qwaylanddestroylistener.cpp b/src/compositor/compositor_api/qwaylanddestroylistener.cpp
index 958ea311c..a243e032c 100644
--- a/src/compositor/compositor_api/qwaylanddestroylistener.cpp
+++ b/src/compositor/compositor_api/qwaylanddestroylistener.cpp
@@ -63,3 +63,5 @@ void QWaylandDestroyListenerPrivate::handler(wl_listener *listener, void *data)
 }
 
 QT_END_NAMESPACE
+
+#include "moc_qwaylanddestroylistener.cpp"
diff --git a/src/compositor/compositor_api/qwaylanddrag.cpp b/src/compositor/compositor_api/qwaylanddrag.cpp
index 2108c3906..9bb48b4c3 100644
--- a/src/compositor/compositor_api/qwaylanddrag.cpp
+++ b/src/compositor/compositor_api/qwaylanddrag.cpp
@@ -130,3 +130,5 @@ void QWaylandDrag::cancelDrag()
 }
 
 QT_END_NAMESPACE
+
+#include "moc_qwaylanddrag.cpp"
diff --git a/src/compositor/compositor_api/qwaylandinputmethodcontrol.cpp b/src/compositor/compositor_api/qwaylandinputmethodcontrol.cpp
index 5ecb9dfa0..1925d2123 100644
--- a/src/compositor/compositor_api/qwaylandinputmethodcontrol.cpp
+++ b/src/compositor/compositor_api/qwaylandinputmethodcontrol.cpp
@@ -150,3 +150,5 @@ QWaylandTextInput *QWaylandInputMethodControlPrivate::textInput() const
 {
     return QWaylandTextInput::findIn(seat);
 }
+
+#include "moc_qwaylandinputmethodcontrol.cpp"
diff --git a/src/compositor/compositor_api/qwaylandkeyboard.cpp b/src/compositor/compositor_api/qwaylandkeyboard.cpp
index 210b683ff..223f19738 100644
--- a/src/compositor/compositor_api/qwaylandkeyboard.cpp
+++ b/src/compositor/compositor_api/qwaylandkeyboard.cpp
@@ -589,3 +589,5 @@ uint QWaylandKeyboard::keyToScanCode(int qtKey) const
 }
 
 QT_END_NAMESPACE
+
+#include "moc_qwaylandkeyboard.cpp"
diff --git a/src/compositor/compositor_api/qwaylandkeymap.cpp b/src/compositor/compositor_api/qwaylandkeymap.cpp
index bd58a84e1..d2f67192d 100644
--- a/src/compositor/compositor_api/qwaylandkeymap.cpp
+++ b/src/compositor/compositor_api/qwaylandkeymap.cpp
@@ -120,3 +120,5 @@ QWaylandKeymapPrivate::QWaylandKeymapPrivate(const QString &layout, const QStrin
 }
 
 QT_END_NAMESPACE
+
+#include "moc_qwaylandkeymap.cpp"