From cb48788425b04338a60587b09c27bd5ed74b739f Mon Sep 17 00:00:00 2001
From: Juha Vuolle <juha.vuolle@qt.io>
Date: Tue, 8 Apr 2025 17:00:33 +0300
Subject: [PATCH] Make autotests compile without draganddrop feature

Disable tst_qdrag test itself, and put proper feature
guards in tst_event test.

Fixes: QTBUG-135806
Pick-to: 6.9 6.8
Change-Id: I80e41538488ba1df230551a97f18c8266c01bdb5
Reviewed-by: Oliver Eftevaag <oliver.eftevaag@qt.io>
---
 tests/auto/gui/kernel/CMakeLists.txt        |  4 +++-
 tests/auto/gui/kernel/qevent/tst_qevent.cpp | 20 ++++++++++++++++----
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/tests/auto/gui/kernel/CMakeLists.txt b/tests/auto/gui/kernel/CMakeLists.txt
index 9acd8176101..a212433f1a6 100644
--- a/tests/auto/gui/kernel/CMakeLists.txt
+++ b/tests/auto/gui/kernel/CMakeLists.txt
@@ -7,7 +7,9 @@ if(QT_FEATURE_action)
 endif()
 add_subdirectory(qbackingstore)
 add_subdirectory(qcursor)
-add_subdirectory(qdrag)
+if(QT_FEATURE_draganddrop)
+    add_subdirectory(qdrag)
+endif()
 add_subdirectory(qevent)
 add_subdirectory(qfileopenevent)
 add_subdirectory(qguichronotimer)
diff --git a/tests/auto/gui/kernel/qevent/tst_qevent.cpp b/tests/auto/gui/kernel/qevent/tst_qevent.cpp
index 95dc096b147..7dc9baaf83a 100644
--- a/tests/auto/gui/kernel/qevent/tst_qevent.cpp
+++ b/tests/auto/gui/kernel/qevent/tst_qevent.cpp
@@ -53,6 +53,18 @@
 #define X_QShortcutEvent(X)
 #endif
 
+#if QT_CONFIG(draganddrop)
+#define X_QDropEvent(X) X(QDropEvent, ({}, {}, {}, {}, {}))
+#define X_QDragMoveEvent(X) X(QDragMoveEvent, ({}, {}, {}, {}, {}))
+#define X_QDragEnterEvent(X) X(QDragEnterEvent, ({}, {}, {}, {}, {}))
+#define X_QDragLeaveEvent(X) X(QDragLeaveEvent, ())
+#else
+#define X_QDropEvent(X)
+#define X_QDragMoveEvent(X)
+#define X_QDragEnterEvent(X)
+#define X_QDragLeaveEvent(X)
+#endif
+
 #define FOR_EACH_CORE_EVENT(X) \
     /* qcoreevent.h */ \
     X(QEvent, (QEvent::None)) \
@@ -89,10 +101,10 @@
     X(QContextMenuEvent, (QContextMenuEvent::Reason::Keyboard, {}, {})) \
     X(QInputMethodEvent, ()) \
     X(QInputMethodQueryEvent, ({})) \
-    X(QDropEvent, ({}, {}, {}, {}, {})) \
-    X(QDragMoveEvent, ({}, {}, {}, {}, {})) \
-    X(QDragEnterEvent, ({}, {}, {}, {}, {})) \
-    X(QDragLeaveEvent, ()) \
+    X_QDropEvent(X) \
+    X_QDragMoveEvent(X) \
+    X_QDragEnterEvent(X) \
+    X_QDragLeaveEvent(X) \
     X(QHelpEvent, ({}, {}, {})) \
     X(QStatusTipEvent, ({})) \
     X_QWhatsThisClickedEvent(X) \