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>

34 files changed, 35 insertions, 35 deletions

diff --git a/tests/auto/corelib/thread/qatomicint/CMakeLists.txt b/tests/auto/corelib/thread/qatomicint/CMakeLists.txt
index 1a084fb28c..d3d30f5928 100644
--- a/tests/auto/corelib/thread/qatomicint/CMakeLists.txt
+++ b/tests/auto/corelib/thread/qatomicint/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qatomicint Test:
 #####################################################################
 
-add_qt_test(tst_qatomicint
+qt_add_test(tst_qatomicint
     SOURCES
         tst_qatomicint.cpp
 )
diff --git a/tests/auto/corelib/thread/qatomicinteger/char/CMakeLists.txt b/tests/auto/corelib/thread/qatomicinteger/char/CMakeLists.txt
index 6ccaf3291d..527302cdd4 100644
--- a/tests/auto/corelib/thread/qatomicinteger/char/CMakeLists.txt
+++ b/tests/auto/corelib/thread/qatomicinteger/char/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qatomicinteger_char Test:
 #####################################################################
 
-add_qt_test(tst_qatomicinteger_char
+qt_add_test(tst_qatomicinteger_char
     SOURCES
         ../tst_qatomicinteger.cpp
     DEFINES
diff --git a/tests/auto/corelib/thread/qatomicinteger/char16_t/CMakeLists.txt b/tests/auto/corelib/thread/qatomicinteger/char16_t/CMakeLists.txt
index d57d4b89dc..6fb1c8e975 100644
--- a/tests/auto/corelib/thread/qatomicinteger/char16_t/CMakeLists.txt
+++ b/tests/auto/corelib/thread/qatomicinteger/char16_t/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qatomicinteger_char16_t Test:
 #####################################################################
 
-add_qt_test(tst_qatomicinteger_char16_t
+qt_add_test(tst_qatomicinteger_char16_t
     SOURCES
         ../tst_qatomicinteger.cpp
     DEFINES
diff --git a/tests/auto/corelib/thread/qatomicinteger/char32_t/CMakeLists.txt b/tests/auto/corelib/thread/qatomicinteger/char32_t/CMakeLists.txt
index 7e04c7864b..9a42a2ef09 100644
--- a/tests/auto/corelib/thread/qatomicinteger/char32_t/CMakeLists.txt
+++ b/tests/auto/corelib/thread/qatomicinteger/char32_t/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qatomicinteger_char32_t Test:
 #####################################################################
 
-add_qt_test(tst_qatomicinteger_char32_t
+qt_add_test(tst_qatomicinteger_char32_t
     SOURCES
         ../tst_qatomicinteger.cpp
     DEFINES
diff --git a/tests/auto/corelib/thread/qatomicinteger/int/CMakeLists.txt b/tests/auto/corelib/thread/qatomicinteger/int/CMakeLists.txt
index 16332fcf3b..32a529ea60 100644
--- a/tests/auto/corelib/thread/qatomicinteger/int/CMakeLists.txt
+++ b/tests/auto/corelib/thread/qatomicinteger/int/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qatomicinteger_int Test:
 #####################################################################
 
-add_qt_test(tst_qatomicinteger_int
+qt_add_test(tst_qatomicinteger_int
     SOURCES
         ../tst_qatomicinteger.cpp
     DEFINES
diff --git a/tests/auto/corelib/thread/qatomicinteger/long/CMakeLists.txt b/tests/auto/corelib/thread/qatomicinteger/long/CMakeLists.txt
index 17c2510ac2..974cb2bb9d 100644
--- a/tests/auto/corelib/thread/qatomicinteger/long/CMakeLists.txt
+++ b/tests/auto/corelib/thread/qatomicinteger/long/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qatomicinteger_long Test:
 #####################################################################
 
-add_qt_test(tst_qatomicinteger_long
+qt_add_test(tst_qatomicinteger_long
     SOURCES
         ../tst_qatomicinteger.cpp
     DEFINES
diff --git a/tests/auto/corelib/thread/qatomicinteger/qlonglong/CMakeLists.txt b/tests/auto/corelib/thread/qatomicinteger/qlonglong/CMakeLists.txt
index 021b865e67..bbee7fcb85 100644
--- a/tests/auto/corelib/thread/qatomicinteger/qlonglong/CMakeLists.txt
+++ b/tests/auto/corelib/thread/qatomicinteger/qlonglong/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qatomicinteger_qlonglong Test:
 #####################################################################
 
-add_qt_test(tst_qatomicinteger_qlonglong
+qt_add_test(tst_qatomicinteger_qlonglong
     SOURCES
         ../tst_qatomicinteger.cpp
     DEFINES
diff --git a/tests/auto/corelib/thread/qatomicinteger/qptrdiff/CMakeLists.txt b/tests/auto/corelib/thread/qatomicinteger/qptrdiff/CMakeLists.txt
index 4beff29882..9dbff18228 100644
--- a/tests/auto/corelib/thread/qatomicinteger/qptrdiff/CMakeLists.txt
+++ b/tests/auto/corelib/thread/qatomicinteger/qptrdiff/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qatomicinteger_qptrdiff Test:
 #####################################################################
 
-add_qt_test(tst_qatomicinteger_qptrdiff
+qt_add_test(tst_qatomicinteger_qptrdiff
     SOURCES
         ../tst_qatomicinteger.cpp
     DEFINES
diff --git a/tests/auto/corelib/thread/qatomicinteger/quintptr/CMakeLists.txt b/tests/auto/corelib/thread/qatomicinteger/quintptr/CMakeLists.txt
index a5f9b7aef3..f5ef36f407 100644
--- a/tests/auto/corelib/thread/qatomicinteger/quintptr/CMakeLists.txt
+++ b/tests/auto/corelib/thread/qatomicinteger/quintptr/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qatomicinteger_quintptr Test:
 #####################################################################
 
-add_qt_test(tst_qatomicinteger_quintptr
+qt_add_test(tst_qatomicinteger_quintptr
     SOURCES
         ../tst_qatomicinteger.cpp
     DEFINES
diff --git a/tests/auto/corelib/thread/qatomicinteger/qulonglong/CMakeLists.txt b/tests/auto/corelib/thread/qatomicinteger/qulonglong/CMakeLists.txt
index d2e1c31856..5a783b941e 100644
--- a/tests/auto/corelib/thread/qatomicinteger/qulonglong/CMakeLists.txt
+++ b/tests/auto/corelib/thread/qatomicinteger/qulonglong/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qatomicinteger_qulonglong Test:
 #####################################################################
 
-add_qt_test(tst_qatomicinteger_qulonglong
+qt_add_test(tst_qatomicinteger_qulonglong
     SOURCES
         ../tst_qatomicinteger.cpp
     DEFINES
diff --git a/tests/auto/corelib/thread/qatomicinteger/schar/CMakeLists.txt b/tests/auto/corelib/thread/qatomicinteger/schar/CMakeLists.txt
index 9354bbe2e2..869473d0c9 100644
--- a/tests/auto/corelib/thread/qatomicinteger/schar/CMakeLists.txt
+++ b/tests/auto/corelib/thread/qatomicinteger/schar/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qatomicinteger_schar Test:
 #####################################################################
 
-add_qt_test(tst_qatomicinteger_schar
+qt_add_test(tst_qatomicinteger_schar
     SOURCES
         ../tst_qatomicinteger.cpp
     DEFINES
diff --git a/tests/auto/corelib/thread/qatomicinteger/short/CMakeLists.txt b/tests/auto/corelib/thread/qatomicinteger/short/CMakeLists.txt
index 07143ed431..a90621584e 100644
--- a/tests/auto/corelib/thread/qatomicinteger/short/CMakeLists.txt
+++ b/tests/auto/corelib/thread/qatomicinteger/short/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qatomicinteger_short Test:
 #####################################################################
 
-add_qt_test(tst_qatomicinteger_short
+qt_add_test(tst_qatomicinteger_short
     SOURCES
         ../tst_qatomicinteger.cpp
     DEFINES
diff --git a/tests/auto/corelib/thread/qatomicinteger/uchar/CMakeLists.txt b/tests/auto/corelib/thread/qatomicinteger/uchar/CMakeLists.txt
index ebc64efea5..a2ee999970 100644
--- a/tests/auto/corelib/thread/qatomicinteger/uchar/CMakeLists.txt
+++ b/tests/auto/corelib/thread/qatomicinteger/uchar/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qatomicinteger_uchar Test:
 #####################################################################
 
-add_qt_test(tst_qatomicinteger_uchar
+qt_add_test(tst_qatomicinteger_uchar
     SOURCES
         ../tst_qatomicinteger.cpp
     DEFINES
diff --git a/tests/auto/corelib/thread/qatomicinteger/uint/CMakeLists.txt b/tests/auto/corelib/thread/qatomicinteger/uint/CMakeLists.txt
index 561274da9d..f1eec6140f 100644
--- a/tests/auto/corelib/thread/qatomicinteger/uint/CMakeLists.txt
+++ b/tests/auto/corelib/thread/qatomicinteger/uint/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qatomicinteger_uint Test:
 #####################################################################
 
-add_qt_test(tst_qatomicinteger_uint
+qt_add_test(tst_qatomicinteger_uint
     SOURCES
         ../tst_qatomicinteger.cpp
     DEFINES
diff --git a/tests/auto/corelib/thread/qatomicinteger/ulong/CMakeLists.txt b/tests/auto/corelib/thread/qatomicinteger/ulong/CMakeLists.txt
index c859818838..eba2944e44 100644
--- a/tests/auto/corelib/thread/qatomicinteger/ulong/CMakeLists.txt
+++ b/tests/auto/corelib/thread/qatomicinteger/ulong/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qatomicinteger_ulong Test:
 #####################################################################
 
-add_qt_test(tst_qatomicinteger_ulong
+qt_add_test(tst_qatomicinteger_ulong
     SOURCES
         ../tst_qatomicinteger.cpp
     DEFINES
diff --git a/tests/auto/corelib/thread/qatomicinteger/ushort/CMakeLists.txt b/tests/auto/corelib/thread/qatomicinteger/ushort/CMakeLists.txt
index 6608390b8e..fe19fc42fc 100644
--- a/tests/auto/corelib/thread/qatomicinteger/ushort/CMakeLists.txt
+++ b/tests/auto/corelib/thread/qatomicinteger/ushort/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qatomicinteger_ushort Test:
 #####################################################################
 
-add_qt_test(tst_qatomicinteger_ushort
+qt_add_test(tst_qatomicinteger_ushort
     SOURCES
         ../tst_qatomicinteger.cpp
     DEFINES
diff --git a/tests/auto/corelib/thread/qatomicinteger/wchar_t/CMakeLists.txt b/tests/auto/corelib/thread/qatomicinteger/wchar_t/CMakeLists.txt
index 9c7e17f1bd..dfc4e6ee37 100644
--- a/tests/auto/corelib/thread/qatomicinteger/wchar_t/CMakeLists.txt
+++ b/tests/auto/corelib/thread/qatomicinteger/wchar_t/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qatomicinteger_wchar_t Test:
 #####################################################################
 
-add_qt_test(tst_qatomicinteger_wchar_t
+qt_add_test(tst_qatomicinteger_wchar_t
     SOURCES
         ../tst_qatomicinteger.cpp
     DEFINES
diff --git a/tests/auto/corelib/thread/qatomicpointer/CMakeLists.txt b/tests/auto/corelib/thread/qatomicpointer/CMakeLists.txt
index f400ad7b2e..09c8c448df 100644
--- a/tests/auto/corelib/thread/qatomicpointer/CMakeLists.txt
+++ b/tests/auto/corelib/thread/qatomicpointer/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qatomicpointer Test:
 #####################################################################
 
-add_qt_test(tst_qatomicpointer
+qt_add_test(tst_qatomicpointer
     SOURCES
         tst_qatomicpointer.cpp
 )
diff --git a/tests/auto/corelib/thread/qfuturesynchronizer/CMakeLists.txt b/tests/auto/corelib/thread/qfuturesynchronizer/CMakeLists.txt
index 54e3eb861d..3ebd266084 100644
--- a/tests/auto/corelib/thread/qfuturesynchronizer/CMakeLists.txt
+++ b/tests/auto/corelib/thread/qfuturesynchronizer/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qfuturesynchronizer Test:
 #####################################################################
 
-add_qt_test(tst_qfuturesynchronizer
+qt_add_test(tst_qfuturesynchronizer
     SOURCES
         tst_qfuturesynchronizer.cpp
 )
diff --git a/tests/auto/corelib/thread/qfuturewatcher/CMakeLists.txt b/tests/auto/corelib/thread/qfuturewatcher/CMakeLists.txt
index c27412daac..a6771e538e 100644
--- a/tests/auto/corelib/thread/qfuturewatcher/CMakeLists.txt
+++ b/tests/auto/corelib/thread/qfuturewatcher/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qfuturewatcher Test:
 #####################################################################
 
-add_qt_test(tst_qfuturewatcher
+qt_add_test(tst_qfuturewatcher
     SOURCES
         tst_qfuturewatcher.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/corelib/thread/qmutex/CMakeLists.txt b/tests/auto/corelib/thread/qmutex/CMakeLists.txt
index 536802f127..ee7bcde85f 100644
--- a/tests/auto/corelib/thread/qmutex/CMakeLists.txt
+++ b/tests/auto/corelib/thread/qmutex/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qmutex Test:
 #####################################################################
 
-add_qt_test(tst_qmutex
+qt_add_test(tst_qmutex
     SOURCES
         tst_qmutex.cpp
 )
@@ -12,7 +12,7 @@ add_qt_test(tst_qmutex
 ## Scopes:
 #####################################################################
 
-extend_target(tst_qmutex CONDITION WIN32
+qt_extend_target(tst_qmutex CONDITION WIN32
     PUBLIC_LIBRARIES
         Qt::CorePrivate
 )
diff --git a/tests/auto/corelib/thread/qmutexlocker/CMakeLists.txt b/tests/auto/corelib/thread/qmutexlocker/CMakeLists.txt
index a07548a494..2f85dd512f 100644
--- a/tests/auto/corelib/thread/qmutexlocker/CMakeLists.txt
+++ b/tests/auto/corelib/thread/qmutexlocker/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qmutexlocker Test:
 #####################################################################
 
-add_qt_test(tst_qmutexlocker
+qt_add_test(tst_qmutexlocker
     SOURCES
         tst_qmutexlocker.cpp
 )
diff --git a/tests/auto/corelib/thread/qreadlocker/CMakeLists.txt b/tests/auto/corelib/thread/qreadlocker/CMakeLists.txt
index c52bc24491..245fb52dfc 100644
--- a/tests/auto/corelib/thread/qreadlocker/CMakeLists.txt
+++ b/tests/auto/corelib/thread/qreadlocker/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qreadlocker Test:
 #####################################################################
 
-add_qt_test(tst_qreadlocker
+qt_add_test(tst_qreadlocker
     SOURCES
         tst_qreadlocker.cpp
 )
diff --git a/tests/auto/corelib/thread/qreadwritelock/CMakeLists.txt b/tests/auto/corelib/thread/qreadwritelock/CMakeLists.txt
index 3de89adb2d..fbd8ebf408 100644
--- a/tests/auto/corelib/thread/qreadwritelock/CMakeLists.txt
+++ b/tests/auto/corelib/thread/qreadwritelock/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qreadwritelock Test:
 #####################################################################
 
-add_qt_test(tst_qreadwritelock
+qt_add_test(tst_qreadwritelock
     SOURCES
         tst_qreadwritelock.cpp
 )
diff --git a/tests/auto/corelib/thread/qresultstore/CMakeLists.txt b/tests/auto/corelib/thread/qresultstore/CMakeLists.txt
index f630bdc43b..c75794cb25 100644
--- a/tests/auto/corelib/thread/qresultstore/CMakeLists.txt
+++ b/tests/auto/corelib/thread/qresultstore/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qresultstore Test:
 #####################################################################
 
-add_qt_test(tst_qresultstore
+qt_add_test(tst_qresultstore
     SOURCES
         tst_qresultstore.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/corelib/thread/qsemaphore/CMakeLists.txt b/tests/auto/corelib/thread/qsemaphore/CMakeLists.txt
index 3aaa71423e..d83e088004 100644
--- a/tests/auto/corelib/thread/qsemaphore/CMakeLists.txt
+++ b/tests/auto/corelib/thread/qsemaphore/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qsemaphore Test:
 #####################################################################
 
-add_qt_test(tst_qsemaphore
+qt_add_test(tst_qsemaphore
     SOURCES
         tst_qsemaphore.cpp
 )
diff --git a/tests/auto/corelib/thread/qthread/.prev_CMakeLists.txt b/tests/auto/corelib/thread/qthread/.prev_CMakeLists.txt
index 749a5e9734..2c92a710b3 100644
--- a/tests/auto/corelib/thread/qthread/.prev_CMakeLists.txt
+++ b/tests/auto/corelib/thread/qthread/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qthread Test:
 #####################################################################
 
-add_qt_test(tst_qthread
+qt_add_test(tst_qthread
     SOURCES
         ../../../../shared/emulationdetector.h
         tst_qthread.cpp
diff --git a/tests/auto/corelib/thread/qthread/CMakeLists.txt b/tests/auto/corelib/thread/qthread/CMakeLists.txt
index a21e239c35..1038eb7210 100644
--- a/tests/auto/corelib/thread/qthread/CMakeLists.txt
+++ b/tests/auto/corelib/thread/qthread/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qthread Test:
 #####################################################################
 
-add_qt_test(tst_qthread
+qt_add_test(tst_qthread
     SOURCES
         ../../../../shared/emulationdetector.h
         tst_qthread.cpp
diff --git a/tests/auto/corelib/thread/qthreadonce/CMakeLists.txt b/tests/auto/corelib/thread/qthreadonce/CMakeLists.txt
index c29b4e640a..1b5b77cfd8 100644
--- a/tests/auto/corelib/thread/qthreadonce/CMakeLists.txt
+++ b/tests/auto/corelib/thread/qthreadonce/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qthreadonce Test:
 #####################################################################
 
-add_qt_test(tst_qthreadonce
+qt_add_test(tst_qthreadonce
     SOURCES
         qthreadonce.cpp
         tst_qthreadonce.cpp
diff --git a/tests/auto/corelib/thread/qthreadpool/CMakeLists.txt b/tests/auto/corelib/thread/qthreadpool/CMakeLists.txt
index bc3fca1b6a..8d2c3719c6 100644
--- a/tests/auto/corelib/thread/qthreadpool/CMakeLists.txt
+++ b/tests/auto/corelib/thread/qthreadpool/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qthreadpool Test:
 #####################################################################
 
-add_qt_test(tst_qthreadpool
+qt_add_test(tst_qthreadpool
     SOURCES
         tst_qthreadpool.cpp
 )
diff --git a/tests/auto/corelib/thread/qthreadstorage/crashonexit/.prev_CMakeLists.txt b/tests/auto/corelib/thread/qthreadstorage/crashonexit/.prev_CMakeLists.txt
index 87ae29a04c..8a8e24587d 100644
--- a/tests/auto/corelib/thread/qthreadstorage/crashonexit/.prev_CMakeLists.txt
+++ b/tests/auto/corelib/thread/qthreadstorage/crashonexit/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## crashonexit Binary:
 #####################################################################
 
-add_qt_executable(crashonexit
+qt_add_executable(crashonexit
     OUTPUT_DIRECTORY "${INSTALL_TESTSDIR}/tst_qthreadstorage/crashonexit"
     INSTALL_DIRECTORY "${INSTALL_TESTSDIR}/tst_qthreadstorage/crashonexit"
     SOURCES
diff --git a/tests/auto/corelib/thread/qthreadstorage/crashonexit/CMakeLists.txt b/tests/auto/corelib/thread/qthreadstorage/crashonexit/CMakeLists.txt
index b2bac9713a..0951c7df53 100644
--- a/tests/auto/corelib/thread/qthreadstorage/crashonexit/CMakeLists.txt
+++ b/tests/auto/corelib/thread/qthreadstorage/crashonexit/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## crashonexit Binary:
 #####################################################################
 
-add_qt_executable(crashOnExit_helper
+qt_add_executable(crashOnExit_helper # special case
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/.." # special case
     INSTALL_DIRECTORY "${INSTALL_TESTSDIR}/tst_qthreadstorage/crashOnExit_helper" # special case
     SOURCES
diff --git a/tests/auto/corelib/thread/qwaitcondition/CMakeLists.txt b/tests/auto/corelib/thread/qwaitcondition/CMakeLists.txt
index 76f8b33aa4..91db59c391 100644
--- a/tests/auto/corelib/thread/qwaitcondition/CMakeLists.txt
+++ b/tests/auto/corelib/thread/qwaitcondition/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qwaitcondition Test:
 #####################################################################
 
-add_qt_test(tst_qwaitcondition
+qt_add_test(tst_qwaitcondition
     SOURCES
         tst_qwaitcondition.cpp
 )
diff --git a/tests/auto/corelib/thread/qwritelocker/CMakeLists.txt b/tests/auto/corelib/thread/qwritelocker/CMakeLists.txt
index 00a9809174..5db1124951 100644
--- a/tests/auto/corelib/thread/qwritelocker/CMakeLists.txt
+++ b/tests/auto/corelib/thread/qwritelocker/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qwritelocker Test:
 #####################################################################
 
-add_qt_test(tst_qwritelocker
+qt_add_test(tst_qwritelocker
     SOURCES
         tst_qwritelocker.cpp
 )