summaryrefslogtreecommitdiffstats
path: root/tests/auto/gui/kernel
diff options
context:
space:
mode:
Diffstat (limited to 'tests/auto/gui/kernel')
-rw-r--r--tests/auto/gui/kernel/noqteventloop/CMakeLists.txt4
-rw-r--r--tests/auto/gui/kernel/qaction/CMakeLists.txt2
-rw-r--r--tests/auto/gui/kernel/qactiongroup/CMakeLists.txt2
-rw-r--r--tests/auto/gui/kernel/qbackingstore/CMakeLists.txt2
-rw-r--r--tests/auto/gui/kernel/qclipboard/test/CMakeLists.txt4
-rw-r--r--tests/auto/gui/kernel/qcursor/CMakeLists.txt2
-rw-r--r--tests/auto/gui/kernel/qdrag/CMakeLists.txt2
-rw-r--r--tests/auto/gui/kernel/qevent/CMakeLists.txt2
-rw-r--r--tests/auto/gui/kernel/qfileopenevent/qfileopeneventexternal/CMakeLists.txt2
-rw-r--r--tests/auto/gui/kernel/qfileopenevent/test/CMakeLists.txt2
-rw-r--r--tests/auto/gui/kernel/qguiapplication/.prev_CMakeLists.txt4
-rw-r--r--tests/auto/gui/kernel/qguiapplication/CMakeLists.txt6
-rw-r--r--tests/auto/gui/kernel/qguieventdispatcher/CMakeLists.txt2
-rw-r--r--tests/auto/gui/kernel/qguieventloop/CMakeLists.txt6
-rw-r--r--tests/auto/gui/kernel/qguimetatype/CMakeLists.txt2
-rw-r--r--tests/auto/gui/kernel/qguitimer/.prev_CMakeLists.txt2
-rw-r--r--tests/auto/gui/kernel/qguitimer/CMakeLists.txt2
-rw-r--r--tests/auto/gui/kernel/qguivariant/no_application/CMakeLists.txt2
-rw-r--r--tests/auto/gui/kernel/qguivariant/test/CMakeLists.txt6
-rw-r--r--tests/auto/gui/kernel/qinputdevice/CMakeLists.txt2
-rw-r--r--tests/auto/gui/kernel/qinputmethod/CMakeLists.txt2
-rw-r--r--tests/auto/gui/kernel/qkeyevent/CMakeLists.txt2
-rw-r--r--tests/auto/gui/kernel/qkeysequence/CMakeLists.txt4
-rw-r--r--tests/auto/gui/kernel/qmouseevent/CMakeLists.txt2
-rw-r--r--tests/auto/gui/kernel/qmouseevent_modal/CMakeLists.txt2
-rw-r--r--tests/auto/gui/kernel/qopenglwindow/CMakeLists.txt2
-rw-r--r--tests/auto/gui/kernel/qpalette/CMakeLists.txt2
-rw-r--r--tests/auto/gui/kernel/qpixelformat/CMakeLists.txt2
-rw-r--r--tests/auto/gui/kernel/qrasterwindow/CMakeLists.txt2
-rw-r--r--tests/auto/gui/kernel/qscreen/CMakeLists.txt2
-rw-r--r--tests/auto/gui/kernel/qshortcut/CMakeLists.txt2
-rw-r--r--tests/auto/gui/kernel/qsurfaceformat/CMakeLists.txt2
-rw-r--r--tests/auto/gui/kernel/qtouchevent/CMakeLists.txt2
-rw-r--r--tests/auto/gui/kernel/qwindow/CMakeLists.txt4
34 files changed, 45 insertions, 45 deletions
diff --git a/tests/auto/gui/kernel/noqteventloop/CMakeLists.txt b/tests/auto/gui/kernel/noqteventloop/CMakeLists.txt
index 4a6ea22d13..262b2ad2f2 100644
--- a/tests/auto/gui/kernel/noqteventloop/CMakeLists.txt
+++ b/tests/auto/gui/kernel/noqteventloop/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_noqteventloop Test:
#####################################################################
-add_qt_test(tst_noqteventloop
+qt_add_test(tst_noqteventloop
SOURCES
tst_noqteventloop.cpp
PUBLIC_LIBRARIES
@@ -17,7 +17,7 @@ add_qt_test(tst_noqteventloop
## Scopes:
#####################################################################
-extend_target(tst_noqteventloop CONDITION QT_FEATURE_dynamicgl AND WIN32
+qt_extend_target(tst_noqteventloop CONDITION QT_FEATURE_dynamicgl AND WIN32
PUBLIC_LIBRARIES
user32
)
diff --git a/tests/auto/gui/kernel/qaction/CMakeLists.txt b/tests/auto/gui/kernel/qaction/CMakeLists.txt
index bdd1a1d165..70065156ca 100644
--- a/tests/auto/gui/kernel/qaction/CMakeLists.txt
+++ b/tests/auto/gui/kernel/qaction/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qaction_kernel Test:
#####################################################################
-add_qt_test(tst_qaction_kernel
+qt_add_test(tst_qaction_kernel
SOURCES
tst_qaction.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/kernel/qactiongroup/CMakeLists.txt b/tests/auto/gui/kernel/qactiongroup/CMakeLists.txt
index bcab5e05a2..e313aebec5 100644
--- a/tests/auto/gui/kernel/qactiongroup/CMakeLists.txt
+++ b/tests/auto/gui/kernel/qactiongroup/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qactiongroup_kernel Test:
#####################################################################
-add_qt_test(tst_qactiongroup_kernel
+qt_add_test(tst_qactiongroup_kernel
SOURCES
tst_qactiongroup.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/kernel/qbackingstore/CMakeLists.txt b/tests/auto/gui/kernel/qbackingstore/CMakeLists.txt
index 639e88fb4c..55d53545bb 100644
--- a/tests/auto/gui/kernel/qbackingstore/CMakeLists.txt
+++ b/tests/auto/gui/kernel/qbackingstore/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qbackingstore Test:
#####################################################################
-add_qt_test(tst_qbackingstore
+qt_add_test(tst_qbackingstore
SOURCES
tst_qbackingstore.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/kernel/qclipboard/test/CMakeLists.txt b/tests/auto/gui/kernel/qclipboard/test/CMakeLists.txt
index e7c1313c7b..dfacb03517 100644
--- a/tests/auto/gui/kernel/qclipboard/test/CMakeLists.txt
+++ b/tests/auto/gui/kernel/qclipboard/test/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qclipboard Test:
#####################################################################
-add_qt_test(tst_qclipboard
+qt_add_test(tst_qclipboard
OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../"
SOURCES
../tst_qclipboard.cpp
@@ -15,7 +15,7 @@ add_qt_test(tst_qclipboard
## Scopes:
#####################################################################
-extend_target(tst_qclipboard CONDITION MACOS
+qt_extend_target(tst_qclipboard CONDITION MACOS
PUBLIC_LIBRARIES
${FWAppKit}
)
diff --git a/tests/auto/gui/kernel/qcursor/CMakeLists.txt b/tests/auto/gui/kernel/qcursor/CMakeLists.txt
index 8f4062a42a..2c3cf28c1a 100644
--- a/tests/auto/gui/kernel/qcursor/CMakeLists.txt
+++ b/tests/auto/gui/kernel/qcursor/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qcursor Test:
#####################################################################
-add_qt_test(tst_qcursor
+qt_add_test(tst_qcursor
SOURCES
tst_qcursor.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/kernel/qdrag/CMakeLists.txt b/tests/auto/gui/kernel/qdrag/CMakeLists.txt
index 84bceaf0de..1b13df54d3 100644
--- a/tests/auto/gui/kernel/qdrag/CMakeLists.txt
+++ b/tests/auto/gui/kernel/qdrag/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qdrag Test:
#####################################################################
-add_qt_test(tst_qdrag
+qt_add_test(tst_qdrag
SOURCES
tst_qdrag.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/kernel/qevent/CMakeLists.txt b/tests/auto/gui/kernel/qevent/CMakeLists.txt
index 01d6db7225..21a2ddad66 100644
--- a/tests/auto/gui/kernel/qevent/CMakeLists.txt
+++ b/tests/auto/gui/kernel/qevent/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qevent Test:
#####################################################################
-add_qt_test(tst_qevent
+qt_add_test(tst_qevent
SOURCES
tst_qevent.cpp
)
diff --git a/tests/auto/gui/kernel/qfileopenevent/qfileopeneventexternal/CMakeLists.txt b/tests/auto/gui/kernel/qfileopenevent/qfileopeneventexternal/CMakeLists.txt
index 0c50f7ff56..0b9cd6d481 100644
--- a/tests/auto/gui/kernel/qfileopenevent/qfileopeneventexternal/CMakeLists.txt
+++ b/tests/auto/gui/kernel/qfileopenevent/qfileopeneventexternal/CMakeLists.txt
@@ -4,7 +4,7 @@
## qfileopeneventexternal Binary:
#####################################################################
-add_qt_executable(qfileopeneventexternal
+qt_add_executable(qfileopeneventexternal
GUI
SOURCES
qfileopeneventexternal.cpp
diff --git a/tests/auto/gui/kernel/qfileopenevent/test/CMakeLists.txt b/tests/auto/gui/kernel/qfileopenevent/test/CMakeLists.txt
index 6695ef42b3..a306a3eae6 100644
--- a/tests/auto/gui/kernel/qfileopenevent/test/CMakeLists.txt
+++ b/tests/auto/gui/kernel/qfileopenevent/test/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qfileopenevent Test:
#####################################################################
-add_qt_test(tst_qfileopenevent
+qt_add_test(tst_qfileopenevent
SOURCES
tst_qfileopenevent.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/kernel/qguiapplication/.prev_CMakeLists.txt b/tests/auto/gui/kernel/qguiapplication/.prev_CMakeLists.txt
index 30a6436ece..0da40c5aa3 100644
--- a/tests/auto/gui/kernel/qguiapplication/.prev_CMakeLists.txt
+++ b/tests/auto/gui/kernel/qguiapplication/.prev_CMakeLists.txt
@@ -8,7 +8,7 @@ endif()
## tst_qguiapplication Test:
#####################################################################
-add_qt_test(tst_qguiapplication
+qt_add_test(tst_qguiapplication
SOURCES
tst_qcoreapplication.cpp tst_qcoreapplication.h
tst_qguiapplication.cpp
@@ -27,7 +27,7 @@ set(tst_qguiapplication_resource_files
"icons/usericon.png"
)
-add_qt_resource(tst_qguiapplication "tst_qguiapplication"
+qt_add_resource(tst_qguiapplication "tst_qguiapplication"
PREFIX
"/"
FILES
diff --git a/tests/auto/gui/kernel/qguiapplication/CMakeLists.txt b/tests/auto/gui/kernel/qguiapplication/CMakeLists.txt
index 24fa6572c1..a98123aa64 100644
--- a/tests/auto/gui/kernel/qguiapplication/CMakeLists.txt
+++ b/tests/auto/gui/kernel/qguiapplication/CMakeLists.txt
@@ -16,8 +16,8 @@ else()
endif()
# special case end
-add_qt_test(tst_qguiapplication
- VERSION ${target_version}
+qt_add_test(tst_qguiapplication
+ VERSION ${target_version} # special case
SOURCES
../../../corelib/kernel/qcoreapplication/tst_qcoreapplication.cpp ../../../corelib/kernel/qcoreapplication/tst_qcoreapplication.h # special case
tst_qguiapplication.cpp
@@ -37,7 +37,7 @@ set(tst_qguiapplication_resource_files
"icons/usericon.png"
)
-add_qt_resource(tst_qguiapplication "tst_qguiapplication"
+qt_add_resource(tst_qguiapplication "tst_qguiapplication"
PREFIX
"/"
FILES
diff --git a/tests/auto/gui/kernel/qguieventdispatcher/CMakeLists.txt b/tests/auto/gui/kernel/qguieventdispatcher/CMakeLists.txt
index eb36e0ece7..14babc165c 100644
--- a/tests/auto/gui/kernel/qguieventdispatcher/CMakeLists.txt
+++ b/tests/auto/gui/kernel/qguieventdispatcher/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qguieventdispatcher Test:
#####################################################################
-add_qt_test(tst_qguieventdispatcher
+qt_add_test(tst_qguieventdispatcher
SOURCES
../../../corelib/kernel/qeventdispatcher/tst_qeventdispatcher.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/kernel/qguieventloop/CMakeLists.txt b/tests/auto/gui/kernel/qguieventloop/CMakeLists.txt
index 3fd943c83c..8d62d716a5 100644
--- a/tests/auto/gui/kernel/qguieventloop/CMakeLists.txt
+++ b/tests/auto/gui/kernel/qguieventloop/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qguieventloop Test:
#####################################################################
-add_qt_test(tst_qguieventloop
+qt_add_test(tst_qguieventloop
SOURCES
../../../corelib/kernel/qeventloop/tst_qeventloop.cpp
PUBLIC_LIBRARIES
@@ -16,12 +16,12 @@ add_qt_test(tst_qguieventloop
## Scopes:
#####################################################################
-extend_target(tst_qguieventloop CONDITION WIN32
+qt_extend_target(tst_qguieventloop CONDITION WIN32
PUBLIC_LIBRARIES
user32
)
-extend_target(tst_qguieventloop CONDITION QT_FEATURE_glib
+qt_extend_target(tst_qguieventloop CONDITION QT_FEATURE_glib
DEFINES
HAVE_GLIB
)
diff --git a/tests/auto/gui/kernel/qguimetatype/CMakeLists.txt b/tests/auto/gui/kernel/qguimetatype/CMakeLists.txt
index 3701b3983a..d124b08828 100644
--- a/tests/auto/gui/kernel/qguimetatype/CMakeLists.txt
+++ b/tests/auto/gui/kernel/qguimetatype/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qguimetatype Test:
#####################################################################
-add_qt_test(tst_qguimetatype
+qt_add_test(tst_qguimetatype
SOURCES
tst_qguimetatype.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/kernel/qguitimer/.prev_CMakeLists.txt b/tests/auto/gui/kernel/qguitimer/.prev_CMakeLists.txt
index c4e5117e8c..8c2ec60bdf 100644
--- a/tests/auto/gui/kernel/qguitimer/.prev_CMakeLists.txt
+++ b/tests/auto/gui/kernel/qguitimer/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qguitimer Test:
#####################################################################
-add_qt_test(tst_qguitimer
+qt_add_test(tst_qguitimer
SOURCES
../../../corelib/kernel/qtimer/tst_qtimer.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/kernel/qguitimer/CMakeLists.txt b/tests/auto/gui/kernel/qguitimer/CMakeLists.txt
index 2be3339fe3..52be3ed547 100644
--- a/tests/auto/gui/kernel/qguitimer/CMakeLists.txt
+++ b/tests/auto/gui/kernel/qguitimer/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qguitimer Test:
#####################################################################
-add_qt_test(tst_qguitimer
+qt_add_test(tst_qguitimer
SOURCES
../../../corelib/kernel/qtimer/tst_qtimer.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/kernel/qguivariant/no_application/CMakeLists.txt b/tests/auto/gui/kernel/qguivariant/no_application/CMakeLists.txt
index 8261212801..344b81bf6d 100644
--- a/tests/auto/gui/kernel/qguivariant/no_application/CMakeLists.txt
+++ b/tests/auto/gui/kernel/qguivariant/no_application/CMakeLists.txt
@@ -4,7 +4,7 @@
## no_application Test:
#####################################################################
-add_qt_test(no_application
+qt_add_test(no_application
SOURCES
main.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/kernel/qguivariant/test/CMakeLists.txt b/tests/auto/gui/kernel/qguivariant/test/CMakeLists.txt
index af2cea60e6..93efaf2aeb 100644
--- a/tests/auto/gui/kernel/qguivariant/test/CMakeLists.txt
+++ b/tests/auto/gui/kernel/qguivariant/test/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qguivariant Test:
#####################################################################
-add_qt_test(tst_qguivariant
+qt_add_test(tst_qguivariant
SOURCES
tst_qguivariant.cpp
INCLUDE_DIRECTORIES
@@ -19,7 +19,7 @@ set(tst_qguivariant_resource_files
"black2.png"
)
-add_qt_resource(tst_qguivariant "tst_qguivariant"
+qt_add_resource(tst_qguivariant "tst_qguivariant"
PREFIX
"/"
FILES
@@ -29,7 +29,7 @@ set(qguivariant_resource_files
"data"
)
-add_qt_resource(tst_qguivariant "qguivariant"
+qt_add_resource(tst_qguivariant "qguivariant"
PREFIX
"/"
FILES
diff --git a/tests/auto/gui/kernel/qinputdevice/CMakeLists.txt b/tests/auto/gui/kernel/qinputdevice/CMakeLists.txt
index 18d4968695..5c368838ab 100644
--- a/tests/auto/gui/kernel/qinputdevice/CMakeLists.txt
+++ b/tests/auto/gui/kernel/qinputdevice/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qinputdevice Test:
#####################################################################
-add_qt_test(tst_qinputdevice
+qt_add_test(tst_qinputdevice
SOURCES
tst_qinputdevice.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/kernel/qinputmethod/CMakeLists.txt b/tests/auto/gui/kernel/qinputmethod/CMakeLists.txt
index 2eee15b816..bdd4940392 100644
--- a/tests/auto/gui/kernel/qinputmethod/CMakeLists.txt
+++ b/tests/auto/gui/kernel/qinputmethod/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qinputmethod Test:
#####################################################################
-add_qt_test(tst_qinputmethod
+qt_add_test(tst_qinputmethod
SOURCES
tst_qinputmethod.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/kernel/qkeyevent/CMakeLists.txt b/tests/auto/gui/kernel/qkeyevent/CMakeLists.txt
index 2e36795375..3c48a6492b 100644
--- a/tests/auto/gui/kernel/qkeyevent/CMakeLists.txt
+++ b/tests/auto/gui/kernel/qkeyevent/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qkeyevent Test:
#####################################################################
-add_qt_test(tst_qkeyevent
+qt_add_test(tst_qkeyevent
SOURCES
tst_qkeyevent.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/kernel/qkeysequence/CMakeLists.txt b/tests/auto/gui/kernel/qkeysequence/CMakeLists.txt
index 07e480c9dd..f5a0c38fe4 100644
--- a/tests/auto/gui/kernel/qkeysequence/CMakeLists.txt
+++ b/tests/auto/gui/kernel/qkeysequence/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qkeysequence Test:
#####################################################################
-add_qt_test(tst_qkeysequence
+qt_add_test(tst_qkeysequence
SOURCES
tst_qkeysequence.cpp
PUBLIC_LIBRARIES
@@ -19,7 +19,7 @@ set(qkeysequence_resource_files
"qt_de.qm"
)
-add_qt_resource(tst_qkeysequence "qkeysequence"
+qt_add_resource(tst_qkeysequence "qkeysequence"
PREFIX
"/"
FILES
diff --git a/tests/auto/gui/kernel/qmouseevent/CMakeLists.txt b/tests/auto/gui/kernel/qmouseevent/CMakeLists.txt
index 4e1081c6ad..4d31363d64 100644
--- a/tests/auto/gui/kernel/qmouseevent/CMakeLists.txt
+++ b/tests/auto/gui/kernel/qmouseevent/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qmouseevent Test:
#####################################################################
-add_qt_test(tst_qmouseevent
+qt_add_test(tst_qmouseevent
SOURCES
tst_qmouseevent.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/kernel/qmouseevent_modal/CMakeLists.txt b/tests/auto/gui/kernel/qmouseevent_modal/CMakeLists.txt
index c7f447ffeb..afe9fe33ed 100644
--- a/tests/auto/gui/kernel/qmouseevent_modal/CMakeLists.txt
+++ b/tests/auto/gui/kernel/qmouseevent_modal/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qmouseevent_modal Test:
#####################################################################
-add_qt_test(tst_qmouseevent_modal
+qt_add_test(tst_qmouseevent_modal
SOURCES
tst_qmouseevent_modal.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/kernel/qopenglwindow/CMakeLists.txt b/tests/auto/gui/kernel/qopenglwindow/CMakeLists.txt
index 4176be9840..1a460a567f 100644
--- a/tests/auto/gui/kernel/qopenglwindow/CMakeLists.txt
+++ b/tests/auto/gui/kernel/qopenglwindow/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qopenglwindow Test:
#####################################################################
-add_qt_test(tst_qopenglwindow
+qt_add_test(tst_qopenglwindow
SOURCES
tst_qopenglwindow.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/kernel/qpalette/CMakeLists.txt b/tests/auto/gui/kernel/qpalette/CMakeLists.txt
index 4bd2ce7cc5..acb413007e 100644
--- a/tests/auto/gui/kernel/qpalette/CMakeLists.txt
+++ b/tests/auto/gui/kernel/qpalette/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qpalette Test:
#####################################################################
-add_qt_test(tst_qpalette
+qt_add_test(tst_qpalette
SOURCES
tst_qpalette.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/kernel/qpixelformat/CMakeLists.txt b/tests/auto/gui/kernel/qpixelformat/CMakeLists.txt
index 43deb02af1..907564dc3d 100644
--- a/tests/auto/gui/kernel/qpixelformat/CMakeLists.txt
+++ b/tests/auto/gui/kernel/qpixelformat/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qpixelformat Test:
#####################################################################
-add_qt_test(tst_qpixelformat
+qt_add_test(tst_qpixelformat
SOURCES
tst_qpixelformat.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/kernel/qrasterwindow/CMakeLists.txt b/tests/auto/gui/kernel/qrasterwindow/CMakeLists.txt
index 9b586ce4c8..6b34b71dac 100644
--- a/tests/auto/gui/kernel/qrasterwindow/CMakeLists.txt
+++ b/tests/auto/gui/kernel/qrasterwindow/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qrasterwindow Test:
#####################################################################
-add_qt_test(tst_qrasterwindow
+qt_add_test(tst_qrasterwindow
SOURCES
tst_qrasterwindow.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/kernel/qscreen/CMakeLists.txt b/tests/auto/gui/kernel/qscreen/CMakeLists.txt
index dd54db4753..b073070155 100644
--- a/tests/auto/gui/kernel/qscreen/CMakeLists.txt
+++ b/tests/auto/gui/kernel/qscreen/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qscreen Test:
#####################################################################
-add_qt_test(tst_qscreen
+qt_add_test(tst_qscreen
SOURCES
tst_qscreen.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/kernel/qshortcut/CMakeLists.txt b/tests/auto/gui/kernel/qshortcut/CMakeLists.txt
index fab20dceed..8c3c2556fe 100644
--- a/tests/auto/gui/kernel/qshortcut/CMakeLists.txt
+++ b/tests/auto/gui/kernel/qshortcut/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qshortcut_kernel Test:
#####################################################################
-add_qt_test(tst_qshortcut_kernel
+qt_add_test(tst_qshortcut_kernel
SOURCES
tst_qshortcut.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/kernel/qsurfaceformat/CMakeLists.txt b/tests/auto/gui/kernel/qsurfaceformat/CMakeLists.txt
index d12e1da106..1d319aaddd 100644
--- a/tests/auto/gui/kernel/qsurfaceformat/CMakeLists.txt
+++ b/tests/auto/gui/kernel/qsurfaceformat/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qsurfaceformat Test:
#####################################################################
-add_qt_test(tst_qsurfaceformat
+qt_add_test(tst_qsurfaceformat
SOURCES
tst_qsurfaceformat.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/kernel/qtouchevent/CMakeLists.txt b/tests/auto/gui/kernel/qtouchevent/CMakeLists.txt
index 7d489e3066..a2976c351f 100644
--- a/tests/auto/gui/kernel/qtouchevent/CMakeLists.txt
+++ b/tests/auto/gui/kernel/qtouchevent/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qtouchevent Test:
#####################################################################
-add_qt_test(tst_qtouchevent
+qt_add_test(tst_qtouchevent
SOURCES
tst_qtouchevent.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/kernel/qwindow/CMakeLists.txt b/tests/auto/gui/kernel/qwindow/CMakeLists.txt
index 60603a219b..84b46b76f5 100644
--- a/tests/auto/gui/kernel/qwindow/CMakeLists.txt
+++ b/tests/auto/gui/kernel/qwindow/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qwindow Test:
#####################################################################
-add_qt_test(tst_qwindow
+qt_add_test(tst_qwindow
SOURCES
tst_qwindow.cpp
PUBLIC_LIBRARIES
@@ -16,7 +16,7 @@ add_qt_test(tst_qwindow
## Scopes:
#####################################################################
-extend_target(tst_qwindow CONDITION QT_FEATURE_dynamicgl AND WIN32
+qt_extend_target(tst_qwindow CONDITION QT_FEATURE_dynamicgl AND WIN32
PUBLIC_LIBRARIES
user32
)