14 files changed, 52 insertions, 267 deletions
diff --git a/tests/auto/client/CMakeLists.txt b/tests/auto/client/CMakeLists.txt
index 78354604..ea6c4c1b 100644
--- a/tests/auto/client/CMakeLists.txt
+++ b/tests/auto/client/CMakeLists.txt
@@ -1,5 +1,7 @@
 # Generated from client.pro.
 
+add_subdirectory(shared)
+
 add_subdirectory(client)
 add_subdirectory(datadevicev1)
 add_subdirectory(fullscreenshellv1)
diff --git a/tests/auto/client/datadevicev1/CMakeLists.txt b/tests/auto/client/datadevicev1/CMakeLists.txt
index b2da6397..9f87eb99 100644
--- a/tests/auto/client/datadevicev1/CMakeLists.txt
+++ b/tests/auto/client/datadevicev1/CMakeLists.txt
@@ -6,28 +6,7 @@
 
 qt_internal_add_test(tst_datadevicev1
     SOURCES
-        ../shared/corecompositor.cpp ../shared/corecompositor.h
-        ../shared/coreprotocol.cpp ../shared/coreprotocol.h
-        ../shared/datadevice.cpp ../shared/datadevice.h
-        ../shared/mockcompositor.cpp ../shared/mockcompositor.h
-        ../shared/textinput.cpp ../shared/textinput.h
-        ../shared/xdgoutputv1.cpp ../shared/xdgoutputv1.h
-        ../shared/xdgshell.cpp ../shared/xdgshell.h
         tst_datadevicev1.cpp
-    INCLUDE_DIRECTORIES
-        ../shared
     PUBLIC_LIBRARIES
-        Qt::Gui
-        Qt::OpenGL
-        Qt::WaylandClientPrivate
-        Wayland::Server
-        Threads::Threads # special case
-)
-
-qt6_generate_wayland_protocol_server_sources(tst_datadevicev1
-    FILES
-        ${CMAKE_CURRENT_SOURCE_DIR}/../shared/../../../../src/3rdparty/protocol/text-input-unstable-v2.xml
-        ${CMAKE_CURRENT_SOURCE_DIR}/../shared/../../../../src/3rdparty/protocol/wayland.xml
-        ${CMAKE_CURRENT_SOURCE_DIR}/../shared/../../../../src/3rdparty/protocol/xdg-output-unstable-v1.xml
-        ${CMAKE_CURRENT_SOURCE_DIR}/../shared/../../../../src/3rdparty/protocol/xdg-shell.xml
+        SharedClientTest
 )
diff --git a/tests/auto/client/inputcontext/CMakeLists.txt b/tests/auto/client/inputcontext/CMakeLists.txt
index 1423c790..06ea08e0 100644
--- a/tests/auto/client/inputcontext/CMakeLists.txt
+++ b/tests/auto/client/inputcontext/CMakeLists.txt
@@ -6,28 +6,7 @@
 
 qt_internal_add_test(tst_inputcontext
     SOURCES
-        ../shared/corecompositor.cpp ../shared/corecompositor.h
-        ../shared/coreprotocol.cpp ../shared/coreprotocol.h
-        ../shared/datadevice.cpp ../shared/datadevice.h
-        ../shared/mockcompositor.cpp ../shared/mockcompositor.h
-        ../shared/textinput.cpp ../shared/textinput.h
-        ../shared/xdgoutputv1.cpp ../shared/xdgoutputv1.h
-        ../shared/xdgshell.cpp ../shared/xdgshell.h
         tst_inputcontext.cpp
-    INCLUDE_DIRECTORIES
-        ../shared
     PUBLIC_LIBRARIES
-        Qt::Gui
-        Qt::OpenGL
-        Qt::WaylandClientPrivate
-        Wayland::Server
-        Threads::Threads # special case
-)
-
-qt6_generate_wayland_protocol_server_sources(tst_inputcontext
-    FILES
-        ${CMAKE_CURRENT_SOURCE_DIR}/../shared/../../../../src/3rdparty/protocol/text-input-unstable-v2.xml
-        ${CMAKE_CURRENT_SOURCE_DIR}/../shared/../../../../src/3rdparty/protocol/wayland.xml
-        ${CMAKE_CURRENT_SOURCE_DIR}/../shared/../../../../src/3rdparty/protocol/xdg-output-unstable-v1.xml
-        ${CMAKE_CURRENT_SOURCE_DIR}/../shared/../../../../src/3rdparty/protocol/xdg-shell.xml
+        SharedClientTest
 )
