3 files changed, 32 insertions, 24 deletions
diff --git a/tests/auto/gui/kernel/qguitimer/.prev_CMakeLists.txt b/tests/auto/gui/kernel/qguitimer/.prev_CMakeLists.txt
deleted file mode 100644
index 8c2ec60bdf..0000000000
--- a/tests/auto/gui/kernel/qguitimer/.prev_CMakeLists.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-# Generated from qguitimer.pro.
-
-#####################################################################
-## tst_qguitimer Test:
-#####################################################################
-
-qt_add_test(tst_qguitimer
-    SOURCES
-        ../../../corelib/kernel/qtimer/tst_qtimer.cpp
-    PUBLIC_LIBRARIES
-        Qt::CorePrivate
-        Qt::Gui
-)
diff --git a/tests/auto/gui/kernel/qguitimer/CMakeLists.txt b/tests/auto/gui/kernel/qguitimer/CMakeLists.txt
index 8c2ec60bdf..bc292e133b 100644
--- a/tests/auto/gui/kernel/qguitimer/CMakeLists.txt
+++ b/tests/auto/gui/kernel/qguitimer/CMakeLists.txt
@@ -1,13 +1,38 @@
-# Generated from qguitimer.pro.
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
 
 #####################################################################
 ## tst_qguitimer Test:
 #####################################################################
 
-qt_add_test(tst_qguitimer
-    SOURCES
-        ../../../corelib/kernel/qtimer/tst_qtimer.cpp
-    PUBLIC_LIBRARIES
-        Qt::CorePrivate
-        Qt::Gui
+if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT)
+    cmake_minimum_required(VERSION 3.16)
+    project(tst_qguitimer LANGUAGES CXX)
+    find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST)
+endif()
+
+function(addGuiTimerTest test)
+    qt_internal_add_test(${test}
+        SOURCES
+            ../../../corelib/kernel/qtimer/tst_qtimer.cpp
+        LIBRARIES
+            Qt::CorePrivate
+            Qt::Gui
+            Qt::TestPrivate
+    )
+endfunction()
+
+addGuiTimerTest(tst_qguitimer)
+qt_internal_extend_target(tst_qguitimer
+    DEFINES
+        tst_Qtimer=tst_QGuiTimer
 )
+
+if(QT_FEATURE_glib AND UNIX)
+    addGuiTimerTest(tst_qguitimer_no_glib)
+    qt_internal_extend_target(tst_qguitimer_no_glib
+        DEFINES
+            DISABLE_GLIB
+            tst_QTimer=tst_QGuiTimer_no_glib # Class name in the unittest
+    )
+endif()
diff --git a/tests/auto/gui/kernel/qguitimer/qguitimer.pro b/tests/auto/gui/kernel/qguitimer/qguitimer.pro
deleted file mode 100644
index 9c58f0e22c..0000000000
--- a/tests/auto/gui/kernel/qguitimer/qguitimer.pro
+++ /dev/null
@@ -1,4 +0,0 @@
-CONFIG += testcase
-TARGET = tst_qguitimer
-QT = core core-private gui testlib
-SOURCES += ../../../corelib/kernel/qtimer/tst_qtimer.cpp