CMake: Regenerate manual tests

Change-Id: Id42b9e481375d2ec0e68b73dc1e2ff36f0cbd49e Reviewed-by: Joerg Bornemann <[email protected]>
author: Alexandru Croitor <[email protected]> 2020-07-07 16:56:37 +0200
committer: Alexandru Croitor <[email protected]> 2020-07-08 11:01:38 +0200
commit: 1339cc46678f475f788c9e86618c3824dd86a7ea (patch)
tree: c339140546e725a4b0d4cc9a7ab92e597ebcff40
parent: adbadc57df9f70ee4144f0dd2425192593656394 (diff)
140 files changed, 276 insertions, 172 deletions
diff --git a/tests/manual/.prev_CMakeLists.txt b/tests/manual/.prev_CMakeLists.txt
index 8c872a2f398..2c476f4688b 100644
--- a/tests/manual/.prev_CMakeLists.txt
+++ b/tests/manual/.prev_CMakeLists.txt
@@ -10,7 +10,6 @@ add_subdirectory(keypadnavigation)
 add_subdirectory(lance)
 add_subdirectory(qcursor)
 add_subdirectory(qdesktopservices)
-add_subdirectory(qdesktopwidget)
 add_subdirectory(qgraphicsitem)
 add_subdirectory(qgraphicsitemgroup)
 add_subdirectory(qgraphicslayout/flicker)
diff --git a/tests/manual/CMakeLists.txt b/tests/manual/CMakeLists.txt
index 7fd2f93966c..9f48f2832ae 100644
--- a/tests/manual/CMakeLists.txt
+++ b/tests/manual/CMakeLists.txt
@@ -21,7 +21,6 @@ add_subdirectory(keypadnavigation)
 #add_subdirectory(lance) # special case qgl.h missing
 add_subdirectory(qcursor)
 add_subdirectory(qdesktopservices)
-add_subdirectory(qdesktopwidget)
 add_subdirectory(qgraphicsitem)
 add_subdirectory(qgraphicsitemgroup)
 add_subdirectory(qgraphicslayout/flicker)
diff --git a/tests/manual/cocoa/appicon/CMakeLists.txt b/tests/manual/cocoa/appicon/CMakeLists.txt
index 5cb97d7c6ad..258c6ce7e35 100644
--- a/tests/manual/cocoa/appicon/CMakeLists.txt
+++ b/tests/manual/cocoa/appicon/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## appicon Binary:
 #####################################################################
 
