3 files changed, 13 insertions, 37 deletions
diff --git a/tests/auto/gui/kernel/qguieventloop/.prev_CMakeLists.txt b/tests/auto/gui/kernel/qguieventloop/.prev_CMakeLists.txt
deleted file mode 100644
index 7fb82219a9..0000000000
--- a/tests/auto/gui/kernel/qguieventloop/.prev_CMakeLists.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-# Generated from qguieventloop.pro.
-
-#####################################################################
-## tst_qguieventloop Test:
-#####################################################################
-
-add_qt_test(tst_qguieventloop
-    SOURCES
-        ../../../corelib/kernel/qeventloop/tst_qeventloop.cpp
-    LIBRARIES
-        Qt::CorePrivate
-    PUBLIC_LIBRARIES
-        Qt::Gui
-        Qt::Network
-)
-
-## Scopes:
-#####################################################################
-
-extend_target(tst_qguieventloop CONDITION WIN32
-    PUBLIC_LIBRARIES
-        user32
-)
-
-extend_target(tst_qguieventloop CONDITION QT_FEATURE_glib
-    DEFINES
-        HAVE_GLIB
-)
diff --git a/tests/auto/gui/kernel/qguieventloop/CMakeLists.txt b/tests/auto/gui/kernel/qguieventloop/CMakeLists.txt
index 8d62d716a5..89c518be10 100644
--- a/tests/auto/gui/kernel/qguieventloop/CMakeLists.txt
+++ b/tests/auto/gui/kernel/qguieventloop/CMakeLists.txt
@@ -1,13 +1,20 @@
-# Generated from qguieventloop.pro.
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
 
 #####################################################################
 ## tst_qguieventloop Test:
 #####################################################################
 
-qt_add_test(tst_qguieventloop
+if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT)
+    cmake_minimum_required(VERSION 3.16)
+    project(tst_qguieventloop LANGUAGES CXX)
+    find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST)
+endif()
+
+qt_internal_add_test(tst_qguieventloop
     SOURCES
         ../../../corelib/kernel/qeventloop/tst_qeventloop.cpp
-    PUBLIC_LIBRARIES
+    LIBRARIES
         Qt::CorePrivate
         Qt::Gui
         Qt::Network
@@ -16,12 +23,12 @@ qt_add_test(tst_qguieventloop
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qguieventloop CONDITION WIN32
-    PUBLIC_LIBRARIES
+qt_internal_extend_target(tst_qguieventloop CONDITION WIN32
+    LIBRARIES
         user32
 )
 
-qt_extend_target(tst_qguieventloop CONDITION QT_FEATURE_glib
+qt_internal_extend_target(tst_qguieventloop CONDITION QT_FEATURE_glib
     DEFINES
         HAVE_GLIB
 )
diff --git a/tests/auto/gui/kernel/qguieventloop/qguieventloop.pro b/tests/auto/gui/kernel/qguieventloop/qguieventloop.pro
deleted file mode 100644
index 633386fa75..0000000000
--- a/tests/auto/gui/kernel/qguieventloop/qguieventloop.pro
+++ /dev/null
@@ -1,3 +0,0 @@
-include(../../../corelib/kernel/qeventloop/qeventloop.pro)
-TARGET = tst_qguieventloop
-QT += gui