CMake: Regenerate tests with new qt_ prefixed APIs

Use pro2cmake with '--api-version 2' to force regenerate
projects to use the new prefixed qt_foo APIs.

Change-Id: I055c4837860319e93aaa6b09d646dda4fc2a4069
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>

48 files changed, 58 insertions, 58 deletions

diff --git a/tests/auto/widgets/widgets/qabstractbutton/CMakeLists.txt b/tests/auto/widgets/widgets/qabstractbutton/CMakeLists.txt
index 48a174b6e1..a308721727 100644
--- a/tests/auto/widgets/widgets/qabstractbutton/CMakeLists.txt
+++ b/tests/auto/widgets/widgets/qabstractbutton/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qabstractbutton Test:
 #####################################################################
 
-add_qt_test(tst_qabstractbutton
+qt_add_test(tst_qabstractbutton
     SOURCES
         tst_qabstractbutton.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/widgets/widgets/qabstractscrollarea/CMakeLists.txt b/tests/auto/widgets/widgets/qabstractscrollarea/CMakeLists.txt
index cb1b2aa936..4a72b409e3 100644
--- a/tests/auto/widgets/widgets/qabstractscrollarea/CMakeLists.txt
+++ b/tests/auto/widgets/widgets/qabstractscrollarea/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qabstractscrollarea Test:
 #####################################################################
 
-add_qt_test(tst_qabstractscrollarea
+qt_add_test(tst_qabstractscrollarea
     SOURCES
         tst_qabstractscrollarea.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/widgets/widgets/qabstractslider/CMakeLists.txt b/tests/auto/widgets/widgets/qabstractslider/CMakeLists.txt
index 0dbbf63239..d2dbcb3585 100644
--- a/tests/auto/widgets/widgets/qabstractslider/CMakeLists.txt
+++ b/tests/auto/widgets/widgets/qabstractslider/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qabstractslider Test:
 #####################################################################
 
-add_qt_test(tst_qabstractslider
+qt_add_test(tst_qabstractslider
     SOURCES
         tst_qabstractslider.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/widgets/widgets/qabstractspinbox/CMakeLists.txt b/tests/auto/widgets/widgets/qabstractspinbox/CMakeLists.txt
index 32c814c535..3ca8eb63d0 100644
--- a/tests/auto/widgets/widgets/qabstractspinbox/CMakeLists.txt
+++ b/tests/auto/widgets/widgets/qabstractspinbox/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qabstractspinbox Test:
 #####################################################################
 
-add_qt_test(tst_qabstractspinbox
+qt_add_test(tst_qabstractspinbox
     SOURCES
         tst_qabstractspinbox.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/widgets/widgets/qbuttongroup/CMakeLists.txt b/tests/auto/widgets/widgets/qbuttongroup/CMakeLists.txt
index 92d04e0c26..822fdf223c 100644
--- a/tests/auto/widgets/widgets/qbuttongroup/CMakeLists.txt
+++ b/tests/auto/widgets/widgets/qbuttongroup/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qbuttongroup Test:
 #####################################################################
 
-add_qt_test(tst_qbuttongroup
+qt_add_test(tst_qbuttongroup
     SOURCES
         tst_qbuttongroup.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/widgets/widgets/qcalendarwidget/CMakeLists.txt b/tests/auto/widgets/widgets/qcalendarwidget/CMakeLists.txt
index 10e24a1016..051b00d0bb 100644
--- a/tests/auto/widgets/widgets/qcalendarwidget/CMakeLists.txt
+++ b/tests/auto/widgets/widgets/qcalendarwidget/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qcalendarwidget Test:
 #####################################################################
 
-add_qt_test(tst_qcalendarwidget
+qt_add_test(tst_qcalendarwidget
     SOURCES
         tst_qcalendarwidget.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/widgets/widgets/qcheckbox/CMakeLists.txt b/tests/auto/widgets/widgets/qcheckbox/CMakeLists.txt
index 2418791e5d..1c44111753 100644
--- a/tests/auto/widgets/widgets/qcheckbox/CMakeLists.txt
+++ b/tests/auto/widgets/widgets/qcheckbox/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qcheckbox Test:
 #####################################################################
 
-add_qt_test(tst_qcheckbox
+qt_add_test(tst_qcheckbox
     SOURCES
         tst_qcheckbox.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/widgets/widgets/qcombobox/CMakeLists.txt b/tests/auto/widgets/widgets/qcombobox/CMakeLists.txt
index 95fbe14eec..a0aabd6773 100644
--- a/tests/auto/widgets/widgets/qcombobox/CMakeLists.txt
+++ b/tests/auto/widgets/widgets/qcombobox/CMakeLists.txt
@@ -8,7 +8,7 @@
 list(APPEND test_data "qtlogo.png")
 list(APPEND test_data "qtlogoinverted.png")
 
-add_qt_test(tst_qcombobox
+qt_add_test(tst_qcombobox
     SOURCES
         tst_qcombobox.cpp
     DEFINES
diff --git a/tests/auto/widgets/widgets/qcommandlinkbutton/CMakeLists.txt b/tests/auto/widgets/widgets/qcommandlinkbutton/CMakeLists.txt
index 59ba375358..5beababe97 100644
--- a/tests/auto/widgets/widgets/qcommandlinkbutton/CMakeLists.txt
+++ b/tests/auto/widgets/widgets/qcommandlinkbutton/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qcommandlinkbutton Test:
 #####################################################################
 
-add_qt_test(tst_qcommandlinkbutton
+qt_add_test(tst_qcommandlinkbutton
     SOURCES
         tst_qcommandlinkbutton.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/widgets/widgets/qdatetimeedit/CMakeLists.txt b/tests/auto/widgets/widgets/qdatetimeedit/CMakeLists.txt
index 8eb294d361..8db1423992 100644
--- a/tests/auto/widgets/widgets/qdatetimeedit/CMakeLists.txt
+++ b/tests/auto/widgets/widgets/qdatetimeedit/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qdatetimeedit Test:
 #####################################################################
 
-add_qt_test(tst_qdatetimeedit
+qt_add_test(tst_qdatetimeedit
     SOURCES
         tst_qdatetimeedit.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/widgets/widgets/qdial/CMakeLists.txt b/tests/auto/widgets/widgets/qdial/CMakeLists.txt
index e725edacb6..162eda24eb 100644
--- a/tests/auto/widgets/widgets/qdial/CMakeLists.txt
+++ b/tests/auto/widgets/widgets/qdial/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qdial Test:
 #####################################################################
 
-add_qt_test(tst_qdial
+qt_add_test(tst_qdial
     SOURCES
         tst_qdial.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/widgets/widgets/qdialogbuttonbox/CMakeLists.txt b/tests/auto/widgets/widgets/qdialogbuttonbox/CMakeLists.txt
index c4961f13a1..16ad2286fb 100644
--- a/tests/auto/widgets/widgets/qdialogbuttonbox/CMakeLists.txt
+++ b/tests/auto/widgets/widgets/qdialogbuttonbox/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qdialogbuttonbox Test:
 #####################################################################
 
-add_qt_test(tst_qdialogbuttonbox
+qt_add_test(tst_qdialogbuttonbox
     SOURCES
         tst_qdialogbuttonbox.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/widgets/widgets/qdockwidget/CMakeLists.txt b/tests/auto/widgets/widgets/qdockwidget/CMakeLists.txt
index e2b6cc5942..0f3e83cead 100644
--- a/tests/auto/widgets/widgets/qdockwidget/CMakeLists.txt
+++ b/tests/auto/widgets/widgets/qdockwidget/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qdockwidget Test:
 #####################################################################
 
-add_qt_test(tst_qdockwidget
+qt_add_test(tst_qdockwidget
     SOURCES
         tst_qdockwidget.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/widgets/widgets/qdoublespinbox/CMakeLists.txt b/tests/auto/widgets/widgets/qdoublespinbox/CMakeLists.txt
index b639289db8..bef0745d01 100644
--- a/tests/auto/widgets/widgets/qdoublespinbox/CMakeLists.txt
+++ b/tests/auto/widgets/widgets/qdoublespinbox/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qdoublespinbox Test:
 #####################################################################
 
-add_qt_test(tst_qdoublespinbox
+qt_add_test(tst_qdoublespinbox
     SOURCES
         tst_qdoublespinbox.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/widgets/widgets/qfocusframe/CMakeLists.txt b/tests/auto/widgets/widgets/qfocusframe/CMakeLists.txt
index 85160faed7..6456e5b7c5 100644
--- a/tests/auto/widgets/widgets/qfocusframe/CMakeLists.txt
+++ b/tests/auto/widgets/widgets/qfocusframe/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qfocusframe Test:
 #####################################################################
 
-add_qt_test(tst_qfocusframe
+qt_add_test(tst_qfocusframe
     SOURCES
         tst_qfocusframe.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/widgets/widgets/qfontcombobox/CMakeLists.txt b/tests/auto/widgets/widgets/qfontcombobox/CMakeLists.txt
index 777abc48c5..1500be0023 100644
--- a/tests/auto/widgets/widgets/qfontcombobox/CMakeLists.txt
+++ b/tests/auto/widgets/widgets/qfontcombobox/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qfontcombobox Test:
 #####################################################################
 
-add_qt_test(tst_qfontcombobox
+qt_add_test(tst_qfontcombobox
     SOURCES
         tst_qfontcombobox.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/widgets/widgets/qframe/CMakeLists.txt b/tests/auto/widgets/widgets/qframe/CMakeLists.txt
index ae23555fa5..89f91d1967 100644
--- a/tests/auto/widgets/widgets/qframe/CMakeLists.txt
+++ b/tests/auto/widgets/widgets/qframe/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     images/*)
 list(APPEND test_data ${test_data_glob})
 
-add_qt_test(tst_qframe
+qt_add_test(tst_qframe
     SOURCES
         tst_qframe.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/widgets/widgets/qgroupbox/CMakeLists.txt b/tests/auto/widgets/widgets/qgroupbox/CMakeLists.txt
index 09d4623cd9..d71fcd18d8 100644
--- a/tests/auto/widgets/widgets/qgroupbox/CMakeLists.txt
+++ b/tests/auto/widgets/widgets/qgroupbox/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qgroupbox Test:
 #####################################################################
 
-add_qt_test(tst_qgroupbox
+qt_add_test(tst_qgroupbox
     SOURCES
         tst_qgroupbox.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/widgets/widgets/qkeysequenceedit/CMakeLists.txt b/tests/auto/widgets/widgets/qkeysequenceedit/CMakeLists.txt
index c57f8b5c0a..e373c14ea4 100644
--- a/tests/auto/widgets/widgets/qkeysequenceedit/CMakeLists.txt
+++ b/tests/auto/widgets/widgets/qkeysequenceedit/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qkeysequenceedit Test:
 #####################################################################
 
-add_qt_test(tst_qkeysequenceedit
+qt_add_test(tst_qkeysequenceedit
     SOURCES
         tst_qkeysequenceedit.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/widgets/widgets/qlabel/CMakeLists.txt b/tests/auto/widgets/widgets/qlabel/CMakeLists.txt
index a4fe508a02..6f8ac33b83 100644
--- a/tests/auto/widgets/widgets/qlabel/CMakeLists.txt
+++ b/tests/auto/widgets/widgets/qlabel/CMakeLists.txt
@@ -14,7 +14,7 @@ file(GLOB_RECURSE test_data_glob
     *.png)
 list(APPEND test_data ${test_data_glob})
 
-add_qt_test(tst_qlabel
+qt_add_test(tst_qlabel
     SOURCES
         tst_qlabel.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/widgets/widgets/qlcdnumber/CMakeLists.txt b/tests/auto/widgets/widgets/qlcdnumber/CMakeLists.txt
index fbd9ff5913..739b9bb55f 100644
--- a/tests/auto/widgets/widgets/qlcdnumber/CMakeLists.txt
+++ b/tests/auto/widgets/widgets/qlcdnumber/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qlcdnumber Test:
 #####################################################################
 
-add_qt_test(tst_qlcdnumber
+qt_add_test(tst_qlcdnumber
     SOURCES
         tst_qlcdnumber.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/widgets/widgets/qlineedit/CMakeLists.txt b/tests/auto/widgets/widgets/qlineedit/CMakeLists.txt
index 615a5a98cb..cdb026c220 100644
--- a/tests/auto/widgets/widgets/qlineedit/CMakeLists.txt
+++ b/tests/auto/widgets/widgets/qlineedit/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qlineedit Test:
 #####################################################################
 
-add_qt_test(tst_qlineedit
+qt_add_test(tst_qlineedit
     SOURCES
         tst_qlineedit.cpp
     PUBLIC_LIBRARIES
@@ -19,7 +19,7 @@ add_qt_test(tst_qlineedit
 ## Scopes:
 #####################################################################
 
-extend_target(tst_qlineedit CONDITION MACOS
+qt_extend_target(tst_qlineedit CONDITION MACOS
     PUBLIC_LIBRARIES
         ${FWAppKit}
 )
diff --git a/tests/auto/widgets/widgets/qmainwindow/CMakeLists.txt b/tests/auto/widgets/widgets/qmainwindow/CMakeLists.txt
index 55bcf941d0..93d0e212c6 100644
--- a/tests/auto/widgets/widgets/qmainwindow/CMakeLists.txt
+++ b/tests/auto/widgets/widgets/qmainwindow/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qmainwindow Test:
 #####################################################################
 
-add_qt_test(tst_qmainwindow
+qt_add_test(tst_qmainwindow
     SOURCES
         tst_qmainwindow.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/widgets/widgets/qmdiarea/CMakeLists.txt b/tests/auto/widgets/widgets/qmdiarea/CMakeLists.txt
index 961bd09492..aa694bd9b7 100644
--- a/tests/auto/widgets/widgets/qmdiarea/CMakeLists.txt
+++ b/tests/auto/widgets/widgets/qmdiarea/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qmdiarea Test:
 #####################################################################
 
-add_qt_test(tst_qmdiarea
+qt_add_test(tst_qmdiarea
     SOURCES
         tst_qmdiarea.cpp
     DEFINES
@@ -21,12 +21,12 @@ add_qt_test(tst_qmdiarea
 ## Scopes:
 #####################################################################
 
-extend_target(tst_qmdiarea CONDITION TARGET Qt::OpenGL
+qt_extend_target(tst_qmdiarea CONDITION TARGET Qt::OpenGL
     PUBLIC_LIBRARIES
         Qt::OpenGL
 )
 
-extend_target(tst_qmdiarea CONDITION APPLE
+qt_extend_target(tst_qmdiarea CONDITION APPLE
     PUBLIC_LIBRARIES
         ${FWSecurity}
 )
diff --git a/tests/auto/widgets/widgets/qmdisubwindow/CMakeLists.txt b/tests/auto/widgets/widgets/qmdisubwindow/CMakeLists.txt
index 791d411970..47c8078777 100644
--- a/tests/auto/widgets/widgets/qmdisubwindow/CMakeLists.txt
+++ b/tests/auto/widgets/widgets/qmdisubwindow/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qmdisubwindow Test:
 #####################################################################
 
-add_qt_test(tst_qmdisubwindow
+qt_add_test(tst_qmdisubwindow
     SOURCES
         tst_qmdisubwindow.cpp
     DEFINES
diff --git a/tests/auto/widgets/widgets/qmenu/CMakeLists.txt b/tests/auto/widgets/widgets/qmenu/CMakeLists.txt
index 63037b7eaa..493e8af6b1 100644
--- a/tests/auto/widgets/widgets/qmenu/CMakeLists.txt
+++ b/tests/auto/widgets/widgets/qmenu/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qmenu Test:
 #####################################################################
 
-add_qt_test(tst_qmenu
+qt_add_test(tst_qmenu
     SOURCES
         tst_qmenu.cpp
     PUBLIC_LIBRARIES
@@ -17,14 +17,14 @@ add_qt_test(tst_qmenu
 ## Scopes:
 #####################################################################
 
-extend_target(tst_qmenu CONDITION MACOS
+qt_extend_target(tst_qmenu CONDITION MACOS
     SOURCES
         tst_qmenu_mac.mm
     PUBLIC_LIBRARIES
         objc
 )
 
-extend_target(tst_qmenu CONDITION NOT MACOS
+qt_extend_target(tst_qmenu CONDITION NOT MACOS
     DEFINES
         QTEST_QPA_MOUSE_HANDLING
 )
diff --git a/tests/auto/widgets/widgets/qmenubar/CMakeLists.txt b/tests/auto/widgets/widgets/qmenubar/CMakeLists.txt
index 415f2aa79f..1b412981d8 100644
--- a/tests/auto/widgets/widgets/qmenubar/CMakeLists.txt
+++ b/tests/auto/widgets/widgets/qmenubar/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qmenubar Test:
 #####################################################################
 
-add_qt_test(tst_qmenubar
+qt_add_test(tst_qmenubar
     SOURCES
         tst_qmenubar.cpp
     PUBLIC_LIBRARIES
@@ -16,7 +16,7 @@ add_qt_test(tst_qmenubar
 ## Scopes:
 #####################################################################
 
-extend_target(tst_qmenubar CONDITION MACOS
+qt_extend_target(tst_qmenubar CONDITION MACOS
     SOURCES
         tst_qmenubar_mac.mm
     PUBLIC_LIBRARIES
diff --git a/tests/auto/widgets/widgets/qopenglwidget/CMakeLists.txt b/tests/auto/widgets/widgets/qopenglwidget/CMakeLists.txt
index c3fdf39fe1..d1af2e811c 100644
--- a/tests/auto/widgets/widgets/qopenglwidget/CMakeLists.txt
+++ b/tests/auto/widgets/widgets/qopenglwidget/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qopenglwidget Test:
 #####################################################################
 
-add_qt_test(tst_qopenglwidget
+qt_add_test(tst_qopenglwidget
     SOURCES
         tst_qopenglwidget.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/widgets/widgets/qplaintextedit/CMakeLists.txt b/tests/auto/widgets/widgets/qplaintextedit/CMakeLists.txt
index cb00d5dd93..994f2b97ab 100644
--- a/tests/auto/widgets/widgets/qplaintextedit/CMakeLists.txt
+++ b/tests/auto/widgets/widgets/qplaintextedit/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qplaintextedit Test:
 #####################################################################
 
-add_qt_test(tst_qplaintextedit
+qt_add_test(tst_qplaintextedit
     SOURCES
         tst_qplaintextedit.cpp
     INCLUDE_DIRECTORIES
@@ -19,7 +19,7 @@ add_qt_test(tst_qplaintextedit
 ## Scopes:
 #####################################################################
 
-extend_target(tst_qplaintextedit CONDITION MACOS
+qt_extend_target(tst_qplaintextedit CONDITION MACOS
     PUBLIC_LIBRARIES
         ${FWAppKit}
 )
diff --git a/tests/auto/widgets/widgets/qprogressbar/CMakeLists.txt b/tests/auto/widgets/widgets/qprogressbar/CMakeLists.txt
index f8b3ac38d9..34131ba34e 100644
--- a/tests/auto/widgets/widgets/qprogressbar/CMakeLists.txt
+++ b/tests/auto/widgets/widgets/qprogressbar/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qprogressbar Test:
 #####################################################################
 
-add_qt_test(tst_qprogressbar
+qt_add_test(tst_qprogressbar
     SOURCES
         tst_qprogressbar.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/widgets/widgets/qpushbutton/CMakeLists.txt b/tests/auto/widgets/widgets/qpushbutton/CMakeLists.txt
index 8d1300de79..186bce967f 100644
--- a/tests/auto/widgets/widgets/qpushbutton/CMakeLists.txt
+++ b/tests/auto/widgets/widgets/qpushbutton/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qpushbutton Test:
 #####################################################################
 
-add_qt_test(tst_qpushbutton
+qt_add_test(tst_qpushbutton
     SOURCES
         tst_qpushbutton.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/widgets/widgets/qradiobutton/CMakeLists.txt b/tests/auto/widgets/widgets/qradiobutton/CMakeLists.txt
index 10db8a2db8..194f6689fe 100644
--- a/tests/auto/widgets/widgets/qradiobutton/CMakeLists.txt
+++ b/tests/auto/widgets/widgets/qradiobutton/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qradiobutton Test:
 #####################################################################
 
-add_qt_test(tst_qradiobutton
+qt_add_test(tst_qradiobutton
     SOURCES
         tst_qradiobutton.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/widgets/widgets/qscrollarea/CMakeLists.txt b/tests/auto/widgets/widgets/qscrollarea/CMakeLists.txt
index cdfb32e0a2..0de4565b5d 100644
--- a/tests/auto/widgets/widgets/qscrollarea/CMakeLists.txt
+++ b/tests/auto/widgets/widgets/qscrollarea/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qscrollarea Test:
 #####################################################################
 
-add_qt_test(tst_qscrollarea
+qt_add_test(tst_qscrollarea
     SOURCES
         tst_qscrollarea.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/widgets/widgets/qscrollbar/CMakeLists.txt b/tests/auto/widgets/widgets/qscrollbar/CMakeLists.txt
index 83d091755f..8b9a3d85ce 100644
--- a/tests/auto/widgets/widgets/qscrollbar/CMakeLists.txt
+++ b/tests/auto/widgets/widgets/qscrollbar/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qscrollbar Test:
 #####################################################################
 
-add_qt_test(tst_qscrollbar
+qt_add_test(tst_qscrollbar
     SOURCES
         tst_qscrollbar.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/widgets/widgets/qsizegrip/CMakeLists.txt b/tests/auto/widgets/widgets/qsizegrip/CMakeLists.txt
index d3b28797f2..084b6b1404 100644
--- a/tests/auto/widgets/widgets/qsizegrip/CMakeLists.txt
+++ b/tests/auto/widgets/widgets/qsizegrip/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qsizegrip Test:
 #####################################################################
 
-add_qt_test(tst_qsizegrip
+qt_add_test(tst_qsizegrip
     SOURCES
         tst_qsizegrip.cpp
     INCLUDE_DIRECTORIES
diff --git a/tests/auto/widgets/widgets/qslider/CMakeLists.txt b/tests/auto/widgets/widgets/qslider/CMakeLists.txt
index 583f12a1fb..a34bfc1ef2 100644
--- a/tests/auto/widgets/widgets/qslider/CMakeLists.txt
+++ b/tests/auto/widgets/widgets/qslider/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qslider Test:
 #####################################################################
 
-add_qt_test(tst_qslider
+qt_add_test(tst_qslider
     SOURCES
         tst_qslider.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/widgets/widgets/qspinbox/CMakeLists.txt b/tests/auto/widgets/widgets/qspinbox/CMakeLists.txt
index 826de28cb4..9b1dbaa337 100644
--- a/tests/auto/widgets/widgets/qspinbox/CMakeLists.txt
+++ b/tests/auto/widgets/widgets/qspinbox/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qspinbox Test:
 #####################################################################
 
-add_qt_test(tst_qspinbox
+qt_add_test(tst_qspinbox
     SOURCES
         tst_qspinbox.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/widgets/widgets/qsplashscreen/CMakeLists.txt b/tests/auto/widgets/widgets/qsplashscreen/CMakeLists.txt
index babe84f43e..fba11c19d7 100644
--- a/tests/auto/widgets/widgets/qsplashscreen/CMakeLists.txt
+++ b/tests/auto/widgets/widgets/qsplashscreen/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qsplashscreen Test:
 #####################################################################
 
-add_qt_test(tst_qsplashscreen
+qt_add_test(tst_qsplashscreen
     SOURCES
         tst_qsplashscreen.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/widgets/widgets/qsplitter/CMakeLists.txt b/tests/auto/widgets/widgets/qsplitter/CMakeLists.txt
index 98c165f034..d25ce98e6c 100644
--- a/tests/auto/widgets/widgets/qsplitter/CMakeLists.txt
+++ b/tests/auto/widgets/widgets/qsplitter/CMakeLists.txt
@@ -8,7 +8,7 @@
 list(APPEND test_data "extradata.txt")
 list(APPEND test_data "setSizes3.dat")
 
-add_qt_test(tst_qsplitter
+qt_add_test(tst_qsplitter
     SOURCES
         tst_qsplitter.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/widgets/widgets/qstackedwidget/CMakeLists.txt b/tests/auto/widgets/widgets/qstackedwidget/CMakeLists.txt
index 37807eb73a..64a97eb7b7 100644
--- a/tests/auto/widgets/widgets/qstackedwidget/CMakeLists.txt
+++ b/tests/auto/widgets/widgets/qstackedwidget/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qstackedwidget Test:
 #####################################################################
 
-add_qt_test(tst_qstackedwidget
+qt_add_test(tst_qstackedwidget
     SOURCES
         tst_qstackedwidget.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/widgets/widgets/qstatusbar/CMakeLists.txt b/tests/auto/widgets/widgets/qstatusbar/CMakeLists.txt
index 56f3c960fd..e5f731d9eb 100644
--- a/tests/auto/widgets/widgets/qstatusbar/CMakeLists.txt
+++ b/tests/auto/widgets/widgets/qstatusbar/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qstatusbar Test:
 #####################################################################
 
-add_qt_test(tst_qstatusbar
+qt_add_test(tst_qstatusbar
     SOURCES
         tst_qstatusbar.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/widgets/widgets/qtabbar/CMakeLists.txt b/tests/auto/widgets/widgets/qtabbar/CMakeLists.txt
index d23d23d88f..4df38be259 100644
--- a/tests/auto/widgets/widgets/qtabbar/CMakeLists.txt
+++ b/tests/auto/widgets/widgets/qtabbar/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qtabbar Test:
 #####################################################################
 
-add_qt_test(tst_qtabbar
+qt_add_test(tst_qtabbar
     SOURCES
         tst_qtabbar.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/widgets/widgets/qtabwidget/CMakeLists.txt b/tests/auto/widgets/widgets/qtabwidget/CMakeLists.txt
index 130cf2422a..f433986a8b 100644
--- a/tests/auto/widgets/widgets/qtabwidget/CMakeLists.txt
+++ b/tests/auto/widgets/widgets/qtabwidget/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qtabwidget Test:
 #####################################################################
 
-add_qt_test(tst_qtabwidget
+qt_add_test(tst_qtabwidget
     SOURCES
         tst_qtabwidget.cpp
     INCLUDE_DIRECTORIES
@@ -18,7 +18,7 @@ add_qt_test(tst_qtabwidget
 ## Scopes:
 #####################################################################
 
-extend_target(tst_qtabwidget CONDITION WIN32
+qt_extend_target(tst_qtabwidget CONDITION WIN32
     PUBLIC_LIBRARIES
         user32
 )
diff --git a/tests/auto/widgets/widgets/qtextbrowser/CMakeLists.txt b/tests/auto/widgets/widgets/qtextbrowser/CMakeLists.txt
index 503dc32a83..8f1ddaf3bd 100644
--- a/tests/auto/widgets/widgets/qtextbrowser/CMakeLists.txt
+++ b/tests/auto/widgets/widgets/qtextbrowser/CMakeLists.txt
@@ -19,7 +19,7 @@ file(GLOB_RECURSE test_data_glob
     subdir/*)
 list(APPEND test_data ${test_data_glob})
 
-add_qt_test(tst_qtextbrowser
+qt_add_test(tst_qtextbrowser
     SOURCES
         tst_qtextbrowser.cpp
     PUBLIC_LIBRARIES
@@ -31,7 +31,7 @@ add_qt_test(tst_qtextbrowser
 ## Scopes:
 #####################################################################
 
-extend_target(tst_qtextbrowser CONDITION builtin_testdata
+qt_extend_target(tst_qtextbrowser CONDITION builtin_testdata
     DEFINES
         BUILTIN_TESTDATA
 )
diff --git a/tests/auto/widgets/widgets/qtextedit/CMakeLists.txt b/tests/auto/widgets/widgets/qtextedit/CMakeLists.txt
index 719acd8dbc..df973fe087 100644
--- a/tests/auto/widgets/widgets/qtextedit/CMakeLists.txt
+++ b/tests/auto/widgets/widgets/qtextedit/CMakeLists.txt
@@ -7,7 +7,7 @@
 # Collect test data
 list(APPEND test_data "fullWidthSelection")
 
-add_qt_test(tst_qtextedit
+qt_add_test(tst_qtextedit
     SOURCES
         tst_qtextedit.cpp
     PUBLIC_LIBRARIES
@@ -22,7 +22,7 @@ add_qt_test(tst_qtextedit
 ## Scopes:
 #####################################################################
 
-extend_target(tst_qtextedit CONDITION MACOS
+qt_extend_target(tst_qtextedit CONDITION MACOS
     PUBLIC_LIBRARIES
         ${FWAppKit}
 )
diff --git a/tests/auto/widgets/widgets/qtoolbar/CMakeLists.txt b/tests/auto/widgets/widgets/qtoolbar/CMakeLists.txt
index d3aef03fa1..afe50c1f13 100644
--- a/tests/auto/widgets/widgets/qtoolbar/CMakeLists.txt
+++ b/tests/auto/widgets/widgets/qtoolbar/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qtoolbar Test:
 #####################################################################
 
-add_qt_test(tst_qtoolbar
+qt_add_test(tst_qtoolbar
     SOURCES
         tst_qtoolbar.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/widgets/widgets/qtoolbox/CMakeLists.txt b/tests/auto/widgets/widgets/qtoolbox/CMakeLists.txt
index dc3e5d016c..1692176f50 100644
--- a/tests/auto/widgets/widgets/qtoolbox/CMakeLists.txt
+++ b/tests/auto/widgets/widgets/qtoolbox/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qtoolbox Test:
 #####################################################################
 
-add_qt_test(tst_qtoolbox
+qt_add_test(tst_qtoolbox
     SOURCES
         tst_qtoolbox.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/widgets/widgets/qtoolbutton/CMakeLists.txt b/tests/auto/widgets/widgets/qtoolbutton/CMakeLists.txt
index ae36488341..42d7cf73f1 100644
--- a/tests/auto/widgets/widgets/qtoolbutton/CMakeLists.txt
+++ b/tests/auto/widgets/widgets/qtoolbutton/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qtoolbutton Test:
 #####################################################################
 
-add_qt_test(tst_qtoolbutton
+qt_add_test(tst_qtoolbutton
     SOURCES
         tst_qtoolbutton.cpp
     PUBLIC_LIBRARIES