-add_qt_manual_test(appicon
+qt_add_manual_test(appicon
     GUI
     SOURCES
         main.cpp
diff --git a/tests/manual/cocoa/menurama/CMakeLists.txt b/tests/manual/cocoa/menurama/CMakeLists.txt
index 1c39a59fc3c..56fe17e34d7 100644
--- a/tests/manual/cocoa/menurama/CMakeLists.txt
+++ b/tests/manual/cocoa/menurama/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## Menurama Binary:
 #####################################################################
 
-add_qt_manual_test(Menurama
+qt_add_manual_test(Menurama
     GUI
     SOURCES
         main.cpp
diff --git a/tests/manual/cocoa/menus/CMakeLists.txt b/tests/manual/cocoa/menus/CMakeLists.txt
index a3fa70ba5dc..534a567a7d9 100644
--- a/tests/manual/cocoa/menus/CMakeLists.txt
+++ b/tests/manual/cocoa/menus/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## menus Binary:
 #####################################################################
 
-add_qt_manual_test(menus
+qt_add_manual_test(menus
     SOURCES
         main.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/manual/cocoa/nativewidgets/CMakeLists.txt b/tests/manual/cocoa/nativewidgets/CMakeLists.txt
index cab2da54212..25d1963feb8 100644
--- a/tests/manual/cocoa/nativewidgets/CMakeLists.txt
+++ b/tests/manual/cocoa/nativewidgets/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## nativewigets Binary:
 #####################################################################
 
-add_qt_manual_test(nativewigets
+qt_add_manual_test(nativewigets
     GUI
     SOURCES
         main.cpp
diff --git a/tests/manual/cocoa/popups/CMakeLists.txt b/tests/manual/cocoa/popups/CMakeLists.txt
index 53468edc7c1..8c572b56c2d 100644
--- a/tests/manual/cocoa/popups/CMakeLists.txt
+++ b/tests/manual/cocoa/popups/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## popups Binary:
 #####################################################################
 
-add_qt_manual_test(popups
+qt_add_manual_test(popups
     SOURCES
         main.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/manual/cocoa/qmaccocoaviewcontainer/CMakeLists.txt b/tests/manual/cocoa/qmaccocoaviewcontainer/CMakeLists.txt
index 95317c520ec..f6c21b8c230 100644
--- a/tests/manual/cocoa/qmaccocoaviewcontainer/CMakeLists.txt
+++ b/tests/manual/cocoa/qmaccocoaviewcontainer/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qmaccocoaviewcontainer Binary:
 #####################################################################
 
-add_qt_manual_test(qmaccocoaviewcontainer
+qt_add_manual_test(qmaccocoaviewcontainer
     GUI
     SOURCES
         TestMouseMovedNSView.h TestMouseMovedNSView.m
diff --git a/tests/manual/cocoa/qsystemtrayicon/CMakeLists.txt b/tests/manual/cocoa/qsystemtrayicon/CMakeLists.txt
index 73c3157b89d..f00b8359027 100644
--- a/tests/manual/cocoa/qsystemtrayicon/CMakeLists.txt
+++ b/tests/manual/cocoa/qsystemtrayicon/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qsystemtrayicon Binary:
 #####################################################################
 
-add_qt_manual_test(qsystemtrayicon
+qt_add_manual_test(qsystemtrayicon
     GUI
     SOURCES
         main.cpp
@@ -26,7 +26,7 @@ set(icons_resource_files
     "macsystray64x64.png"
 )
 
-add_qt_resource(qsystemtrayicon "icons"
+qt_add_resource(qsystemtrayicon "icons"
     PREFIX
         "/"
     FILES
diff --git a/tests/manual/cocoa/qt_on_cocoa/CMakeLists.txt b/tests/manual/cocoa/qt_on_cocoa/CMakeLists.txt
index 066eefa3130..fb9c3951694 100644
--- a/tests/manual/cocoa/qt_on_cocoa/CMakeLists.txt
+++ b/tests/manual/cocoa/qt_on_cocoa/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qt_on_cocoa Binary:
 #####################################################################
 
-add_qt_manual_test(qt_on_cocoa
+qt_add_manual_test(qt_on_cocoa
     GUI
     SOURCES
         main.mm
diff --git a/tests/manual/cocoa/wheelevent/CMakeLists.txt b/tests/manual/cocoa/wheelevent/CMakeLists.txt
index 305036fa781..d544ab2730c 100644
--- a/tests/manual/cocoa/wheelevent/CMakeLists.txt
+++ b/tests/manual/cocoa/wheelevent/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## wheelevent Binary:
 #####################################################################
 
-add_qt_manual_test(wheelevent
+qt_add_manual_test(wheelevent
     GUI
     SOURCES
         main.cpp
diff --git a/tests/manual/dialogs/CMakeLists.txt b/tests/manual/dialogs/CMakeLists.txt
index ef000529a5b..d449c191fe9 100644
--- a/tests/manual/dialogs/CMakeLists.txt
+++ b/tests/manual/dialogs/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## dialogs Binary:
 #####################################################################
 
-add_qt_manual_test(dialogs
+qt_add_manual_test(dialogs
     GUI
     SOURCES
         colordialogpanel.cpp colordialogpanel.h
@@ -25,12 +25,12 @@ add_qt_manual_test(dialogs
 ## Scopes:
 #####################################################################
 
-extend_target(dialogs CONDITION TARGET Qt::PrintSupport
+qt_extend_target(dialogs CONDITION TARGET Qt::PrintSupport
     PUBLIC_LIBRARIES
         Qt::PrintSupport
 )
 
-extend_target(dialogs CONDITION NOT (QT_FEATURE_printer EQUAL FALSE)
+qt_extend_target(dialogs CONDITION NOT (QT_FEATURE_printer EQUAL FALSE)
     SOURCES
         printdialogpanel.cpp printdialogpanel.h printdialogpanel.ui
     ENABLE_AUTOGEN_TOOLS
diff --git a/tests/manual/embeddedintoforeignwindow/CMakeLists.txt b/tests/manual/embeddedintoforeignwindow/CMakeLists.txt
index 2de0ff3bfbf..06fee7d482e 100644
--- a/tests/manual/embeddedintoforeignwindow/CMakeLists.txt
+++ b/tests/manual/embeddedintoforeignwindow/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## embeddedintoforeignwindow Binary:
 #####################################################################
 
-add_qt_manual_test(embeddedintoforeignwindow
+qt_add_manual_test(embeddedintoforeignwindow
     SOURCES
         ../diaglib/eventfilter.cpp ../diaglib/eventfilter.h
         ../diaglib/nativewindowdump.h
@@ -28,19 +28,19 @@ add_qt_manual_test(embeddedintoforeignwindow
 ## Scopes:
 #####################################################################
 
-extend_target(embeddedintoforeignwindow CONDITION WIN32
+qt_extend_target(embeddedintoforeignwindow CONDITION WIN32
     SOURCES
         ../diaglib/nativewindowdump_win.cpp
     PUBLIC_LIBRARIES
         user32
 )
 
-extend_target(embeddedintoforeignwindow CONDITION UNIX
+qt_extend_target(embeddedintoforeignwindow CONDITION UNIX
     SOURCES
         ../diaglib/nativewindowdump.cpp
 )
 
-extend_target(embeddedintoforeignwindow CONDITION QT_FEATURE_widgets
+qt_extend_target(embeddedintoforeignwindow CONDITION QT_FEATURE_widgets
     SOURCES
         ../diaglib/debugproxystyle.cpp ../diaglib/debugproxystyle.h
         ../diaglib/logwidget.cpp ../diaglib/logwidget.h
@@ -49,7 +49,7 @@ extend_target(embeddedintoforeignwindow CONDITION QT_FEATURE_widgets
         Qt::WidgetsPrivate
 )
 
-extend_target(embeddedintoforeignwindow CONDITION QT_FEATURE_opengl
+qt_extend_target(embeddedintoforeignwindow CONDITION QT_FEATURE_opengl
     SOURCES
         ../diaglib/glinfo.cpp ../diaglib/glinfo.h
     PUBLIC_LIBRARIES
diff --git a/tests/manual/filetest/CMakeLists.txt b/tests/manual/filetest/CMakeLists.txt
index efefc262ef0..e8c04be928a 100644
--- a/tests/manual/filetest/CMakeLists.txt
+++ b/tests/manual/filetest/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## filetest Binary:
 #####################################################################
 
-add_qt_manual_test(filetest
+qt_add_manual_test(filetest
     SOURCES
         main.cpp
 )
diff --git a/tests/manual/foreignwindows/CMakeLists.txt b/tests/manual/foreignwindows/CMakeLists.txt
index d22636925ad..bd0af73058e 100644
--- a/tests/manual/foreignwindows/CMakeLists.txt
+++ b/tests/manual/foreignwindows/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## foreignwindows Binary:
 #####################################################################
 
-add_qt_manual_test(foreignwindows
+qt_add_manual_test(foreignwindows
     SOURCES
         ../diaglib/eventfilter.cpp ../diaglib/eventfilter.h
         ../diaglib/nativewindowdump.h
@@ -29,19 +29,19 @@ add_qt_manual_test(foreignwindows
 ## Scopes:
 #####################################################################
 
-extend_target(foreignwindows CONDITION WIN32
+qt_extend_target(foreignwindows CONDITION WIN32
     SOURCES
         ../diaglib/nativewindowdump_win.cpp
     PUBLIC_LIBRARIES
         user32
 )
 
-extend_target(foreignwindows CONDITION UNIX
+qt_extend_target(foreignwindows CONDITION UNIX
     SOURCES
         ../diaglib/nativewindowdump.cpp
 )
 
-extend_target(foreignwindows CONDITION QT_FEATURE_widgets
+qt_extend_target(foreignwindows CONDITION QT_FEATURE_widgets
     SOURCES
         ../diaglib/debugproxystyle.cpp ../diaglib/debugproxystyle.h
         ../diaglib/logwidget.cpp ../diaglib/logwidget.h
@@ -50,7 +50,7 @@ extend_target(foreignwindows CONDITION QT_FEATURE_widgets
         Qt::WidgetsPrivate
 )
 
-extend_target(foreignwindows CONDITION QT_FEATURE_opengl
+qt_extend_target(foreignwindows CONDITION QT_FEATURE_opengl
     SOURCES
         ../diaglib/glinfo.cpp ../diaglib/glinfo.h
     PUBLIC_LIBRARIES
diff --git a/tests/manual/gestures/graphicsview/CMakeLists.txt b/tests/manual/gestures/graphicsview/CMakeLists.txt
index 81dc1931aaf..e998bf113e7 100644
--- a/tests/manual/gestures/graphicsview/CMakeLists.txt
+++ b/tests/manual/gestures/graphicsview/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_manual_graphicsview Binary:
 #####################################################################
 
-add_qt_manual_test(tst_manual_graphicsview
+qt_add_manual_test(tst_manual_graphicsview
     GUI
     SOURCES
         gestures.cpp gestures.h
diff --git a/tests/manual/gestures/scrollarea/CMakeLists.txt b/tests/manual/gestures/scrollarea/CMakeLists.txt
index c521c8e2df1..d1446964cd5 100644
--- a/tests/manual/gestures/scrollarea/CMakeLists.txt
+++ b/tests/manual/gestures/scrollarea/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## scrollarea Binary:
 #####################################################################
 
-add_qt_manual_test(scrollarea
+qt_add_manual_test(scrollarea
     GUI
     SOURCES
         main.cpp
diff --git a/tests/manual/highdpi/CMakeLists.txt b/tests/manual/highdpi/CMakeLists.txt
index dee2d1ae438..72ed49bb71d 100644
--- a/tests/manual/highdpi/CMakeLists.txt
+++ b/tests/manual/highdpi/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## highdpi Binary:
 #####################################################################
 
-add_qt_manual_test(highdpi
+qt_add_manual_test(highdpi
     SOURCES
         dragwidget.cpp dragwidget.h
         main.cpp
@@ -28,7 +28,7 @@ set(highdpi_resource_files
     "qticon64.png"
 )
 
-add_qt_resource(highdpi "highdpi"
+qt_add_resource(highdpi "highdpi"
     PREFIX
         "/"
     FILES
diff --git a/tests/manual/inputmethodhints/CMakeLists.txt b/tests/manual/inputmethodhints/CMakeLists.txt
index 1bbf7caef89..8b501f66a03 100644
--- a/tests/manual/inputmethodhints/CMakeLists.txt
+++ b/tests/manual/inputmethodhints/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_inputmethodhints Binary:
 #####################################################################
 
-add_qt_manual_test(tst_inputmethodhints
+qt_add_manual_test(tst_inputmethodhints
     GUI
     SOURCES
         inputmethodhints.cpp inputmethodhints.h inputmethodhints.ui
diff --git a/tests/manual/keypadnavigation/CMakeLists.txt b/tests/manual/keypadnavigation/CMakeLists.txt
index 8f11ad711ce..34946e643fa 100644
--- a/tests/manual/keypadnavigation/CMakeLists.txt
+++ b/tests/manual/keypadnavigation/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## keypadnavigation Binary:
 #####################################################################
 
-add_qt_manual_test(keypadnavigation
+qt_add_manual_test(keypadnavigation
     GUI
     SOURCES
         keypadnavigation.ui
diff --git a/tests/manual/lance/CMakeLists.txt b/tests/manual/lance/CMakeLists.txt
index 511f8b150f8..d0d898b2577 100644
--- a/tests/manual/lance/CMakeLists.txt
+++ b/tests/manual/lance/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## lance Binary:
 #####################################################################
 
-add_qt_manual_test(lance
+qt_add_manual_test(lance
     SOURCES
         ../../auto/other/lancelot/paintcommands.cpp ../../auto/other/lancelot/paintcommands.h
         interactivewidget.cpp interactivewidget.h
@@ -28,7 +28,7 @@ set(icons_resource_files
     "tools.png"
 )
 
-add_qt_resource(lance "icons"
+qt_add_resource(lance "icons"
     PREFIX
         "/icons"
     FILES
@@ -153,7 +153,7 @@ set(images_resource_files
     "images/zebra.png"
 )
 
-add_qt_resource(lance "images"
+qt_add_resource(lance "images"
     PREFIX
         "/"
     BASE
@@ -169,7 +169,7 @@ add_qt_resource(lance "images"
 ## Scopes:
 #####################################################################
 
-extend_target(lance CONDITION TARGET Qt::OpenGL
+qt_extend_target(lance CONDITION TARGET Qt::OpenGL
     PUBLIC_LIBRARIES
         Qt::OpenGL
 )
diff --git a/tests/manual/markdown/CMakeLists.txt b/tests/manual/markdown/CMakeLists.txt
index f6e5284eeaa..33af58f812c 100644
--- a/tests/manual/markdown/CMakeLists.txt
+++ b/tests/manual/markdown/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## html2md Binary:
 #####################################################################
 
-add_qt_manual_test(html2md
+qt_add_manual_test(html2md
     GUI
     SOURCES
         html2md.cpp
diff --git a/tests/manual/network_remote_stresstest/CMakeLists.txt b/tests/manual/network_remote_stresstest/CMakeLists.txt
index 46db952b46e..409f5c28332 100644
--- a/tests/manual/network_remote_stresstest/CMakeLists.txt
+++ b/tests/manual/network_remote_stresstest/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_network_remote_stresstest Binary:
 #####################################################################
 
-add_qt_manual_test(tst_network_remote_stresstest
+qt_add_manual_test(tst_network_remote_stresstest
     SOURCES
         tst_network_remote_stresstest.cpp
     PUBLIC_LIBRARIES
@@ -19,7 +19,7 @@ set(url-list_resource_files
     "url-list.txt"
 )
 
-add_qt_resource(tst_network_remote_stresstest "url-list"
+qt_add_resource(tst_network_remote_stresstest "url-list"
     PREFIX
         "/"
     FILES
diff --git a/tests/manual/network_stresstest/CMakeLists.txt b/tests/manual/network_stresstest/CMakeLists.txt
index 310c62dae81..664457caef2 100644
--- a/tests/manual/network_stresstest/CMakeLists.txt
+++ b/tests/manual/network_stresstest/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_network_stresstest Binary:
 #####################################################################
 
-add_qt_manual_test(tst_network_stresstest
+qt_add_manual_test(tst_network_stresstest
     SOURCES
         minihttpserver.cpp minihttpserver.h
         tst_network_stresstest.cpp
@@ -21,7 +21,7 @@ set(wwwfiles_resource_files
     "qtest"
 )
 
-add_qt_resource(tst_network_stresstest "wwwfiles"
+qt_add_resource(tst_network_stresstest "wwwfiles"
     PREFIX
         "/"
     FILES
diff --git a/tests/manual/qcursor/allcursors/CMakeLists.txt b/tests/manual/qcursor/allcursors/CMakeLists.txt
index 0452653b869..cfaf947ff9b 100644
--- a/tests/manual/qcursor/allcursors/CMakeLists.txt
+++ b/tests/manual/qcursor/allcursors/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_allcursors Binary:
 #####################################################################
 
-add_qt_manual_test(tst_allcursors
+qt_add_manual_test(tst_allcursors
     GUI
     SOURCES
         main.cpp
diff --git a/tests/manual/qcursor/childwidget/CMakeLists.txt b/tests/manual/qcursor/childwidget/CMakeLists.txt
index 5992cdaf735..bb357f348dc 100644
--- a/tests/manual/qcursor/childwidget/CMakeLists.txt
+++ b/tests/manual/qcursor/childwidget/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_manual_childwidget Binary:
 #####################################################################
 
-add_qt_manual_test(tst_manual_childwidget
+qt_add_manual_test(tst_manual_childwidget
     GUI
     SOURCES
         main.cpp
diff --git a/tests/manual/qcursor/childwindow/CMakeLists.txt b/tests/manual/qcursor/childwindow/CMakeLists.txt
index de2a8dae6d1..5399735075a 100644
--- a/tests/manual/qcursor/childwindow/CMakeLists.txt
+++ b/tests/manual/qcursor/childwindow/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## childwindow Binary:
 #####################################################################
 
-add_qt_manual_test(childwindow
+qt_add_manual_test(childwindow
     GUI
     SOURCES
         main.cpp
diff --git a/tests/manual/qcursor/childwindowcontainer/CMakeLists.txt b/tests/manual/qcursor/childwindowcontainer/CMakeLists.txt
index 70c2bb7431f..1653e5764ff 100644
--- a/tests/manual/qcursor/childwindowcontainer/CMakeLists.txt
+++ b/tests/manual/qcursor/childwindowcontainer/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## childwindowcontainer Binary:
 #####################################################################
 
-add_qt_manual_test(childwindowcontainer
+qt_add_manual_test(childwindowcontainer
     GUI
     SOURCES
         main.cpp
diff --git a/tests/manual/qcursor/grab_override/CMakeLists.txt b/tests/manual/qcursor/grab_override/CMakeLists.txt
index d3ea88de658..d2395630e83 100644
--- a/tests/manual/qcursor/grab_override/CMakeLists.txt
+++ b/tests/manual/qcursor/grab_override/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## t_cursors Binary:
 #####################################################################
 
-add_qt_manual_test(t_cursors
+qt_add_manual_test(t_cursors
     GUI
     SOURCES
         main.cpp
@@ -21,7 +21,7 @@ set(images_resource_files
     "data/monkey_on_64x64.png"
 )
 
-add_qt_resource(t_cursors "images"
+qt_add_resource(t_cursors "images"
     PREFIX
         "/"
     FILES
diff --git a/tests/manual/qcursor/qcursorhighdpi/CMakeLists.txt b/tests/manual/qcursor/qcursorhighdpi/CMakeLists.txt
index 9489d0675ef..635536c9ed3 100644
--- a/tests/manual/qcursor/qcursorhighdpi/CMakeLists.txt
+++ b/tests/manual/qcursor/qcursorhighdpi/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qcursorhighdpi Binary:
 #####################################################################
 
-add_qt_manual_test(qcursorhighdpi
+qt_add_manual_test(qcursorhighdpi
     SOURCES
         main.cpp
     PUBLIC_LIBRARIES
@@ -20,7 +20,7 @@ add_qt_manual_test(qcursorhighdpi
 ## Scopes:
 #####################################################################
 
-extend_target(qcursorhighdpi CONDITION WIN32
+qt_extend_target(qcursorhighdpi CONDITION WIN32
     PUBLIC_LIBRARIES
         User32
 )
diff --git a/tests/manual/qdesktopservices/CMakeLists.txt b/tests/manual/qdesktopservices/CMakeLists.txt
index 5d880fcf656..8b93835b666 100644
--- a/tests/manual/qdesktopservices/CMakeLists.txt
+++ b/tests/manual/qdesktopservices/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_manual_qdesktopservices Binary:
 #####################################################################
 
-add_qt_manual_test(tst_manual_qdesktopservices
+qt_add_manual_test(tst_manual_qdesktopservices
     SOURCES
         tst_qdesktopservices.cpp
     DEFINES
diff --git a/tests/manual/qgraphicsitem/CMakeLists.txt b/tests/manual/qgraphicsitem/CMakeLists.txt
index a75b436e74f..32814afb33f 100644
--- a/tests/manual/qgraphicsitem/CMakeLists.txt
+++ b/tests/manual/qgraphicsitem/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qgraphicsitem Binary:
 #####################################################################
 
-add_qt_manual_test(qgraphicsitem
+qt_add_manual_test(qgraphicsitem
     GUI
     SOURCES
         main.cpp
diff --git a/tests/manual/qgraphicsitemgroup/CMakeLists.txt b/tests/manual/qgraphicsitemgroup/CMakeLists.txt
index 8658c933b34..0558b9475d4 100644
--- a/tests/manual/qgraphicsitemgroup/CMakeLists.txt
+++ b/tests/manual/qgraphicsitemgroup/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qgraphicsitemgroup Binary:
 #####################################################################
 
-add_qt_manual_test(qgraphicsitemgroup
+qt_add_manual_test(qgraphicsitemgroup
     GUI
     SOURCES
         customitem.cpp customitem.h
diff --git a/tests/manual/qgraphicslayout/flicker/CMakeLists.txt b/tests/manual/qgraphicslayout/flicker/CMakeLists.txt
index 0d7fcce6871..005c6ca07f9 100644
--- a/tests/manual/qgraphicslayout/flicker/CMakeLists.txt
+++ b/tests/manual/qgraphicslayout/flicker/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## flicker Binary:
 #####################################################################
 
-add_qt_manual_test(flicker
+qt_add_manual_test(flicker
     GUI
     SOURCES
         main.cpp
diff --git a/tests/manual/qhttpnetworkconnection/CMakeLists.txt b/tests/manual/qhttpnetworkconnection/CMakeLists.txt
index 7331bf46115..08308011a67 100644
--- a/tests/manual/qhttpnetworkconnection/CMakeLists.txt
+++ b/tests/manual/qhttpnetworkconnection/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_manual_qhttpnetworkconnection Binary:
 #####################################################################
 
-add_qt_manual_test(tst_manual_qhttpnetworkconnection
+qt_add_manual_test(tst_manual_qhttpnetworkconnection
     SOURCES
         main.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/manual/qimagereader/CMakeLists.txt b/tests/manual/qimagereader/CMakeLists.txt
index 9e5869063bc..898cdbae0ef 100644
--- a/tests/manual/qimagereader/CMakeLists.txt
+++ b/tests/manual/qimagereader/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qimagereader Binary:
 #####################################################################
 
-add_qt_manual_test(qimagereader
+qt_add_manual_test(qimagereader
     GUI
     SOURCES
         main.cpp
diff --git a/tests/manual/qlayout/CMakeLists.txt b/tests/manual/qlayout/CMakeLists.txt
index 541dc188570..72702a47010 100644
--- a/tests/manual/qlayout/CMakeLists.txt
+++ b/tests/manual/qlayout/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qlayout Binary:
 #####################################################################
 
-add_qt_manual_test(qlayout
+qt_add_manual_test(qlayout
     GUI
     SOURCES
         gridwidget.cpp gridwidget.h
diff --git a/tests/manual/qlocale/CMakeLists.txt b/tests/manual/qlocale/CMakeLists.txt
index 60519da9a19..c837bf5a9b0 100644
--- a/tests/manual/qlocale/CMakeLists.txt
+++ b/tests/manual/qlocale/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qlocale Binary:
 #####################################################################
 
-add_qt_manual_test(qlocale
+qt_add_manual_test(qlocale
     GUI
     SOURCES
         calendar.cpp calendar.h
diff --git a/tests/manual/qmetatype/CMakeLists.txt b/tests/manual/qmetatype/CMakeLists.txt
index bb5f75092a9..696c74ee34a 100644
--- a/tests/manual/qmetatype/CMakeLists.txt
+++ b/tests/manual/qmetatype/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qmetatype_expect_fail Test:
 #####################################################################
 
-add_qt_test(tst_qmetatype_expect_fail
+qt_add_test(tst_qmetatype_expect_fail
     GUI
     SOURCES
         declare_metatype_noninline.cpp declare_metatype_noninline.h
diff --git a/tests/manual/qmimedatabase/CMakeLists.txt b/tests/manual/qmimedatabase/CMakeLists.txt
index 038f784ac24..4b15506e1ce 100644
--- a/tests/manual/qmimedatabase/CMakeLists.txt
+++ b/tests/manual/qmimedatabase/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qmimedatabase Binary:
 #####################################################################
 
-add_qt_manual_test(qmimedatabase
+qt_add_manual_test(qmimedatabase
     SOURCES
         main.cpp
 )
diff --git a/tests/manual/qnetconmonitor/.prev_CMakeLists.txt b/tests/manual/qnetconmonitor/.prev_CMakeLists.txt
index ed552bc435d..0c08769907a 100644
--- a/tests/manual/qnetconmonitor/.prev_CMakeLists.txt
+++ b/tests/manual/qnetconmonitor/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qnetconmonitor Binary:
 #####################################################################
 
-add_qt_manual_test(qnetconmonitor
+qt_add_manual_test(qnetconmonitor
     SOURCES
         tst_qnetconmonitor.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/manual/qnetconmonitor/CMakeLists.txt b/tests/manual/qnetconmonitor/CMakeLists.txt
index 8eda85b783f..714344e1d9e 100644
--- a/tests/manual/qnetconmonitor/CMakeLists.txt
+++ b/tests/manual/qnetconmonitor/CMakeLists.txt
@@ -10,7 +10,7 @@ if (NOT QT_FEATURE_private_tests)
 endif()
 # special case end
 
-add_qt_manual_test(qnetconmonitor
+qt_add_manual_test(qnetconmonitor
     SOURCES
         tst_qnetconmonitor.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/manual/qnetworkaccessmanager/qget/CMakeLists.txt b/tests/manual/qnetworkaccessmanager/qget/CMakeLists.txt
index 1d4ffa4b360..21d129d09f4 100644
--- a/tests/manual/qnetworkaccessmanager/qget/CMakeLists.txt
+++ b/tests/manual/qnetworkaccessmanager/qget/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qget Binary:
 #####################################################################
 
-add_qt_manual_test(qget
+qt_add_manual_test(qget
     SOURCES
         downloadmanager.cpp
         qget.cpp qget.h
diff --git a/tests/manual/qnetworkreply/.prev_CMakeLists.txt b/tests/manual/qnetworkreply/.prev_CMakeLists.txt
index 24854aa64fa..2b2ba41e0be 100644
--- a/tests/manual/qnetworkreply/.prev_CMakeLists.txt
+++ b/tests/manual/qnetworkreply/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_manual_qnetworkreply Binary:
 #####################################################################
 
-add_qt_manual_test(tst_manual_qnetworkreply
+qt_add_manual_test(tst_manual_qnetworkreply
     SOURCES
         main.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/manual/qnetworkreply/CMakeLists.txt b/tests/manual/qnetworkreply/CMakeLists.txt
index 5ac12ced951..9af59aae917 100644
--- a/tests/manual/qnetworkreply/CMakeLists.txt
+++ b/tests/manual/qnetworkreply/CMakeLists.txt
@@ -10,7 +10,7 @@ if (NOT QT_FEATURE_private_tests)
 endif()
 # special case end
 
-add_qt_manual_test(tst_manual_qnetworkreply
+qt_add_manual_test(tst_manual_qnetworkreply
     SOURCES
         main.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/manual/qopenglcontext/CMakeLists.txt b/tests/manual/qopenglcontext/CMakeLists.txt
index 9cec06ff1ec..396da589ca3 100644
--- a/tests/manual/qopenglcontext/CMakeLists.txt
+++ b/tests/manual/qopenglcontext/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qopenglcontext Binary:
 #####################################################################
 
-add_qt_manual_test(qopenglcontext
+qt_add_manual_test(qopenglcontext
     GUI
     SOURCES
         main.cpp
@@ -13,6 +13,7 @@ add_qt_manual_test(qopenglcontext
         Qt::EglSupportPrivate
         Qt::Gui
         Qt::GuiPrivate
+        Qt::OpenGL
 )
 
 #### Keys ignored in scope 1:.:.:qopenglcontext.pro:<TRUE>:
diff --git a/tests/manual/qopengltextureblitter/.prev_CMakeLists.txt b/tests/manual/qopengltextureblitter/.prev_CMakeLists.txt
index f56583c1e06..db7fff80939 100644
--- a/tests/manual/qopengltextureblitter/.prev_CMakeLists.txt
+++ b/tests/manual/qopengltextureblitter/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qopengltextureblitter Binary:
 #####################################################################
 
-add_qt_manual_test(qopengltextureblitter
+qt_add_manual_test(qopengltextureblitter
     GUI
     SOURCES
         main.cpp
diff --git a/tests/manual/qopengltextureblitter/CMakeLists.txt b/tests/manual/qopengltextureblitter/CMakeLists.txt
index 1fe33049fc9..c9e9a49901a 100644
--- a/tests/manual/qopengltextureblitter/CMakeLists.txt
+++ b/tests/manual/qopengltextureblitter/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qopengltextureblitter Binary:
 #####################################################################
 
-add_qt_manual_test(qopengltextureblitter
+qt_add_manual_test(qopengltextureblitter
     GUI
     SOURCES
         main.cpp
diff --git a/tests/manual/qopenglwidget/openglwidget/CMakeLists.txt b/tests/manual/qopenglwidget/openglwidget/CMakeLists.txt
index ffdb8880404..66c7b8495ee 100644
--- a/tests/manual/qopenglwidget/openglwidget/CMakeLists.txt
+++ b/tests/manual/qopenglwidget/openglwidget/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## openglwidget Binary:
 #####################################################################
 
-add_qt_manual_test(openglwidget
+qt_add_manual_test(openglwidget
     GUI
     SOURCES
         main.cpp
diff --git a/tests/manual/qopenglwindow/multiwindow/CMakeLists.txt b/tests/manual/qopenglwindow/multiwindow/CMakeLists.txt
index 82acac6affc..c322d40027f 100644
--- a/tests/manual/qopenglwindow/multiwindow/CMakeLists.txt
+++ b/tests/manual/qopenglwindow/multiwindow/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## multiwindow Binary:
 #####################################################################
 
-add_qt_manual_test(multiwindow
+qt_add_manual_test(multiwindow
     GUI
     SOURCES
         main.cpp
diff --git a/tests/manual/qprintdevice_dump/CMakeLists.txt b/tests/manual/qprintdevice_dump/CMakeLists.txt
index f619024286f..73e25b66775 100644
--- a/tests/manual/qprintdevice_dump/CMakeLists.txt
+++ b/tests/manual/qprintdevice_dump/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qprintdevice_dump Binary:
 #####################################################################
 
-add_qt_manual_test(qprintdevice_dump
+qt_add_manual_test(qprintdevice_dump
     GUI
     SOURCES
         main.cpp
diff --git a/tests/manual/qscreen/CMakeLists.txt b/tests/manual/qscreen/CMakeLists.txt
index 53b431c548f..3c5622536a3 100644
--- a/tests/manual/qscreen/CMakeLists.txt
+++ b/tests/manual/qscreen/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qscreen Binary:
 #####################################################################
 
-add_qt_manual_test(qscreen
+qt_add_manual_test(qscreen
     SOURCES
         main.cpp
         propertyfield.cpp propertyfield.h
diff --git a/tests/manual/qssloptions/CMakeLists.txt b/tests/manual/qssloptions/CMakeLists.txt
index 1fe53b9e507..92983a7a5ba 100644
--- a/tests/manual/qssloptions/CMakeLists.txt
+++ b/tests/manual/qssloptions/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qssloptions Binary:
 #####################################################################
 
-add_qt_manual_test(tst_qssloptions
+qt_add_manual_test(tst_qssloptions
     SOURCES
         main.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/manual/qsslsocket/CMakeLists.txt b/tests/manual/qsslsocket/CMakeLists.txt
index bd7c9fc5690..a0d0fd23a0c 100644
--- a/tests/manual/qsslsocket/CMakeLists.txt
+++ b/tests/manual/qsslsocket/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_manual_qsslsocket Test:
 #####################################################################
 
-add_qt_test(tst_manual_qsslsocket
+qt_add_test(tst_manual_qsslsocket
     SOURCES
         main.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/manual/qstorageinfo/CMakeLists.txt b/tests/manual/qstorageinfo/CMakeLists.txt
index fab2da606b0..58782c138db 100644
--- a/tests/manual/qstorageinfo/CMakeLists.txt
+++ b/tests/manual/qstorageinfo/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qstorageinfo Binary:
 #####################################################################
 
-add_qt_manual_test(qstorageinfo
+qt_add_manual_test(qstorageinfo
     SOURCES
         main.cpp
 )
diff --git a/tests/manual/qsysinfo/CMakeLists.txt b/tests/manual/qsysinfo/CMakeLists.txt
index cd668a5bf2f..e0e49fa1bf4 100644
--- a/tests/manual/qsysinfo/CMakeLists.txt
+++ b/tests/manual/qsysinfo/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qsysinfo Binary:
 #####################################################################
 
-add_qt_manual_test(qsysinfo
+qt_add_manual_test(qsysinfo
     SOURCES
         main.cpp
 )
diff --git a/tests/manual/qt_poll/CMakeLists.txt b/tests/manual/qt_poll/CMakeLists.txt
index 0e19e6a4e32..d8784a6ed36 100644
--- a/tests/manual/qt_poll/CMakeLists.txt
+++ b/tests/manual/qt_poll/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qt_poll Test:
 #####################################################################
 
-add_qt_test(tst_qt_poll
+qt_add_test(tst_qt_poll
     SOURCES
         ../../../src/corelib/kernel/qpoll.cpp
         tst_qt_poll.cpp
diff --git a/tests/manual/qtabbar/CMakeLists.txt b/tests/manual/qtabbar/CMakeLists.txt
index a44b6a331a2..157c64250f6 100644
--- a/tests/manual/qtabbar/CMakeLists.txt
+++ b/tests/manual/qtabbar/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qtabbar Binary:
 #####################################################################
 
-add_qt_manual_test(qtabbar
+qt_add_manual_test(qtabbar
     GUI
     SOURCES
         main.cpp
diff --git a/tests/manual/qtabletevent/.prev_CMakeLists.txt b/tests/manual/qtabletevent/.prev_CMakeLists.txt
new file mode 100644
index 00000000000..06a0bab2d87
--- /dev/null
+++ b/tests/manual/qtabletevent/.prev_CMakeLists.txt
@@ -0,0 +1,5 @@
+# Generated from qtabletevent.pro.
+
+add_subdirectory(device_information)
+add_subdirectory(event_compression)
+add_subdirectory(regular_widgets)
diff --git a/tests/manual/qtabletevent/device_information/CMakeLists.txt b/tests/manual/qtabletevent/device_information/CMakeLists.txt
index d0e12fac0ae..8a13e6e7302 100644
--- a/tests/manual/qtabletevent/device_information/CMakeLists.txt
+++ b/tests/manual/qtabletevent/device_information/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## device_information Binary:
 #####################################################################
 
-add_qt_manual_test(device_information
+qt_add_manual_test(device_information
     GUI
     SOURCES
         main.cpp
diff --git a/tests/manual/qtabletevent/event_compression/CMakeLists.txt b/tests/manual/qtabletevent/event_compression/CMakeLists.txt
index b6cc8032e52..1f959a51e26 100644
--- a/tests/manual/qtabletevent/event_compression/CMakeLists.txt
+++ b/tests/manual/qtabletevent/event_compression/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## event_compression Binary:
 #####################################################################
 
-add_qt_manual_test(event_compression
+qt_add_manual_test(event_compression
     SOURCES
         main.cpp
         mousestatwidget.cpp mousestatwidget.h
diff --git a/tests/manual/qtabletevent/regular_widgets/CMakeLists.txt b/tests/manual/qtabletevent/regular_widgets/CMakeLists.txt
index 7937aa5d90f..f4630a3789f 100644
--- a/tests/manual/qtabletevent/regular_widgets/CMakeLists.txt
+++ b/tests/manual/qtabletevent/regular_widgets/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## regular_widgets Binary:
 #####################################################################
 
-add_qt_manual_test(regular_widgets
+qt_add_manual_test(regular_widgets
     GUI
     SOURCES
         main.cpp
diff --git a/tests/manual/qtbug-52641/CMakeLists.txt b/tests/manual/qtbug-52641/CMakeLists.txt
index 7f96b66eaa7..7ae762b62f1 100644
--- a/tests/manual/qtbug-52641/CMakeLists.txt
+++ b/tests/manual/qtbug-52641/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qtbug-52641 Binary:
 #####################################################################
 
-add_qt_manual_test(qtbug-52641
+qt_add_manual_test(qtbug-52641
     GUI
     SOURCES
         main.cpp
diff --git a/tests/manual/qtbug-8933/CMakeLists.txt b/tests/manual/qtbug-8933/CMakeLists.txt
index a5de7687cb6..ec47dd5ce7e 100644
--- a/tests/manual/qtbug-8933/CMakeLists.txt
+++ b/tests/manual/qtbug-8933/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qtbug-8933 Binary:
 #####################################################################
 
-add_qt_manual_test(qtbug-8933
+qt_add_manual_test(qtbug-8933
     GUI
     SOURCES
         main.cpp
diff --git a/tests/manual/qtexteditlist/CMakeLists.txt b/tests/manual/qtexteditlist/CMakeLists.txt
index 963ffa54411..49647ca7c03 100644
--- a/tests/manual/qtexteditlist/CMakeLists.txt
+++ b/tests/manual/qtexteditlist/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qtexteditlist Binary:
 #####################################################################
 
-add_qt_manual_test(qtexteditlist
+qt_add_manual_test(qtexteditlist
     GUI
     SOURCES
         main.cpp
diff --git a/tests/manual/qtexttableborders/CMakeLists.txt b/tests/manual/qtexttableborders/CMakeLists.txt
index c273b3aeb27..83c46c5ad56 100644
--- a/tests/manual/qtexttableborders/CMakeLists.txt
+++ b/tests/manual/qtexttableborders/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qtexttableborders Binary:
 #####################################################################
 
-add_qt_manual_test(qtexttableborders
+qt_add_manual_test(qtexttableborders
     GUI
     SOURCES
         main.cpp
@@ -23,7 +23,7 @@ set(resources_resource_files
     "table-border-test.html"
 )
 
-add_qt_resource(qtexttableborders "resources"
+qt_add_resource(qtexttableborders "resources"
     PREFIX
         "/"
     FILES
diff --git a/tests/manual/qtouchevent/CMakeLists.txt b/tests/manual/qtouchevent/CMakeLists.txt
index 8cee742ca1c..031d2b35218 100644
--- a/tests/manual/qtouchevent/CMakeLists.txt
+++ b/tests/manual/qtouchevent/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qtouchevent Binary:
 #####################################################################
 
-add_qt_manual_test(qtouchevent
+qt_add_manual_test(qtouchevent
     SOURCES
         form.ui
         main.cpp
diff --git a/tests/manual/qvulkaninstance/CMakeLists.txt b/tests/manual/qvulkaninstance/CMakeLists.txt
index 2071010da10..e645ee007c1 100644
--- a/tests/manual/qvulkaninstance/CMakeLists.txt
+++ b/tests/manual/qvulkaninstance/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qvulkaninstance Binary:
 #####################################################################
 
-add_qt_manual_test(qvulkaninstance
+qt_add_manual_test(qvulkaninstance
     GUI
     SOURCES
         main.cpp
diff --git a/tests/manual/qwidget_zorder/CMakeLists.txt b/tests/manual/qwidget_zorder/CMakeLists.txt
index 2ae52decac1..62c3963481a 100644
--- a/tests/manual/qwidget_zorder/CMakeLists.txt
+++ b/tests/manual/qwidget_zorder/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qwidget_zorder Binary:
 #####################################################################
 
-add_qt_manual_test(qwidget_zorder
+qt_add_manual_test(qwidget_zorder
     GUI
     SOURCES
         main.cpp
diff --git a/tests/manual/repaint/mainwindow/CMakeLists.txt b/tests/manual/repaint/mainwindow/CMakeLists.txt
index f71b5ddf6c6..24bbbc93c02 100644
--- a/tests/manual/repaint/mainwindow/CMakeLists.txt
+++ b/tests/manual/repaint/mainwindow/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_manual_mainwindow Binary:
 #####################################################################
 
-add_qt_manual_test(tst_manual_mainwindow
+qt_add_manual_test(tst_manual_mainwindow
     GUI
     SOURCES
         ../shared/shared.h
diff --git a/tests/manual/repaint/scrollarea/CMakeLists.txt b/tests/manual/repaint/scrollarea/CMakeLists.txt
index 9d2d52fd65c..1c1bfdfb3f5 100644
--- a/tests/manual/repaint/scrollarea/CMakeLists.txt
+++ b/tests/manual/repaint/scrollarea/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_manual_scrollarea Binary:
 #####################################################################
 
-add_qt_manual_test(tst_manual_scrollarea
+qt_add_manual_test(tst_manual_scrollarea
     GUI
     SOURCES
         ../shared/shared.h
diff --git a/tests/manual/repaint/splitter/CMakeLists.txt b/tests/manual/repaint/splitter/CMakeLists.txt
index cb1d7aab0b4..2cecbc3741b 100644
--- a/tests/manual/repaint/splitter/CMakeLists.txt
+++ b/tests/manual/repaint/splitter/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## splitter Binary:
 #####################################################################
 
-add_qt_manual_test(splitter
+qt_add_manual_test(splitter
     GUI
     SOURCES
         ../shared/shared.h
diff --git a/tests/manual/repaint/tableview/CMakeLists.txt b/tests/manual/repaint/tableview/CMakeLists.txt
index 5c9634db88f..0c7ed5d532e 100644
--- a/tests/manual/repaint/tableview/CMakeLists.txt
+++ b/tests/manual/repaint/tableview/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tableview Binary:
 #####################################################################
 
-add_qt_manual_test(tableview
+qt_add_manual_test(tableview
     GUI
     SOURCES
         ../shared/shared.h
diff --git a/tests/manual/repaint/task141091/CMakeLists.txt b/tests/manual/repaint/task141091/CMakeLists.txt
index 3a74ef58deb..3d899d79e3c 100644
--- a/tests/manual/repaint/task141091/CMakeLists.txt
+++ b/tests/manual/repaint/task141091/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## task141091 Binary:
 #####################################################################
 
-add_qt_manual_test(task141091
+qt_add_manual_test(task141091
     SOURCES
         main.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/manual/repaint/toplevel/CMakeLists.txt b/tests/manual/repaint/toplevel/CMakeLists.txt
index 6b5a3c83a9a..a4e603686a4 100644
--- a/tests/manual/repaint/toplevel/CMakeLists.txt
+++ b/tests/manual/repaint/toplevel/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_manual_toplevel Binary:
 #####################################################################
 
-add_qt_manual_test(tst_manual_toplevel
+qt_add_manual_test(tst_manual_toplevel
     SOURCES
         ../shared/shared.h
         main.cpp
diff --git a/tests/manual/repaint/widget/CMakeLists.txt b/tests/manual/repaint/widget/CMakeLists.txt
index f58c49c9fbe..681f1e090c0 100644
--- a/tests/manual/repaint/widget/CMakeLists.txt
+++ b/tests/manual/repaint/widget/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## widget Binary:
 #####################################################################
 
-add_qt_manual_test(widget
+qt_add_manual_test(widget
     GUI
     SOURCES
         ../shared/shared.h
diff --git a/tests/manual/rhi/CMakeLists.txt b/tests/manual/rhi/CMakeLists.txt
index 621a3073048..8f35c98aefc 100644
--- a/tests/manual/rhi/CMakeLists.txt
+++ b/tests/manual/rhi/CMakeLists.txt
@@ -8,11 +8,13 @@ add_subdirectory(msaatexture)
 add_subdirectory(msaarenderbuffer)
 add_subdirectory(cubemap)
 add_subdirectory(cubemap_scissor)
+add_subdirectory(cubemap_render)
 add_subdirectory(multiwindow)
 add_subdirectory(multiwindow_threaded)
 add_subdirectory(triquadcube)
 add_subdirectory(offscreen)
 add_subdirectory(floattexture)
+add_subdirectory(float16texture_with_compute)
 add_subdirectory(mrt)
 add_subdirectory(shadowmap)
 add_subdirectory(computebuffer)
diff --git a/tests/manual/rhi/compressedtexture_bc1/CMakeLists.txt b/tests/manual/rhi/compressedtexture_bc1/CMakeLists.txt
index 5da0ad29329..294b6cb9421 100644
--- a/tests/manual/rhi/compressedtexture_bc1/CMakeLists.txt
+++ b/tests/manual/rhi/compressedtexture_bc1/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## compressedtexture_bc1 Binary:
 #####################################################################
 
-add_qt_manual_test(compressedtexture_bc1
+qt_add_manual_test(compressedtexture_bc1
     GUI
     SOURCES
         compressedtexture_bc1.cpp
@@ -29,7 +29,7 @@ set(compressedtexture_bc1_resource_files
     "../shared/texture.vert.qsb"
 )
 
-add_qt_resource(compressedtexture_bc1 "compressedtexture_bc1"
+qt_add_resource(compressedtexture_bc1 "compressedtexture_bc1"
     PREFIX
         "/"
     FILES
diff --git a/tests/manual/rhi/compressedtexture_bc1_subupload/CMakeLists.txt b/tests/manual/rhi/compressedtexture_bc1_subupload/CMakeLists.txt
index bd82a5cb0dc..508df6b5d54 100644
--- a/tests/manual/rhi/compressedtexture_bc1_subupload/CMakeLists.txt
+++ b/tests/manual/rhi/compressedtexture_bc1_subupload/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## compressedtexture_bc1_subupload Binary:
 #####################################################################
 
-add_qt_manual_test(compressedtexture_bc1_subupload
+qt_add_manual_test(compressedtexture_bc1_subupload
     GUI
     SOURCES
         compressedtexture_bc1_subupload.cpp
@@ -33,7 +33,7 @@ set(compressedtexture_bc1_subupload_resource_files
     "../shared/texture.vert.qsb"
 )
 
-add_qt_resource(compressedtexture_bc1_subupload "compressedtexture_bc1_subupload"
+qt_add_resource(compressedtexture_bc1_subupload "compressedtexture_bc1_subupload"
     PREFIX
         "/"
     FILES
diff --git a/tests/manual/rhi/computebuffer/CMakeLists.txt b/tests/manual/rhi/computebuffer/CMakeLists.txt
index e2a959c1e43..3d19620dce6 100644
--- a/tests/manual/rhi/computebuffer/CMakeLists.txt
+++ b/tests/manual/rhi/computebuffer/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## computebuffer Binary:
 #####################################################################
 
-add_qt_manual_test(computebuffer
+qt_add_manual_test(computebuffer
     GUI
     SOURCES
         computebuffer.cpp
@@ -20,7 +20,7 @@ set(computebuffer_resource_files
     "main.vert.qsb"
 )
 
-add_qt_resource(computebuffer "computebuffer"
+qt_add_resource(computebuffer "computebuffer"
     PREFIX
         "/"
     FILES
diff --git a/tests/manual/rhi/computeimage/CMakeLists.txt b/tests/manual/rhi/computeimage/CMakeLists.txt
index a634f1cf987..a5408233d57 100644
--- a/tests/manual/rhi/computeimage/CMakeLists.txt
+++ b/tests/manual/rhi/computeimage/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## computeimage Binary:
 #####################################################################
 
-add_qt_manual_test(computeimage
+qt_add_manual_test(computeimage
     GUI
     SOURCES
         computeimage.cpp
@@ -30,7 +30,7 @@ set(computeimage_resource_files
     "image.comp.qsb"
 )
 
-add_qt_resource(computeimage "computeimage"
+qt_add_resource(computeimage "computeimage"
     PREFIX
         "/"
     FILES
diff --git a/tests/manual/rhi/cubemap/CMakeLists.txt b/tests/manual/rhi/cubemap/CMakeLists.txt
index 323ad78170e..6a69d760653 100644
--- a/tests/manual/rhi/cubemap/CMakeLists.txt
+++ b/tests/manual/rhi/cubemap/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## cubemap Binary:
 #####################################################################
 
-add_qt_manual_test(cubemap
+qt_add_manual_test(cubemap
     GUI
     SOURCES
         cubemap.cpp
@@ -20,7 +20,7 @@ set(cubemap_resource_files
     "cubemap.vert.qsb"
 )
 
-add_qt_resource(cubemap "cubemap"
+qt_add_resource(cubemap "cubemap"
     PREFIX
         "/"
     FILES
diff --git a/tests/manual/rhi/cubemap_render/CMakeLists.txt b/tests/manual/rhi/cubemap_render/CMakeLists.txt
new file mode 100644
index 00000000000..c21ebc40a34
--- /dev/null
+++ b/tests/manual/rhi/cubemap_render/CMakeLists.txt
@@ -0,0 +1,35 @@
+# Generated from cubemap_render.pro.
+
+#####################################################################
+## cubemap_render Binary:
+#####################################################################
+
+qt_add_manual_test(cubemap_render
+    GUI
+    SOURCES
+        cubemap_render.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::GuiPrivate
+)
+
+# Resources:
+set(cubemap_render_resource_files
+    "cubemap_mrt.frag.qsb"
+    "cubemap_mrt.vert.qsb"
+    "cubemap_oneface.frag.qsb"
+    "cubemap_oneface.vert.qsb"
+    "cubemap_sample.frag.qsb"
+    "cubemap_sample.vert.qsb"
+)
+
+qt_add_resource(cubemap_render "cubemap_render"
+    PREFIX
+        "/"
+    FILES
+        ${cubemap_render_resource_files}
+)
+
+
+#### Keys ignored in scope 1:.:.:cubemap_render.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/manual/rhi/cubemap_scissor/CMakeLists.txt b/tests/manual/rhi/cubemap_scissor/CMakeLists.txt
index 519d9dc6ec0..759c7220064 100644
--- a/tests/manual/rhi/cubemap_scissor/CMakeLists.txt
+++ b/tests/manual/rhi/cubemap_scissor/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## cubemap_scissor Binary:
 #####################################################################
 
-add_qt_manual_test(cubemap_scissor
+qt_add_manual_test(cubemap_scissor
     GUI
     SOURCES
         cubemap_scissor.cpp
@@ -29,7 +29,7 @@ set(cubemap_scissor_resource_files
     "../cubemap/cubemap.vert.qsb"
 )
 
-add_qt_resource(cubemap_scissor "cubemap_scissor"
+qt_add_resource(cubemap_scissor "cubemap_scissor"
     PREFIX
         "/"
     FILES
diff --git a/tests/manual/rhi/float16texture_with_compute/CMakeLists.txt b/tests/manual/rhi/float16texture_with_compute/CMakeLists.txt
new file mode 100644
index 00000000000..935f653742c
--- /dev/null
+++ b/tests/manual/rhi/float16texture_with_compute/CMakeLists.txt
@@ -0,0 +1,43 @@
+# Generated from float16texture_with_compute.pro.
+
+#####################################################################
+## float16texture_with_compute Binary:
+#####################################################################
+
+qt_add_manual_test(float16texture_with_compute
+    GUI
+    SOURCES
+        float16texture_with_compute.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::GuiPrivate
+)
+
+# Resources:
+set_source_files_properties("../shared/qt256.png"
+    PROPERTIES QT_RESOURCE_ALIAS "qt256.png"
+)
+set_source_files_properties("../shared/texture.frag.qsb"
+    PROPERTIES QT_RESOURCE_ALIAS "texture.frag.qsb"
+)
+set_source_files_properties("../shared/texture.vert.qsb"
+    PROPERTIES QT_RESOURCE_ALIAS "texture.vert.qsb"
+)
+set(float16texture_with_compute_resource_files
+    "../shared/qt256.png"
+    "../shared/texture.frag.qsb"
+    "../shared/texture.vert.qsb"
+    "load.comp.qsb"
+    "prefilter.comp.qsb"
+)
+
+qt_add_resource(float16texture_with_compute "float16texture_with_compute"
+    PREFIX
+        "/"
+    FILES
+        ${float16texture_with_compute_resource_files}
+)
+
+
+#### Keys ignored in scope 1:.:.:float16texture_with_compute.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/manual/rhi/floattexture/CMakeLists.txt b/tests/manual/rhi/floattexture/CMakeLists.txt
index 3368812524c..241387eb4b5 100644
--- a/tests/manual/rhi/floattexture/CMakeLists.txt
+++ b/tests/manual/rhi/floattexture/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## floattexture Binary:
 #####################################################################
 
-add_qt_manual_test(floattexture
+qt_add_manual_test(floattexture
     GUI
     SOURCES
         floattexture.cpp
@@ -29,7 +29,7 @@ set(floattexture_resource_files
     "../shared/texture.vert.qsb"
 )
 
-add_qt_resource(floattexture "floattexture"
+qt_add_resource(floattexture "floattexture"
     PREFIX
         "/"
     FILES
diff --git a/tests/manual/rhi/hellominimalcrossgfxtriangle/CMakeLists.txt b/tests/manual/rhi/hellominimalcrossgfxtriangle/CMakeLists.txt
index 8b9d3389f82..c995f56de20 100644
--- a/tests/manual/rhi/hellominimalcrossgfxtriangle/CMakeLists.txt
+++ b/tests/manual/rhi/hellominimalcrossgfxtriangle/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## hellominimalcrossgfxtriangle Binary:
 #####################################################################
 
-add_qt_manual_test(hellominimalcrossgfxtriangle
+qt_add_manual_test(hellominimalcrossgfxtriangle
     SOURCES
         hellowindow.cpp hellowindow.h
         main.cpp
@@ -26,7 +26,7 @@ set(hellominimalcrossgfxtriangle_resource_files
     "../shared/color.vert.qsb"
 )
 
-add_qt_resource(hellominimalcrossgfxtriangle "hellominimalcrossgfxtriangle"
+qt_add_resource(hellominimalcrossgfxtriangle "hellominimalcrossgfxtriangle"
     PREFIX
         "/"
     FILES
diff --git a/tests/manual/rhi/instancing/CMakeLists.txt b/tests/manual/rhi/instancing/CMakeLists.txt
index 8c8d0c2a9ac..6cc41c7a733 100644
--- a/tests/manual/rhi/instancing/CMakeLists.txt
+++ b/tests/manual/rhi/instancing/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## instancing Binary:
 #####################################################################
 
-add_qt_manual_test(instancing
+qt_add_manual_test(instancing
     GUI
     SOURCES
         instancing.cpp
@@ -19,7 +19,7 @@ set(instancing_resource_files
     "inst.vert.qsb"
 )
 
-add_qt_resource(instancing "instancing"
+qt_add_resource(instancing "instancing"
     PREFIX
         "/"
     FILES
diff --git a/tests/manual/rhi/mrt/CMakeLists.txt b/tests/manual/rhi/mrt/CMakeLists.txt
index db63ebe07d8..0df83106d04 100644
--- a/tests/manual/rhi/mrt/CMakeLists.txt
+++ b/tests/manual/rhi/mrt/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## mrt Binary:
 #####################################################################
 
-add_qt_manual_test(mrt
+qt_add_manual_test(mrt
     GUI
     SOURCES
         mrt.cpp
@@ -27,7 +27,7 @@ set(mrt_resource_files
     "mrt.vert.qsb"
 )
 
-add_qt_resource(mrt "mrt"
+qt_add_resource(mrt "mrt"
     PREFIX
         "/"
     FILES
diff --git a/tests/manual/rhi/msaarenderbuffer/CMakeLists.txt b/tests/manual/rhi/msaarenderbuffer/CMakeLists.txt
index 26aa8798de2..2b682d81f7b 100644
--- a/tests/manual/rhi/msaarenderbuffer/CMakeLists.txt
+++ b/tests/manual/rhi/msaarenderbuffer/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## msaarenderbuffer Binary:
 #####################################################################
 
-add_qt_manual_test(msaarenderbuffer
+qt_add_manual_test(msaarenderbuffer
     GUI
     SOURCES
         msaarenderbuffer.cpp
@@ -33,7 +33,7 @@ set(msaarenderbuffer_resource_files
     "../shared/texture.vert.qsb"
 )
 
-add_qt_resource(msaarenderbuffer "msaarenderbuffer"
+qt_add_resource(msaarenderbuffer "msaarenderbuffer"
     PREFIX
         "/"
     FILES
diff --git a/tests/manual/rhi/msaatexture/CMakeLists.txt b/tests/manual/rhi/msaatexture/CMakeLists.txt
index 5a3c447db4b..e2392e4c3de 100644
--- a/tests/manual/rhi/msaatexture/CMakeLists.txt
+++ b/tests/manual/rhi/msaatexture/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## msaatexture Binary:
 #####################################################################
 
-add_qt_manual_test(msaatexture
+qt_add_manual_test(msaatexture
     GUI
     SOURCES
         msaatexture.cpp
@@ -37,7 +37,7 @@ set(msaatexture_resource_files
     "../shared/texture_ms4.frag.qsb"
 )
 
-add_qt_resource(msaatexture "msaatexture"
+qt_add_resource(msaatexture "msaatexture"
     PREFIX
         "/"
     FILES
diff --git a/tests/manual/rhi/multiwindow/CMakeLists.txt b/tests/manual/rhi/multiwindow/CMakeLists.txt
index a3e63b9d066..eb6e739addc 100644
--- a/tests/manual/rhi/multiwindow/CMakeLists.txt
+++ b/tests/manual/rhi/multiwindow/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## multiwindow Binary:
 #####################################################################
 
-add_qt_manual_test(multiwindow
+qt_add_manual_test(multiwindow
     GUI
     SOURCES
         multiwindow.cpp
@@ -26,7 +26,7 @@ set(multiwindow_resource_files
     "../shared/color.vert.qsb"
 )
 
-add_qt_resource(multiwindow "multiwindow"
+qt_add_resource(multiwindow "multiwindow"
     PREFIX
         "/"
     FILES
diff --git a/tests/manual/rhi/multiwindow_threaded/CMakeLists.txt b/tests/manual/rhi/multiwindow_threaded/CMakeLists.txt
index f3f220dba64..2aad008e741 100644
--- a/tests/manual/rhi/multiwindow_threaded/CMakeLists.txt
+++ b/tests/manual/rhi/multiwindow_threaded/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## multiwindow_threaded Binary:
 #####################################################################
 
-add_qt_manual_test(multiwindow_threaded
+qt_add_manual_test(multiwindow_threaded
     GUI
     SOURCES
         multiwindow_threaded.cpp
@@ -31,7 +31,7 @@ set(multiwindow_threaded_resource_files
     "../shared/texture.vert.qsb"
 )
 
-add_qt_resource(multiwindow_threaded "multiwindow_threaded"
+qt_add_resource(multiwindow_threaded "multiwindow_threaded"
     PREFIX
         "/"
     FILES
diff --git a/tests/manual/rhi/offscreen/CMakeLists.txt b/tests/manual/rhi/offscreen/CMakeLists.txt
index 56a9f2661d9..ffda2b17b48 100644
--- a/tests/manual/rhi/offscreen/CMakeLists.txt
+++ b/tests/manual/rhi/offscreen/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## offscreen Binary:
 #####################################################################
 
-add_qt_manual_test(offscreen
+qt_add_manual_test(offscreen
     SOURCES
         offscreen.cpp
     PUBLIC_LIBRARIES
@@ -24,7 +24,7 @@ set(offscreen_resource_files
     "../shared/color.vert.qsb"
 )
 
-add_qt_resource(offscreen "offscreen"
+qt_add_resource(offscreen "offscreen"
     PREFIX
         "/"
     FILES
diff --git a/tests/manual/rhi/qrhiprof/CMakeLists.txt b/tests/manual/rhi/qrhiprof/CMakeLists.txt
index 8f4fb3797b6..a10161afaf5 100644
--- a/tests/manual/rhi/qrhiprof/CMakeLists.txt
+++ b/tests/manual/rhi/qrhiprof/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qrhiprof Binary:
 #####################################################################
 
-add_qt_manual_test(qrhiprof
+qt_add_manual_test(qrhiprof
     GUI
     SOURCES
         qrhiprof.cpp
diff --git a/tests/manual/rhi/shadowmap/CMakeLists.txt b/tests/manual/rhi/shadowmap/CMakeLists.txt
index d2de92d0941..23e24c17623 100644
--- a/tests/manual/rhi/shadowmap/CMakeLists.txt
+++ b/tests/manual/rhi/shadowmap/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## shadowmap Binary:
 #####################################################################
 
-add_qt_manual_test(shadowmap
+qt_add_manual_test(shadowmap
     GUI
     SOURCES
         shadowmap.cpp
@@ -21,7 +21,7 @@ set(shadowmap_resource_files
     "shadowmap.vert.qsb"
 )
 
-add_qt_resource(shadowmap "shadowmap"
+qt_add_resource(shadowmap "shadowmap"
     PREFIX
         "/"
     FILES
diff --git a/tests/manual/rhi/texuploads/CMakeLists.txt b/tests/manual/rhi/texuploads/CMakeLists.txt
index 2e97336a9d6..20078d40676 100644
--- a/tests/manual/rhi/texuploads/CMakeLists.txt
+++ b/tests/manual/rhi/texuploads/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## texuploads Binary:
 #####################################################################
 
-add_qt_manual_test(texuploads
+qt_add_manual_test(texuploads
     GUI
     SOURCES
         texuploads.cpp
@@ -29,7 +29,7 @@ set(texuploads_resource_files
     "../shared/texture.vert.qsb"
 )
 
-add_qt_resource(texuploads "texuploads"
+qt_add_resource(texuploads "texuploads"
     PREFIX
         "/"
     FILES
diff --git a/tests/manual/rhi/triquadcube/CMakeLists.txt b/tests/manual/rhi/triquadcube/CMakeLists.txt
index 42ebf1f55f3..c4fd5a04980 100644
--- a/tests/manual/rhi/triquadcube/CMakeLists.txt
+++ b/tests/manual/rhi/triquadcube/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## triquadcube Binary:
 #####################################################################
 
-add_qt_manual_test(triquadcube
+qt_add_manual_test(triquadcube
     GUI
     SOURCES
         quadrenderer.cpp quadrenderer.h
@@ -41,7 +41,7 @@ set(triquadcube_resource_files
     "../shared/texture.vert.qsb"
 )
 
-add_qt_resource(triquadcube "triquadcube"
+qt_add_resource(triquadcube "triquadcube"
     PREFIX
         "/"
     FILES
diff --git a/tests/manual/shortcuts/CMakeLists.txt b/tests/manual/shortcuts/CMakeLists.txt
index c4ac6b040b7..e8474fc9a7a 100644
--- a/tests/manual/shortcuts/CMakeLists.txt
+++ b/tests/manual/shortcuts/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## shortcuts Binary:
 #####################################################################
 
-add_qt_manual_test(shortcuts
+qt_add_manual_test(shortcuts
     GUI
     SOURCES
         main.cpp
diff --git a/tests/manual/socketengine/.prev_CMakeLists.txt b/tests/manual/socketengine/.prev_CMakeLists.txt
index 61635f7e776..a96c5b2e75c 100644
--- a/tests/manual/socketengine/.prev_CMakeLists.txt
+++ b/tests/manual/socketengine/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_socketengine Binary:
 #####################################################################
 
-add_qt_manual_test(tst_socketengine
+qt_add_manual_test(tst_socketengine
     SOURCES
         main.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/manual/socketengine/CMakeLists.txt b/tests/manual/socketengine/CMakeLists.txt
index 927955c3dbe..81e937a3c3a 100644
--- a/tests/manual/socketengine/CMakeLists.txt
+++ b/tests/manual/socketengine/CMakeLists.txt
@@ -10,7 +10,7 @@ if (NOT QT_FEATURE_private_tests)
 endif()
 # special case end
 
-add_qt_manual_test(tst_socketengine
+qt_add_manual_test(tst_socketengine
     SOURCES
         main.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/manual/textrendering/glyphshaping/CMakeLists.txt b/tests/manual/textrendering/glyphshaping/CMakeLists.txt
index 891503dea14..0dd163183b4 100644
--- a/tests/manual/textrendering/glyphshaping/CMakeLists.txt
+++ b/tests/manual/textrendering/glyphshaping/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## glyphshaping Binary:
 #####################################################################
 
-add_qt_manual_test(glyphshaping
+qt_add_manual_test(glyphshaping
     GUI
     SOURCES
         main.cpp
diff --git a/tests/manual/textrendering/nativetext/CMakeLists.txt b/tests/manual/textrendering/nativetext/CMakeLists.txt
index c03a8ed2883..b8f215f57bb 100644
--- a/tests/manual/textrendering/nativetext/CMakeLists.txt
+++ b/tests/manual/textrendering/nativetext/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## nativetext Binary:
 #####################################################################
 
-add_qt_manual_test(nativetext
+qt_add_manual_test(nativetext
     SOURCES
         main.cpp
     PUBLIC_LIBRARIES
@@ -17,7 +17,7 @@ add_qt_manual_test(nativetext
 ## Scopes:
 #####################################################################
 
-extend_target(nativetext CONDITION APPLE
+qt_extend_target(nativetext CONDITION APPLE
     PUBLIC_LIBRARIES
         ${FWAppKit}
         ${FWCoreGraphics}
diff --git a/tests/manual/textrendering/textperformance/CMakeLists.txt b/tests/manual/textrendering/textperformance/CMakeLists.txt
index cf21b4ecacb..b84db9e0aa7 100644
--- a/tests/manual/textrendering/textperformance/CMakeLists.txt
+++ b/tests/manual/textrendering/textperformance/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## textperformance Binary:
 #####################################################################
 
-add_qt_manual_test(textperformance
+qt_add_manual_test(textperformance
     GUI
     SOURCES
         main.cpp
diff --git a/tests/manual/touch/CMakeLists.txt b/tests/manual/touch/CMakeLists.txt
index 5f7e9ec286c..571e2bbcec9 100644
--- a/tests/manual/touch/CMakeLists.txt
+++ b/tests/manual/touch/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## touch Binary:
 #####################################################################
 
-add_qt_manual_test(touch
+qt_add_manual_test(touch
     SOURCES
         main.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/manual/touchGraphicsItem/CMakeLists.txt b/tests/manual/touchGraphicsItem/CMakeLists.txt
index cc02dcdab23..1055a761b27 100644
--- a/tests/manual/touchGraphicsItem/CMakeLists.txt
+++ b/tests/manual/touchGraphicsItem/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## touchGraphicsItem Binary:
 #####################################################################
 
-add_qt_manual_test(touchGraphicsItem
+qt_add_manual_test(touchGraphicsItem
     GUI
     SOURCES
         main.cpp
diff --git a/tests/manual/transientwindow/CMakeLists.txt b/tests/manual/transientwindow/CMakeLists.txt
index 0356bdcd022..c3307282c10 100644
--- a/tests/manual/transientwindow/CMakeLists.txt
+++ b/tests/manual/transientwindow/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## transientwindow Binary:
 #####################################################################
 
-add_qt_manual_test(transientwindow
+qt_add_manual_test(transientwindow
     GUI
     SOURCES
         main.cpp
diff --git a/tests/manual/triangulator/CMakeLists.txt b/tests/manual/triangulator/CMakeLists.txt
index f3ebfb28a9d..d3d6a8cc1f1 100644
--- a/tests/manual/triangulator/CMakeLists.txt
+++ b/tests/manual/triangulator/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## triangulator Binary:
 #####################################################################
 
-add_qt_manual_test(triangulator
+qt_add_manual_test(triangulator
     GUI
     SOURCES
         main.cpp
diff --git a/tests/manual/unc/CMakeLists.txt b/tests/manual/unc/CMakeLists.txt
index f63ffe34ad5..edab5ef368d 100644
--- a/tests/manual/unc/CMakeLists.txt
+++ b/tests/manual/unc/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## unc Binary:
 #####################################################################
 
-add_qt_manual_test(unc
+qt_add_manual_test(unc
     GUI
     SOURCES
         main.cpp
diff --git a/tests/manual/widgetgrab/CMakeLists.txt b/tests/manual/widgetgrab/CMakeLists.txt
index a5563882079..8285d19992d 100644
--- a/tests/manual/widgetgrab/CMakeLists.txt
+++ b/tests/manual/widgetgrab/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## widgetgrab Binary:
 #####################################################################
 
-add_qt_manual_test(widgetgrab
+qt_add_manual_test(widgetgrab
     GUI
     SOURCES
         main.cpp
diff --git a/tests/manual/widgets/itemviews/autoResizePrecision/tablehorz/CMakeLists.txt b/tests/manual/widgets/itemviews/autoResizePrecision/tablehorz/CMakeLists.txt
index 8d5730267d0..fe6202f6447 100644
--- a/tests/manual/widgets/itemviews/autoResizePrecision/tablehorz/CMakeLists.txt
+++ b/tests/manual/widgets/itemviews/autoResizePrecision/tablehorz/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## testtable1 Binary:
 #####################################################################
 
-add_qt_manual_test(testtable1
+qt_add_manual_test(testtable1
     GUI
     SOURCES
         testtable1.cpp
diff --git a/tests/manual/widgets/itemviews/autoResizePrecision/tablevert/CMakeLists.txt b/tests/manual/widgets/itemviews/autoResizePrecision/tablevert/CMakeLists.txt
index ed9f5c98eb5..ad27ac86982 100644
--- a/tests/manual/widgets/itemviews/autoResizePrecision/tablevert/CMakeLists.txt
+++ b/tests/manual/widgets/itemviews/autoResizePrecision/tablevert/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## testtable2 Binary:
 #####################################################################
 
-add_qt_manual_test(testtable2
+qt_add_manual_test(testtable2
     GUI
     SOURCES
         testtable2.cpp
diff --git a/tests/manual/widgets/itemviews/autoResizePrecision/treeview/CMakeLists.txt b/tests/manual/widgets/itemviews/autoResizePrecision/treeview/CMakeLists.txt
index 33073d3a42d..9812b7956fb 100644
--- a/tests/manual/widgets/itemviews/autoResizePrecision/treeview/CMakeLists.txt
+++ b/tests/manual/widgets/itemviews/autoResizePrecision/treeview/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## testtree Binary:
 #####################################################################
 
-add_qt_manual_test(testtree
+qt_add_manual_test(testtree
     GUI
     SOURCES
         testtree.cpp
diff --git a/tests/manual/widgets/itemviews/delegate/CMakeLists.txt b/tests/manual/widgets/itemviews/delegate/CMakeLists.txt
index 533cf4913e8..b00639bc3fb 100644
--- a/tests/manual/widgets/itemviews/delegate/CMakeLists.txt
+++ b/tests/manual/widgets/itemviews/delegate/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## delegate Binary:
 #####################################################################
 
-add_qt_manual_test(delegate
+qt_add_manual_test(delegate
     GUI
     SOURCES
         example.cpp
diff --git a/tests/manual/widgets/itemviews/qconcatenatetablesproxymodel/CMakeLists.txt b/tests/manual/widgets/itemviews/qconcatenatetablesproxymodel/CMakeLists.txt
index 21c7ed431e9..47d53d16461 100644
--- a/tests/manual/widgets/itemviews/qconcatenatetablesproxymodel/CMakeLists.txt
+++ b/tests/manual/widgets/itemviews/qconcatenatetablesproxymodel/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qconcatenatetablesproxymodel Binary:
 #####################################################################
 
-add_qt_manual_test(qconcatenatetablesproxymodel
+qt_add_manual_test(qconcatenatetablesproxymodel
     GUI
     SOURCES
         main.cpp
diff --git a/tests/manual/widgets/itemviews/qheaderview/CMakeLists.txt b/tests/manual/widgets/itemviews/qheaderview/CMakeLists.txt
index eeb9913126c..d99ecf0f399 100644
--- a/tests/manual/widgets/itemviews/qheaderview/CMakeLists.txt
+++ b/tests/manual/widgets/itemviews/qheaderview/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qheaderview Binary:
 #####################################################################
 
-add_qt_manual_test(qheaderview
+qt_add_manual_test(qheaderview
     GUI
     SOURCES
         qheaderviewtest1.cpp
diff --git a/tests/manual/widgets/itemviews/qtreeview/CMakeLists.txt b/tests/manual/widgets/itemviews/qtreeview/CMakeLists.txt
index ff69f09cf06..06bf5b71a6a 100644
--- a/tests/manual/widgets/itemviews/qtreeview/CMakeLists.txt
+++ b/tests/manual/widgets/itemviews/qtreeview/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qtreeview Binary:
 #####################################################################
 
-add_qt_manual_test(qtreeview
+qt_add_manual_test(qtreeview
     GUI
     SOURCES
         main.cpp
diff --git a/tests/manual/widgets/itemviews/qtreewidget/CMakeLists.txt b/tests/manual/widgets/itemviews/qtreewidget/CMakeLists.txt
index f6b1a2f7eba..ada07cd5f8a 100644
--- a/tests/manual/widgets/itemviews/qtreewidget/CMakeLists.txt
+++ b/tests/manual/widgets/itemviews/qtreewidget/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qtreewidget Binary:
 #####################################################################
 
-add_qt_manual_test(qtreewidget
+qt_add_manual_test(qtreewidget
     GUI
     SOURCES
         main.cpp
diff --git a/tests/manual/widgets/itemviews/tableview-span-navigation/CMakeLists.txt b/tests/manual/widgets/itemviews/tableview-span-navigation/CMakeLists.txt
index f9efb5373d5..cad99e4783c 100644
--- a/tests/manual/widgets/itemviews/tableview-span-navigation/CMakeLists.txt
+++ b/tests/manual/widgets/itemviews/tableview-span-navigation/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tableview-span-navigation Binary:
 #####################################################################
 
-add_qt_manual_test(tableview-span-navigation
+qt_add_manual_test(tableview-span-navigation
     GUI
     SOURCES
         main.cpp
diff --git a/tests/manual/widgets/kernel/.prev_CMakeLists.txt b/tests/manual/widgets/kernel/.prev_CMakeLists.txt
new file mode 100644
index 00000000000..0c03aec3199
--- /dev/null
+++ b/tests/manual/widgets/kernel/.prev_CMakeLists.txt
@@ -0,0 +1,5 @@
+# Generated from kernel.pro.
+
+add_subdirectory(qtooltip)
+add_subdirectory(sizeonhide)
+add_subdirectory(layoutreplace)
diff --git a/tests/manual/widgets/kernel/layoutreplace/CMakeLists.txt b/tests/manual/widgets/kernel/layoutreplace/CMakeLists.txt
index 04b36ee4e37..1f36f4c326e 100644
--- a/tests/manual/widgets/kernel/layoutreplace/CMakeLists.txt
+++ b/tests/manual/widgets/kernel/layoutreplace/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## layoutreplace Binary:
 #####################################################################
 
-add_qt_manual_test(layoutreplace
+qt_add_manual_test(layoutreplace
     GUI
     SOURCES
         main.cpp
diff --git a/tests/manual/widgets/kernel/qtooltip/CMakeLists.txt b/tests/manual/widgets/kernel/qtooltip/CMakeLists.txt
index 2b30e5eeec8..10d98cb0c5b 100644
--- a/tests/manual/widgets/kernel/qtooltip/CMakeLists.txt
+++ b/tests/manual/widgets/kernel/qtooltip/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qtooltip Binary:
 #####################################################################
 
-add_qt_manual_test(qtooltip
+qt_add_manual_test(qtooltip
     SOURCES
         main.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/manual/widgets/kernel/sizeonhide/CMakeLists.txt b/tests/manual/widgets/kernel/sizeonhide/CMakeLists.txt
index b1f8353a4f6..de3b7241964 100644
--- a/tests/manual/widgets/kernel/sizeonhide/CMakeLists.txt
+++ b/tests/manual/widgets/kernel/sizeonhide/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## sizeonhide Binary:
 #####################################################################
 
-add_qt_manual_test(sizeonhide
+qt_add_manual_test(sizeonhide
     GUI
     SOURCES
         main.cpp
diff --git a/tests/manual/widgets/qgraphicsview/rubberband/CMakeLists.txt b/tests/manual/widgets/qgraphicsview/rubberband/CMakeLists.txt
index 726404679ed..06e5029bb56 100644
--- a/tests/manual/widgets/qgraphicsview/rubberband/CMakeLists.txt
+++ b/tests/manual/widgets/qgraphicsview/rubberband/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## rubberband Binary:
 #####################################################################
 
-add_qt_manual_test(rubberband
+qt_add_manual_test(rubberband
     GUI
     SOURCES
         rubberbandtest.cpp
diff --git a/tests/manual/widgets/styles/CMakeLists.txt b/tests/manual/widgets/styles/CMakeLists.txt
index 26fa8317cca..4dfa6d7d307 100644
--- a/tests/manual/widgets/styles/CMakeLists.txt
+++ b/tests/manual/widgets/styles/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_manual_styles Binary:
 #####################################################################
 
-add_qt_manual_test(tst_manual_styles
+qt_add_manual_test(tst_manual_styles
     SOURCES
         main.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/manual/widgets/widgets/CMakeLists.txt b/tests/manual/widgets/widgets/CMakeLists.txt
index d760abdd59d..446a3dfb033 100644
--- a/tests/manual/widgets/widgets/CMakeLists.txt
+++ b/tests/manual/widgets/widgets/CMakeLists.txt
@@ -4,3 +4,4 @@ add_subdirectory(bigmenucreator)
 add_subdirectory(defaultUpMenuBar)
 add_subdirectory(multiscreen-menus)
 add_subdirectory(qtoolbutton/menuOnMultiScreens)
+add_subdirectory(qtabbar)
diff --git a/tests/manual/widgets/widgets/bigmenucreator/CMakeLists.txt b/tests/manual/widgets/widgets/bigmenucreator/CMakeLists.txt
index f0161997c0d..44db18eefeb 100644
--- a/tests/manual/widgets/widgets/bigmenucreator/CMakeLists.txt
+++ b/tests/manual/widgets/widgets/bigmenucreator/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## BigMenuCreator Binary:
 #####################################################################
 
-add_qt_manual_test(BigMenuCreator
+qt_add_manual_test(BigMenuCreator
     GUI
     SOURCES
         main.cpp
diff --git a/tests/manual/widgets/widgets/defaultUpMenuBar/CMakeLists.txt b/tests/manual/widgets/widgets/defaultUpMenuBar/CMakeLists.txt
index 8d866723276..327721ac635 100644
--- a/tests/manual/widgets/widgets/defaultUpMenuBar/CMakeLists.txt
+++ b/tests/manual/widgets/widgets/defaultUpMenuBar/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## defaultUpMenuBar Binary:
 #####################################################################
 
-add_qt_manual_test(defaultUpMenuBar
+qt_add_manual_test(defaultUpMenuBar
     GUI
     SOURCES
         main.cpp
diff --git a/tests/manual/widgets/widgets/multiscreen-menus/CMakeLists.txt b/tests/manual/widgets/widgets/multiscreen-menus/CMakeLists.txt
index b750431d583..40fd38edf71 100644
--- a/tests/manual/widgets/widgets/multiscreen-menus/CMakeLists.txt
+++ b/tests/manual/widgets/widgets/multiscreen-menus/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## multiscreen-menus Binary:
 #####################################################################
 
-add_qt_manual_test(multiscreen-menus
+qt_add_manual_test(multiscreen-menus
     GUI
     SOURCES
         main.cpp
diff --git a/tests/manual/widgets/widgets/qmainwindow/saveStateSize/CMakeLists.txt b/tests/manual/widgets/widgets/qmainwindow/saveStateSize/CMakeLists.txt
index 461b595a686..e49d5ea559c 100644
--- a/tests/manual/widgets/widgets/qmainwindow/saveStateSize/CMakeLists.txt
+++ b/tests/manual/widgets/widgets/qmainwindow/saveStateSize/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## saveStateSize Binary:
 #####################################################################
 
-add_qt_manual_test(saveStateSize
+qt_add_manual_test(saveStateSize
     GUI
     SOURCES
         main.cpp
diff --git a/tests/manual/widgets/widgets/qtabbar/CMakeLists.txt b/tests/manual/widgets/widgets/qtabbar/CMakeLists.txt
new file mode 100644
index 00000000000..cb4ee1f4d19
--- /dev/null
+++ b/tests/manual/widgets/widgets/qtabbar/CMakeLists.txt
@@ -0,0 +1,14 @@
+# Generated from qtabbar.pro.
+
+#####################################################################
+## qtabbar Binary:
+#####################################################################
+
+qt_add_manual_test(qtabbar
+    GUI
+    PUBLIC_LIBRARIES
+        Qt::Gui
+)
+
+#### Keys ignored in scope 1:.:.:qtabbar.pro:<TRUE>:
+# SUBDIRS = "stylesheet"
diff --git a/tests/manual/widgets/widgets/qtoolbutton/menuOnMultiScreens/CMakeLists.txt b/tests/manual/widgets/widgets/qtoolbutton/menuOnMultiScreens/CMakeLists.txt
index f49d630de70..4be0bcf05e5 100644
--- a/tests/manual/widgets/widgets/qtoolbutton/menuOnMultiScreens/CMakeLists.txt
+++ b/tests/manual/widgets/widgets/qtoolbutton/menuOnMultiScreens/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## menuOnMultiScreens Binary:
 #####################################################################
 
-add_qt_manual_test(menuOnMultiScreens
+qt_add_manual_test(menuOnMultiScreens
     GUI
     SOURCES
         main.cpp
diff --git a/tests/manual/windowchildgeometry/CMakeLists.txt b/tests/manual/windowchildgeometry/CMakeLists.txt
index e6f7c232a36..22b4af820b1 100644
--- a/tests/manual/windowchildgeometry/CMakeLists.txt
+++ b/tests/manual/windowchildgeometry/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## windowchildgeometry Binary:
 #####################################################################
 
-add_qt_manual_test(windowchildgeometry
+qt_add_manual_test(windowchildgeometry
     GUI
     SOURCES
         ../windowflags/controls.cpp ../windowflags/controls.h
diff --git a/tests/manual/windowflags/CMakeLists.txt b/tests/manual/windowflags/CMakeLists.txt
index 1aba06d9a11..179acbef727 100644
--- a/tests/manual/windowflags/CMakeLists.txt
+++ b/tests/manual/windowflags/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_manual_windowflags Binary:
 #####################################################################
 
-add_qt_manual_test(tst_manual_windowflags
+qt_add_manual_test(tst_manual_windowflags
     GUI
     SOURCES
         controllerwindow.cpp controllerwindow.h
diff --git a/tests/manual/windowgeometry/CMakeLists.txt b/tests/manual/windowgeometry/CMakeLists.txt
index adeae599fc8..1c158a513ad 100644
--- a/tests/manual/windowgeometry/CMakeLists.txt
+++ b/tests/manual/windowgeometry/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## windowgeometry Binary:
 #####################################################################
 
-add_qt_manual_test(windowgeometry
+qt_add_manual_test(windowgeometry
     GUI
     SOURCES
         ../windowflags/controls.cpp ../windowflags/controls.h
diff --git a/tests/manual/windowmodality/CMakeLists.txt b/tests/manual/windowmodality/CMakeLists.txt
index 67e6071add3..02280cef9b3 100644
--- a/tests/manual/windowmodality/CMakeLists.txt
+++ b/tests/manual/windowmodality/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## windowmodality Binary:
 #####################################################################
 
-add_qt_manual_test(windowmodality
+qt_add_manual_test(windowmodality
     GUI
     SOURCES
         dialog.ui
diff --git a/tests/manual/windowtransparency/CMakeLists.txt b/tests/manual/windowtransparency/CMakeLists.txt
index 42de6d67c69..6b245898dce 100644
--- a/tests/manual/windowtransparency/CMakeLists.txt
+++ b/tests/manual/windowtransparency/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## windowtransparency Binary:
 #####################################################################
 
-add_qt_manual_test(windowtransparency
+qt_add_manual_test(windowtransparency
     SOURCES
         windowtransparency.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/manual/xcb_gl_integration/CMakeLists.txt b/tests/manual/xcb_gl_integration/CMakeLists.txt
index e92e47fb8a1..6d3f32e68ef 100644
--- a/tests/manual/xcb_gl_integration/CMakeLists.txt
+++ b/tests/manual/xcb_gl_integration/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## xcb_gl_integration Binary:
 #####################################################################
 
-add_qt_manual_test(xcb_gl_integration
+qt_add_manual_test(xcb_gl_integration
     GUI
     SOURCES
         main.cpp
diff --git a/tests/manual/xembed-raster/CMakeLists.txt b/tests/manual/xembed-raster/CMakeLists.txt
index 6c8996e9c15..be322752222 100644
--- a/tests/manual/xembed-raster/CMakeLists.txt
+++ b/tests/manual/xembed-raster/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_manual_rasterwindow Binary:
 #####################################################################
 
-add_qt_manual_test(tst_manual_rasterwindow
+qt_add_manual_test(tst_manual_rasterwindow
     GUI
     SOURCES
         main.cpp
diff --git a/tests/manual/xembed-widgets/CMakeLists.txt b/tests/manual/xembed-widgets/CMakeLists.txt
index ed8c5355a98..2164095c784 100644
--- a/tests/manual/xembed-widgets/CMakeLists.txt
+++ b/tests/manual/xembed-widgets/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_manual_lineedits Binary:
 #####################################################################
 
-add_qt_manual_test(tst_manual_lineedits
+qt_add_manual_test(tst_manual_lineedits
     GUI
     SOURCES
         main.cpp
author	Alexandru Croitor <[email protected]>	2020-07-07 16:56:37 +0200
committer	Alexandru Croitor <[email protected]>	2020-07-08 11:01:38 +0200
commit	1339cc46678f475f788c9e86618c3824dd86a7ea (patch)
tree	c339140546e725a4b0d4cc9a7ab92e597ebcff40
parent	adbadc57df9f70ee4144f0dd2425192593656394 (diff)