2 files changed, 12 insertions, 15 deletions
diff --git a/tests/auto/gui/kernel/qevent/CMakeLists.txt b/tests/auto/gui/kernel/qevent/CMakeLists.txt
index 7b37b0c51a..c6ad861f25 100644
--- a/tests/auto/gui/kernel/qevent/CMakeLists.txt
+++ b/tests/auto/gui/kernel/qevent/CMakeLists.txt
@@ -1,13 +1,20 @@
-# Generated from qevent.pro.
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
 
 #####################################################################
 ## tst_qevent Test:
 #####################################################################
 
+if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT)
+    cmake_minimum_required(VERSION 3.16)
+    project(tst_qevent LANGUAGES CXX)
+    find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST)
+endif()
+
 qt_internal_add_test(tst_qevent
     SOURCES
         tst_qevent.cpp
-    PUBLIC_LIBRARIES
+    LIBRARIES
         Qt::Gui
         Qt::CorePrivate
 )
diff --git a/tests/auto/gui/kernel/qevent/tst_qevent.cpp b/tests/auto/gui/kernel/qevent/tst_qevent.cpp
index 0ad8a60bea..6960f99af2 100644
--- a/tests/auto/gui/kernel/qevent/tst_qevent.cpp
+++ b/tests/auto/gui/kernel/qevent/tst_qevent.cpp
@@ -1,5 +1,5 @@
 // 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>
@@ -8,21 +8,14 @@
 #include <QtGui/qevent.h>
 #include <QtCore/private/qfutureinterface_p.h>
 
-#ifdef QT_BUILD_INTERNAL
-# define ONLY_IF_INTERNAL_BUILD(...) __VA_ARGS__
-#else
-# define ONLY_IF_INTERNAL_BUILD(...)
-#endif
-
 #define FOR_EACH_CORE_EVENT(X) \
     /* qcoreevent.h */ \
     X(QEvent, (QEvent::None)) \
     X(QTimerEvent, (42)) \
     X(QChildEvent, (QEvent::ChildAdded, nullptr)) \
     X(QDynamicPropertyChangeEvent, ("size")) \
-    X(QDeferredDeleteEvent, ()) \
     /* qfutureinterface_p.h */ \
-    ONLY_IF_INTERNAL_BUILD(X(QFutureCallOutEvent, ())) \
+    X(QFutureCallOutEvent, ()) \
     /* end */
 
 #define FOR_EACH_GUI_EVENT(X) \
@@ -48,10 +41,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, ({}, {}, {}, {}, {})) \