From 9a74d70ba444b07f60dc04b63b55afa54d2c5d5d Mon Sep 17 00:00:00 2001
From: David Redondo <kde@david-redondo.de>
Date: Thu, 4 Apr 2024 16:59:13 +0200
Subject: [PATCH] Fix build with newer QtWaylandScanner

Because of a shortcoming in upstream qtwaylandscanner and the cmake
macro we defered to the ecm macro which renames the output files
acoording to what qtwaylandscanner expects. However since this
was corrected in newer Qt this doesn't build anymore since
the tool now expects correctly named files.
---
 autotests/integration/CMakeLists.txt      | 19 +++++++++++++------
 autotests/integration/kwin_wayland_test.h |  6 +++++-
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/autotests/integration/CMakeLists.txt b/autotests/integration/CMakeLists.txt
index f180b1070d..917dd426f5 100644
--- a/autotests/integration/CMakeLists.txt
+++ b/autotests/integration/CMakeLists.txt
@@ -25,12 +25,19 @@ qt6_generate_wayland_protocol_client_sources(KWinIntegrationTestFramework
         ${PLASMA_WAYLAND_PROTOCOLS_DIR}/fake-input.xml
 )
 
-# the qtwaylandscanner macro cannot handle the mismatched file name and <protocol  name=""
-find_package(QtWaylandScanner REQUIRED)
-ecm_add_qtwayland_client_protocol(KWinIntegrationTestFramework
-    PROTOCOL ${WaylandProtocols_DATADIR}/staging/xdg-dialog/xdg-dialog-v1.xml
-    BASENAME dialog-v1
-)
+if (Qt6_VERSION VERSION_LESS "6.7.1")
+    # the qtwaylandscanner macro cannot handle the mismatched file name and <protocol  name=""
+    find_package(QtWaylandScanner REQUIRED)
+    ecm_add_qtwayland_client_protocol(KWinIntegrationTestFramework
+        PROTOCOL ${WaylandProtocols_DATADIR}/staging/xdg-dialog/xdg-dialog-v1.xml
+        BASENAME dialog-v1
+    )
+else()
+    qt6_generate_wayland_protocol_client_sources(KWinIntegrationTestFramework
+        FILES
+            ${WaylandProtocols_DATADIR}/staging/xdg-dialog/xdg-dialog-v1.xml
+    )
+endif()
 
 target_sources(KWinIntegrationTestFramework PRIVATE
     generic_scene_opengl_test.cpp
diff --git a/autotests/integration/kwin_wayland_test.h b/autotests/integration/kwin_wayland_test.h
index 6b8e39a565..0740689615 100644
--- a/autotests/integration/kwin_wayland_test.h
+++ b/autotests/integration/kwin_wayland_test.h
@@ -21,7 +21,6 @@
 #include <optional>
 
 #include "qwayland-cursor-shape-v1.h"
-#include "qwayland-dialog-v1.h"
 #include "qwayland-fake-input.h"
 #include "qwayland-fractional-scale-v1.h"
 #include "qwayland-idle-inhibit-unstable-v1.h"
@@ -35,6 +34,11 @@
 #include "qwayland-xdg-decoration-unstable-v1.h"
 #include "qwayland-xdg-shell.h"
 #include "qwayland-zkde-screencast-unstable-v1.h"
+#if QT_VERSION < QT_VERSION_CHECK(6, 7, 1)
+#include "qwayland-dialog-v1.h"
+#else
+#include "qwayland-xdg-dialog-v1.h"
+#endif
 
 namespace KWayland
 {