diff --git a/tests/auto/client/nooutput/CMakeLists.txt b/tests/auto/client/nooutput/CMakeLists.txt
index b353d324..ab9dd3a6 100644
--- a/tests/auto/client/nooutput/CMakeLists.txt
+++ b/tests/auto/client/nooutput/CMakeLists.txt
@@ -6,28 +6,7 @@
 
 qt_internal_add_test(tst_nooutput
     SOURCES
-        ../shared/corecompositor.cpp ../shared/corecompositor.h
-        ../shared/coreprotocol.cpp ../shared/coreprotocol.h
-        ../shared/datadevice.cpp ../shared/datadevice.h
-        ../shared/mockcompositor.cpp ../shared/mockcompositor.h
-        ../shared/textinput.cpp ../shared/textinput.h
-        ../shared/xdgoutputv1.cpp ../shared/xdgoutputv1.h
-        ../shared/xdgshell.cpp ../shared/xdgshell.h
         tst_nooutput.cpp
-    INCLUDE_DIRECTORIES
-        ../shared
     PUBLIC_LIBRARIES
-        Qt::Gui
-        Qt::OpenGL
-        Qt::WaylandClientPrivate
-        Wayland::Server
-        Threads::Threads # special case
-)
-
-qt6_generate_wayland_protocol_server_sources(tst_nooutput
-    FILES
-        ${CMAKE_CURRENT_SOURCE_DIR}/../shared/../../../../src/3rdparty/protocol/text-input-unstable-v2.xml
-        ${CMAKE_CURRENT_SOURCE_DIR}/../shared/../../../../src/3rdparty/protocol/wayland.xml
-        ${CMAKE_CURRENT_SOURCE_DIR}/../shared/../../../../src/3rdparty/protocol/xdg-output-unstable-v1.xml
-        ${CMAKE_CURRENT_SOURCE_DIR}/../shared/../../../../src/3rdparty/protocol/xdg-shell.xml
+        SharedClientTest
 )
diff --git a/tests/auto/client/output/CMakeLists.txt b/tests/auto/client/output/CMakeLists.txt
index acb1d53e..45b6be4f 100644
--- a/tests/auto/client/output/CMakeLists.txt
+++ b/tests/auto/client/output/CMakeLists.txt
@@ -6,28 +6,7 @@
 
 qt_internal_add_test(tst_output
     SOURCES
-        ../shared/corecompositor.cpp ../shared/corecompositor.h
-        ../shared/coreprotocol.cpp ../shared/coreprotocol.h
-        ../shared/datadevice.cpp ../shared/datadevice.h
-        ../shared/mockcompositor.cpp ../shared/mockcompositor.h
-        ../shared/textinput.cpp ../shared/textinput.h
-        ../shared/xdgoutputv1.cpp ../shared/xdgoutputv1.h
-        ../shared/xdgshell.cpp ../shared/xdgshell.h
         tst_output.cpp
-    INCLUDE_DIRECTORIES
-        ../shared
     PUBLIC_LIBRARIES
-        Qt::Gui
-        Qt::OpenGL
-        Qt::WaylandClientPrivate
-        Wayland::Server
-        Threads::Threads # special case
-)
-
-qt6_generate_wayland_protocol_server_sources(tst_output
-    FILES
-        ${CMAKE_CURRENT_SOURCE_DIR}/../shared/../../../../src/3rdparty/protocol/text-input-unstable-v2.xml
-        ${CMAKE_CURRENT_SOURCE_DIR}/../shared/../../../../src/3rdparty/protocol/wayland.xml
-        ${CMAKE_CURRENT_SOURCE_DIR}/../shared/../../../../src/3rdparty/protocol/xdg-output-unstable-v1.xml
-        ${CMAKE_CURRENT_SOURCE_DIR}/../shared/../../../../src/3rdparty/protocol/xdg-shell.xml
+        SharedClientTest
 )
