AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tst_QTimer: refactor CMake code

Browse Source 
It's used to build different variations of the unittest,
linking against QtCore-only/QtGui, with/without GLib, that's four
individual tests.

Change-Id: Iaf0f37041dbb148134631f86be99feaa881a8ce8
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
Ahmad Samir 2023-11-20 15:28:51 +02:00
parent 2dc0c01449
commit 9cf47946fc
3 changed files with 31 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
tests/auto/corelib/kernel/qtimer/CMakeLists.txt
View File

@ -11,22 +11,24 @@ if (NOT QT_FEATURE_thread)
return()
endif()
qt_internal_add_test(tst_qtimer
SOURCES
tst_qtimer.cpp
LIBRARIES
Qt::CorePrivate
Qt::TestPrivate
)
if(QT_FEATURE_glib AND UNIX)
qt_internal_add_test(tst_qtimer_no_glib
function(addTimerTest test)
qt_internal_add_test(${test}
SOURCES
tst_qtimer.cpp
DEFINES
DISABLE_GLIB
LIBRARIES
Qt::CorePrivate
Qt::TestPrivate
)
endfunction()
addTimerTest(tst_qtimer)
if(QT_FEATURE_glib AND UNIX)
addTimerTest(tst_qtimer_no_glib)
qt_internal_extend_target(tst_qtimer_no_glib
DEFINES
DISABLE_GLIB
tst_QTimer=tst_QTimer_no_glib # Class name in the unittest
)
endif()

7
tests/auto/corelib/kernel/qtimer/tst_qtimer.cpp
View File

@ -4,7 +4,6 @@
#ifdef QT_GUI_LIB
# include <QtGui/QGuiApplication>
# define tst_QTimer tst_QGuiTimer
#else
# include <QtCore/QCoreApplication>
#endif
@ -24,12 +23,6 @@
#endif
#ifdef DISABLE_GLIB
# ifdef tst_QTimer
# undef tst_QTimer
# define tst_QTimer tst_QGuiTimer_NoGlib
# else
# define tst_QTimer tst_QTimer_NoGlib
# endif
static bool glibDisabled = []() {
qputenv("QT_NO_GLIB", "1");
return true;

31
tests/auto/gui/kernel/qguitimer/CMakeLists.txt
View File

@ -11,25 +11,28 @@ if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT)
find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST)
endif()
qt_internal_add_test(tst_qguitimer
SOURCES
../../../corelib/kernel/qtimer/tst_qtimer.cpp
LIBRARIES
Qt::CorePrivate
Qt::Gui
Qt::TestPrivate
)
if(QT_FEATURE_glib AND UNIX)
# only exists as a different dispatcher for XCB
qt_internal_add_test(tst_qguitimer_no_glib
function(addGuiTimerTest test)
qt_internal_add_test(${test}
SOURCES
../../../corelib/kernel/qtimer/tst_qtimer.cpp
DEFINES
DISABLE_GLIB
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()