1 files changed, 51 insertions, 16 deletions
diff --git a/tests/auto/gui/kernel/qevent/tst_qevent.cpp b/tests/auto/gui/kernel/qevent/tst_qevent.cpp
index 0ad8a60bea..8e8169b16c 100644
--- a/tests/auto/gui/kernel/qevent/tst_qevent.cpp
+++ b/tests/auto/gui/kernel/qevent/tst_qevent.cpp
@@ -1,17 +1,56 @@
 // Copyright (C) 2016 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
 
 #include <QTest>
 
 #include <QtGui/qguiapplication.h>
 #include <QtGui/qevent.h>
+#if QT_CONFIG(future)
 #include <QtCore/private/qfutureinterface_p.h>
+#endif
+
+
+#if QT_CONFIG(future)
+#define X_QFutureCallOutEvent(X) X(QFutureCallOutEvent, ())
+#else
+#define X_QFutureCallOutEvent(X)
+#endif
+
+#if QT_CONFIG(wheelevent)
+#define X_QWheelEvent(X) X(QWheelEvent, ({}, {}, {}, {}, {}, {}, {}, {}))
+#else
+#define X_QWheelEvent(X)
+#endif
+
+#if QT_CONFIG(tabletevent)
+#define X_QTabletEvent(X) X(QTabletEvent, (QEvent::None, QPointingDevice::primaryPointingDevice(), {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}))
+#else
+#define X_QTabletEvent(X)
+#endif
+
+#if QT_CONFIG(gestures)
+#define X_QNativeGestureEvent(X) X(QNativeGestureEvent, ({}, QPointingDevice::primaryPointingDevice(), 0, {}, {}, {}, {}, {}))
+#else
+#define X_QNativeGestureEvent(X)
+#endif
+
+#if QT_CONFIG(whatsthis)
+#define X_QWhatsThisClickedEvent(X) X(QWhatsThisClickedEvent, ({}))
+#else
+#define X_QWhatsThisClickedEvent(X)
+#endif
+
+#if QT_CONFIG(action)
+#define X_QActionEvent(X) X(QActionEvent, (0, nullptr))
+#else
+#define X_QActionEvent(X)
+#endif
 
-#ifdef QT_BUILD_INTERNAL
-# define ONLY_IF_INTERNAL_BUILD(...) __VA_ARGS__
+#if QT_CONFIG(shortcut)
+#define X_QShortcutEvent(X) X(QShortcutEvent, ({}, 0))
 #else
-# define ONLY_IF_INTERNAL_BUILD(...)
+#define X_QShortcutEvent(X)
 #endif
 
 #define FOR_EACH_CORE_EVENT(X) \
@@ -20,9 +59,8 @@
     X(QTimerEvent, (42)) \
     X(QChildEvent, (QEvent::ChildAdded, nullptr)) \
     X(QDynamicPropertyChangeEvent, ("size")) \
-    X(QDeferredDeleteEvent, ()) \
     /* qfutureinterface_p.h */ \
-    ONLY_IF_INTERNAL_BUILD(X(QFutureCallOutEvent, ())) \
+    X_QFutureCallOutEvent(X) \
     /* end */
 
 #define FOR_EACH_GUI_EVENT(X) \
@@ -34,9 +72,9 @@
     X(QEnterEvent, ({}, {}, {})) \
     X(QMouseEvent, (QEvent::None, {}, {}, {}, {}, {}, {}, {}, QPointingDevice::primaryPointingDevice())) \
     X(QHoverEvent, (QEvent::None, {}, {}, QPointF{})) \
-    X(QWheelEvent, ({}, {}, {}, {}, {}, {}, {}, {})) \
-    X(QTabletEvent, (QEvent::None, QPointingDevice::primaryPointingDevice(), {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {})) \
-    X(QNativeGestureEvent, ({}, QPointingDevice::primaryPointingDevice(), 0, {}, {}, {}, {}, {})) \
+    X_QWheelEvent(X) \
+    X_QTabletEvent(X) \
+    X_QNativeGestureEvent(X) \
     X(QKeyEvent, (QEvent::None, 0, {})) \
     X(QFocusEvent, (QEvent::None)) \
     X(QPaintEvent, (QRect{0, 0, 100, 100})) \
@@ -48,10 +86,7 @@
     X(QIconDragEvent, ()) \
     X(QShowEvent, ()) \
     X(QHideEvent, ()) \
-    QT_WARNING_PUSH \
-    QT_WARNING_DISABLE_DEPRECATED \
-    X(QContextMenuEvent, (QContextMenuEvent::Reason::Keyboard, {})) \
-    QT_WARNING_POP \
+    X(QContextMenuEvent, (QContextMenuEvent::Reason::Keyboard, {}, {})) \
     X(QInputMethodEvent, ()) \
     X(QInputMethodQueryEvent, ({})) \
     X(QDropEvent, ({}, {}, {}, {}, {})) \
@@ -60,11 +95,11 @@
     X(QDragLeaveEvent, ()) \
     X(QHelpEvent, ({}, {}, {})) \
     X(QStatusTipEvent, ({})) \
-    X(QWhatsThisClickedEvent, ({})) \
-    X(QActionEvent, (0, nullptr)) \
+    X_QWhatsThisClickedEvent(X) \
+    X_QActionEvent(X) \
     X(QFileOpenEvent, (QString{})) \
     X(QToolBarChangeEvent, (false)) \
-    X(QShortcutEvent, ({}, 0)) \
+    X_QShortcutEvent(X) \
     X(QWindowStateChangeEvent, ({})) \
     X(QTouchEvent, (QEvent::None)) \
     X(QScrollPrepareEvent, ({})) \