diff --git a/tests/auto/client/primaryselectionv1/CMakeLists.txt b/tests/auto/client/primaryselectionv1/CMakeLists.txt
index f3e592ca..c95a7fb1 100644
--- a/tests/auto/client/primaryselectionv1/CMakeLists.txt
+++ b/tests/auto/client/primaryselectionv1/CMakeLists.txt
@@ -6,29 +6,7 @@
 
 qt_internal_add_test(tst_primaryselectionv1
     SOURCES
-        ../shared/corecompositor.cpp ../shared/corecompositor.h
-        ../shared/coreprotocol.cpp ../shared/coreprotocol.h
-        ../shared/datadevice.cpp ../shared/datadevice.h
-        ../shared/mockcompositor.cpp ../shared/mockcompositor.h
-        ../shared/textinput.cpp ../shared/textinput.h
-        ../shared/xdgoutputv1.cpp ../shared/xdgoutputv1.h
-        ../shared/xdgshell.cpp ../shared/xdgshell.h
         tst_primaryselectionv1.cpp
-    INCLUDE_DIRECTORIES
-        ../shared
     PUBLIC_LIBRARIES
-        Qt::Gui
-        Qt::OpenGL
-        Qt::WaylandClientPrivate
-        Wayland::Server
-        Threads::Threads # special case
-)
-
-qt6_generate_wayland_protocol_server_sources(tst_primaryselectionv1
-    FILES
-        ${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/3rdparty/protocol/wp-primary-selection-unstable-v1.xml
-        ${CMAKE_CURRENT_SOURCE_DIR}/../shared/../../../../src/3rdparty/protocol/text-input-unstable-v2.xml
-        ${CMAKE_CURRENT_SOURCE_DIR}/../shared/../../../../src/3rdparty/protocol/wayland.xml
-        ${CMAKE_CURRENT_SOURCE_DIR}/../shared/../../../../src/3rdparty/protocol/xdg-output-unstable-v1.xml
-        ${CMAKE_CURRENT_SOURCE_DIR}/../shared/../../../../src/3rdparty/protocol/xdg-shell.xml
+        SharedClientTest
 )
diff --git a/tests/auto/client/seatv4/CMakeLists.txt b/tests/auto/client/seatv4/CMakeLists.txt
index f4eb28b8..31ea86b7 100644
--- a/tests/auto/client/seatv4/CMakeLists.txt
+++ b/tests/auto/client/seatv4/CMakeLists.txt
@@ -6,30 +6,9 @@
 
 qt_internal_add_test(tst_seatv4
     SOURCES
-        ../shared/corecompositor.cpp ../shared/corecompositor.h
-        ../shared/coreprotocol.cpp ../shared/coreprotocol.h
-        ../shared/datadevice.cpp ../shared/datadevice.h
-        ../shared/mockcompositor.cpp ../shared/mockcompositor.h
-        ../shared/textinput.cpp ../shared/textinput.h
-        ../shared/xdgoutputv1.cpp ../shared/xdgoutputv1.h
-        ../shared/xdgshell.cpp ../shared/xdgshell.h
         tst_seatv4.cpp
-    INCLUDE_DIRECTORIES
-        ../shared
     PUBLIC_LIBRARIES
-        Qt::Gui
-        Qt::OpenGL
-        Qt::WaylandClientPrivate
-        Wayland::Server
-        Threads::Threads # special case
-)
-
-qt6_generate_wayland_protocol_server_sources(tst_seatv4
-    FILES
-        ${CMAKE_CURRENT_SOURCE_DIR}/../shared/../../../../src/3rdparty/protocol/text-input-unstable-v2.xml
-        ${CMAKE_CURRENT_SOURCE_DIR}/../shared/../../../../src/3rdparty/protocol/wayland.xml
-        ${CMAKE_CURRENT_SOURCE_DIR}/../shared/../../../../src/3rdparty/protocol/xdg-output-unstable-v1.xml
-        ${CMAKE_CURRENT_SOURCE_DIR}/../shared/../../../../src/3rdparty/protocol/xdg-shell.xml
+        SharedClientTest
 )
 
 ## Scopes:
diff --git a/tests/auto/client/seatv5/CMakeLists.txt b/tests/auto/client/seatv5/CMakeLists.txt
index 7545d769..f48d8613 100644
--- a/tests/auto/client/seatv5/CMakeLists.txt
+++ b/tests/auto/client/seatv5/CMakeLists.txt
@@ -6,28 +6,7 @@
 
 qt_internal_add_test(tst_seatv5
     SOURCES
-        ../shared/corecompositor.cpp ../shared/corecompositor.h
-        ../shared/coreprotocol.cpp ../shared/coreprotocol.h
-        ../shared/datadevice.cpp ../shared/datadevice.h
-        ../shared/mockcompositor.cpp ../shared/mockcompositor.h
-        ../shared/textinput.cpp ../shared/textinput.h
-        ../shared/xdgoutputv1.cpp ../shared/xdgoutputv1.h
-        ../shared/xdgshell.cpp ../shared/xdgshell.h
         tst_seatv5.cpp
-    INCLUDE_DIRECTORIES
-        ../shared
     PUBLIC_LIBRARIES
-        Qt::Gui
-        Qt::OpenGL
-        Qt::WaylandClientPrivate
-        Wayland::Server
-        Threads::Threads # special case
-)
-
-qt6_generate_wayland_protocol_server_sources(tst_seatv5
-    FILES
-        ${CMAKE_CURRENT_SOURCE_DIR}/../shared/../../../../src/3rdparty/protocol/text-input-unstable-v2.xml
-        ${CMAKE_CURRENT_SOURCE_DIR}/../shared/../../../../src/3rdparty/protocol/wayland.xml
-        ${CMAKE_CURRENT_SOURCE_DIR}/../shared/../../../../src/3rdparty/protocol/xdg-output-unstable-v1.xml
-        ${CMAKE_CURRENT_SOURCE_DIR}/../shared/../../../../src/3rdparty/protocol/xdg-shell.xml
+        SharedClientTest
 )
diff --git a/tests/auto/client/shared/CMakeLists.txt b/tests/auto/client/shared/CMakeLists.txt
new file mode 100644
index 00000000..c465ea1b
--- /dev/null
+++ b/tests/auto/client/shared/CMakeLists.txt
@@ -0,0 +1,38 @@
+#####################################################################
+##Client test shared components:
+#####################################################################
+
+add_library(SharedClientTest
+    OBJECT
+        corecompositor.cpp corecompositor.h
+        coreprotocol.cpp coreprotocol.h
+        datadevice.cpp datadevice.h
+        mockcompositor.cpp mockcompositor.h
+        textinput.cpp textinput.h
+        xdgoutputv1.cpp xdgoutputv1.h
+        xdgshell.cpp xdgshell.h
+)
+
+set_property(TARGET SharedClientTest PROPERTY AUTOMOC ON)
+
+qt6_generate_wayland_protocol_server_sources(SharedClientTest
+    FILES
+        ${PROJECT_SOURCE_DIR}/src/3rdparty/protocol/wp-primary-selection-unstable-v1.xml
+        ${PROJECT_SOURCE_DIR}/src/3rdparty/protocol/tablet-unstable-v2.xml
+        ${PROJECT_SOURCE_DIR}/src/3rdparty/protocol/text-input-unstable-v2.xml
+        ${PROJECT_SOURCE_DIR}/src/3rdparty/protocol/wayland.xml
+        ${PROJECT_SOURCE_DIR}/src/3rdparty/protocol/xdg-decoration-unstable-v1.xml
+        ${PROJECT_SOURCE_DIR}/src/3rdparty/protocol/xdg-output-unstable-v1.xml
+        ${PROJECT_SOURCE_DIR}/src/3rdparty/protocol/xdg-shell.xml
+)
+
+target_link_libraries(SharedClientTest
+    PUBLIC
+        Qt::Gui
+        Qt::OpenGL
+        Qt::WaylandClientPrivate
+        Wayland::Server
+        Threads::Threads # special case
+)
+
+target_include_directories(SharedClientTest PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
diff --git a/tests/auto/client/surface/CMakeLists.txt b/tests/auto/client/surface/CMakeLists.txt
index 0674f7de..93cfb2fb 100644
--- a/tests/auto/client/surface/CMakeLists.txt
+++ b/tests/auto/client/surface/CMakeLists.txt
@@ -6,28 +6,7 @@
 
 qt_internal_add_test(tst_surface
     SOURCES
-        ../shared/corecompositor.cpp ../shared/corecompositor.h
-        ../shared/coreprotocol.cpp ../shared/coreprotocol.h
-        ../shared/datadevice.cpp ../shared/datadevice.h
-        ../shared/mockcompositor.cpp ../shared/mockcompositor.h
-        ../shared/textinput.cpp ../shared/textinput.h
-        ../shared/xdgoutputv1.cpp ../shared/xdgoutputv1.h
-        ../shared/xdgshell.cpp ../shared/xdgshell.h
         tst_surface.cpp
-    INCLUDE_DIRECTORIES
-        ../shared
     PUBLIC_LIBRARIES
-        Qt::Gui
-        Qt::OpenGL
-        Qt::WaylandClientPrivate
-        Wayland::Server
-        Threads::Threads # special case
-)
-
-qt6_generate_wayland_protocol_server_sources(tst_surface
-    FILES
-        ${CMAKE_CURRENT_SOURCE_DIR}/../shared/../../../../src/3rdparty/protocol/text-input-unstable-v2.xml
-        ${CMAKE_CURRENT_SOURCE_DIR}/../shared/../../../../src/3rdparty/protocol/wayland.xml
-        ${CMAKE_CURRENT_SOURCE_DIR}/../shared/../../../../src/3rdparty/protocol/xdg-output-unstable-v1.xml
-        ${CMAKE_CURRENT_SOURCE_DIR}/../shared/../../../../src/3rdparty/protocol/xdg-shell.xml
+        SharedClientTest
 )
diff --git a/tests/auto/client/tabletv2/CMakeLists.txt b/tests/auto/client/tabletv2/CMakeLists.txt
index 6d750726..5334b7a1 100644
--- a/tests/auto/client/tabletv2/CMakeLists.txt
+++ b/tests/auto/client/tabletv2/CMakeLists.txt
@@ -6,29 +6,7 @@
 
 qt_internal_add_test(tst_tabletv2
     SOURCES
-        ../shared/corecompositor.cpp ../shared/corecompositor.h
-        ../shared/coreprotocol.cpp ../shared/coreprotocol.h
-        ../shared/datadevice.cpp ../shared/datadevice.h
-        ../shared/mockcompositor.cpp ../shared/mockcompositor.h
-        ../shared/textinput.cpp ../shared/textinput.h
-        ../shared/xdgoutputv1.cpp ../shared/xdgoutputv1.h
-        ../shared/xdgshell.cpp ../shared/xdgshell.h
         tst_tabletv2.cpp
-    INCLUDE_DIRECTORIES
-        ../shared
     PUBLIC_LIBRARIES
-        Qt::Gui
-        Qt::OpenGL
-        Qt::WaylandClientPrivate
-        Wayland::Server
-        Threads::Threads # special case
-)
-
-qt6_generate_wayland_protocol_server_sources(tst_tabletv2
-    FILES
-        ${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/3rdparty/protocol/tablet-unstable-v2.xml
-        ${CMAKE_CURRENT_SOURCE_DIR}/../shared/../../../../src/3rdparty/protocol/text-input-unstable-v2.xml
-        ${CMAKE_CURRENT_SOURCE_DIR}/../shared/../../../../src/3rdparty/protocol/wayland.xml
-        ${CMAKE_CURRENT_SOURCE_DIR}/../shared/../../../../src/3rdparty/protocol/xdg-output-unstable-v1.xml
-        ${CMAKE_CURRENT_SOURCE_DIR}/../shared/../../../../src/3rdparty/protocol/xdg-shell.xml
+        SharedClientTest
 )
diff --git a/tests/auto/client/xdgdecorationv1/CMakeLists.txt b/tests/auto/client/xdgdecorationv1/CMakeLists.txt
index 8959be98..1fe7bc44 100644
--- a/tests/auto/client/xdgdecorationv1/CMakeLists.txt
+++ b/tests/auto/client/xdgdecorationv1/CMakeLists.txt
@@ -6,29 +6,7 @@
 
 qt_internal_add_test(tst_xdgdecorationv1
     SOURCES
-        ../shared/corecompositor.cpp ../shared/corecompositor.h
-        ../shared/coreprotocol.cpp ../shared/coreprotocol.h
-        ../shared/datadevice.cpp ../shared/datadevice.h
-        ../shared/mockcompositor.cpp ../shared/mockcompositor.h
-        ../shared/textinput.cpp ../shared/textinput.h
-        ../shared/xdgoutputv1.cpp ../shared/xdgoutputv1.h
-        ../shared/xdgshell.cpp ../shared/xdgshell.h
         tst_xdgdecorationv1.cpp
-    INCLUDE_DIRECTORIES
-        ../shared
     PUBLIC_LIBRARIES
-        Qt::Gui
-        Qt::OpenGL
-        Qt::WaylandClientPrivate
-        Wayland::Server
-        Threads::Threads # special case
-)
-
-qt6_generate_wayland_protocol_server_sources(tst_xdgdecorationv1
-    FILES
-        ${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/3rdparty/protocol/xdg-decoration-unstable-v1.xml
-        ${CMAKE_CURRENT_SOURCE_DIR}/../shared/../../../../src/3rdparty/protocol/text-input-unstable-v2.xml
-        ${CMAKE_CURRENT_SOURCE_DIR}/../shared/../../../../src/3rdparty/protocol/wayland.xml
-        ${CMAKE_CURRENT_SOURCE_DIR}/../shared/../../../../src/3rdparty/protocol/xdg-output-unstable-v1.xml
-        ${CMAKE_CURRENT_SOURCE_DIR}/../shared/../../../../src/3rdparty/protocol/xdg-shell.xml
+        SharedClientTest
 )
diff --git a/tests/auto/client/xdgoutput/CMakeLists.txt b/tests/auto/client/xdgoutput/CMakeLists.txt
index 37dee4e4..baaf226b 100644
--- a/tests/auto/client/xdgoutput/CMakeLists.txt
+++ b/tests/auto/client/xdgoutput/CMakeLists.txt
@@ -6,28 +6,7 @@
 
 qt_internal_add_test(tst_xdgoutput
     SOURCES
-        ../shared/corecompositor.cpp ../shared/corecompositor.h
-        ../shared/coreprotocol.cpp ../shared/coreprotocol.h
-        ../shared/datadevice.cpp ../shared/datadevice.h
-        ../shared/mockcompositor.cpp ../shared/mockcompositor.h
-        ../shared/textinput.cpp ../shared/textinput.h
-        ../shared/xdgoutputv1.cpp ../shared/xdgoutputv1.h
-        ../shared/xdgshell.cpp ../shared/xdgshell.h
         tst_xdgoutput.cpp
-    INCLUDE_DIRECTORIES
-        ../shared
     PUBLIC_LIBRARIES
-        Qt::Gui
-        Qt::OpenGL
-        Qt::WaylandClientPrivate
-        Wayland::Server
-        Threads::Threads # special case
-)
-
-qt6_generate_wayland_protocol_server_sources(tst_xdgoutput
-    FILES
-        ${CMAKE_CURRENT_SOURCE_DIR}/../shared/../../../../src/3rdparty/protocol/text-input-unstable-v2.xml
-        ${CMAKE_CURRENT_SOURCE_DIR}/../shared/../../../../src/3rdparty/protocol/wayland.xml
-        ${CMAKE_CURRENT_SOURCE_DIR}/../shared/../../../../src/3rdparty/protocol/xdg-output-unstable-v1.xml
-        ${CMAKE_CURRENT_SOURCE_DIR}/../shared/../../../../src/3rdparty/protocol/xdg-shell.xml
+        SharedClientTest
 )
diff --git a/tests/auto/client/xdgshell/CMakeLists.txt b/tests/auto/client/xdgshell/CMakeLists.txt
index 3b5cdfe8..ea34539d 100644
--- a/tests/auto/client/xdgshell/CMakeLists.txt
+++ b/tests/auto/client/xdgshell/CMakeLists.txt
@@ -6,28 +6,7 @@
 
 qt_internal_add_test(tst_xdgshell
     SOURCES
-        ../shared/corecompositor.cpp ../shared/corecompositor.h
-        ../shared/coreprotocol.cpp ../shared/coreprotocol.h
-        ../shared/datadevice.cpp ../shared/datadevice.h
-        ../shared/mockcompositor.cpp ../shared/mockcompositor.h
-        ../shared/textinput.cpp ../shared/textinput.h
-        ../shared/xdgoutputv1.cpp ../shared/xdgoutputv1.h
-        ../shared/xdgshell.cpp ../shared/xdgshell.h
         tst_xdgshell.cpp
-    INCLUDE_DIRECTORIES
-        ../shared
     PUBLIC_LIBRARIES
-        Qt::Gui
-        Qt::OpenGL
-        Qt::WaylandClientPrivate
-        Wayland::Server
-        Threads::Threads # special case
-)
-
-qt6_generate_wayland_protocol_server_sources(tst_xdgshell
-    FILES
-        ${CMAKE_CURRENT_SOURCE_DIR}/../shared/../../../../src/3rdparty/protocol/text-input-unstable-v2.xml
-        ${CMAKE_CURRENT_SOURCE_DIR}/../shared/../../../../src/3rdparty/protocol/wayland.xml
-        ${CMAKE_CURRENT_SOURCE_DIR}/../shared/../../../../src/3rdparty/protocol/xdg-output-unstable-v1.xml
-        ${CMAKE_CURRENT_SOURCE_DIR}/../shared/../../../../src/3rdparty/protocol/xdg-shell.xml
+        SharedClientTest
 )