summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--tests/auto/concurrent/qtconcurrentiteratekernel/CMakeLists.txt2
-rw-r--r--tests/auto/concurrent/qtconcurrentmedian/CMakeLists.txt2
-rw-r--r--tests/auto/concurrent/qtconcurrentrun/CMakeLists.txt2
-rw-r--r--tests/auto/concurrent/qtconcurrenttask/CMakeLists.txt2
-rw-r--r--tests/auto/concurrent/qtconcurrentthreadengine/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/animation/qabstractanimation/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/animation/qanimationgroup/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/animation/qparallelanimationgroup/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/animation/qpauseanimation/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/animation/qsequentialanimationgroup/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/animation/qvariantanimation/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/global/q_func_info/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/global/qflags/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/global/qfloat16/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/global/qgetputenv/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/global/qglobal/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/global/qglobalstatic/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/global/qhooks/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/global/qnumeric/CMakeLists.txt6
-rw-r--r--tests/auto/corelib/global/qrand/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/global/qrandomgenerator/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/global/qtendian/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/io/largefile/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/io/qabstractfileengine/CMakeLists.txt4
-rw-r--r--tests/auto/corelib/io/qbuffer/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/io/qdataurl/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/io/qdebug/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/io/qdir/CMakeLists.txt8
-rw-r--r--tests/auto/corelib/io/qdir/testdir/dir/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/io/qdiriterator/CMakeLists.txt6
-rw-r--r--tests/auto/corelib/io/qfile/stdinprocess/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/io/qfileinfo/CMakeLists.txt8
-rw-r--r--tests/auto/corelib/io/qfilesystementry/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/io/qfilesystemmetadata/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/io/qfilesystemwatcher/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/io/qiodevice/CMakeLists.txt4
-rw-r--r--tests/auto/corelib/io/qipaddress/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/io/qlockfile/qlockfiletesthelper/.prev_CMakeLists.txt2
-rw-r--r--tests/auto/corelib/io/qlockfile/qlockfiletesthelper/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/io/qloggingcategory/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/io/qloggingregistry/CMakeLists.txt4
-rw-r--r--tests/auto/corelib/io/qnodebug/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/io/qprocess-noapplication/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/io/qprocessenvironment/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/io/qsavefile/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/io/qsettings/CMakeLists.txt8
-rw-r--r--tests/auto/corelib/io/qstandardpaths/CMakeLists.txt4
-rw-r--r--tests/auto/corelib/io/qstorageinfo/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/io/qtemporarydir/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/io/qtemporaryfile/CMakeLists.txt6
-rw-r--r--tests/auto/corelib/io/qurl/CMakeLists.txt4
-rw-r--r--tests/auto/corelib/io/qurlinternal/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/io/qurlquery/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/itemmodels/qabstractitemmodel/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/itemmodels/qabstractproxymodel/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/itemmodels/qconcatenatetablesproxymodel/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/itemmodels/qidentityproxymodel/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/itemmodels/qitemmodel/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/itemmodels/qitemselectionmodel/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/itemmodels/qsortfilterproxymodel_recursive/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/itemmodels/qsortfilterproxymodel_regularexpression/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/itemmodels/qstringlistmodel/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/itemmodels/qtransposeproxymodel/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/kernel/qdeadlinetimer/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/kernel/qelapsedtimer/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/kernel/qeventdispatcher/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/kernel/qeventloop/CMakeLists.txt6
-rw-r--r--tests/auto/corelib/kernel/qmath/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/kernel/qmetaenum/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/kernel/qmetamethod/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/kernel/qmetaobject/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/kernel/qmetaobjectbuilder/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/kernel/qmetaproperty/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/kernel/qmetatype/.prev_CMakeLists.txt6
-rw-r--r--tests/auto/corelib/kernel/qmetatype/CMakeLists.txt6
-rw-r--r--tests/auto/corelib/kernel/qmimedata/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/kernel/qobject/signalbug/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/kernel/qpointer/CMakeLists.txt4
-rw-r--r--tests/auto/corelib/kernel/qsharedmemory/producerconsumer/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/kernel/qsignalblocker/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/kernel/qsignalmapper/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/kernel/qsocketnotifier/CMakeLists.txt4
-rw-r--r--tests/auto/corelib/kernel/qsystemsemaphore/acquirerelease/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/kernel/qtimer/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/kernel/qtranslator/CMakeLists.txt6
-rw-r--r--tests/auto/corelib/kernel/qvariant/CMakeLists.txt6
-rw-r--r--tests/auto/corelib/kernel/qwineventnotifier/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-cache/.prev_CMakeLists.txt14
-rw-r--r--tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-cache/CMakeLists.txt8
-rw-r--r--tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-xml/.prev_CMakeLists.txt14
-rw-r--r--tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-xml/CMakeLists.txt8
-rw-r--r--tests/auto/corelib/mimetypes/qmimetype/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/plugin/qfactoryloader/plugin1/CMakeLists.txt4
-rw-r--r--tests/auto/corelib/plugin/qfactoryloader/plugin2/CMakeLists.txt4
-rw-r--r--tests/auto/corelib/plugin/qfactoryloader/test/.prev_CMakeLists.txt6
-rw-r--r--tests/auto/corelib/plugin/qfactoryloader/test/CMakeLists.txt6
-rw-r--r--tests/auto/corelib/plugin/qlibrary/lib/.prev_CMakeLists.txt4
-rw-r--r--tests/auto/corelib/plugin/qlibrary/lib/CMakeLists.txt4
-rw-r--r--tests/auto/corelib/plugin/qlibrary/tst/.prev_CMakeLists.txt4
-rw-r--r--tests/auto/corelib/plugin/qlibrary/tst/CMakeLists.txt4
-rw-r--r--tests/auto/corelib/plugin/qplugin/debugplugin/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/plugin/qplugin/invalidplugin/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/plugin/qplugin/releaseplugin/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/plugin/qpluginloader/almostplugin/.prev_CMakeLists.txt4
-rw-r--r--tests/auto/corelib/plugin/qpluginloader/almostplugin/CMakeLists.txt4
-rw-r--r--tests/auto/corelib/plugin/qpluginloader/lib/.prev_CMakeLists.txt4
-rw-r--r--tests/auto/corelib/plugin/qpluginloader/lib/CMakeLists.txt4
-rw-r--r--tests/auto/corelib/plugin/qpluginloader/staticplugin/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/plugin/qpluginloader/theplugin/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/plugin/qpluginloader/tst/.prev_CMakeLists.txt14
-rw-r--r--tests/auto/corelib/plugin/qpluginloader/tst/CMakeLists.txt10
-rw-r--r--tests/auto/corelib/plugin/quuid/test/.prev_CMakeLists.txt4
-rw-r--r--tests/auto/corelib/plugin/quuid/test/CMakeLists.txt4
-rw-r--r--tests/auto/corelib/serialization/json/CMakeLists.txt6
-rw-r--r--tests/auto/corelib/serialization/qcborstreamreader/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/serialization/qcborstreamwriter/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/serialization/qcborvalue/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/serialization/qcborvalue_json/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/serialization/qdatastream/CMakeLists.txt4
-rw-r--r--tests/auto/corelib/serialization/qdatastream_core_pixmap/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/serialization/qtextstream/readAllStdinProcess/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/serialization/qtextstream/readLineStdinProcess/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/serialization/qtextstream/stdinProcess/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/serialization/qtextstream/test/CMakeLists.txt6
-rw-r--r--tests/auto/corelib/serialization/qxmlstream/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/statemachine/qstate/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/text/qbytearraylist/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/text/qbytedatabuffer/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/text/qregularexpression/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/text/qstring_no_cast_from_bytearray/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/text/qstringbuilder/qstringbuilder1/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/text/qstringbuilder/qstringbuilder2/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/text/qstringbuilder/qstringbuilder3/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/text/qstringbuilder/qstringbuilder4/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/text/qstringiterator/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/text/qstringlist/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/text/qstringmatcher/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/text/qstringref/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/thread/qatomicint/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/thread/qatomicinteger/char/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/thread/qatomicinteger/char16_t/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/thread/qatomicinteger/char32_t/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/thread/qatomicinteger/int/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/thread/qatomicinteger/long/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/thread/qatomicinteger/qlonglong/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/thread/qatomicinteger/qptrdiff/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/thread/qatomicinteger/quintptr/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/thread/qatomicinteger/qulonglong/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/thread/qatomicinteger/schar/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/thread/qatomicinteger/short/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/thread/qatomicinteger/uchar/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/thread/qatomicinteger/uint/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/thread/qatomicinteger/ulong/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/thread/qatomicinteger/ushort/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/thread/qatomicinteger/wchar_t/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/thread/qatomicpointer/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/thread/qfuturesynchronizer/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/thread/qfuturewatcher/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/thread/qmutex/CMakeLists.txt4
-rw-r--r--tests/auto/corelib/thread/qmutexlocker/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/thread/qreadlocker/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/thread/qreadwritelock/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/thread/qresultstore/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/thread/qsemaphore/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/thread/qthread/.prev_CMakeLists.txt2
-rw-r--r--tests/auto/corelib/thread/qthread/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/thread/qthreadonce/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/thread/qthreadpool/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/thread/qthreadstorage/crashonexit/.prev_CMakeLists.txt2
-rw-r--r--tests/auto/corelib/thread/qthreadstorage/crashonexit/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/thread/qwaitcondition/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/thread/qwritelocker/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/time/qcalendar/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/time/qdate/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/time/qdatetime/CMakeLists.txt4
-rw-r--r--tests/auto/corelib/time/qtime/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/time/qtimezone/CMakeLists.txt6
-rw-r--r--tests/auto/corelib/tools/qalgorithms/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/tools/qarraydata/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/tools/qbitarray/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/tools/qcache/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/tools/qcommandlineparser/testhelper/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/tools/qcontiguouscache/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/tools/qeasingcurve/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/tools/qexplicitlyshareddatapointer/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/tools/qhash/.prev_CMakeLists.txt2
-rw-r--r--tests/auto/corelib/tools/qhash/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/tools/qhashfunctions/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/tools/qmakearray/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/tools/qmap/.prev_CMakeLists.txt2
-rw-r--r--tests/auto/corelib/tools/qmap/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/tools/qmargins/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/tools/qmessageauthenticationcode/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/tools/qpair/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/tools/qpoint/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/tools/qpointf/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/tools/qqueue/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/tools/qrect/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/tools/qringbuffer/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/tools/qscopedpointer/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/tools/qscopedvaluerollback/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/tools/qscopeguard/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/tools/qset/.prev_CMakeLists.txt2
-rw-r--r--tests/auto/corelib/tools/qset/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/tools/qsize/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/tools/qsizef/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/tools/qstl/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/tools/qtimeline/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/tools/qvarlengtharray/CMakeLists.txt2
-rw-r--r--tests/auto/dbus/qdbusabstractadaptor/qmyserver/.prev_CMakeLists.txt2
-rw-r--r--tests/auto/dbus/qdbusabstractadaptor/qmyserver/CMakeLists.txt2
-rw-r--r--tests/auto/dbus/qdbusabstractinterface/CMakeLists.txt4
-rw-r--r--tests/auto/dbus/qdbusabstractinterface/qdbusabstractinterface/.prev_CMakeLists.txt2
-rw-r--r--tests/auto/dbus/qdbusabstractinterface/qpinger/.prev_CMakeLists.txt2
-rw-r--r--tests/auto/dbus/qdbusabstractinterface/qpinger/CMakeLists.txt2
-rw-r--r--tests/auto/dbus/qdbusconnection/CMakeLists.txt2
-rw-r--r--tests/auto/dbus/qdbusconnection_delayed/CMakeLists.txt2
-rw-r--r--tests/auto/dbus/qdbusconnection_no_app/CMakeLists.txt2
-rw-r--r--tests/auto/dbus/qdbusconnection_no_bus/CMakeLists.txt2
-rw-r--r--tests/auto/dbus/qdbusconnection_no_libdbus/CMakeLists.txt2
-rw-r--r--tests/auto/dbus/qdbusconnection_spyhook/CMakeLists.txt2
-rw-r--r--tests/auto/dbus/qdbuscontext/CMakeLists.txt2
-rw-r--r--tests/auto/dbus/qdbusinterface/qmyserver/.prev_CMakeLists.txt2
-rw-r--r--tests/auto/dbus/qdbusinterface/qmyserver/CMakeLists.txt2
-rw-r--r--tests/auto/dbus/qdbuslocalcalls/CMakeLists.txt2
-rw-r--r--tests/auto/dbus/qdbusmarshall/qdbusmarshall/.prev_CMakeLists.txt6
-rw-r--r--tests/auto/dbus/qdbusmarshall/qdbusmarshall/CMakeLists.txt6
-rw-r--r--tests/auto/dbus/qdbusmarshall/qpong/CMakeLists.txt2
-rw-r--r--tests/auto/dbus/qdbusmetaobject/CMakeLists.txt2
-rw-r--r--tests/auto/dbus/qdbusmetatype/CMakeLists.txt2
-rw-r--r--tests/auto/dbus/qdbuspendingcall/CMakeLists.txt2
-rw-r--r--tests/auto/dbus/qdbuspendingreply/CMakeLists.txt2
-rw-r--r--tests/auto/dbus/qdbusreply/CMakeLists.txt2
-rw-r--r--tests/auto/dbus/qdbusservicewatcher/CMakeLists.txt2
-rw-r--r--tests/auto/dbus/qdbusthreading/CMakeLists.txt2
-rw-r--r--tests/auto/dbus/qdbustype/CMakeLists.txt6
-rw-r--r--tests/auto/dbus/qdbusxmlparser/CMakeLists.txt2
-rw-r--r--tests/auto/gui/image/qicoimageformat/CMakeLists.txt4
-rw-r--r--tests/auto/gui/image/qicon/CMakeLists.txt8
-rw-r--r--tests/auto/gui/image/qiconhighdpi/CMakeLists.txt4
-rw-r--r--tests/auto/gui/image/qimage/CMakeLists.txt8
-rw-r--r--tests/auto/gui/image/qimageiohandler/CMakeLists.txt2
-rw-r--r--tests/auto/gui/image/qimagereader/CMakeLists.txt6
-rw-r--r--tests/auto/gui/image/qimagewriter/CMakeLists.txt4
-rw-r--r--tests/auto/gui/image/qmovie/CMakeLists.txt10
-rw-r--r--tests/auto/gui/image/qpicture/CMakeLists.txt2
-rw-r--r--tests/auto/gui/image/qpixmap/CMakeLists.txt8
-rw-r--r--tests/auto/gui/image/qpixmapcache/CMakeLists.txt2
-rw-r--r--tests/auto/gui/itemmodels/qstandarditem/CMakeLists.txt2
-rw-r--r--tests/auto/gui/kernel/noqteventloop/CMakeLists.txt4
-rw-r--r--tests/auto/gui/kernel/qaction/CMakeLists.txt2
-rw-r--r--tests/auto/gui/kernel/qactiongroup/CMakeLists.txt2
-rw-r--r--tests/auto/gui/kernel/qbackingstore/CMakeLists.txt2
-rw-r--r--tests/auto/gui/kernel/qclipboard/test/CMakeLists.txt4
-rw-r--r--tests/auto/gui/kernel/qcursor/CMakeLists.txt2
-rw-r--r--tests/auto/gui/kernel/qdrag/CMakeLists.txt2
-rw-r--r--tests/auto/gui/kernel/qevent/CMakeLists.txt2
-rw-r--r--tests/auto/gui/kernel/qfileopenevent/qfileopeneventexternal/CMakeLists.txt2
-rw-r--r--tests/auto/gui/kernel/qfileopenevent/test/CMakeLists.txt2
-rw-r--r--tests/auto/gui/kernel/qguiapplication/.prev_CMakeLists.txt4
-rw-r--r--tests/auto/gui/kernel/qguiapplication/CMakeLists.txt6
-rw-r--r--tests/auto/gui/kernel/qguieventdispatcher/CMakeLists.txt2
-rw-r--r--tests/auto/gui/kernel/qguieventloop/CMakeLists.txt6
-rw-r--r--tests/auto/gui/kernel/qguimetatype/CMakeLists.txt2
-rw-r--r--tests/auto/gui/kernel/qguitimer/.prev_CMakeLists.txt2
-rw-r--r--tests/auto/gui/kernel/qguitimer/CMakeLists.txt2
-rw-r--r--tests/auto/gui/kernel/qguivariant/no_application/CMakeLists.txt2
-rw-r--r--tests/auto/gui/kernel/qguivariant/test/CMakeLists.txt6
-rw-r--r--tests/auto/gui/kernel/qinputdevice/CMakeLists.txt2
-rw-r--r--tests/auto/gui/kernel/qinputmethod/CMakeLists.txt2
-rw-r--r--tests/auto/gui/kernel/qkeyevent/CMakeLists.txt2
-rw-r--r--tests/auto/gui/kernel/qkeysequence/CMakeLists.txt4
-rw-r--r--tests/auto/gui/kernel/qmouseevent/CMakeLists.txt2
-rw-r--r--tests/auto/gui/kernel/qmouseevent_modal/CMakeLists.txt2
-rw-r--r--tests/auto/gui/kernel/qopenglwindow/CMakeLists.txt2
-rw-r--r--tests/auto/gui/kernel/qpalette/CMakeLists.txt2
-rw-r--r--tests/auto/gui/kernel/qpixelformat/CMakeLists.txt2
-rw-r--r--tests/auto/gui/kernel/qrasterwindow/CMakeLists.txt2
-rw-r--r--tests/auto/gui/kernel/qscreen/CMakeLists.txt2
-rw-r--r--tests/auto/gui/kernel/qshortcut/CMakeLists.txt2
-rw-r--r--tests/auto/gui/kernel/qsurfaceformat/CMakeLists.txt2
-rw-r--r--tests/auto/gui/kernel/qtouchevent/CMakeLists.txt2
-rw-r--r--tests/auto/gui/kernel/qwindow/CMakeLists.txt4
-rw-r--r--tests/auto/gui/math3d/qmatrixnxn/CMakeLists.txt2
-rw-r--r--tests/auto/gui/math3d/qquaternion/CMakeLists.txt2
-rw-r--r--tests/auto/gui/math3d/qvectornd/CMakeLists.txt2
-rw-r--r--tests/auto/gui/painting/qpagesize/CMakeLists.txt2
-rw-r--r--tests/auto/gui/painting/qpaintengine/CMakeLists.txt2
-rw-r--r--tests/auto/gui/painting/qpainterpath/CMakeLists.txt2
-rw-r--r--tests/auto/gui/painting/qpainterpathstroker/CMakeLists.txt2
-rw-r--r--tests/auto/gui/painting/qpen/CMakeLists.txt2
-rw-r--r--tests/auto/gui/qopengl/CMakeLists.txt4
-rw-r--r--tests/auto/gui/qopenglconfig/CMakeLists.txt2
-rw-r--r--tests/auto/gui/qvulkan/CMakeLists.txt2
-rw-r--r--tests/auto/gui/rhi/qrhi/CMakeLists.txt4
-rw-r--r--tests/auto/gui/rhi/qshader/CMakeLists.txt4
-rw-r--r--tests/auto/gui/text/qabstracttextdocumentlayout/CMakeLists.txt2
-rw-r--r--tests/auto/gui/text/qcssparser/CMakeLists.txt4
-rw-r--r--tests/auto/gui/text/qfont/CMakeLists.txt6
-rw-r--r--tests/auto/gui/text/qfontcache/CMakeLists.txt2
-rw-r--r--tests/auto/gui/text/qfontdatabase/CMakeLists.txt4
-rw-r--r--tests/auto/gui/text/qfontmetrics/CMakeLists.txt4
-rw-r--r--tests/auto/gui/text/qglyphrun/CMakeLists.txt4
-rw-r--r--tests/auto/gui/text/qinputcontrol/CMakeLists.txt2
-rw-r--r--tests/auto/gui/text/qrawfont/CMakeLists.txt4
-rw-r--r--tests/auto/gui/text/qstatictext/CMakeLists.txt4
-rw-r--r--tests/auto/gui/text/qsyntaxhighlighter/CMakeLists.txt4
-rw-r--r--tests/auto/gui/text/qtextblock/CMakeLists.txt2
-rw-r--r--tests/auto/gui/text/qtextcursor/CMakeLists.txt2
-rw-r--r--tests/auto/gui/text/qtextdocument/CMakeLists.txt2
-rw-r--r--tests/auto/gui/text/qtextdocumentfragment/CMakeLists.txt2
-rw-r--r--tests/auto/gui/text/qtextdocumentlayout/CMakeLists.txt4
-rw-r--r--tests/auto/gui/text/qtextformat/CMakeLists.txt2
-rw-r--r--tests/auto/gui/text/qtextlayout/CMakeLists.txt2
-rw-r--r--tests/auto/gui/text/qtextlist/CMakeLists.txt2
-rw-r--r--tests/auto/gui/text/qtextmarkdownimporter/CMakeLists.txt2
-rw-r--r--tests/auto/gui/text/qtextmarkdownwriter/CMakeLists.txt2
-rw-r--r--tests/auto/gui/text/qtextobject/CMakeLists.txt4
-rw-r--r--tests/auto/gui/text/qtextodfwriter/CMakeLists.txt2
-rw-r--r--tests/auto/gui/text/qtextpiecetable/CMakeLists.txt2
-rw-r--r--tests/auto/gui/text/qtextscriptengine/CMakeLists.txt2
-rw-r--r--tests/auto/gui/text/qtextscriptengine/generate/CMakeLists.txt2
-rw-r--r--tests/auto/gui/text/qtexttable/CMakeLists.txt4
-rw-r--r--tests/auto/gui/text/qzip/CMakeLists.txt4
-rw-r--r--tests/auto/gui/util/qdesktopservices/.prev_CMakeLists.txt2
-rw-r--r--tests/auto/gui/util/qdesktopservices/CMakeLists.txt2
-rw-r--r--tests/auto/gui/util/qdoublevalidator/CMakeLists.txt2
-rw-r--r--tests/auto/gui/util/qintvalidator/CMakeLists.txt2
-rw-r--r--tests/auto/gui/util/qregularexpressionvalidator/CMakeLists.txt2
-rw-r--r--tests/auto/gui/util/qshadergenerator/CMakeLists.txt2
-rw-r--r--tests/auto/gui/util/qshadergraph/CMakeLists.txt2
-rw-r--r--tests/auto/gui/util/qshadergraphloader/CMakeLists.txt2
-rw-r--r--tests/auto/gui/util/qshadernodes/CMakeLists.txt2
-rw-r--r--tests/auto/gui/util/qshadernodesloader/CMakeLists.txt2
-rw-r--r--tests/auto/gui/util/qtexturefilereader/CMakeLists.txt4
-rw-r--r--tests/auto/gui/util/qundogroup/CMakeLists.txt2
-rw-r--r--tests/auto/gui/util/qundostack/CMakeLists.txt2
-rw-r--r--tests/auto/network/access/hpack/CMakeLists.txt2
-rw-r--r--tests/auto/network/access/hsts/CMakeLists.txt2
-rw-r--r--tests/auto/network/access/http2/CMakeLists.txt2
-rw-r--r--tests/auto/network/access/qabstractnetworkcache/CMakeLists.txt2
-rw-r--r--tests/auto/network/access/qftp/CMakeLists.txt2
-rw-r--r--tests/auto/network/access/qhttpnetworkconnection/CMakeLists.txt2
-rw-r--r--tests/auto/network/access/qhttpnetworkreply/CMakeLists.txt2
-rw-r--r--tests/auto/network/access/qnetworkaccessmanager/CMakeLists.txt2
-rw-r--r--tests/auto/network/access/qnetworkcachemetadata/CMakeLists.txt2
-rw-r--r--tests/auto/network/access/qnetworkcookie/CMakeLists.txt2
-rw-r--r--tests/auto/network/access/qnetworkcookiejar/CMakeLists.txt2
-rw-r--r--tests/auto/network/access/qnetworkdiskcache/CMakeLists.txt2
-rw-r--r--tests/auto/network/access/qnetworkreply/echo/.prev_CMakeLists.txt2
-rw-r--r--tests/auto/network/access/qnetworkreply/echo/CMakeLists.txt2
-rw-r--r--tests/auto/network/access/qnetworkreply/test/.prev_CMakeLists.txt4
-rw-r--r--tests/auto/network/access/qnetworkreply/test/CMakeLists.txt4
-rw-r--r--tests/auto/network/access/qnetworkrequest/CMakeLists.txt2
-rw-r--r--tests/auto/network/kernel/qauthenticator/CMakeLists.txt2
-rw-r--r--tests/auto/network/kernel/qdnslookup/CMakeLists.txt2
-rw-r--r--tests/auto/network/kernel/qdnslookup_appless/CMakeLists.txt2
-rw-r--r--tests/auto/network/kernel/qhostaddress/CMakeLists.txt4
-rw-r--r--tests/auto/network/kernel/qhostinfo/CMakeLists.txt4
-rw-r--r--tests/auto/network/kernel/qnetworkaddressentry/CMakeLists.txt2
-rw-r--r--tests/auto/network/kernel/qnetworkdatagram/CMakeLists.txt2
-rw-r--r--tests/auto/network/kernel/qnetworkinterface/CMakeLists.txt2
-rw-r--r--tests/auto/network/kernel/qnetworkproxy/CMakeLists.txt2
-rw-r--r--tests/auto/network/kernel/qnetworkproxyfactory/CMakeLists.txt2
-rw-r--r--tests/auto/network/socket/platformsocketengine/CMakeLists.txt4
-rw-r--r--tests/auto/network/socket/qabstractsocket/CMakeLists.txt2
-rw-r--r--tests/auto/network/socket/qhttpsocketengine/CMakeLists.txt4
-rw-r--r--tests/auto/network/socket/qlocalsocket/socketprocess/CMakeLists.txt2
-rw-r--r--tests/auto/network/socket/qlocalsocket/test/CMakeLists.txt2
-rw-r--r--tests/auto/network/socket/qsctpsocket/CMakeLists.txt2
-rw-r--r--tests/auto/network/socket/qsocks5socketengine/CMakeLists.txt4
-rw-r--r--tests/auto/network/socket/qtcpserver/crashingServer/CMakeLists.txt2
-rw-r--r--tests/auto/network/socket/qtcpserver/test/.prev_CMakeLists.txt4
-rw-r--r--tests/auto/network/socket/qtcpserver/test/CMakeLists.txt4
-rw-r--r--tests/auto/network/socket/qtcpsocket/stressTest/CMakeLists.txt2
-rw-r--r--tests/auto/network/socket/qtcpsocket/test/.prev_CMakeLists.txt4
-rw-r--r--tests/auto/network/socket/qtcpsocket/test/CMakeLists.txt4
-rw-r--r--tests/auto/network/socket/qudpsocket/clientserver/CMakeLists.txt2
-rw-r--r--tests/auto/network/socket/qudpsocket/test/.prev_CMakeLists.txt2
-rw-r--r--tests/auto/network/socket/qudpsocket/test/CMakeLists.txt2
-rw-r--r--tests/auto/network/socket/qudpsocket/udpServer/.prev_CMakeLists.txt2
-rw-r--r--tests/auto/network/socket/qudpsocket/udpServer/CMakeLists.txt2
-rw-r--r--tests/auto/network/ssl/qasn1element/CMakeLists.txt2
-rw-r--r--tests/auto/network/ssl/qdtls/CMakeLists.txt2
-rw-r--r--tests/auto/network/ssl/qdtlscookie/CMakeLists.txt2
-rw-r--r--tests/auto/network/ssl/qocsp/CMakeLists.txt2
-rw-r--r--tests/auto/network/ssl/qpassworddigestor/CMakeLists.txt2
-rw-r--r--tests/auto/network/ssl/qsslcertificate/.prev_CMakeLists.txt2
-rw-r--r--tests/auto/network/ssl/qsslcertificate/CMakeLists.txt2
-rw-r--r--tests/auto/network/ssl/qsslcipher/CMakeLists.txt2
-rw-r--r--tests/auto/network/ssl/qssldiffiehellmanparameters/CMakeLists.txt2
-rw-r--r--tests/auto/network/ssl/qsslellipticcurve/CMakeLists.txt2
-rw-r--r--tests/auto/network/ssl/qsslerror/CMakeLists.txt2
-rw-r--r--tests/auto/network/ssl/qsslkey/CMakeLists.txt4
-rw-r--r--tests/auto/network/ssl/qsslsocket/CMakeLists.txt2
-rw-r--r--tests/auto/network/ssl/qsslsocket_onDemandCertificates_member/CMakeLists.txt2
-rw-r--r--tests/auto/network/ssl/qsslsocket_onDemandCertificates_static/CMakeLists.txt2
-rw-r--r--tests/auto/other/android/CMakeLists.txt2
-rw-r--r--tests/auto/other/compiler/.prev_CMakeLists.txt2
-rw-r--r--tests/auto/other/compiler/CMakeLists.txt2
-rw-r--r--tests/auto/other/gestures/CMakeLists.txt2
-rw-r--r--tests/auto/other/lancelot/CMakeLists.txt6
-rw-r--r--tests/auto/other/languagechange/CMakeLists.txt2
-rw-r--r--tests/auto/other/macgui/.prev_CMakeLists.txt4
-rw-r--r--tests/auto/other/macgui/CMakeLists.txt4
-rw-r--r--tests/auto/other/macnativeevents/CMakeLists.txt2
-rw-r--r--tests/auto/other/macplist/app/.prev_CMakeLists.txt2
-rw-r--r--tests/auto/other/macplist/app/CMakeLists.txt2
-rw-r--r--tests/auto/other/macplist/test/CMakeLists.txt2
-rw-r--r--tests/auto/other/networkselftest/CMakeLists.txt2
-rw-r--r--tests/auto/other/qaccessibility/.prev_CMakeLists.txt6
-rw-r--r--tests/auto/other/qaccessibility/CMakeLists.txt6
-rw-r--r--tests/auto/other/qaccessibilitylinux/.prev_CMakeLists.txt2
-rw-r--r--tests/auto/other/qaccessibilitylinux/CMakeLists.txt2
-rw-r--r--tests/auto/other/qaccessibilitymac/CMakeLists.txt4
-rw-r--r--tests/auto/other/qcomplextext/CMakeLists.txt6
-rw-r--r--tests/auto/other/qfocusevent/CMakeLists.txt2
-rw-r--r--tests/auto/other/qnetworkaccessmanager_and_qprogressdialog/CMakeLists.txt2
-rw-r--r--tests/auto/other/qobjectrace/CMakeLists.txt2
-rw-r--r--tests/auto/other/qprocess_and_guieventloop/write-read-write/CMakeLists.txt2
-rw-r--r--tests/auto/other/qsharedpointer_and_qwidget/CMakeLists.txt2
-rw-r--r--tests/auto/other/toolsupport/CMakeLists.txt2
-rw-r--r--tests/auto/other/xkbkeyboard/CMakeLists.txt2
-rw-r--r--tests/auto/printsupport/dialogs/qabstractprintdialog/CMakeLists.txt2
-rw-r--r--tests/auto/printsupport/kernel/qprintdevice/CMakeLists.txt2
-rw-r--r--tests/auto/printsupport/kernel/qprinter/CMakeLists.txt2
-rw-r--r--tests/auto/printsupport/kernel/qprinterinfo/CMakeLists.txt2
-rw-r--r--tests/auto/sql/kernel/qsql/CMakeLists.txt2
-rw-r--r--tests/auto/sql/kernel/qsqldatabase/CMakeLists.txt2
-rw-r--r--tests/auto/sql/kernel/qsqldriver/CMakeLists.txt2
-rw-r--r--tests/auto/sql/kernel/qsqlerror/CMakeLists.txt2
-rw-r--r--tests/auto/sql/kernel/qsqlfield/CMakeLists.txt2
-rw-r--r--tests/auto/sql/kernel/qsqlquery/CMakeLists.txt2
-rw-r--r--tests/auto/sql/kernel/qsqlrecord/CMakeLists.txt2
-rw-r--r--tests/auto/sql/kernel/qsqlresult/CMakeLists.txt2
-rw-r--r--tests/auto/sql/kernel/qsqlthread/CMakeLists.txt2
-rw-r--r--tests/auto/sql/models/qsqlquerymodel/CMakeLists.txt2
-rw-r--r--tests/auto/sql/models/qsqlrelationaldelegate/CMakeLists.txt2
-rw-r--r--tests/auto/sql/models/qsqlrelationaltablemodel/CMakeLists.txt2
-rw-r--r--tests/auto/sql/models/qsqltablemodel/CMakeLists.txt2
-rw-r--r--tests/auto/testlib/qabstractitemmodeltester/CMakeLists.txt2
-rw-r--r--tests/auto/testlib/qsignalspy/CMakeLists.txt2
-rw-r--r--tests/auto/testlib/selftests/assert/.prev_CMakeLists.txt2
-rw-r--r--tests/auto/testlib/selftests/assert/CMakeLists.txt2
-rw-r--r--tests/auto/testlib/selftests/badxml/.prev_CMakeLists.txt2
-rw-r--r--tests/auto/testlib/selftests/badxml/CMakeLists.txt2
-rw-r--r--tests/auto/testlib/selftests/benchlibcallgrind/.prev_CMakeLists.txt2
-rw-r--r--tests/auto/testlib/selftests/benchlibcallgrind/CMakeLists.txt2
-rw-r--r--tests/auto/testlib/selftests/benchlibcounting/.prev_CMakeLists.txt2
-rw-r--r--tests/auto/testlib/selftests/benchlibcounting/CMakeLists.txt2
-rw-r--r--tests/auto/testlib/selftests/benchlibeventcounter/.prev_CMakeLists.txt2
-rw-r--r--tests/auto/testlib/selftests/benchlibeventcounter/CMakeLists.txt2
-rw-r--r--tests/auto/testlib/selftests/benchliboptions/.prev_CMakeLists.txt2
-rw-r--r--tests/auto/testlib/selftests/benchliboptions/CMakeLists.txt2
-rw-r--r--tests/auto/testlib/selftests/benchlibtickcounter/.prev_CMakeLists.txt2
-rw-r--r--tests/auto/testlib/selftests/benchlibtickcounter/CMakeLists.txt2
-rw-r--r--tests/auto/testlib/selftests/benchlibwalltime/.prev_CMakeLists.txt2
-rw-r--r--tests/auto/testlib/selftests/benchlibwalltime/CMakeLists.txt2
-rw-r--r--tests/auto/testlib/selftests/blacklisted/.prev_CMakeLists.txt2
-rw-r--r--tests/auto/testlib/selftests/blacklisted/CMakeLists.txt2
-rw-r--r--tests/auto/testlib/selftests/cmptest/.prev_CMakeLists.txt4
-rw-r--r--tests/auto/testlib/selftests/cmptest/CMakeLists.txt4
-rw-r--r--tests/auto/testlib/selftests/commandlinedata/.prev_CMakeLists.txt2
-rw-r--r--tests/auto/testlib/selftests/commandlinedata/CMakeLists.txt2
-rw-r--r--tests/auto/testlib/selftests/counting/.prev_CMakeLists.txt2
-rw-r--r--tests/auto/testlib/selftests/counting/CMakeLists.txt2
-rw-r--r--tests/auto/testlib/selftests/crashes/.prev_CMakeLists.txt2
-rw-r--r--tests/auto/testlib/selftests/crashes/CMakeLists.txt2
-rw-r--r--tests/auto/testlib/selftests/datatable/.prev_CMakeLists.txt2
-rw-r--r--tests/auto/testlib/selftests/datatable/CMakeLists.txt2
-rw-r--r--tests/auto/testlib/selftests/datetime/.prev_CMakeLists.txt2
-rw-r--r--tests/auto/testlib/selftests/datetime/CMakeLists.txt2
-rw-r--r--tests/auto/testlib/selftests/deleteLater/.prev_CMakeLists.txt2
-rw-r--r--tests/auto/testlib/selftests/deleteLater/CMakeLists.txt2
-rw-r--r--tests/auto/testlib/selftests/deleteLater_noApp/.prev_CMakeLists.txt2
-rw-r--r--tests/auto/testlib/selftests/deleteLater_noApp/CMakeLists.txt2
-rw-r--r--tests/auto/testlib/selftests/differentexec/.prev_CMakeLists.txt2
-rw-r--r--tests/auto/testlib/selftests/differentexec/CMakeLists.txt2
-rw-r--r--tests/auto/testlib/selftests/exceptionthrow/.prev_CMakeLists.txt2
-rw-r--r--tests/auto/testlib/selftests/exceptionthrow/CMakeLists.txt2
-rw-r--r--tests/auto/testlib/selftests/expectfail/.prev_CMakeLists.txt2
-rw-r--r--tests/auto/testlib/selftests/expectfail/CMakeLists.txt2
-rw-r--r--tests/auto/testlib/selftests/failcleanup/.prev_CMakeLists.txt2
-rw-r--r--tests/auto/testlib/selftests/failcleanup/CMakeLists.txt2
-rw-r--r--tests/auto/testlib/selftests/faildatatype/.prev_CMakeLists.txt2
-rw-r--r--tests/auto/testlib/selftests/faildatatype/CMakeLists.txt2
-rw-r--r--tests/auto/testlib/selftests/failfetchtype/.prev_CMakeLists.txt2
-rw-r--r--tests/auto/testlib/selftests/failfetchtype/CMakeLists.txt2
-rw-r--r--tests/auto/testlib/selftests/failinit/.prev_CMakeLists.txt2
-rw-r--r--tests/auto/testlib/selftests/failinit/CMakeLists.txt2
-rw-r--r--tests/auto/testlib/selftests/failinitdata/.prev_CMakeLists.txt2
-rw-r--r--tests/auto/testlib/selftests/failinitdata/CMakeLists.txt2
-rw-r--r--tests/auto/testlib/selftests/fetchbogus/.prev_CMakeLists.txt2
-rw-r--r--tests/auto/testlib/selftests/fetchbogus/CMakeLists.txt2
-rw-r--r--tests/auto/testlib/selftests/findtestdata/.prev_CMakeLists.txt4
-rw-r--r--tests/auto/testlib/selftests/findtestdata/CMakeLists.txt4
-rw-r--r--tests/auto/testlib/selftests/float/.prev_CMakeLists.txt2
-rw-r--r--tests/auto/testlib/selftests/float/CMakeLists.txt2
-rw-r--r--tests/auto/testlib/selftests/globaldata/.prev_CMakeLists.txt2
-rw-r--r--tests/auto/testlib/selftests/globaldata/CMakeLists.txt2
-rw-r--r--tests/auto/testlib/selftests/keyboard/.prev_CMakeLists.txt2
-rw-r--r--tests/auto/testlib/selftests/keyboard/CMakeLists.txt2
-rw-r--r--tests/auto/testlib/selftests/longstring/.prev_CMakeLists.txt2
-rw-r--r--tests/auto/testlib/selftests/longstring/CMakeLists.txt2
-rw-r--r--tests/auto/testlib/selftests/maxwarnings/.prev_CMakeLists.txt2
-rw-r--r--tests/auto/testlib/selftests/maxwarnings/CMakeLists.txt2
-rw-r--r--tests/auto/testlib/selftests/mouse/.prev_CMakeLists.txt2
-rw-r--r--tests/auto/testlib/selftests/mouse/CMakeLists.txt2
-rw-r--r--tests/auto/testlib/selftests/multiexec/.prev_CMakeLists.txt2
-rw-r--r--tests/auto/testlib/selftests/multiexec/CMakeLists.txt2
-rw-r--r--tests/auto/testlib/selftests/pairdiagnostics/.prev_CMakeLists.txt2
-rw-r--r--tests/auto/testlib/selftests/pairdiagnostics/CMakeLists.txt2
-rw-r--r--tests/auto/testlib/selftests/printdatatags/.prev_CMakeLists.txt2
-rw-r--r--tests/auto/testlib/selftests/printdatatags/CMakeLists.txt2
-rw-r--r--tests/auto/testlib/selftests/printdatatagswithglobaltags/.prev_CMakeLists.txt2
-rw-r--r--tests/auto/testlib/selftests/printdatatagswithglobaltags/CMakeLists.txt2
-rw-r--r--tests/auto/testlib/selftests/qexecstringlist/.prev_CMakeLists.txt2
-rw-r--r--tests/auto/testlib/selftests/qexecstringlist/CMakeLists.txt2
-rw-r--r--tests/auto/testlib/selftests/signaldumper/.prev_CMakeLists.txt2
-rw-r--r--tests/auto/testlib/selftests/signaldumper/CMakeLists.txt2
-rw-r--r--tests/auto/testlib/selftests/silent/.prev_CMakeLists.txt2
-rw-r--r--tests/auto/testlib/selftests/silent/CMakeLists.txt2
-rw-r--r--tests/auto/testlib/selftests/singleskip/.prev_CMakeLists.txt2
-rw-r--r--tests/auto/testlib/selftests/singleskip/CMakeLists.txt2
-rw-r--r--tests/auto/testlib/selftests/skip/.prev_CMakeLists.txt2
-rw-r--r--tests/auto/testlib/selftests/skip/CMakeLists.txt2
-rw-r--r--tests/auto/testlib/selftests/skipcleanup/.prev_CMakeLists.txt2
-rw-r--r--tests/auto/testlib/selftests/skipcleanup/CMakeLists.txt2
-rw-r--r--tests/auto/testlib/selftests/skipinit/.prev_CMakeLists.txt2
-rw-r--r--tests/auto/testlib/selftests/skipinit/CMakeLists.txt2
-rw-r--r--tests/auto/testlib/selftests/skipinitdata/.prev_CMakeLists.txt2
-rw-r--r--tests/auto/testlib/selftests/skipinitdata/CMakeLists.txt2
-rw-r--r--tests/auto/testlib/selftests/sleep/.prev_CMakeLists.txt2
-rw-r--r--tests/auto/testlib/selftests/sleep/CMakeLists.txt2
-rw-r--r--tests/auto/testlib/selftests/strcmp/.prev_CMakeLists.txt2
-rw-r--r--tests/auto/testlib/selftests/strcmp/CMakeLists.txt2
-rw-r--r--tests/auto/testlib/selftests/subtest/.prev_CMakeLists.txt2
-rw-r--r--tests/auto/testlib/selftests/subtest/CMakeLists.txt2
-rw-r--r--tests/auto/testlib/selftests/testlib/.prev_CMakeLists.txt2
-rw-r--r--tests/auto/testlib/selftests/testlib/CMakeLists.txt2
-rw-r--r--tests/auto/testlib/selftests/tuplediagnostics/.prev_CMakeLists.txt2
-rw-r--r--tests/auto/testlib/selftests/tuplediagnostics/CMakeLists.txt2
-rw-r--r--tests/auto/testlib/selftests/verbose1/.prev_CMakeLists.txt2
-rw-r--r--tests/auto/testlib/selftests/verbose1/CMakeLists.txt2
-rw-r--r--tests/auto/testlib/selftests/verbose2/.prev_CMakeLists.txt2
-rw-r--r--tests/auto/testlib/selftests/verbose2/CMakeLists.txt2
-rw-r--r--tests/auto/testlib/selftests/verifyexceptionthrown/.prev_CMakeLists.txt2
-rw-r--r--tests/auto/testlib/selftests/verifyexceptionthrown/CMakeLists.txt2
-rw-r--r--tests/auto/testlib/selftests/warnings/.prev_CMakeLists.txt2
-rw-r--r--tests/auto/testlib/selftests/warnings/CMakeLists.txt2
-rw-r--r--tests/auto/testlib/selftests/watchdog/.prev_CMakeLists.txt2
-rw-r--r--tests/auto/testlib/selftests/watchdog/CMakeLists.txt2
-rw-r--r--tests/auto/testlib/selftests/xunit/.prev_CMakeLists.txt2
-rw-r--r--tests/auto/testlib/selftests/xunit/CMakeLists.txt2
-rw-r--r--tests/auto/tools/qdbuscpp2xml/CMakeLists.txt4
-rw-r--r--tests/auto/tools/qdbusxml2cpp/CMakeLists.txt2
-rw-r--r--tests/auto/tools/qmake/CMakeLists.txt2
-rw-r--r--tests/auto/tools/qmakelib/CMakeLists.txt4
-rw-r--r--tests/auto/tools/uic/CMakeLists.txt2
-rw-r--r--tests/auto/widgets/dialogs/qcolordialog/CMakeLists.txt2
-rw-r--r--tests/auto/widgets/dialogs/qdialog/CMakeLists.txt2
-rw-r--r--tests/auto/widgets/dialogs/qerrormessage/CMakeLists.txt2
-rw-r--r--tests/auto/widgets/dialogs/qfiledialog/CMakeLists.txt2
-rw-r--r--tests/auto/widgets/dialogs/qfiledialog2/CMakeLists.txt2
-rw-r--r--tests/auto/widgets/dialogs/qfilesystemmodel/CMakeLists.txt2
-rw-r--r--tests/auto/widgets/dialogs/qfontdialog/CMakeLists.txt4
-rw-r--r--tests/auto/widgets/dialogs/qinputdialog/CMakeLists.txt2
-rw-r--r--tests/auto/widgets/dialogs/qmessagebox/CMakeLists.txt2
-rw-r--r--tests/auto/widgets/dialogs/qprogressdialog/CMakeLists.txt2
-rw-r--r--tests/auto/widgets/dialogs/qsidebar/CMakeLists.txt2
-rw-r--r--tests/auto/widgets/dialogs/qwizard/CMakeLists.txt4
-rw-r--r--tests/auto/widgets/effects/qgraphicseffect/CMakeLists.txt2
-rw-r--r--tests/auto/widgets/effects/qpixmapfilter/CMakeLists.txt2
-rw-r--r--tests/auto/widgets/graphicsview/qgraphicsanchorlayout/CMakeLists.txt2
-rw-r--r--tests/auto/widgets/graphicsview/qgraphicsanchorlayout1/CMakeLists.txt2
-rw-r--r--tests/auto/widgets/graphicsview/qgraphicseffectsource/CMakeLists.txt2
-rw-r--r--tests/auto/widgets/graphicsview/qgraphicsgridlayout/CMakeLists.txt2
-rw-r--r--tests/auto/widgets/graphicsview/qgraphicsitem/CMakeLists.txt4
-rw-r--r--tests/auto/widgets/graphicsview/qgraphicsitemanimation/CMakeLists.txt2
-rw-r--r--tests/auto/widgets/graphicsview/qgraphicslayout/CMakeLists.txt2
-rw-r--r--tests/auto/widgets/graphicsview/qgraphicslayoutitem/CMakeLists.txt2
-rw-r--r--tests/auto/widgets/graphicsview/qgraphicslinearlayout/CMakeLists.txt2
-rw-r--r--tests/auto/widgets/graphicsview/qgraphicsobject/CMakeLists.txt2
-rw-r--r--tests/auto/widgets/graphicsview/qgraphicspixmapitem/CMakeLists.txt2
-rw-r--r--tests/auto/widgets/graphicsview/qgraphicspolygonitem/CMakeLists.txt2
-rw-r--r--tests/auto/widgets/graphicsview/qgraphicsproxywidget/CMakeLists.txt2
-rw-r--r--tests/auto/widgets/graphicsview/qgraphicsscene/CMakeLists.txt8
-rw-r--r--tests/auto/widgets/graphicsview/qgraphicssceneindex/CMakeLists.txt2
-rw-r--r--tests/auto/widgets/graphicsview/qgraphicstransform/CMakeLists.txt2
-rw-r--r--tests/auto/widgets/graphicsview/qgraphicsview/CMakeLists.txt4
-rw-r--r--tests/auto/widgets/graphicsview/qgraphicswidget/CMakeLists.txt2
-rw-r--r--tests/auto/widgets/itemviews/qabstractitemview/CMakeLists.txt2
-rw-r--r--tests/auto/widgets/itemviews/qcolumnview/CMakeLists.txt2
-rw-r--r--tests/auto/widgets/itemviews/qdatawidgetmapper/CMakeLists.txt2
-rw-r--r--tests/auto/widgets/itemviews/qfileiconprovider/CMakeLists.txt2
-rw-r--r--tests/auto/widgets/itemviews/qheaderview/CMakeLists.txt2
-rw-r--r--tests/auto/widgets/itemviews/qitemdelegate/CMakeLists.txt4
-rw-r--r--tests/auto/widgets/itemviews/qitemeditorfactory/CMakeLists.txt2
-rw-r--r--tests/auto/widgets/itemviews/qitemview/CMakeLists.txt2
-rw-r--r--tests/auto/widgets/itemviews/qlistview/CMakeLists.txt4
-rw-r--r--tests/auto/widgets/itemviews/qlistwidget/CMakeLists.txt2
-rw-r--r--tests/auto/widgets/itemviews/qtableview/CMakeLists.txt2
-rw-r--r--tests/auto/widgets/itemviews/qtablewidget/CMakeLists.txt2
-rw-r--r--tests/auto/widgets/itemviews/qtreeview/CMakeLists.txt2
-rw-r--r--tests/auto/widgets/itemviews/qtreewidget/CMakeLists.txt2
-rw-r--r--tests/auto/widgets/itemviews/qtreewidgetitemiterator/CMakeLists.txt2
-rw-r--r--tests/auto/widgets/kernel/qaction/CMakeLists.txt2
-rw-r--r--tests/auto/widgets/kernel/qactiongroup/CMakeLists.txt2
-rw-r--r--tests/auto/widgets/kernel/qapplication/desktopsettingsaware/.prev_CMakeLists.txt2
-rw-r--r--tests/auto/widgets/kernel/qapplication/desktopsettingsaware/CMakeLists.txt2
-rw-r--r--tests/auto/widgets/kernel/qapplication/modal/.prev_CMakeLists.txt2
-rw-r--r--tests/auto/widgets/kernel/qapplication/modal/CMakeLists.txt2
-rw-r--r--tests/auto/widgets/kernel/qapplication/test/.prev_CMakeLists.txt4
-rw-r--r--tests/auto/widgets/kernel/qapplication/test/CMakeLists.txt4
-rw-r--r--tests/auto/widgets/kernel/qboxlayout/CMakeLists.txt2
-rw-r--r--tests/auto/widgets/kernel/qformlayout/CMakeLists.txt2
-rw-r--r--tests/auto/widgets/kernel/qgesturerecognizer/CMakeLists.txt2
-rw-r--r--tests/auto/widgets/kernel/qgridlayout/CMakeLists.txt2
-rw-r--r--tests/auto/widgets/kernel/qlayout/CMakeLists.txt4
-rw-r--r--tests/auto/widgets/kernel/qshortcut/CMakeLists.txt2
-rw-r--r--tests/auto/widgets/kernel/qsizepolicy/CMakeLists.txt2
-rw-r--r--tests/auto/widgets/kernel/qstackedlayout/CMakeLists.txt2
-rw-r--r--tests/auto/widgets/kernel/qtooltip/CMakeLists.txt2
-rw-r--r--tests/auto/widgets/kernel/qwidget/CMakeLists.txt10
-rw-r--r--tests/auto/widgets/kernel/qwidget_window/CMakeLists.txt2
-rw-r--r--tests/auto/widgets/kernel/qwidgetaction/CMakeLists.txt2
-rw-r--r--tests/auto/widgets/kernel/qwidgetmetatype/CMakeLists.txt2
-rw-r--r--tests/auto/widgets/kernel/qwidgetsvariant/CMakeLists.txt2
-rw-r--r--tests/auto/widgets/kernel/qwindowcontainer/CMakeLists.txt2
-rw-r--r--tests/auto/widgets/styles/qmacstyle/CMakeLists.txt2
-rw-r--r--tests/auto/widgets/styles/qstyle/CMakeLists.txt2
-rw-r--r--tests/auto/widgets/styles/qstyleoption/CMakeLists.txt2
-rw-r--r--tests/auto/widgets/styles/qstylesheetstyle/CMakeLists.txt4
-rw-r--r--tests/auto/widgets/util/qcompleter/CMakeLists.txt2
-rw-r--r--tests/auto/widgets/util/qscroller/CMakeLists.txt2
-rw-r--r--tests/auto/widgets/util/qsystemtrayicon/CMakeLists.txt2
-rw-r--r--tests/auto/widgets/widgets/qabstractbutton/CMakeLists.txt2
-rw-r--r--tests/auto/widgets/widgets/qabstractscrollarea/CMakeLists.txt2
-rw-r--r--tests/auto/widgets/widgets/qabstractslider/CMakeLists.txt2
-rw-r--r--tests/auto/widgets/widgets/qabstractspinbox/CMakeLists.txt2
-rw-r--r--tests/auto/widgets/widgets/qbuttongroup/CMakeLists.txt2
-rw-r--r--tests/auto/widgets/widgets/qcalendarwidget/CMakeLists.txt2
-rw-r--r--tests/auto/widgets/widgets/qcheckbox/CMakeLists.txt2
-rw-r--r--tests/auto/widgets/widgets/qcombobox/CMakeLists.txt2
-rw-r--r--tests/auto/widgets/widgets/qcommandlinkbutton/CMakeLists.txt2
-rw-r--r--tests/auto/widgets/widgets/qdatetimeedit/CMakeLists.txt2
-rw-r--r--tests/auto/widgets/widgets/qdial/CMakeLists.txt2
-rw-r--r--tests/auto/widgets/widgets/qdialogbuttonbox/CMakeLists.txt2
-rw-r--r--tests/auto/widgets/widgets/qdockwidget/CMakeLists.txt2
-rw-r--r--tests/auto/widgets/widgets/qdoublespinbox/CMakeLists.txt2
-rw-r--r--tests/auto/widgets/widgets/qfocusframe/CMakeLists.txt2
-rw-r--r--tests/auto/widgets/widgets/qfontcombobox/CMakeLists.txt2
-rw-r--r--tests/auto/widgets/widgets/qframe/CMakeLists.txt2
-rw-r--r--tests/auto/widgets/widgets/qgroupbox/CMakeLists.txt2
-rw-r--r--tests/auto/widgets/widgets/qkeysequenceedit/CMakeLists.txt2
-rw-r--r--tests/auto/widgets/widgets/qlabel/CMakeLists.txt2
-rw-r--r--tests/auto/widgets/widgets/qlcdnumber/CMakeLists.txt2
-rw-r--r--tests/auto/widgets/widgets/qlineedit/CMakeLists.txt4
-rw-r--r--tests/auto/widgets/widgets/qmainwindow/CMakeLists.txt2
-rw-r--r--tests/auto/widgets/widgets/qmdiarea/CMakeLists.txt6
-rw-r--r--tests/auto/widgets/widgets/qmdisubwindow/CMakeLists.txt2
-rw-r--r--tests/auto/widgets/widgets/qmenu/CMakeLists.txt6
-rw-r--r--tests/auto/widgets/widgets/qmenubar/CMakeLists.txt4
-rw-r--r--tests/auto/widgets/widgets/qopenglwidget/CMakeLists.txt2
-rw-r--r--tests/auto/widgets/widgets/qplaintextedit/CMakeLists.txt4
-rw-r--r--tests/auto/widgets/widgets/qprogressbar/CMakeLists.txt2
-rw-r--r--tests/auto/widgets/widgets/qpushbutton/CMakeLists.txt2
-rw-r--r--tests/auto/widgets/widgets/qradiobutton/CMakeLists.txt2
-rw-r--r--tests/auto/widgets/widgets/qscrollarea/CMakeLists.txt2
-rw-r--r--tests/auto/widgets/widgets/qscrollbar/CMakeLists.txt2
-rw-r--r--tests/auto/widgets/widgets/qsizegrip/CMakeLists.txt2
-rw-r--r--tests/auto/widgets/widgets/qslider/CMakeLists.txt2
-rw-r--r--tests/auto/widgets/widgets/qspinbox/CMakeLists.txt2
-rw-r--r--tests/auto/widgets/widgets/qsplashscreen/CMakeLists.txt2
-rw-r--r--tests/auto/widgets/widgets/qsplitter/CMakeLists.txt2
-rw-r--r--tests/auto/widgets/widgets/qstackedwidget/CMakeLists.txt2
-rw-r--r--tests/auto/widgets/widgets/qstatusbar/CMakeLists.txt2
-rw-r--r--tests/auto/widgets/widgets/qtabbar/CMakeLists.txt2
-rw-r--r--tests/auto/widgets/widgets/qtabwidget/CMakeLists.txt4
-rw-r--r--tests/auto/widgets/widgets/qtextbrowser/CMakeLists.txt4
-rw-r--r--tests/auto/widgets/widgets/qtextedit/CMakeLists.txt4
-rw-r--r--tests/auto/widgets/widgets/qtoolbar/CMakeLists.txt2
-rw-r--r--tests/auto/widgets/widgets/qtoolbox/CMakeLists.txt2
-rw-r--r--tests/auto/widgets/widgets/qtoolbutton/CMakeLists.txt2
-rw-r--r--tests/auto/xml/dom/qdom/CMakeLists.txt2
-rw-r--r--tests/auto/xml/sax/qxml/CMakeLists.txt2
-rw-r--r--tests/auto/xml/sax/qxmlinputsource/CMakeLists.txt2
-rw-r--r--tests/auto/xml/sax/qxmlsimplereader/CMakeLists.txt2
688 files changed, 881 insertions, 883 deletions
diff --git a/tests/auto/concurrent/qtconcurrentiteratekernel/CMakeLists.txt b/tests/auto/concurrent/qtconcurrentiteratekernel/CMakeLists.txt
index af44d66642..e73d574fcb 100644
--- a/tests/auto/concurrent/qtconcurrentiteratekernel/CMakeLists.txt
+++ b/tests/auto/concurrent/qtconcurrentiteratekernel/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qtconcurrentiteratekernel Test:
#####################################################################
-add_qt_test(tst_qtconcurrentiteratekernel
+qt_add_test(tst_qtconcurrentiteratekernel
SOURCES
tst_qtconcurrentiteratekernel.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/concurrent/qtconcurrentmedian/CMakeLists.txt b/tests/auto/concurrent/qtconcurrentmedian/CMakeLists.txt
index 27b376a406..5d7e95049f 100644
--- a/tests/auto/concurrent/qtconcurrentmedian/CMakeLists.txt
+++ b/tests/auto/concurrent/qtconcurrentmedian/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qtconcurrentmedian Test:
#####################################################################
-add_qt_test(tst_qtconcurrentmedian
+qt_add_test(tst_qtconcurrentmedian
SOURCES
tst_qtconcurrentmedian.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/concurrent/qtconcurrentrun/CMakeLists.txt b/tests/auto/concurrent/qtconcurrentrun/CMakeLists.txt
index ca1f616137..07cb4d360f 100644
--- a/tests/auto/concurrent/qtconcurrentrun/CMakeLists.txt
+++ b/tests/auto/concurrent/qtconcurrentrun/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qtconcurrentrun Test:
#####################################################################
-add_qt_test(tst_qtconcurrentrun
+qt_add_test(tst_qtconcurrentrun
SOURCES
tst_qtconcurrentrun.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/concurrent/qtconcurrenttask/CMakeLists.txt b/tests/auto/concurrent/qtconcurrenttask/CMakeLists.txt
index 3e6fc9fe6c..23a0d45e83 100644
--- a/tests/auto/concurrent/qtconcurrenttask/CMakeLists.txt
+++ b/tests/auto/concurrent/qtconcurrenttask/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qtconcurrenttask Test:
#####################################################################
-add_qt_test(tst_qtconcurrenttask
+qt_add_test(tst_qtconcurrenttask
SOURCES
tst_qtconcurrenttask.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/concurrent/qtconcurrentthreadengine/CMakeLists.txt b/tests/auto/concurrent/qtconcurrentthreadengine/CMakeLists.txt
index e9384c4fb4..9c24dd1662 100644
--- a/tests/auto/concurrent/qtconcurrentthreadengine/CMakeLists.txt
+++ b/tests/auto/concurrent/qtconcurrentthreadengine/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qtconcurrentthreadengine Test:
#####################################################################
-add_qt_test(tst_qtconcurrentthreadengine
+qt_add_test(tst_qtconcurrentthreadengine
SOURCES
tst_qtconcurrentthreadengine.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/corelib/animation/qabstractanimation/CMakeLists.txt b/tests/auto/corelib/animation/qabstractanimation/CMakeLists.txt
index d5f4a9a016..4e9759faae 100644
--- a/tests/auto/corelib/animation/qabstractanimation/CMakeLists.txt
+++ b/tests/auto/corelib/animation/qabstractanimation/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qabstractanimation Test:
#####################################################################
-add_qt_test(tst_qabstractanimation
+qt_add_test(tst_qabstractanimation
SOURCES
tst_qabstractanimation.cpp
)
diff --git a/tests/auto/corelib/animation/qanimationgroup/CMakeLists.txt b/tests/auto/corelib/animation/qanimationgroup/CMakeLists.txt
index 9b165f7983..d25e437ea5 100644
--- a/tests/auto/corelib/animation/qanimationgroup/CMakeLists.txt
+++ b/tests/auto/corelib/animation/qanimationgroup/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qanimationgroup Test:
#####################################################################
-add_qt_test(tst_qanimationgroup
+qt_add_test(tst_qanimationgroup
SOURCES
tst_qanimationgroup.cpp
)
diff --git a/tests/auto/corelib/animation/qparallelanimationgroup/CMakeLists.txt b/tests/auto/corelib/animation/qparallelanimationgroup/CMakeLists.txt
index 376c9351bd..182bee1cbf 100644
--- a/tests/auto/corelib/animation/qparallelanimationgroup/CMakeLists.txt
+++ b/tests/auto/corelib/animation/qparallelanimationgroup/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qparallelanimationgroup Test:
#####################################################################
-add_qt_test(tst_qparallelanimationgroup
+qt_add_test(tst_qparallelanimationgroup
SOURCES
tst_qparallelanimationgroup.cpp
)
diff --git a/tests/auto/corelib/animation/qpauseanimation/CMakeLists.txt b/tests/auto/corelib/animation/qpauseanimation/CMakeLists.txt
index 183127519f..7fd1132c33 100644
--- a/tests/auto/corelib/animation/qpauseanimation/CMakeLists.txt
+++ b/tests/auto/corelib/animation/qpauseanimation/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qpauseanimation Test:
#####################################################################
-add_qt_test(tst_qpauseanimation
+qt_add_test(tst_qpauseanimation
SOURCES
tst_qpauseanimation.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/corelib/animation/qsequentialanimationgroup/CMakeLists.txt b/tests/auto/corelib/animation/qsequentialanimationgroup/CMakeLists.txt
index a3381b06b0..5418f1e198 100644
--- a/tests/auto/corelib/animation/qsequentialanimationgroup/CMakeLists.txt
+++ b/tests/auto/corelib/animation/qsequentialanimationgroup/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qsequentialanimationgroup Test:
#####################################################################
-add_qt_test(tst_qsequentialanimationgroup
+qt_add_test(tst_qsequentialanimationgroup
SOURCES
tst_qsequentialanimationgroup.cpp
)
diff --git a/tests/auto/corelib/animation/qvariantanimation/CMakeLists.txt b/tests/auto/corelib/animation/qvariantanimation/CMakeLists.txt
index 1c5f9bd03b..caebb13342 100644
--- a/tests/auto/corelib/animation/qvariantanimation/CMakeLists.txt
+++ b/tests/auto/corelib/animation/qvariantanimation/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qvariantanimation Test:
#####################################################################
-add_qt_test(tst_qvariantanimation
+qt_add_test(tst_qvariantanimation
SOURCES
tst_qvariantanimation.cpp
)
diff --git a/tests/auto/corelib/global/q_func_info/CMakeLists.txt b/tests/auto/corelib/global/q_func_info/CMakeLists.txt
index 5435c97cf8..57ae4369a2 100644
--- a/tests/auto/corelib/global/q_func_info/CMakeLists.txt
+++ b/tests/auto/corelib/global/q_func_info/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_q_func_info Test:
#####################################################################
-add_qt_test(tst_q_func_info
+qt_add_test(tst_q_func_info
SOURCES
tst_q_func_info.cpp
)
diff --git a/tests/auto/corelib/global/qflags/CMakeLists.txt b/tests/auto/corelib/global/qflags/CMakeLists.txt
index f1fdb7a5f8..8ba1cb6d48 100644
--- a/tests/auto/corelib/global/qflags/CMakeLists.txt
+++ b/tests/auto/corelib/global/qflags/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qflags Test:
#####################################################################
-add_qt_test(tst_qflags
+qt_add_test(tst_qflags
SOURCES
tst_qflags.cpp
)
diff --git a/tests/auto/corelib/global/qfloat16/CMakeLists.txt b/tests/auto/corelib/global/qfloat16/CMakeLists.txt
index 36e15d8225..a9c3f2dd7f 100644
--- a/tests/auto/corelib/global/qfloat16/CMakeLists.txt
+++ b/tests/auto/corelib/global/qfloat16/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qfloat16 Test:
#####################################################################
-add_qt_test(tst_qfloat16
+qt_add_test(tst_qfloat16
SOURCES
tst_qfloat16.cpp
)
diff --git a/tests/auto/corelib/global/qgetputenv/CMakeLists.txt b/tests/auto/corelib/global/qgetputenv/CMakeLists.txt
index c5f3a53810..a2cc20c378 100644
--- a/tests/auto/corelib/global/qgetputenv/CMakeLists.txt
+++ b/tests/auto/corelib/global/qgetputenv/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qgetputenv Test:
#####################################################################
-add_qt_test(tst_qgetputenv
+qt_add_test(tst_qgetputenv
SOURCES
tst_qgetputenv.cpp
)
diff --git a/tests/auto/corelib/global/qglobal/CMakeLists.txt b/tests/auto/corelib/global/qglobal/CMakeLists.txt
index 1efaaa71d0..c292b65cf9 100644
--- a/tests/auto/corelib/global/qglobal/CMakeLists.txt
+++ b/tests/auto/corelib/global/qglobal/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qglobal Test:
#####################################################################
-add_qt_test(tst_qglobal
+qt_add_test(tst_qglobal
SOURCES
qglobal.c
tst_qglobal.cpp
diff --git a/tests/auto/corelib/global/qglobalstatic/CMakeLists.txt b/tests/auto/corelib/global/qglobalstatic/CMakeLists.txt
index 7e8eee14d3..cadc627fa7 100644
--- a/tests/auto/corelib/global/qglobalstatic/CMakeLists.txt
+++ b/tests/auto/corelib/global/qglobalstatic/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qglobalstatic Test:
#####################################################################
-add_qt_test(tst_qglobalstatic
+qt_add_test(tst_qglobalstatic
EXCEPTIONS
SOURCES
tst_qglobalstatic.cpp
diff --git a/tests/auto/corelib/global/qhooks/CMakeLists.txt b/tests/auto/corelib/global/qhooks/CMakeLists.txt
index c86faba75f..0aaefaf96e 100644
--- a/tests/auto/corelib/global/qhooks/CMakeLists.txt
+++ b/tests/auto/corelib/global/qhooks/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qhooks Test:
#####################################################################
-add_qt_test(tst_qhooks
+qt_add_test(tst_qhooks
SOURCES
tst_qhooks.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/corelib/global/qnumeric/CMakeLists.txt b/tests/auto/corelib/global/qnumeric/CMakeLists.txt
index 8a857c5622..7ca7b92f70 100644
--- a/tests/auto/corelib/global/qnumeric/CMakeLists.txt
+++ b/tests/auto/corelib/global/qnumeric/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qnumeric Test:
#####################################################################
-add_qt_test(tst_qnumeric
+qt_add_test(tst_qnumeric
SOURCES
tst_qnumeric.cpp
PUBLIC_LIBRARIES
@@ -14,13 +14,13 @@ add_qt_test(tst_qnumeric
## Scopes:
#####################################################################
-extend_target(tst_qnumeric CONDITION ICC
+qt_extend_target(tst_qnumeric CONDITION ICC
COMPILE_OPTIONS
-fp-model
strict
)
-extend_target(tst_qnumeric CONDITION intel_icl
+qt_extend_target(tst_qnumeric CONDITION intel_icl
COMPILE_OPTIONS
/fp:strict
)
diff --git a/tests/auto/corelib/global/qrand/CMakeLists.txt b/tests/auto/corelib/global/qrand/CMakeLists.txt
index 80e8132809..8b1fabfeb8 100644
--- a/tests/auto/corelib/global/qrand/CMakeLists.txt
+++ b/tests/auto/corelib/global/qrand/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qrand Test:
#####################################################################
-add_qt_test(tst_qrand
+qt_add_test(tst_qrand
SOURCES
tst_qrand.cpp
)
diff --git a/tests/auto/corelib/global/qrandomgenerator/CMakeLists.txt b/tests/auto/corelib/global/qrandomgenerator/CMakeLists.txt
index edd2efe760..4e162e8fa4 100644
--- a/tests/auto/corelib/global/qrandomgenerator/CMakeLists.txt
+++ b/tests/auto/corelib/global/qrandomgenerator/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qrandomgenerator Test:
#####################################################################
-add_qt_test(tst_qrandomgenerator
+qt_add_test(tst_qrandomgenerator
SOURCES
tst_qrandomgenerator.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/corelib/global/qtendian/CMakeLists.txt b/tests/auto/corelib/global/qtendian/CMakeLists.txt
index 9efb17712e..77c3c433cd 100644
--- a/tests/auto/corelib/global/qtendian/CMakeLists.txt
+++ b/tests/auto/corelib/global/qtendian/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qtendian Test:
#####################################################################
-add_qt_test(tst_qtendian
+qt_add_test(tst_qtendian
SOURCES
tst_qtendian.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/corelib/io/largefile/CMakeLists.txt b/tests/auto/corelib/io/largefile/CMakeLists.txt
index cb1eba8526..6e9a3cbae8 100644
--- a/tests/auto/corelib/io/largefile/CMakeLists.txt
+++ b/tests/auto/corelib/io/largefile/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_largefile Test:
#####################################################################
-add_qt_test(tst_largefile
+qt_add_test(tst_largefile
SOURCES
../../../../shared/emulationdetector.h
tst_largefile.cpp
diff --git a/tests/auto/corelib/io/qabstractfileengine/CMakeLists.txt b/tests/auto/corelib/io/qabstractfileengine/CMakeLists.txt
index 1b7a11d657..8267c7241c 100644
--- a/tests/auto/corelib/io/qabstractfileengine/CMakeLists.txt
+++ b/tests/auto/corelib/io/qabstractfileengine/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qabstractfileengine Test:
#####################################################################
-add_qt_test(tst_qabstractfileengine
+qt_add_test(tst_qabstractfileengine
SOURCES
tst_qabstractfileengine.cpp
PUBLIC_LIBRARIES
@@ -16,7 +16,7 @@ set(qabstractfileengine_resource_files
"resources/"
)
-add_qt_resource(tst_qabstractfileengine "qabstractfileengine"
+qt_add_resource(tst_qabstractfileengine "qabstractfileengine"
PREFIX
"/tst_qabstractfileengine/"
FILES
diff --git a/tests/auto/corelib/io/qbuffer/CMakeLists.txt b/tests/auto/corelib/io/qbuffer/CMakeLists.txt
index 40502dd004..5a374173ef 100644
--- a/tests/auto/corelib/io/qbuffer/CMakeLists.txt
+++ b/tests/auto/corelib/io/qbuffer/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qbuffer Test:
#####################################################################
-add_qt_test(tst_qbuffer
+qt_add_test(tst_qbuffer
SOURCES
tst_qbuffer.cpp
)
diff --git a/tests/auto/corelib/io/qdataurl/CMakeLists.txt b/tests/auto/corelib/io/qdataurl/CMakeLists.txt
index 507852a11e..8020879311 100644
--- a/tests/auto/corelib/io/qdataurl/CMakeLists.txt
+++ b/tests/auto/corelib/io/qdataurl/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qdataurl Test:
#####################################################################
-add_qt_test(tst_qdataurl
+qt_add_test(tst_qdataurl
SOURCES
tst_qdataurl.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/corelib/io/qdebug/CMakeLists.txt b/tests/auto/corelib/io/qdebug/CMakeLists.txt
index d7fa4fb7cd..6656b6089b 100644
--- a/tests/auto/corelib/io/qdebug/CMakeLists.txt
+++ b/tests/auto/corelib/io/qdebug/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qdebug Test:
#####################################################################
-add_qt_test(tst_qdebug
+qt_add_test(tst_qdebug
SOURCES
tst_qdebug.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/corelib/io/qdir/CMakeLists.txt b/tests/auto/corelib/io/qdir/CMakeLists.txt
index f77185bc2b..49711da087 100644
--- a/tests/auto/corelib/io/qdir/CMakeLists.txt
+++ b/tests/auto/corelib/io/qdir/CMakeLists.txt
@@ -13,7 +13,7 @@ list(APPEND test_data "entrylist")
list(APPEND test_data "types")
list(APPEND test_data "tst_qdir.cpp")
-add_qt_test(tst_qdir
+qt_add_test(tst_qdir
SOURCES
tst_qdir.cpp
PUBLIC_LIBRARIES
@@ -26,7 +26,7 @@ set(qdir_resource_files
"resources/entryList/"
)
-add_qt_resource(tst_qdir "qdir"
+qt_add_resource(tst_qdir "qdir"
PREFIX
"/tst_qdir/"
FILES
@@ -40,7 +40,7 @@ add_qt_resource(tst_qdir "qdir"
#### Keys ignored in scope 2:.:.:qdir.pro:IOS:
# QMAKE_INFO_PLIST = "Info.plist"
-extend_target(tst_qdir CONDITION CONFIG___contains___builtin_testdata
+qt_extend_target(tst_qdir CONDITION CONFIG___contains___builtin_testdata
DEFINES
BUILTIN_TESTDATA
)
@@ -90,7 +90,7 @@ if(ANDROID AND NOT ANDROID_EMBEDDED)
"types/f/dummy"
)
- add_qt_resource(tst_qdir "android_testdata"
+ qt_add_resource(tst_qdir "android_testdata"
PREFIX
"/android_testdata"
FILES
diff --git a/tests/auto/corelib/io/qdir/testdir/dir/CMakeLists.txt b/tests/auto/corelib/io/qdir/testdir/dir/CMakeLists.txt
index e50fcb60ca..19e64e037c 100644
--- a/tests/auto/corelib/io/qdir/testdir/dir/CMakeLists.txt
+++ b/tests/auto/corelib/io/qdir/testdir/dir/CMakeLists.txt
@@ -4,7 +4,7 @@
## qdir Binary:
#####################################################################
-add_qt_executable(qdir
+qt_add_executable(qdir
GUI
DEFINES
QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/corelib/io/qdiriterator/CMakeLists.txt b/tests/auto/corelib/io/qdiriterator/CMakeLists.txt
index 2e120b4621..39703e8c83 100644
--- a/tests/auto/corelib/io/qdiriterator/CMakeLists.txt
+++ b/tests/auto/corelib/io/qdiriterator/CMakeLists.txt
@@ -7,7 +7,7 @@
# Collect test data
list(APPEND test_data "entrylist")
-add_qt_test(tst_qdiriterator
+qt_add_test(tst_qdiriterator
SOURCES
tst_qdiriterator.cpp
PUBLIC_LIBRARIES
@@ -21,7 +21,7 @@ set(qdiriterator_resource_files
"entrylist/file"
)
-add_qt_resource(tst_qdiriterator "qdiriterator"
+qt_add_resource(tst_qdiriterator "qdiriterator"
PREFIX
"/testdata/"
FILES
@@ -32,7 +32,7 @@ add_qt_resource(tst_qdiriterator "qdiriterator"
## Scopes:
#####################################################################
-extend_target(tst_qdiriterator CONDITION CONFIG___contains___builtin_testdata
+qt_extend_target(tst_qdiriterator CONDITION CONFIG___contains___builtin_testdata
DEFINES
BUILTIN_TESTDATA
)
diff --git a/tests/auto/corelib/io/qfile/stdinprocess/CMakeLists.txt b/tests/auto/corelib/io/qfile/stdinprocess/CMakeLists.txt
index 994c2fc268..eb1f6a0ff0 100644
--- a/tests/auto/corelib/io/qfile/stdinprocess/CMakeLists.txt
+++ b/tests/auto/corelib/io/qfile/stdinprocess/CMakeLists.txt
@@ -4,7 +4,7 @@
## stdinprocess_helper Binary:
#####################################################################
-add_qt_test_helper(stdinprocess_helper
+qt_add_test_helper(stdinprocess_helper
SOURCES
main.cpp
)
diff --git a/tests/auto/corelib/io/qfileinfo/CMakeLists.txt b/tests/auto/corelib/io/qfileinfo/CMakeLists.txt
index 05a14d4e1a..a7ccda9c58 100644
--- a/tests/auto/corelib/io/qfileinfo/CMakeLists.txt
+++ b/tests/auto/corelib/io/qfileinfo/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qfileinfo Test:
#####################################################################
-add_qt_test(tst_qfileinfo
+qt_add_test(tst_qfileinfo
SOURCES
tst_qfileinfo.cpp
PUBLIC_LIBRARIES
@@ -16,7 +16,7 @@ set(qfileinfo_resource_files
"resources/"
)
-add_qt_resource(tst_qfileinfo "qfileinfo"
+qt_add_resource(tst_qfileinfo "qfileinfo"
PREFIX
"/tst_qfileinfo/"
FILES
@@ -29,7 +29,7 @@ set(testdata_resource_files
"tst_qfileinfo.cpp"
)
-add_qt_resource(tst_qfileinfo "testdata"
+qt_add_resource(tst_qfileinfo "testdata"
PREFIX
"/testdata"
FILES
@@ -40,7 +40,7 @@ add_qt_resource(tst_qfileinfo "testdata"
## Scopes:
#####################################################################
-extend_target(tst_qfileinfo CONDITION WIN32
+qt_extend_target(tst_qfileinfo CONDITION WIN32
PUBLIC_LIBRARIES
advapi32
netapi32
diff --git a/tests/auto/corelib/io/qfilesystementry/CMakeLists.txt b/tests/auto/corelib/io/qfilesystementry/CMakeLists.txt
index e989315bdd..a99884b617 100644
--- a/tests/auto/corelib/io/qfilesystementry/CMakeLists.txt
+++ b/tests/auto/corelib/io/qfilesystementry/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qfilesystementry Test:
#####################################################################
-add_qt_test(tst_qfilesystementry
+qt_add_test(tst_qfilesystementry
SOURCES
${QT_SOURCE_TREE}/src/corelib/io/qfilesystementry.cpp ${QT_SOURCE_TREE}/src/corelib/io/qfilesystementry_p.h
tst_qfilesystementry.cpp
diff --git a/tests/auto/corelib/io/qfilesystemmetadata/CMakeLists.txt b/tests/auto/corelib/io/qfilesystemmetadata/CMakeLists.txt
index a237090a48..4970e5a426 100644
--- a/tests/auto/corelib/io/qfilesystemmetadata/CMakeLists.txt
+++ b/tests/auto/corelib/io/qfilesystemmetadata/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qfilesystemmetadata Test:
#####################################################################
-add_qt_test(tst_qfilesystemmetadata
+qt_add_test(tst_qfilesystemmetadata
SOURCES
tst_qfilesystemmetadata.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/corelib/io/qfilesystemwatcher/CMakeLists.txt b/tests/auto/corelib/io/qfilesystemwatcher/CMakeLists.txt
index 1dfef5acab..ac72470019 100644
--- a/tests/auto/corelib/io/qfilesystemwatcher/CMakeLists.txt
+++ b/tests/auto/corelib/io/qfilesystemwatcher/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qfilesystemwatcher Test:
#####################################################################
-add_qt_test(tst_qfilesystemwatcher
+qt_add_test(tst_qfilesystemwatcher
SOURCES
tst_qfilesystemwatcher.cpp
)
diff --git a/tests/auto/corelib/io/qiodevice/CMakeLists.txt b/tests/auto/corelib/io/qiodevice/CMakeLists.txt
index 6b7833ac22..fdc896e45d 100644
--- a/tests/auto/corelib/io/qiodevice/CMakeLists.txt
+++ b/tests/auto/corelib/io/qiodevice/CMakeLists.txt
@@ -7,7 +7,7 @@
# Collect test data
list(APPEND test_data "tst_qiodevice.cpp")
-add_qt_test(tst_qiodevice
+qt_add_test(tst_qiodevice
SOURCES
tst_qiodevice.cpp
PUBLIC_LIBRARIES
@@ -27,7 +27,7 @@ if(ANDROID AND NOT ANDROID_EMBEDDED)
"tst_qiodevice.cpp"
)
- add_qt_resource(tst_qiodevice "android_testdata"
+ qt_add_resource(tst_qiodevice "android_testdata"
PREFIX
"/"
FILES
diff --git a/tests/auto/corelib/io/qipaddress/CMakeLists.txt b/tests/auto/corelib/io/qipaddress/CMakeLists.txt
index 821cd58bdb..da7f5a9061 100644
--- a/tests/auto/corelib/io/qipaddress/CMakeLists.txt
+++ b/tests/auto/corelib/io/qipaddress/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qipaddress Test:
#####################################################################
-add_qt_test(tst_qipaddress
+qt_add_test(tst_qipaddress
SOURCES
tst_qipaddress.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/corelib/io/qlockfile/qlockfiletesthelper/.prev_CMakeLists.txt b/tests/auto/corelib/io/qlockfile/qlockfiletesthelper/.prev_CMakeLists.txt
index 755dc7cf39..e0f500f8ae 100644
--- a/tests/auto/corelib/io/qlockfile/qlockfiletesthelper/.prev_CMakeLists.txt
+++ b/tests/auto/corelib/io/qlockfile/qlockfiletesthelper/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
## qlockfile_test_helper Binary:
#####################################################################
-add_qt_executable(qlockfile_test_helper
+qt_add_executable(qlockfile_test_helper
OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
SOURCES
qlockfile_test_helper.cpp
diff --git a/tests/auto/corelib/io/qlockfile/qlockfiletesthelper/CMakeLists.txt b/tests/auto/corelib/io/qlockfile/qlockfiletesthelper/CMakeLists.txt
index b515037d56..957d60ca1b 100644
--- a/tests/auto/corelib/io/qlockfile/qlockfiletesthelper/CMakeLists.txt
+++ b/tests/auto/corelib/io/qlockfile/qlockfiletesthelper/CMakeLists.txt
@@ -4,7 +4,7 @@
## qlockfile_test_helper Binary:
#####################################################################
-add_qt_test_helper(qlockfile_test_helper # special case
+qt_add_test_helper(qlockfile_test_helper # special case
OVERRIDE_OUTPUT_DIRECTORY # special case
OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
SOURCES
diff --git a/tests/auto/corelib/io/qloggingcategory/CMakeLists.txt b/tests/auto/corelib/io/qloggingcategory/CMakeLists.txt
index 9e1eaf3e4a..778315db5b 100644
--- a/tests/auto/corelib/io/qloggingcategory/CMakeLists.txt
+++ b/tests/auto/corelib/io/qloggingcategory/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qloggingcategory Test:
#####################################################################
-add_qt_test(tst_qloggingcategory
+qt_add_test(tst_qloggingcategory
SOURCES
tst_qloggingcategory.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/corelib/io/qloggingregistry/CMakeLists.txt b/tests/auto/corelib/io/qloggingregistry/CMakeLists.txt
index 3c42af9d01..e4d1cf4aaf 100644
--- a/tests/auto/corelib/io/qloggingregistry/CMakeLists.txt
+++ b/tests/auto/corelib/io/qloggingregistry/CMakeLists.txt
@@ -7,7 +7,7 @@
# Collect test data
list(APPEND test_data "qtlogging.ini")
-add_qt_test(tst_qloggingregistry
+qt_add_test(tst_qloggingregistry
SOURCES
tst_qloggingregistry.cpp
PUBLIC_LIBRARIES
@@ -27,7 +27,7 @@ if(ANDROID AND NOT ANDROID_EMBEDDED)
"qtlogging.ini"
)
- add_qt_resource(tst_qloggingregistry "android_testdata"
+ qt_add_resource(tst_qloggingregistry "android_testdata"
PREFIX
"/"
FILES
diff --git a/tests/auto/corelib/io/qnodebug/CMakeLists.txt b/tests/auto/corelib/io/qnodebug/CMakeLists.txt
index 4d1b57e222..fe410643fc 100644
--- a/tests/auto/corelib/io/qnodebug/CMakeLists.txt
+++ b/tests/auto/corelib/io/qnodebug/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qnodebug Test:
#####################################################################
-add_qt_test(tst_qnodebug
+qt_add_test(tst_qnodebug
SOURCES
tst_qnodebug.cpp
)
diff --git a/tests/auto/corelib/io/qprocess-noapplication/CMakeLists.txt b/tests/auto/corelib/io/qprocess-noapplication/CMakeLists.txt
index ce6195fc37..ae7910e302 100644
--- a/tests/auto/corelib/io/qprocess-noapplication/CMakeLists.txt
+++ b/tests/auto/corelib/io/qprocess-noapplication/CMakeLists.txt
@@ -4,7 +4,7 @@
## qprocess-noapplication Test:
#####################################################################
-add_qt_test(qprocess-noapplication
+qt_add_test(qprocess-noapplication
SOURCES
tst_qprocessnoapplication.cpp
)
diff --git a/tests/auto/corelib/io/qprocessenvironment/CMakeLists.txt b/tests/auto/corelib/io/qprocessenvironment/CMakeLists.txt
index dbcd8c8172..ba935455af 100644
--- a/tests/auto/corelib/io/qprocessenvironment/CMakeLists.txt
+++ b/tests/auto/corelib/io/qprocessenvironment/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qprocessenvironment Test:
#####################################################################
-add_qt_test(tst_qprocessenvironment
+qt_add_test(tst_qprocessenvironment
SOURCES
tst_qprocessenvironment.cpp
)
diff --git a/tests/auto/corelib/io/qsavefile/CMakeLists.txt b/tests/auto/corelib/io/qsavefile/CMakeLists.txt
index aec5da1f99..f2c8cf0a56 100644
--- a/tests/auto/corelib/io/qsavefile/CMakeLists.txt
+++ b/tests/auto/corelib/io/qsavefile/CMakeLists.txt
@@ -7,7 +7,7 @@
# Collect test data
list(APPEND test_data "tst_qsavefile.cpp")
-add_qt_test(tst_qsavefile
+qt_add_test(tst_qsavefile
SOURCES
tst_qsavefile.cpp
TESTDATA ${test_data}
diff --git a/tests/auto/corelib/io/qsettings/CMakeLists.txt b/tests/auto/corelib/io/qsettings/CMakeLists.txt
index 161b03b041..3cc9547d3c 100644
--- a/tests/auto/corelib/io/qsettings/CMakeLists.txt
+++ b/tests/auto/corelib/io/qsettings/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qsettings Test:
#####################################################################
-add_qt_test(tst_qsettings
+qt_add_test(tst_qsettings
SOURCES
tst_qsettings.cpp
DEFINES
@@ -28,7 +28,7 @@ set(qsettings_resource_files
"withcomments.ini"
)
-add_qt_resource(tst_qsettings "qsettings"
+qt_add_resource(tst_qsettings "qsettings"
PREFIX
"/"
FILES
@@ -39,12 +39,12 @@ add_qt_resource(tst_qsettings "qsettings"
## Scopes:
#####################################################################
-extend_target(tst_qsettings CONDITION MSVC
+qt_extend_target(tst_qsettings CONDITION MSVC
PUBLIC_LIBRARIES
advapi32
)
-extend_target(tst_qsettings CONDITION APPLE
+qt_extend_target(tst_qsettings CONDITION APPLE
PUBLIC_LIBRARIES
${FWCoreFoundation}
)
diff --git a/tests/auto/corelib/io/qstandardpaths/CMakeLists.txt b/tests/auto/corelib/io/qstandardpaths/CMakeLists.txt
index 5bceaf1d77..be03b3e986 100644
--- a/tests/auto/corelib/io/qstandardpaths/CMakeLists.txt
+++ b/tests/auto/corelib/io/qstandardpaths/CMakeLists.txt
@@ -8,7 +8,7 @@
list(APPEND test_data "tst_qstandardpaths.cpp")
list(APPEND test_data "qstandardpaths.pro")
-add_qt_test(tst_qstandardpaths
+qt_add_test(tst_qstandardpaths
SOURCES
../../../../shared/emulationdetector.h
tst_qstandardpaths.cpp
@@ -20,7 +20,7 @@ add_qt_test(tst_qstandardpaths
## Scopes:
#####################################################################
-extend_target(tst_qstandardpaths CONDITION boot2qt
+qt_extend_target(tst_qstandardpaths CONDITION boot2qt
DEFINES
SKIP_FINDEXECUTABLE
)
diff --git a/tests/auto/corelib/io/qstorageinfo/CMakeLists.txt b/tests/auto/corelib/io/qstorageinfo/CMakeLists.txt
index 08af02dc6c..e2a47a2832 100644
--- a/tests/auto/corelib/io/qstorageinfo/CMakeLists.txt
+++ b/tests/auto/corelib/io/qstorageinfo/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qstorageinfo Test:
#####################################################################
-add_qt_test(tst_qstorageinfo
+qt_add_test(tst_qstorageinfo
SOURCES
tst_qstorageinfo.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/corelib/io/qtemporarydir/CMakeLists.txt b/tests/auto/corelib/io/qtemporarydir/CMakeLists.txt
index 855495bbbb..f1c3db54d0 100644
--- a/tests/auto/corelib/io/qtemporarydir/CMakeLists.txt
+++ b/tests/auto/corelib/io/qtemporarydir/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qtemporarydir Test:
#####################################################################
-add_qt_test(tst_qtemporarydir
+qt_add_test(tst_qtemporarydir
SOURCES
../../../../shared/emulationdetector.h
tst_qtemporarydir.cpp
diff --git a/tests/auto/corelib/io/qtemporaryfile/CMakeLists.txt b/tests/auto/corelib/io/qtemporaryfile/CMakeLists.txt
index af614552cc..9b35f72a69 100644
--- a/tests/auto/corelib/io/qtemporaryfile/CMakeLists.txt
+++ b/tests/auto/corelib/io/qtemporaryfile/CMakeLists.txt
@@ -7,7 +7,7 @@
# Collect test data
list(APPEND test_data "tst_qtemporaryfile.cpp")
-add_qt_test(tst_qtemporaryfile
+qt_add_test(tst_qtemporaryfile
SOURCES
tst_qtemporaryfile.cpp
PUBLIC_LIBRARIES
@@ -20,7 +20,7 @@ set(qtemporaryfile_resource_files
"resources/test.txt"
)
-add_qt_resource(tst_qtemporaryfile "qtemporaryfile"
+qt_add_resource(tst_qtemporaryfile "qtemporaryfile"
PREFIX
"/"
FILES
@@ -38,7 +38,7 @@ if(ANDROID AND NOT ANDROID_EMBEDDED)
"tst_qtemporaryfile.cpp"
)
- add_qt_resource(tst_qtemporaryfile "android_testdata"
+ qt_add_resource(tst_qtemporaryfile "android_testdata"
PREFIX
"/android_testdata"
FILES
diff --git a/tests/auto/corelib/io/qurl/CMakeLists.txt b/tests/auto/corelib/io/qurl/CMakeLists.txt
index c23ad27cfc..2ea06f62d7 100644
--- a/tests/auto/corelib/io/qurl/CMakeLists.txt
+++ b/tests/auto/corelib/io/qurl/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qurl Test:
#####################################################################
-add_qt_test(tst_qurl
+qt_add_test(tst_qurl
SOURCES
tst_qurl.cpp
PUBLIC_LIBRARIES
@@ -14,7 +14,7 @@ add_qt_test(tst_qurl
## Scopes:
#####################################################################
-extend_target(tst_qurl CONDITION APPLE
+qt_extend_target(tst_qurl CONDITION APPLE
SOURCES
tst_qurl_mac.mm
)
diff --git a/tests/auto/corelib/io/qurlinternal/CMakeLists.txt b/tests/auto/corelib/io/qurlinternal/CMakeLists.txt
index 3225f7d308..80f8e0d128 100644
--- a/tests/auto/corelib/io/qurlinternal/CMakeLists.txt
+++ b/tests/auto/corelib/io/qurlinternal/CMakeLists.txt
@@ -8,7 +8,7 @@ endif()
## tst_qurlinternal Test:
#####################################################################
-add_qt_test(tst_qurlinternal
+qt_add_test(tst_qurlinternal
SOURCES
tst_qurlinternal.cpp
utf8data.cpp
diff --git a/tests/auto/corelib/io/qurlquery/CMakeLists.txt b/tests/auto/corelib/io/qurlquery/CMakeLists.txt
index 8a0cc54aeb..b85e688b45 100644
--- a/tests/auto/corelib/io/qurlquery/CMakeLists.txt
+++ b/tests/auto/corelib/io/qurlquery/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qurlquery Test:
#####################################################################
-add_qt_test(tst_qurlquery
+qt_add_test(tst_qurlquery
SOURCES
tst_qurlquery.cpp
DEFINES
diff --git a/tests/auto/corelib/itemmodels/qabstractitemmodel/CMakeLists.txt b/tests/auto/corelib/itemmodels/qabstractitemmodel/CMakeLists.txt
index edc7f4321a..33d790ddc5 100644
--- a/tests/auto/corelib/itemmodels/qabstractitemmodel/CMakeLists.txt
+++ b/tests/auto/corelib/itemmodels/qabstractitemmodel/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qabstractitemmodel Test:
#####################################################################
-add_qt_test(tst_qabstractitemmodel
+qt_add_test(tst_qabstractitemmodel
SOURCES
../../../other/qabstractitemmodelutils/dynamictreemodel.cpp ../../../other/qabstractitemmodelutils/dynamictreemodel.h
tst_qabstractitemmodel.cpp
diff --git a/tests/auto/corelib/itemmodels/qabstractproxymodel/CMakeLists.txt b/tests/auto/corelib/itemmodels/qabstractproxymodel/CMakeLists.txt
index f6a443213c..f3915f98bb 100644
--- a/tests/auto/corelib/itemmodels/qabstractproxymodel/CMakeLists.txt
+++ b/tests/auto/corelib/itemmodels/qabstractproxymodel/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qabstractproxymodel Test:
#####################################################################
-add_qt_test(tst_qabstractproxymodel
+qt_add_test(tst_qabstractproxymodel
SOURCES
tst_qabstractproxymodel.cpp
DEFINES
diff --git a/tests/auto/corelib/itemmodels/qconcatenatetablesproxymodel/CMakeLists.txt b/tests/auto/corelib/itemmodels/qconcatenatetablesproxymodel/CMakeLists.txt
index 90b371cb1b..d20abd3655 100644
--- a/tests/auto/corelib/itemmodels/qconcatenatetablesproxymodel/CMakeLists.txt
+++ b/tests/auto/corelib/itemmodels/qconcatenatetablesproxymodel/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qconcatenatetablesproxymodel Test:
#####################################################################
-add_qt_test(tst_qconcatenatetablesproxymodel
+qt_add_test(tst_qconcatenatetablesproxymodel
SOURCES
tst_qconcatenatetablesproxymodel.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/corelib/itemmodels/qidentityproxymodel/CMakeLists.txt b/tests/auto/corelib/itemmodels/qidentityproxymodel/CMakeLists.txt
index c02e7b5ad4..cd8b2843b5 100644
--- a/tests/auto/corelib/itemmodels/qidentityproxymodel/CMakeLists.txt
+++ b/tests/auto/corelib/itemmodels/qidentityproxymodel/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qidentityproxymodel Test:
#####################################################################
-add_qt_test(tst_qidentityproxymodel
+qt_add_test(tst_qidentityproxymodel
SOURCES
../../../other/qabstractitemmodelutils/dynamictreemodel.cpp ../../../other/qabstractitemmodelutils/dynamictreemodel.h
tst_qidentityproxymodel.cpp
diff --git a/tests/auto/corelib/itemmodels/qitemmodel/CMakeLists.txt b/tests/auto/corelib/itemmodels/qitemmodel/CMakeLists.txt
index 3baf727cf9..c3174fe77d 100644
--- a/tests/auto/corelib/itemmodels/qitemmodel/CMakeLists.txt
+++ b/tests/auto/corelib/itemmodels/qitemmodel/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qitemmodel Test:
#####################################################################
-add_qt_test(tst_qitemmodel
+qt_add_test(tst_qitemmodel
SOURCES
tst_qitemmodel.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/corelib/itemmodels/qitemselectionmodel/CMakeLists.txt b/tests/auto/corelib/itemmodels/qitemselectionmodel/CMakeLists.txt
index bd79cba5e2..308a526307 100644
--- a/tests/auto/corelib/itemmodels/qitemselectionmodel/CMakeLists.txt
+++ b/tests/auto/corelib/itemmodels/qitemselectionmodel/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qitemselectionmodel Test:
#####################################################################
-add_qt_test(tst_qitemselectionmodel
+qt_add_test(tst_qitemselectionmodel
SOURCES
tst_qitemselectionmodel.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/corelib/itemmodels/qsortfilterproxymodel_recursive/CMakeLists.txt b/tests/auto/corelib/itemmodels/qsortfilterproxymodel_recursive/CMakeLists.txt
index 59f5d8ae76..1849ffff4f 100644
--- a/tests/auto/corelib/itemmodels/qsortfilterproxymodel_recursive/CMakeLists.txt
+++ b/tests/auto/corelib/itemmodels/qsortfilterproxymodel_recursive/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qsortfilterproxymodel_recursive Test:
#####################################################################
-add_qt_test(tst_qsortfilterproxymodel_recursive
+qt_add_test(tst_qsortfilterproxymodel_recursive
SOURCES
tst_qsortfilterproxymodel_recursive.cpp
DEFINES
diff --git a/tests/auto/corelib/itemmodels/qsortfilterproxymodel_regularexpression/CMakeLists.txt b/tests/auto/corelib/itemmodels/qsortfilterproxymodel_regularexpression/CMakeLists.txt
index 8bc7f55f7c..47cb6aab34 100644
--- a/tests/auto/corelib/itemmodels/qsortfilterproxymodel_regularexpression/CMakeLists.txt
+++ b/tests/auto/corelib/itemmodels/qsortfilterproxymodel_regularexpression/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qsortfilterproxymodel_regularexpression Test:
#####################################################################
-add_qt_test(tst_qsortfilterproxymodel_regularexpression
+qt_add_test(tst_qsortfilterproxymodel_regularexpression
SOURCES
../../../other/qabstractitemmodelutils/dynamictreemodel.cpp ../../../other/qabstractitemmodelutils/dynamictreemodel.h
../qsortfilterproxymodel_common/tst_qsortfilterproxymodel.cpp ../qsortfilterproxymodel_common/tst_qsortfilterproxymodel.h
diff --git a/tests/auto/corelib/itemmodels/qstringlistmodel/CMakeLists.txt b/tests/auto/corelib/itemmodels/qstringlistmodel/CMakeLists.txt
index 53bfdbe419..18d34f8951 100644
--- a/tests/auto/corelib/itemmodels/qstringlistmodel/CMakeLists.txt
+++ b/tests/auto/corelib/itemmodels/qstringlistmodel/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qstringlistmodel Test:
#####################################################################
-add_qt_test(tst_qstringlistmodel
+qt_add_test(tst_qstringlistmodel
SOURCES
qmodellistener.h
tst_qstringlistmodel.cpp
diff --git a/tests/auto/corelib/itemmodels/qtransposeproxymodel/CMakeLists.txt b/tests/auto/corelib/itemmodels/qtransposeproxymodel/CMakeLists.txt
index ad1b65d348..57c8309d05 100644
--- a/tests/auto/corelib/itemmodels/qtransposeproxymodel/CMakeLists.txt
+++ b/tests/auto/corelib/itemmodels/qtransposeproxymodel/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qtransposeproxymodel Test:
#####################################################################
-add_qt_test(tst_qtransposeproxymodel
+qt_add_test(tst_qtransposeproxymodel
SOURCES
tst_qtransposeproxymodel.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/corelib/kernel/qdeadlinetimer/CMakeLists.txt b/tests/auto/corelib/kernel/qdeadlinetimer/CMakeLists.txt
index 5feb9ff535..933f8e937e 100644
--- a/tests/auto/corelib/kernel/qdeadlinetimer/CMakeLists.txt
+++ b/tests/auto/corelib/kernel/qdeadlinetimer/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qdeadlinetimer Test:
#####################################################################
-add_qt_test(tst_qdeadlinetimer
+qt_add_test(tst_qdeadlinetimer
SOURCES
tst_qdeadlinetimer.cpp
)
diff --git a/tests/auto/corelib/kernel/qelapsedtimer/CMakeLists.txt b/tests/auto/corelib/kernel/qelapsedtimer/CMakeLists.txt
index e188c94933..e88fb72bec 100644
--- a/tests/auto/corelib/kernel/qelapsedtimer/CMakeLists.txt
+++ b/tests/auto/corelib/kernel/qelapsedtimer/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qelapsedtimer Test:
#####################################################################
-add_qt_test(tst_qelapsedtimer
+qt_add_test(tst_qelapsedtimer
SOURCES
tst_qelapsedtimer.cpp
)
diff --git a/tests/auto/corelib/kernel/qeventdispatcher/CMakeLists.txt b/tests/auto/corelib/kernel/qeventdispatcher/CMakeLists.txt
index 4dbabc2d69..1893dedc30 100644
--- a/tests/auto/corelib/kernel/qeventdispatcher/CMakeLists.txt
+++ b/tests/auto/corelib/kernel/qeventdispatcher/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qeventdispatcher Test:
#####################################################################
-add_qt_test(tst_qeventdispatcher
+qt_add_test(tst_qeventdispatcher
SOURCES
tst_qeventdispatcher.cpp
)
diff --git a/tests/auto/corelib/kernel/qeventloop/CMakeLists.txt b/tests/auto/corelib/kernel/qeventloop/CMakeLists.txt
index 1b2e058a3d..b09f6715e1 100644
--- a/tests/auto/corelib/kernel/qeventloop/CMakeLists.txt
+++ b/tests/auto/corelib/kernel/qeventloop/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qeventloop Test:
#####################################################################
-add_qt_test(tst_qeventloop
+qt_add_test(tst_qeventloop
SOURCES
tst_qeventloop.cpp
PUBLIC_LIBRARIES
@@ -15,12 +15,12 @@ add_qt_test(tst_qeventloop
## Scopes:
#####################################################################
-extend_target(tst_qeventloop CONDITION WIN32
+qt_extend_target(tst_qeventloop CONDITION WIN32
PUBLIC_LIBRARIES
user32
)
-extend_target(tst_qeventloop CONDITION QT_FEATURE_glib
+qt_extend_target(tst_qeventloop CONDITION QT_FEATURE_glib
DEFINES
HAVE_GLIB
)
diff --git a/tests/auto/corelib/kernel/qmath/CMakeLists.txt b/tests/auto/corelib/kernel/qmath/CMakeLists.txt
index 5e73597c67..4174144141 100644
--- a/tests/auto/corelib/kernel/qmath/CMakeLists.txt
+++ b/tests/auto/corelib/kernel/qmath/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qmath Test:
#####################################################################
-add_qt_test(tst_qmath
+qt_add_test(tst_qmath
SOURCES
tst_qmath.cpp
)
diff --git a/tests/auto/corelib/kernel/qmetaenum/CMakeLists.txt b/tests/auto/corelib/kernel/qmetaenum/CMakeLists.txt
index 12c9d9a8a7..eba96be7db 100644
--- a/tests/auto/corelib/kernel/qmetaenum/CMakeLists.txt
+++ b/tests/auto/corelib/kernel/qmetaenum/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qmetaenum Test:
#####################################################################
-add_qt_test(tst_qmetaenum
+qt_add_test(tst_qmetaenum
SOURCES
tst_qmetaenum.cpp
)
diff --git a/tests/auto/corelib/kernel/qmetamethod/CMakeLists.txt b/tests/auto/corelib/kernel/qmetamethod/CMakeLists.txt
index b16101a1a1..5062dc7a3f 100644
--- a/tests/auto/corelib/kernel/qmetamethod/CMakeLists.txt
+++ b/tests/auto/corelib/kernel/qmetamethod/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qmetamethod Test:
#####################################################################
-add_qt_test(tst_qmetamethod
+qt_add_test(tst_qmetamethod
SOURCES
tst_qmetamethod.cpp
)
diff --git a/tests/auto/corelib/kernel/qmetaobject/CMakeLists.txt b/tests/auto/corelib/kernel/qmetaobject/CMakeLists.txt
index 888bfeaa78..0a9a839505 100644
--- a/tests/auto/corelib/kernel/qmetaobject/CMakeLists.txt
+++ b/tests/auto/corelib/kernel/qmetaobject/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qmetaobject Test:
#####################################################################
-add_qt_test(tst_qmetaobject
+qt_add_test(tst_qmetaobject
SOURCES
tst_qmetaobject.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/corelib/kernel/qmetaobjectbuilder/CMakeLists.txt b/tests/auto/corelib/kernel/qmetaobjectbuilder/CMakeLists.txt
index e7586d580b..bae83c137f 100644
--- a/tests/auto/corelib/kernel/qmetaobjectbuilder/CMakeLists.txt
+++ b/tests/auto/corelib/kernel/qmetaobjectbuilder/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qmetaobjectbuilder Test:
#####################################################################
-add_qt_test(tst_qmetaobjectbuilder
+qt_add_test(tst_qmetaobjectbuilder
SOURCES
tst_qmetaobjectbuilder.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/corelib/kernel/qmetaproperty/CMakeLists.txt b/tests/auto/corelib/kernel/qmetaproperty/CMakeLists.txt
index 2d657d5217..0c9c0a810c 100644
--- a/tests/auto/corelib/kernel/qmetaproperty/CMakeLists.txt
+++ b/tests/auto/corelib/kernel/qmetaproperty/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qmetaproperty Test:
#####################################################################
-add_qt_test(tst_qmetaproperty
+qt_add_test(tst_qmetaproperty
SOURCES
tst_qmetaproperty.cpp
)
diff --git a/tests/auto/corelib/kernel/qmetatype/.prev_CMakeLists.txt b/tests/auto/corelib/kernel/qmetatype/.prev_CMakeLists.txt
index 397dbdf850..a6a3bb58c1 100644
--- a/tests/auto/corelib/kernel/qmetatype/.prev_CMakeLists.txt
+++ b/tests/auto/corelib/kernel/qmetatype/.prev_CMakeLists.txt
@@ -7,7 +7,7 @@
# Collect test data
list(APPEND test_data "./typeFlags.bin")
-add_qt_test(tst_qmetatype
+qt_add_test(tst_qmetatype
SOURCES
tst_qmetatype.cpp
DEFINES
@@ -22,7 +22,7 @@ add_qt_test(tst_qmetatype
## Scopes:
#####################################################################
-extend_target(tst_qmetatype CONDITION MSVC
+qt_extend_target(tst_qmetatype CONDITION MSVC
COMPILE_OPTIONS
/bigobj
)
@@ -31,7 +31,7 @@ extend_target(tst_qmetatype CONDITION MSVC
# QMAKE_CFLAGS_RELEASE = "--O2" "--g"
# QMAKE_CXXFLAGS_RELEASE = "--O2" "--g"
-extend_target(tst_qmetatype CONDITION CLANG AND (TEST_architecture_arch STREQUAL "arm")
+qt_extend_target(tst_qmetatype CONDITION CLANG AND (TEST_architecture_arch STREQUAL "arm")
DEFINES
TST_QMETATYPE_BROKEN_COMPILER
)
diff --git a/tests/auto/corelib/kernel/qmetatype/CMakeLists.txt b/tests/auto/corelib/kernel/qmetatype/CMakeLists.txt
index 0188d83e59..0368578c4c 100644
--- a/tests/auto/corelib/kernel/qmetatype/CMakeLists.txt
+++ b/tests/auto/corelib/kernel/qmetatype/CMakeLists.txt
@@ -7,7 +7,7 @@
# Collect test data
list(APPEND test_data "./typeFlags.bin")
-add_qt_test(tst_qmetatype
+qt_add_test(tst_qmetatype
SOURCES
tst_qmetatype.cpp
DEFINES
@@ -23,7 +23,7 @@ add_qt_test(tst_qmetatype
## Scopes:
#####################################################################
-extend_target(tst_qmetatype CONDITION MSVC
+qt_extend_target(tst_qmetatype CONDITION MSVC
COMPILE_OPTIONS
/bigobj
)
@@ -32,7 +32,7 @@ extend_target(tst_qmetatype CONDITION MSVC
# QMAKE_CFLAGS_RELEASE = "--O2" "--g"
# QMAKE_CXXFLAGS_RELEASE = "--O2" "--g"
-extend_target(tst_qmetatype CONDITION CLANG AND (TEST_architecture_arch STREQUAL "arm")
+qt_extend_target(tst_qmetatype CONDITION CLANG AND (TEST_architecture_arch STREQUAL "arm")
DEFINES
TST_QMETATYPE_BROKEN_COMPILER
)
diff --git a/tests/auto/corelib/kernel/qmimedata/CMakeLists.txt b/tests/auto/corelib/kernel/qmimedata/CMakeLists.txt
index b4965302dd..4400dfd46e 100644
--- a/tests/auto/corelib/kernel/qmimedata/CMakeLists.txt
+++ b/tests/auto/corelib/kernel/qmimedata/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qmimedata Test:
#####################################################################
-add_qt_test(tst_qmimedata
+qt_add_test(tst_qmimedata
SOURCES
tst_qmimedata.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/corelib/kernel/qobject/signalbug/CMakeLists.txt b/tests/auto/corelib/kernel/qobject/signalbug/CMakeLists.txt
index e798028b1b..9dadd94f04 100644
--- a/tests/auto/corelib/kernel/qobject/signalbug/CMakeLists.txt
+++ b/tests/auto/corelib/kernel/qobject/signalbug/CMakeLists.txt
@@ -4,7 +4,7 @@
## signalbug_helper Binary:
#####################################################################
-add_qt_test_helper(signalbug_helper
+qt_add_test_helper(signalbug_helper
SOURCES
signalbug.cpp signalbug.h
)
diff --git a/tests/auto/corelib/kernel/qpointer/CMakeLists.txt b/tests/auto/corelib/kernel/qpointer/CMakeLists.txt
index 804a3a9def..a24f25b087 100644
--- a/tests/auto/corelib/kernel/qpointer/CMakeLists.txt
+++ b/tests/auto/corelib/kernel/qpointer/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qpointer Test:
#####################################################################
-add_qt_test(tst_qpointer
+qt_add_test(tst_qpointer
SOURCES
tst_qpointer.cpp
)
@@ -12,7 +12,7 @@ add_qt_test(tst_qpointer
## Scopes:
#####################################################################
-extend_target(tst_qpointer CONDITION TARGET Qt::Widgets
+qt_extend_target(tst_qpointer CONDITION TARGET Qt::Widgets
PUBLIC_LIBRARIES
Qt::Widgets
)
diff --git a/tests/auto/corelib/kernel/qsharedmemory/producerconsumer/CMakeLists.txt b/tests/auto/corelib/kernel/qsharedmemory/producerconsumer/CMakeLists.txt
index 2e16a673b1..31d7f0386e 100644
--- a/tests/auto/corelib/kernel/qsharedmemory/producerconsumer/CMakeLists.txt
+++ b/tests/auto/corelib/kernel/qsharedmemory/producerconsumer/CMakeLists.txt
@@ -4,7 +4,7 @@
## producerconsumer_helper Binary:
#####################################################################
-add_qt_test_helper(producerconsumer_helper
+qt_add_test_helper(producerconsumer_helper
SOURCES
main.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/corelib/kernel/qsignalblocker/CMakeLists.txt b/tests/auto/corelib/kernel/qsignalblocker/CMakeLists.txt
index ae86137c94..a7a6306bfc 100644
--- a/tests/auto/corelib/kernel/qsignalblocker/CMakeLists.txt
+++ b/tests/auto/corelib/kernel/qsignalblocker/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qsignalblocker Test:
#####################################################################
-add_qt_test(tst_qsignalblocker
+qt_add_test(tst_qsignalblocker
SOURCES
tst_qsignalblocker.cpp
)
diff --git a/tests/auto/corelib/kernel/qsignalmapper/CMakeLists.txt b/tests/auto/corelib/kernel/qsignalmapper/CMakeLists.txt
index 1360e76ea1..9ce292c242 100644
--- a/tests/auto/corelib/kernel/qsignalmapper/CMakeLists.txt
+++ b/tests/auto/corelib/kernel/qsignalmapper/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qsignalmapper Test:
#####################################################################
-add_qt_test(tst_qsignalmapper
+qt_add_test(tst_qsignalmapper
SOURCES
tst_qsignalmapper.cpp
)
diff --git a/tests/auto/corelib/kernel/qsocketnotifier/CMakeLists.txt b/tests/auto/corelib/kernel/qsocketnotifier/CMakeLists.txt
index bb9429cdb5..2367a8a54e 100644
--- a/tests/auto/corelib/kernel/qsocketnotifier/CMakeLists.txt
+++ b/tests/auto/corelib/kernel/qsocketnotifier/CMakeLists.txt
@@ -8,7 +8,7 @@ endif()
## tst_qsocketnotifier Test:
#####################################################################
-add_qt_test(tst_qsocketnotifier
+qt_add_test(tst_qsocketnotifier
SOURCES
tst_qsocketnotifier.cpp
INCLUDE_DIRECTORIES
@@ -25,7 +25,7 @@ add_qt_test(tst_qsocketnotifier
## Scopes:
#####################################################################
-extend_target(tst_qsocketnotifier CONDITION WIN32
+qt_extend_target(tst_qsocketnotifier CONDITION WIN32
PUBLIC_LIBRARIES
ws2_32
)
diff --git a/tests/auto/corelib/kernel/qsystemsemaphore/acquirerelease/CMakeLists.txt b/tests/auto/corelib/kernel/qsystemsemaphore/acquirerelease/CMakeLists.txt
index ddce7297d2..74f7bf3f61 100644
--- a/tests/auto/corelib/kernel/qsystemsemaphore/acquirerelease/CMakeLists.txt
+++ b/tests/auto/corelib/kernel/qsystemsemaphore/acquirerelease/CMakeLists.txt
@@ -4,7 +4,7 @@
## acquirerelease_helper Binary:
#####################################################################
-add_qt_test_helper(acquirerelease_helper
+qt_add_test_helper(acquirerelease_helper
SOURCES
main.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/corelib/kernel/qtimer/CMakeLists.txt b/tests/auto/corelib/kernel/qtimer/CMakeLists.txt
index 84585751ac..d6e41f6344 100644
--- a/tests/auto/corelib/kernel/qtimer/CMakeLists.txt
+++ b/tests/auto/corelib/kernel/qtimer/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qtimer Test:
#####################################################################
-add_qt_test(tst_qtimer
+qt_add_test(tst_qtimer
SOURCES
tst_qtimer.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/corelib/kernel/qtranslator/CMakeLists.txt b/tests/auto/corelib/kernel/qtranslator/CMakeLists.txt
index 79e44bc928..e1cefa3325 100644
--- a/tests/auto/corelib/kernel/qtranslator/CMakeLists.txt
+++ b/tests/auto/corelib/kernel/qtranslator/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qtranslator Test:
#####################################################################
-add_qt_test(tst_qtranslator
+qt_add_test(tst_qtranslator
SOURCES
tst_qtranslator.cpp
)
@@ -15,7 +15,7 @@ set(qtranslator_resource_files
"hellotr_la.qm"
)
-add_qt_resource(tst_qtranslator "qtranslator"
+qt_add_resource(tst_qtranslator "qtranslator"
PREFIX
"/tst_qtranslator"
FILES
@@ -35,7 +35,7 @@ if(ANDROID AND NOT ANDROID_EMBEDDED)
"msgfmt_from_po.qm"
)
- add_qt_resource(tst_qtranslator "android_testdata"
+ qt_add_resource(tst_qtranslator "android_testdata"
PREFIX
"/android_testdata"
FILES
diff --git a/tests/auto/corelib/kernel/qvariant/CMakeLists.txt b/tests/auto/corelib/kernel/qvariant/CMakeLists.txt
index bdf2e2f461..f1baaefe43 100644
--- a/tests/auto/corelib/kernel/qvariant/CMakeLists.txt
+++ b/tests/auto/corelib/kernel/qvariant/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qvariant Test:
#####################################################################
-add_qt_test(tst_qvariant
+qt_add_test(tst_qvariant
SOURCES
tst_qvariant.cpp
DEFINES
@@ -21,7 +21,7 @@ set(qvariant_resource_files
"stream/qt5.0/"
)
-add_qt_resource(tst_qvariant "qvariant"
+qt_add_resource(tst_qvariant "qvariant"
PREFIX
"/"
FILES
@@ -32,7 +32,7 @@ add_qt_resource(tst_qvariant "qvariant"
## Scopes:
#####################################################################
-extend_target(tst_qvariant CONDITION NOT QT_FEATURE_doubleconversion AND NOT QT_FEATURE_system_doubleconversion
+qt_extend_target(tst_qvariant CONDITION NOT QT_FEATURE_doubleconversion AND NOT QT_FEATURE_system_doubleconversion
DEFINES
QT_NO_DOUBLECONVERSION
)
diff --git a/tests/auto/corelib/kernel/qwineventnotifier/CMakeLists.txt b/tests/auto/corelib/kernel/qwineventnotifier/CMakeLists.txt
index 0f287a1652..7974c3765b 100644
--- a/tests/auto/corelib/kernel/qwineventnotifier/CMakeLists.txt
+++ b/tests/auto/corelib/kernel/qwineventnotifier/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qwineventnotifier Test:
#####################################################################
-add_qt_test(tst_qwineventnotifier
+qt_add_test(tst_qwineventnotifier
SOURCES
tst_qwineventnotifier.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-cache/.prev_CMakeLists.txt b/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-cache/.prev_CMakeLists.txt
index 9dc2ea18bf..592ef6e513 100644
--- a/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-cache/.prev_CMakeLists.txt
+++ b/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-cache/.prev_CMakeLists.txt
@@ -8,7 +8,7 @@ endif()
## tst_qmimedatabase-cache Test:
#####################################################################
-add_qt_test(tst_qmimedatabase-cache
+qt_add_test(tst_qmimedatabase-cache
SOURCES
../tst_qmimedatabase.h
tst_qmimedatabase-cache.cpp
@@ -17,18 +17,18 @@ add_qt_test(tst_qmimedatabase-cache
)
# Resources:
-set_source_files_properties("/devel/work/qt-cmake/qtbase/src/corelib/mimetypes/mime/packages/freedesktop.org.xml"
+set_source_files_properties("/Volumes/T3/Dev/qt/qt5_cmake/qtbase/src/corelib/mimetypes/mime/packages/freedesktop.org.xml"
PROPERTIES QT_RESOURCE_ALIAS "freedesktop.org.xml"
)
set(mimetypes_resource_files
"mime/packages/freedesktop.org.xml"
)
-add_qt_resource(tst_qmimedatabase-cache "mimetypes"
+qt_add_resource(tst_qmimedatabase-cache "mimetypes"
PREFIX
"/qt-project.org/qmime/packages"
BASE
- "/devel/work/qt-cmake/qtbase/src/corelib/mimetypes"
+ "/Volumes/T3/Dev/qt/qt5_cmake/qtbase/src/corelib/mimetypes"
FILES
${mimetypes_resource_files}
)
@@ -75,7 +75,7 @@ set(testdata_resource_files
"yast2-metapackage-handler-mimetypes.xml"
)
-add_qt_resource(tst_qmimedatabase-cache "testdata"
+qt_add_resource(tst_qmimedatabase-cache "testdata"
PREFIX
"/qt-project.org/qmime"
BASE
@@ -91,7 +91,7 @@ add_qt_resource(tst_qmimedatabase-cache "testdata"
## Scopes:
#####################################################################
-extend_target(tst_qmimedatabase-cache CONDITION GCC
+qt_extend_target(tst_qmimedatabase-cache CONDITION GCC
COMPILE_OPTIONS
-W
-Wall
@@ -101,7 +101,7 @@ extend_target(tst_qmimedatabase-cache CONDITION GCC
-Wshadow
)
-extend_target(tst_qmimedatabase-cache CONDITION UNIX AND NOT APPLE AND NOT QNX
+qt_extend_target(tst_qmimedatabase-cache CONDITION UNIX AND NOT APPLE AND NOT QNX
DEFINES
USE_XDG_DATA_DIRS
)
diff --git a/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-cache/CMakeLists.txt b/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-cache/CMakeLists.txt
index 7720e4d18e..e47d721f54 100644
--- a/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-cache/CMakeLists.txt
+++ b/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-cache/CMakeLists.txt
@@ -8,7 +8,7 @@ endif()
## tst_qmimedatabase-cache Test:
#####################################################################
-add_qt_test(tst_qmimedatabase-cache
+qt_add_test(tst_qmimedatabase-cache
SOURCES
../tst_qmimedatabase.h
tst_qmimedatabase-cache.cpp
@@ -66,7 +66,7 @@ set(testdata_resource_files
"yast2-metapackage-handler-mimetypes.xml"
)
-add_qt_resource(tst_qmimedatabase-cache "testdata"
+qt_add_resource(tst_qmimedatabase-cache "testdata"
PREFIX
"/qt-project.org/qmime"
BASE
@@ -87,7 +87,7 @@ corelib_add_mimetypes_resources(tst_qmimedatabase-cache)
## Scopes:
#####################################################################
-extend_target(tst_qmimedatabase-cache CONDITION GCC
+qt_extend_target(tst_qmimedatabase-cache CONDITION GCC
COMPILE_OPTIONS
-W
-Wall
@@ -97,7 +97,7 @@ extend_target(tst_qmimedatabase-cache CONDITION GCC
-Wshadow
)
-extend_target(tst_qmimedatabase-cache CONDITION UNIX AND NOT APPLE AND NOT QNX
+qt_extend_target(tst_qmimedatabase-cache CONDITION UNIX AND NOT APPLE AND NOT QNX
DEFINES
USE_XDG_DATA_DIRS
)
diff --git a/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-xml/.prev_CMakeLists.txt b/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-xml/.prev_CMakeLists.txt
index 1672255d29..d449343e56 100644
--- a/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-xml/.prev_CMakeLists.txt
+++ b/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-xml/.prev_CMakeLists.txt
@@ -8,7 +8,7 @@ endif()
## tst_qmimedatabase-xml Test:
#####################################################################
-add_qt_test(tst_qmimedatabase-xml
+qt_add_test(tst_qmimedatabase-xml
SOURCES
../tst_qmimedatabase.h
tst_qmimedatabase-xml.cpp
@@ -17,18 +17,18 @@ add_qt_test(tst_qmimedatabase-xml
)
# Resources:
-set_source_files_properties("/devel/work/qt-cmake/qtbase/src/corelib/mimetypes/mime/packages/freedesktop.org.xml"
+set_source_files_properties("/Volumes/T3/Dev/qt/qt5_cmake/qtbase/src/corelib/mimetypes/mime/packages/freedesktop.org.xml"
PROPERTIES QT_RESOURCE_ALIAS "freedesktop.org.xml"
)
set(mimetypes_resource_files
"mime/packages/freedesktop.org.xml"
)
-add_qt_resource(tst_qmimedatabase-xml "mimetypes"
+qt_add_resource(tst_qmimedatabase-xml "mimetypes"
PREFIX
"/qt-project.org/qmime/packages"
BASE
- "/devel/work/qt-cmake/qtbase/src/corelib/mimetypes"
+ "/Volumes/T3/Dev/qt/qt5_cmake/qtbase/src/corelib/mimetypes"
FILES
${mimetypes_resource_files}
)
@@ -75,7 +75,7 @@ set(testdata_resource_files
"yast2-metapackage-handler-mimetypes.xml"
)
-add_qt_resource(tst_qmimedatabase-xml "testdata"
+qt_add_resource(tst_qmimedatabase-xml "testdata"
PREFIX
"/qt-project.org/qmime"
BASE
@@ -91,7 +91,7 @@ add_qt_resource(tst_qmimedatabase-xml "testdata"
## Scopes:
#####################################################################
-extend_target(tst_qmimedatabase-xml CONDITION GCC
+qt_extend_target(tst_qmimedatabase-xml CONDITION GCC
COMPILE_OPTIONS
-W
-Wall
@@ -101,7 +101,7 @@ extend_target(tst_qmimedatabase-xml CONDITION GCC
-Wshadow
)
-extend_target(tst_qmimedatabase-xml CONDITION UNIX AND NOT APPLE AND NOT QNX
+qt_extend_target(tst_qmimedatabase-xml CONDITION UNIX AND NOT APPLE AND NOT QNX
DEFINES
USE_XDG_DATA_DIRS
)
diff --git a/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-xml/CMakeLists.txt b/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-xml/CMakeLists.txt
index cf8e349226..45770cf247 100644
--- a/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-xml/CMakeLists.txt
+++ b/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-xml/CMakeLists.txt
@@ -8,7 +8,7 @@ endif()
## tst_qmimedatabase-xml Test:
#####################################################################
-add_qt_test(tst_qmimedatabase-xml
+qt_add_test(tst_qmimedatabase-xml
SOURCES
../tst_qmimedatabase.h
tst_qmimedatabase-xml.cpp
@@ -66,7 +66,7 @@ set(testdata_resource_files
"yast2-metapackage-handler-mimetypes.xml"
)
-add_qt_resource(tst_qmimedatabase-xml "testdata"
+qt_add_resource(tst_qmimedatabase-xml "testdata"
PREFIX
"/qt-project.org/qmime"
BASE
@@ -87,7 +87,7 @@ corelib_add_mimetypes_resources(tst_qmimedatabase-xml)
## Scopes:
#####################################################################
-extend_target(tst_qmimedatabase-xml CONDITION GCC
+qt_extend_target(tst_qmimedatabase-xml CONDITION GCC
COMPILE_OPTIONS
-W
-Wall
@@ -97,7 +97,7 @@ extend_target(tst_qmimedatabase-xml CONDITION GCC
-Wshadow
)
-extend_target(tst_qmimedatabase-xml CONDITION UNIX AND NOT APPLE AND NOT QNX
+qt_extend_target(tst_qmimedatabase-xml CONDITION UNIX AND NOT APPLE AND NOT QNX
DEFINES
USE_XDG_DATA_DIRS
)
diff --git a/tests/auto/corelib/mimetypes/qmimetype/CMakeLists.txt b/tests/auto/corelib/mimetypes/qmimetype/CMakeLists.txt
index 990835c86a..7637ef5d2d 100644
--- a/tests/auto/corelib/mimetypes/qmimetype/CMakeLists.txt
+++ b/tests/auto/corelib/mimetypes/qmimetype/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qmimetype Test:
#####################################################################
-add_qt_test(tst_qmimetype
+qt_add_test(tst_qmimetype
SOURCES
tst_qmimetype.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/corelib/plugin/qfactoryloader/plugin1/CMakeLists.txt b/tests/auto/corelib/plugin/qfactoryloader/plugin1/CMakeLists.txt
index fe5670da88..2eaac94408 100644
--- a/tests/auto/corelib/plugin/qfactoryloader/plugin1/CMakeLists.txt
+++ b/tests/auto/corelib/plugin/qfactoryloader/plugin1/CMakeLists.txt
@@ -4,7 +4,7 @@
## plugin1 Generic Library:
#####################################################################
-add_cmake_library(plugin1
+qt_add_cmake_library(plugin1
MODULE
INSTALL_DIRECTORY "${INSTALL_TESTSDIR}/tst_qfactoryloader/bin"
OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../bin"
@@ -22,7 +22,7 @@ add_cmake_library(plugin1
## Scopes:
#####################################################################
-extend_target(plugin1 CONDITION NOT QT_FEATURE_library
+qt_extend_target(plugin1 CONDITION NOT QT_FEATURE_library
DEFINES
QT_STATICPLUGIN
)
diff --git a/tests/auto/corelib/plugin/qfactoryloader/plugin2/CMakeLists.txt b/tests/auto/corelib/plugin/qfactoryloader/plugin2/CMakeLists.txt
index fe616f7cb2..0e0c589fc1 100644
--- a/tests/auto/corelib/plugin/qfactoryloader/plugin2/CMakeLists.txt
+++ b/tests/auto/corelib/plugin/qfactoryloader/plugin2/CMakeLists.txt
@@ -4,7 +4,7 @@
## plugin2 Generic Library:
#####################################################################
-add_cmake_library(plugin2
+qt_add_cmake_library(plugin2
MODULE
INSTALL_DIRECTORY "${INSTALL_TESTSDIR}/tst_qfactoryloader/bin"
OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../bin"
@@ -22,7 +22,7 @@ add_cmake_library(plugin2
## Scopes:
#####################################################################
-extend_target(plugin2 CONDITION NOT QT_FEATURE_library
+qt_extend_target(plugin2 CONDITION NOT QT_FEATURE_library
DEFINES
QT_STATICPLUGIN
)
diff --git a/tests/auto/corelib/plugin/qfactoryloader/test/.prev_CMakeLists.txt b/tests/auto/corelib/plugin/qfactoryloader/test/.prev_CMakeLists.txt
index 454b6c061a..9e3a686340 100644
--- a/tests/auto/corelib/plugin/qfactoryloader/test/.prev_CMakeLists.txt
+++ b/tests/auto/corelib/plugin/qfactoryloader/test/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qfactoryloader Test:
#####################################################################
-add_qt_test(tst_qfactoryloader
+qt_add_test(tst_qfactoryloader
OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../"
SOURCES
../plugin1/plugininterface1.h
@@ -17,7 +17,7 @@ add_qt_test(tst_qfactoryloader
## Scopes:
#####################################################################
-extend_target(tst_qfactoryloader CONDITION NOT QT_FEATURE_library
+qt_extend_target(tst_qfactoryloader CONDITION NOT QT_FEATURE_library
PUBLIC_LIBRARIES
# Remove: L
../bin/
@@ -31,7 +31,7 @@ if(ANDROID)
${CMAKE_CURRENT_BINARY_DIR}/../bin
)
- add_qt_resource(tst_qfactoryloader "qmake_libs"
+ qt_add_resource(tst_qfactoryloader "qmake_libs"
PREFIX
"android_test_data"
BASE
diff --git a/tests/auto/corelib/plugin/qfactoryloader/test/CMakeLists.txt b/tests/auto/corelib/plugin/qfactoryloader/test/CMakeLists.txt
index d532eeeb4b..7d10294399 100644
--- a/tests/auto/corelib/plugin/qfactoryloader/test/CMakeLists.txt
+++ b/tests/auto/corelib/plugin/qfactoryloader/test/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qfactoryloader Test:
#####################################################################
-add_qt_test(tst_qfactoryloader
+qt_add_test(tst_qfactoryloader
OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../"
SOURCES
../plugin1/plugininterface1.h
@@ -23,7 +23,7 @@ if (NOT QT_FEATURE_library)
endif()
# special case end
-extend_target(tst_qfactoryloader CONDITION NOT QT_FEATURE_library
+qt_extend_target(tst_qfactoryloader CONDITION NOT QT_FEATURE_library
PUBLIC_LIBRARIES
# Remove: L
# special case begin
@@ -57,7 +57,7 @@ if(ANDROID)
endif()
# special case end
- add_qt_resource(tst_qfactoryloader "qmake_libs"
+ qt_add_resource(tst_qfactoryloader "qmake_libs"
PREFIX
"android_test_data"
BASE
diff --git a/tests/auto/corelib/plugin/qlibrary/lib/.prev_CMakeLists.txt b/tests/auto/corelib/plugin/qlibrary/lib/.prev_CMakeLists.txt
index 6dbbd7a060..b1435b77d3 100644
--- a/tests/auto/corelib/plugin/qlibrary/lib/.prev_CMakeLists.txt
+++ b/tests/auto/corelib/plugin/qlibrary/lib/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
## mylib Generic Library:
#####################################################################
-add_cmake_library(mylib
+qt_add_cmake_library(mylib
SHARED
INSTALL_DIRECTORY "${INSTALL_TESTSDIR}/tst_qlibrary"
OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../"
@@ -22,7 +22,7 @@ add_cmake_library(mylib
## Scopes:
#####################################################################
-extend_target(mylib CONDITION MSVC
+qt_extend_target(mylib CONDITION MSVC
DEFINES
WIN32_MSVC
)
diff --git a/tests/auto/corelib/plugin/qlibrary/lib/CMakeLists.txt b/tests/auto/corelib/plugin/qlibrary/lib/CMakeLists.txt
index f3480200cc..41bd6bf252 100644
--- a/tests/auto/corelib/plugin/qlibrary/lib/CMakeLists.txt
+++ b/tests/auto/corelib/plugin/qlibrary/lib/CMakeLists.txt
@@ -4,7 +4,7 @@
## mylib Generic Library:
#####################################################################
-add_cmake_library(mylib
+qt_add_cmake_library(mylib
SHARED
INSTALL_DIRECTORY "${INSTALL_TESTSDIR}/tst_qlibrary"
OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../"
@@ -37,7 +37,7 @@ endif()
## Scopes:
#####################################################################
-extend_target(mylib CONDITION MSVC
+qt_extend_target(mylib CONDITION MSVC
DEFINES
WIN32_MSVC
)
diff --git a/tests/auto/corelib/plugin/qlibrary/tst/.prev_CMakeLists.txt b/tests/auto/corelib/plugin/qlibrary/tst/.prev_CMakeLists.txt
index ac6515ba63..c3af98df13 100644
--- a/tests/auto/corelib/plugin/qlibrary/tst/.prev_CMakeLists.txt
+++ b/tests/auto/corelib/plugin/qlibrary/tst/.prev_CMakeLists.txt
@@ -7,7 +7,7 @@
# Collect test data
list(APPEND test_data "../library_path/invalid.so")
-add_qt_test(tst_qlibrary
+qt_add_test(tst_qlibrary
OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../"
SOURCES
../tst_qlibrary.cpp
@@ -26,7 +26,7 @@ if(ANDROID)
${CMAKE_CURRENT_BINARY_DIR}/../system.qt.test.mylib.so
)
- add_qt_resource(tst_qlibrary "qmake_libs"
+ qt_add_resource(tst_qlibrary "qmake_libs"
PREFIX
"android_test_data"
BASE
diff --git a/tests/auto/corelib/plugin/qlibrary/tst/CMakeLists.txt b/tests/auto/corelib/plugin/qlibrary/tst/CMakeLists.txt
index e6086a982f..a99b96c806 100644
--- a/tests/auto/corelib/plugin/qlibrary/tst/CMakeLists.txt
+++ b/tests/auto/corelib/plugin/qlibrary/tst/CMakeLists.txt
@@ -7,7 +7,7 @@
# Collect test data
list(APPEND test_data "../library_path/invalid.so")
-add_qt_test(tst_qlibrary
+qt_add_test(tst_qlibrary
OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../"
SOURCES
../tst_qlibrary.cpp
@@ -39,7 +39,7 @@ if(ANDROID)
# special case end
)
- add_qt_resource(tst_qlibrary "qmake_libs"
+ qt_add_resource(tst_qlibrary "qmake_libs"
PREFIX
"android_test_data"
BASE
diff --git a/tests/auto/corelib/plugin/qplugin/debugplugin/CMakeLists.txt b/tests/auto/corelib/plugin/qplugin/debugplugin/CMakeLists.txt
index ab32e5e364..379faad981 100644
--- a/tests/auto/corelib/plugin/qplugin/debugplugin/CMakeLists.txt
+++ b/tests/auto/corelib/plugin/qplugin/debugplugin/CMakeLists.txt
@@ -4,7 +4,7 @@
## debugplugin Generic Library:
#####################################################################
-add_cmake_library(debugplugin
+qt_add_cmake_library(debugplugin
MODULE
OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../plugins"
SOURCES
diff --git a/tests/auto/corelib/plugin/qplugin/invalidplugin/CMakeLists.txt b/tests/auto/corelib/plugin/qplugin/invalidplugin/CMakeLists.txt
index c3eb37d930..0dc5a28edb 100644
--- a/tests/auto/corelib/plugin/qplugin/invalidplugin/CMakeLists.txt
+++ b/tests/auto/corelib/plugin/qplugin/invalidplugin/CMakeLists.txt
@@ -4,7 +4,7 @@
## invalidplugin Generic Library:
#####################################################################
-add_cmake_library(invalidplugin
+qt_add_cmake_library(invalidplugin
MODULE
OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../plugins"
SOURCES
diff --git a/tests/auto/corelib/plugin/qplugin/releaseplugin/CMakeLists.txt b/tests/auto/corelib/plugin/qplugin/releaseplugin/CMakeLists.txt
index 893386bc6b..0332bcc15b 100644
--- a/tests/auto/corelib/plugin/qplugin/releaseplugin/CMakeLists.txt
+++ b/tests/auto/corelib/plugin/qplugin/releaseplugin/CMakeLists.txt
@@ -4,7 +4,7 @@
## releaseplugin Generic Library:
#####################################################################
-add_cmake_library(releaseplugin
+qt_add_cmake_library(releaseplugin
MODULE
OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../plugins"
SOURCES
diff --git a/tests/auto/corelib/plugin/qpluginloader/almostplugin/.prev_CMakeLists.txt b/tests/auto/corelib/plugin/qpluginloader/almostplugin/.prev_CMakeLists.txt
index 5e42a1aef0..64b1db677d 100644
--- a/tests/auto/corelib/plugin/qpluginloader/almostplugin/.prev_CMakeLists.txt
+++ b/tests/auto/corelib/plugin/qpluginloader/almostplugin/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
## almostplugin Generic Library:
#####################################################################
-add_cmake_library(almostplugin
+qt_add_cmake_library(almostplugin
MODULE
INSTALL_DIRECTORY "${INSTALL_TESTSDIR}/tst_qpluginloader/bin"
OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../bin"
@@ -22,7 +22,7 @@ add_cmake_library(almostplugin
## Scopes:
#####################################################################
-extend_target(almostplugin CONDITION GCC
+qt_extend_target(almostplugin CONDITION GCC
LINK_OPTIONS
"--Wl,--no-undefined"
)
diff --git a/tests/auto/corelib/plugin/qpluginloader/almostplugin/CMakeLists.txt b/tests/auto/corelib/plugin/qpluginloader/almostplugin/CMakeLists.txt
index 5208a70c9d..c8a320d2cf 100644
--- a/tests/auto/corelib/plugin/qpluginloader/almostplugin/CMakeLists.txt
+++ b/tests/auto/corelib/plugin/qpluginloader/almostplugin/CMakeLists.txt
@@ -4,7 +4,7 @@
## almostplugin Generic Library:
#####################################################################
-add_cmake_library(almostplugin
+qt_add_cmake_library(almostplugin
MODULE
INSTALL_DIRECTORY "${INSTALL_TESTSDIR}/tst_qpluginloader/bin"
OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../bin"
@@ -25,7 +25,7 @@ add_cmake_library(almostplugin
qt_autogen_tools_initial_setup(almostplugin)
# special case begin
# We want the opposite of this
-#extend_target(almostplugin CONDITION GCC
+#qt_extend_target(almostplugin CONDITION GCC
# LINK_OPTIONS
# "--Wl,--no-undefined"
#)
diff --git a/tests/auto/corelib/plugin/qpluginloader/lib/.prev_CMakeLists.txt b/tests/auto/corelib/plugin/qpluginloader/lib/.prev_CMakeLists.txt
index dddd7cb953..b5ae34e9df 100644
--- a/tests/auto/corelib/plugin/qpluginloader/lib/.prev_CMakeLists.txt
+++ b/tests/auto/corelib/plugin/qpluginloader/lib/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qpluginloaderlib Generic Library:
#####################################################################
-add_cmake_library(tst_qpluginloaderlib
+qt_add_cmake_library(tst_qpluginloaderlib
SHARED
INSTALL_DIRECTORY "${INSTALL_TESTSDIR}/tst_qpluginloader/bin"
OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../bin"
@@ -22,7 +22,7 @@ add_cmake_library(tst_qpluginloaderlib
## Scopes:
#####################################################################
-extend_target(tst_qpluginloaderlib CONDITION MSVC
+qt_extend_target(tst_qpluginloaderlib CONDITION MSVC
DEFINES
WIN32_MSVC
)
diff --git a/tests/auto/corelib/plugin/qpluginloader/lib/CMakeLists.txt b/tests/auto/corelib/plugin/qpluginloader/lib/CMakeLists.txt
index c547b75592..f760ce9935 100644
--- a/tests/auto/corelib/plugin/qpluginloader/lib/CMakeLists.txt
+++ b/tests/auto/corelib/plugin/qpluginloader/lib/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qpluginloaderlib Generic Library:
#####################################################################
-add_cmake_library(tst_qpluginloaderlib
+qt_add_cmake_library(tst_qpluginloaderlib
SHARED
INSTALL_DIRECTORY "${INSTALL_TESTSDIR}/tst_qpluginloader/bin"
OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../bin"
@@ -29,7 +29,7 @@ endif()
## Scopes:
#####################################################################
-extend_target(tst_qpluginloaderlib CONDITION MSVC
+qt_extend_target(tst_qpluginloaderlib CONDITION MSVC
DEFINES
WIN32_MSVC
)
diff --git a/tests/auto/corelib/plugin/qpluginloader/staticplugin/CMakeLists.txt b/tests/auto/corelib/plugin/qpluginloader/staticplugin/CMakeLists.txt
index fb9d365d74..0eb42728f4 100644
--- a/tests/auto/corelib/plugin/qpluginloader/staticplugin/CMakeLists.txt
+++ b/tests/auto/corelib/plugin/qpluginloader/staticplugin/CMakeLists.txt
@@ -4,7 +4,7 @@
## staticplugin Generic Library:
#####################################################################
-add_cmake_library(staticplugin
+qt_add_cmake_library(staticplugin
STATIC
SOURCES
main.cpp
diff --git a/tests/auto/corelib/plugin/qpluginloader/theplugin/CMakeLists.txt b/tests/auto/corelib/plugin/qpluginloader/theplugin/CMakeLists.txt
index 83f5f0605e..ef39d6cc0f 100644
--- a/tests/auto/corelib/plugin/qpluginloader/theplugin/CMakeLists.txt
+++ b/tests/auto/corelib/plugin/qpluginloader/theplugin/CMakeLists.txt
@@ -4,7 +4,7 @@
## theplugin Generic Library:
#####################################################################
-add_cmake_library(theplugin
+qt_add_cmake_library(theplugin
MODULE
INSTALL_DIRECTORY "${INSTALL_TESTSDIR}/tst_qpluginloader/bin"
OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../bin"
diff --git a/tests/auto/corelib/plugin/qpluginloader/tst/.prev_CMakeLists.txt b/tests/auto/corelib/plugin/qpluginloader/tst/.prev_CMakeLists.txt
index 8bef975168..0b0d76bbc4 100644
--- a/tests/auto/corelib/plugin/qpluginloader/tst/.prev_CMakeLists.txt
+++ b/tests/auto/corelib/plugin/qpluginloader/tst/.prev_CMakeLists.txt
@@ -8,7 +8,7 @@
list(APPEND test_data "../elftest")
list(APPEND test_data "../machtest")
-add_qt_test(tst_qpluginloader
+qt_add_test(tst_qpluginloader
OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../"
SOURCES
../fakeplugin.cpp
@@ -22,24 +22,22 @@ add_qt_test(tst_qpluginloader
## Scopes:
#####################################################################
-extend_target(tst_qpluginloader CONDITION QT_FEATURE_private_tests
- LIBRARIES
- Qt::CorePrivate
+qt_extend_target(tst_qpluginloader CONDITION QT_FEATURE_private_tests
PUBLIC_LIBRARIES
- Qt::Core
+ Qt::CorePrivate
)
-extend_target(tst_qpluginloader CONDITION CMAKE_BUILD_TYPE STREQUAL Debug AND WIN32 AND debug_and_release
+qt_extend_target(tst_qpluginloader CONDITION CMAKE_BUILD_TYPE STREQUAL Debug AND WIN32 AND debug_and_release
PUBLIC_LIBRARIES
# Remove: L../staticplugin/debug
)
-extend_target(tst_qpluginloader CONDITION WIN32 AND debug_and_release AND NOT CMAKE_BUILD_TYPE STREQUAL Debug
+qt_extend_target(tst_qpluginloader CONDITION WIN32 AND debug_and_release AND NOT CMAKE_BUILD_TYPE STREQUAL Debug
PUBLIC_LIBRARIES
# Remove: L../staticplugin/release
)
-extend_target(tst_qpluginloader CONDITION UNIX OR NOT debug_and_release
+qt_extend_target(tst_qpluginloader CONDITION UNIX OR NOT debug_and_release
PUBLIC_LIBRARIES
# Remove: L../staticplugin
)
diff --git a/tests/auto/corelib/plugin/qpluginloader/tst/CMakeLists.txt b/tests/auto/corelib/plugin/qpluginloader/tst/CMakeLists.txt
index c1c0d4b02b..0b0d76bbc4 100644
--- a/tests/auto/corelib/plugin/qpluginloader/tst/CMakeLists.txt
+++ b/tests/auto/corelib/plugin/qpluginloader/tst/CMakeLists.txt
@@ -8,7 +8,7 @@
list(APPEND test_data "../elftest")
list(APPEND test_data "../machtest")
-add_qt_test(tst_qpluginloader
+qt_add_test(tst_qpluginloader
OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../"
SOURCES
../fakeplugin.cpp
@@ -22,22 +22,22 @@ add_qt_test(tst_qpluginloader
## Scopes:
#####################################################################
-extend_target(tst_qpluginloader CONDITION QT_FEATURE_private_tests
+qt_extend_target(tst_qpluginloader CONDITION QT_FEATURE_private_tests
PUBLIC_LIBRARIES
Qt::CorePrivate
)
-extend_target(tst_qpluginloader CONDITION CMAKE_BUILD_TYPE STREQUAL Debug AND WIN32 AND debug_and_release
+qt_extend_target(tst_qpluginloader CONDITION CMAKE_BUILD_TYPE STREQUAL Debug AND WIN32 AND debug_and_release
PUBLIC_LIBRARIES
# Remove: L../staticplugin/debug
)
-extend_target(tst_qpluginloader CONDITION WIN32 AND debug_and_release AND NOT CMAKE_BUILD_TYPE STREQUAL Debug
+qt_extend_target(tst_qpluginloader CONDITION WIN32 AND debug_and_release AND NOT CMAKE_BUILD_TYPE STREQUAL Debug
PUBLIC_LIBRARIES
# Remove: L../staticplugin/release
)
-extend_target(tst_qpluginloader CONDITION UNIX OR NOT debug_and_release
+qt_extend_target(tst_qpluginloader CONDITION UNIX OR NOT debug_and_release
PUBLIC_LIBRARIES
# Remove: L../staticplugin
)
diff --git a/tests/auto/corelib/plugin/quuid/test/.prev_CMakeLists.txt b/tests/auto/corelib/plugin/quuid/test/.prev_CMakeLists.txt
index c635f6479c..05ed8f84ac 100644
--- a/tests/auto/corelib/plugin/quuid/test/.prev_CMakeLists.txt
+++ b/tests/auto/corelib/plugin/quuid/test/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_quuid Test:
#####################################################################
-add_qt_test(tst_quuid
+qt_add_test(tst_quuid
SOURCES
../tst_quuid.cpp
)
@@ -12,7 +12,7 @@ add_qt_test(tst_quuid
## Scopes:
#####################################################################
-extend_target(tst_quuid CONDITION APPLE
+qt_extend_target(tst_quuid CONDITION APPLE
SOURCES
../tst_quuid_darwin.mm
PUBLIC_LIBRARIES
diff --git a/tests/auto/corelib/plugin/quuid/test/CMakeLists.txt b/tests/auto/corelib/plugin/quuid/test/CMakeLists.txt
index 5707dfa5a1..1ba9de95ca 100644
--- a/tests/auto/corelib/plugin/quuid/test/CMakeLists.txt
+++ b/tests/auto/corelib/plugin/quuid/test/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_quuid Test:
#####################################################################
-add_qt_test(tst_quuid
+qt_add_test(tst_quuid
OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../" # special case
SOURCES
../tst_quuid.cpp
@@ -13,7 +13,7 @@ add_qt_test(tst_quuid
## Scopes:
#####################################################################
-extend_target(tst_quuid CONDITION APPLE
+qt_extend_target(tst_quuid CONDITION APPLE
SOURCES
../tst_quuid_darwin.mm
PUBLIC_LIBRARIES
diff --git a/tests/auto/corelib/serialization/json/CMakeLists.txt b/tests/auto/corelib/serialization/json/CMakeLists.txt
index 6f477bb541..57cab16b3d 100644
--- a/tests/auto/corelib/serialization/json/CMakeLists.txt
+++ b/tests/auto/corelib/serialization/json/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_json Test:
#####################################################################
-add_qt_test(tst_json
+qt_add_test(tst_json
SOURCES
tst_qtjson.cpp
PUBLIC_LIBRARIES
@@ -27,7 +27,7 @@ if(ANDROID)
"test3.json"
)
- add_qt_resource(tst_json "json"
+ qt_add_resource(tst_json "json"
PREFIX
"/"
FILES
@@ -35,7 +35,7 @@ if(ANDROID)
)
endif()
-extend_target(tst_json CONDITION NOT QT_FEATURE_doubleconversion AND NOT QT_FEATURE_system_doubleconversion
+qt_extend_target(tst_json CONDITION NOT QT_FEATURE_doubleconversion AND NOT QT_FEATURE_system_doubleconversion
DEFINES
QT_NO_DOUBLECONVERSION
)
diff --git a/tests/auto/corelib/serialization/qcborstreamreader/CMakeLists.txt b/tests/auto/corelib/serialization/qcborstreamreader/CMakeLists.txt
index d5f5aea5be..74d4e692df 100644
--- a/tests/auto/corelib/serialization/qcborstreamreader/CMakeLists.txt
+++ b/tests/auto/corelib/serialization/qcborstreamreader/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qcborstreamreader Test:
#####################################################################
-add_qt_test(tst_qcborstreamreader
+qt_add_test(tst_qcborstreamreader
SOURCES
tst_qcborstreamreader.cpp
DEFINES
diff --git a/tests/auto/corelib/serialization/qcborstreamwriter/CMakeLists.txt b/tests/auto/corelib/serialization/qcborstreamwriter/CMakeLists.txt
index 9265df415e..33707ff24f 100644
--- a/tests/auto/corelib/serialization/qcborstreamwriter/CMakeLists.txt
+++ b/tests/auto/corelib/serialization/qcborstreamwriter/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qcborstreamwriter Test:
#####################################################################
-add_qt_test(tst_qcborstreamwriter
+qt_add_test(tst_qcborstreamwriter
SOURCES
tst_qcborstreamwriter.cpp
DEFINES
diff --git a/tests/auto/corelib/serialization/qcborvalue/CMakeLists.txt b/tests/auto/corelib/serialization/qcborvalue/CMakeLists.txt
index 0835ac9c50..3877e565cd 100644
--- a/tests/auto/corelib/serialization/qcborvalue/CMakeLists.txt
+++ b/tests/auto/corelib/serialization/qcborvalue/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qcborvalue Test:
#####################################################################
-add_qt_test(tst_qcborvalue
+qt_add_test(tst_qcborvalue
SOURCES
tst_qcborvalue.cpp
DEFINES
diff --git a/tests/auto/corelib/serialization/qcborvalue_json/CMakeLists.txt b/tests/auto/corelib/serialization/qcborvalue_json/CMakeLists.txt
index 0346d2d0e0..8801d67783 100644
--- a/tests/auto/corelib/serialization/qcborvalue_json/CMakeLists.txt
+++ b/tests/auto/corelib/serialization/qcborvalue_json/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qcborvalue_json Test:
#####################################################################
-add_qt_test(tst_qcborvalue_json
+qt_add_test(tst_qcborvalue_json
SOURCES
tst_qcborvalue_json.cpp
DEFINES
diff --git a/tests/auto/corelib/serialization/qdatastream/CMakeLists.txt b/tests/auto/corelib/serialization/qdatastream/CMakeLists.txt
index a293f87155..35a62fe00c 100644
--- a/tests/auto/corelib/serialization/qdatastream/CMakeLists.txt
+++ b/tests/auto/corelib/serialization/qdatastream/CMakeLists.txt
@@ -7,7 +7,7 @@
# Collect test data
list(APPEND test_data "datastream.q42")
-add_qt_test(tst_qdatastream
+qt_add_test(tst_qdatastream
SOURCES
tst_qdatastream.cpp
PUBLIC_LIBRARIES
@@ -24,7 +24,7 @@ if(ANDROID AND NOT ANDROID_EMBEDDED)
"datastream.q42"
)
- add_qt_resource(tst_qdatastream "testdata"
+ qt_add_resource(tst_qdatastream "testdata"
PREFIX
"/"
FILES
diff --git a/tests/auto/corelib/serialization/qdatastream_core_pixmap/CMakeLists.txt b/tests/auto/corelib/serialization/qdatastream_core_pixmap/CMakeLists.txt
index 55e8c164e5..91280c79b3 100644
--- a/tests/auto/corelib/serialization/qdatastream_core_pixmap/CMakeLists.txt
+++ b/tests/auto/corelib/serialization/qdatastream_core_pixmap/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qdatastream_core_pixmap Test:
#####################################################################
-add_qt_test(tst_qdatastream_core_pixmap
+qt_add_test(tst_qdatastream_core_pixmap
SOURCES
tst_qdatastream_core_pixmap.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/corelib/serialization/qtextstream/readAllStdinProcess/CMakeLists.txt b/tests/auto/corelib/serialization/qtextstream/readAllStdinProcess/CMakeLists.txt
index f377c97c2d..160b63f809 100644
--- a/tests/auto/corelib/serialization/qtextstream/readAllStdinProcess/CMakeLists.txt
+++ b/tests/auto/corelib/serialization/qtextstream/readAllStdinProcess/CMakeLists.txt
@@ -4,7 +4,7 @@
## readAllStdinProcess Binary:
#####################################################################
-add_qt_executable(readAllStdinProcess
+qt_add_executable(readAllStdinProcess
INSTALL_DIRECTORY "${INSTALL_TESTSDIR}/tst_qtextstream/readAllStdinProcess"
OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
SOURCES
diff --git a/tests/auto/corelib/serialization/qtextstream/readLineStdinProcess/CMakeLists.txt b/tests/auto/corelib/serialization/qtextstream/readLineStdinProcess/CMakeLists.txt
index ae899e55df..399e9f44a5 100644
--- a/tests/auto/corelib/serialization/qtextstream/readLineStdinProcess/CMakeLists.txt
+++ b/tests/auto/corelib/serialization/qtextstream/readLineStdinProcess/CMakeLists.txt
@@ -4,7 +4,7 @@
## readLineStdinProcess Binary:
#####################################################################
-add_qt_executable(readLineStdinProcess
+qt_add_executable(readLineStdinProcess
INSTALL_DIRECTORY "${INSTALL_TESTSDIR}/tst_qtextstream/readLineStdinProcess"
OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
SOURCES
diff --git a/tests/auto/corelib/serialization/qtextstream/stdinProcess/CMakeLists.txt b/tests/auto/corelib/serialization/qtextstream/stdinProcess/CMakeLists.txt
index fed74b64c2..3e5383fdc1 100644
--- a/tests/auto/corelib/serialization/qtextstream/stdinProcess/CMakeLists.txt
+++ b/tests/auto/corelib/serialization/qtextstream/stdinProcess/CMakeLists.txt
@@ -4,7 +4,7 @@
## stdinProcess Binary:
#####################################################################
-add_qt_executable(stdinProcess
+qt_add_executable(stdinProcess
INSTALL_DIRECTORY "${INSTALL_TESTSDIR}/tst_qtextstream/stdinProcess"
OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
SOURCES
diff --git a/tests/auto/corelib/serialization/qtextstream/test/CMakeLists.txt b/tests/auto/corelib/serialization/qtextstream/test/CMakeLists.txt
index 52df750222..4471335770 100644
--- a/tests/auto/corelib/serialization/qtextstream/test/CMakeLists.txt
+++ b/tests/auto/corelib/serialization/qtextstream/test/CMakeLists.txt
@@ -12,7 +12,7 @@ list(APPEND test_data "../tst_qtextstream.cpp")
list(APPEND test_data "../resources")
list(APPEND test_data "../BLACKLIST")
-add_qt_test(tst_qtextstream
+qt_add_test(tst_qtextstream
OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../"
SOURCES
../../../../../shared/emulationdetector.h
@@ -36,7 +36,7 @@ set(qtextstream_resource_files
"resources/little_endian/"
)
-add_qt_resource(tst_qtextstream "qtextstream"
+qt_add_resource(tst_qtextstream "qtextstream"
PREFIX
"/tst_textstream/"
BASE
@@ -49,7 +49,7 @@ add_qt_resource(tst_qtextstream "qtextstream"
## Scopes:
#####################################################################
-extend_target(tst_qtextstream CONDITION builtin_testdata
+qt_extend_target(tst_qtextstream CONDITION builtin_testdata
DEFINES
BUILTIN_TESTDATA
)
diff --git a/tests/auto/corelib/serialization/qxmlstream/CMakeLists.txt b/tests/auto/corelib/serialization/qxmlstream/CMakeLists.txt
index 0339b57c71..0039214d6b 100644
--- a/tests/auto/corelib/serialization/qxmlstream/CMakeLists.txt
+++ b/tests/auto/corelib/serialization/qxmlstream/CMakeLists.txt
@@ -8,7 +8,7 @@
list(APPEND test_data "data")
list(APPEND test_data "XML-Test-Suite")
-add_qt_test(tst_qxmlstream
+qt_add_test(tst_qxmlstream
SOURCES
tst_qxmlstream.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/corelib/statemachine/qstate/CMakeLists.txt b/tests/auto/corelib/statemachine/qstate/CMakeLists.txt
index e269f7191a..515db3c167 100644
--- a/tests/auto/corelib/statemachine/qstate/CMakeLists.txt
+++ b/tests/auto/corelib/statemachine/qstate/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qstate Test:
#####################################################################
-add_qt_test(tst_qstate
+qt_add_test(tst_qstate
SOURCES
tst_qstate.cpp
)
diff --git a/tests/auto/corelib/text/qbytearraylist/CMakeLists.txt b/tests/auto/corelib/text/qbytearraylist/CMakeLists.txt
index 780216a38c..a7b9578d5f 100644
--- a/tests/auto/corelib/text/qbytearraylist/CMakeLists.txt
+++ b/tests/auto/corelib/text/qbytearraylist/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qbytearraylist Test:
#####################################################################
-add_qt_test(tst_qbytearraylist
+qt_add_test(tst_qbytearraylist
SOURCES
tst_qbytearraylist.cpp
)
diff --git a/tests/auto/corelib/text/qbytedatabuffer/CMakeLists.txt b/tests/auto/corelib/text/qbytedatabuffer/CMakeLists.txt
index c9cd01231b..5262e009cd 100644
--- a/tests/auto/corelib/text/qbytedatabuffer/CMakeLists.txt
+++ b/tests/auto/corelib/text/qbytedatabuffer/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qbytedatabuffer Test:
#####################################################################
-add_qt_test(tst_qbytedatabuffer
+qt_add_test(tst_qbytedatabuffer
SOURCES
tst_qbytedatabuffer.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/corelib/text/qregularexpression/CMakeLists.txt b/tests/auto/corelib/text/qregularexpression/CMakeLists.txt
index b1ee1ff7de..2ea0cfad7d 100644
--- a/tests/auto/corelib/text/qregularexpression/CMakeLists.txt
+++ b/tests/auto/corelib/text/qregularexpression/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qregularexpression Test:
#####################################################################
-add_qt_test(tst_qregularexpression
+qt_add_test(tst_qregularexpression
SOURCES
tst_qregularexpression.cpp
)
diff --git a/tests/auto/corelib/text/qstring_no_cast_from_bytearray/CMakeLists.txt b/tests/auto/corelib/text/qstring_no_cast_from_bytearray/CMakeLists.txt
index d0285cce3c..030d678e94 100644
--- a/tests/auto/corelib/text/qstring_no_cast_from_bytearray/CMakeLists.txt
+++ b/tests/auto/corelib/text/qstring_no_cast_from_bytearray/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qstring_no_cast_from_bytearray Test:
#####################################################################
-add_qt_test(tst_qstring_no_cast_from_bytearray
+qt_add_test(tst_qstring_no_cast_from_bytearray
SOURCES
tst_qstring_no_cast_from_bytearray.cpp
DEFINES
diff --git a/tests/auto/corelib/text/qstringbuilder/qstringbuilder1/CMakeLists.txt b/tests/auto/corelib/text/qstringbuilder/qstringbuilder1/CMakeLists.txt
index 959f04f07e..2c897ddcd3 100644
--- a/tests/auto/corelib/text/qstringbuilder/qstringbuilder1/CMakeLists.txt
+++ b/tests/auto/corelib/text/qstringbuilder/qstringbuilder1/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qstringbuilder1 Test:
#####################################################################
-add_qt_test(tst_qstringbuilder1
+qt_add_test(tst_qstringbuilder1
SOURCES
tst_qstringbuilder1.cpp
)
diff --git a/tests/auto/corelib/text/qstringbuilder/qstringbuilder2/CMakeLists.txt b/tests/auto/corelib/text/qstringbuilder/qstringbuilder2/CMakeLists.txt
index ff9dfd4ce1..7b5b96aef3 100644
--- a/tests/auto/corelib/text/qstringbuilder/qstringbuilder2/CMakeLists.txt
+++ b/tests/auto/corelib/text/qstringbuilder/qstringbuilder2/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qstringbuilder2 Test:
#####################################################################
-add_qt_test(tst_qstringbuilder2
+qt_add_test(tst_qstringbuilder2
SOURCES
tst_qstringbuilder2.cpp
)
diff --git a/tests/auto/corelib/text/qstringbuilder/qstringbuilder3/CMakeLists.txt b/tests/auto/corelib/text/qstringbuilder/qstringbuilder3/CMakeLists.txt
index 810004cc7d..3293f26e5c 100644
--- a/tests/auto/corelib/text/qstringbuilder/qstringbuilder3/CMakeLists.txt
+++ b/tests/auto/corelib/text/qstringbuilder/qstringbuilder3/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qstringbuilder3 Test:
#####################################################################
-add_qt_test(tst_qstringbuilder3
+qt_add_test(tst_qstringbuilder3
SOURCES
tst_qstringbuilder3.cpp
)
diff --git a/tests/auto/corelib/text/qstringbuilder/qstringbuilder4/CMakeLists.txt b/tests/auto/corelib/text/qstringbuilder/qstringbuilder4/CMakeLists.txt
index 1ad6d02418..55c4400acf 100644
--- a/tests/auto/corelib/text/qstringbuilder/qstringbuilder4/CMakeLists.txt
+++ b/tests/auto/corelib/text/qstringbuilder/qstringbuilder4/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qstringbuilder4 Test:
#####################################################################
-add_qt_test(tst_qstringbuilder4
+qt_add_test(tst_qstringbuilder4
SOURCES
tst_qstringbuilder4.cpp
)
diff --git a/tests/auto/corelib/text/qstringiterator/CMakeLists.txt b/tests/auto/corelib/text/qstringiterator/CMakeLists.txt
index e3388ee1b9..96b34e9d23 100644
--- a/tests/auto/corelib/text/qstringiterator/CMakeLists.txt
+++ b/tests/auto/corelib/text/qstringiterator/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qstringiterator Test:
#####################################################################
-add_qt_test(tst_qstringiterator
+qt_add_test(tst_qstringiterator
SOURCES
tst_qstringiterator.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/corelib/text/qstringlist/CMakeLists.txt b/tests/auto/corelib/text/qstringlist/CMakeLists.txt
index aff8b59c15..c41403227b 100644
--- a/tests/auto/corelib/text/qstringlist/CMakeLists.txt
+++ b/tests/auto/corelib/text/qstringlist/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qstringlist Test:
#####################################################################
-add_qt_test(tst_qstringlist
+qt_add_test(tst_qstringlist
SOURCES
tst_qstringlist.cpp
)
diff --git a/tests/auto/corelib/text/qstringmatcher/CMakeLists.txt b/tests/auto/corelib/text/qstringmatcher/CMakeLists.txt
index 15616a0b13..1cce5690ce 100644
--- a/tests/auto/corelib/text/qstringmatcher/CMakeLists.txt
+++ b/tests/auto/corelib/text/qstringmatcher/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qstringmatcher Test:
#####################################################################
-add_qt_test(tst_qstringmatcher
+qt_add_test(tst_qstringmatcher
SOURCES
tst_qstringmatcher.cpp
DEFINES
diff --git a/tests/auto/corelib/text/qstringref/CMakeLists.txt b/tests/auto/corelib/text/qstringref/CMakeLists.txt
index 961f37c93d..089a3f128d 100644
--- a/tests/auto/corelib/text/qstringref/CMakeLists.txt
+++ b/tests/auto/corelib/text/qstringref/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qstringref Test:
#####################################################################
-add_qt_test(tst_qstringref
+qt_add_test(tst_qstringref
SOURCES
tst_qstringref.cpp
)
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
)
diff --git a/tests/auto/corelib/time/qcalendar/CMakeLists.txt b/tests/auto/corelib/time/qcalendar/CMakeLists.txt
index 1e59a1f0b0..12365467fb 100644
--- a/tests/auto/corelib/time/qcalendar/CMakeLists.txt
+++ b/tests/auto/corelib/time/qcalendar/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qcalendar Test:
#####################################################################
-add_qt_test(tst_qcalendar
+qt_add_test(tst_qcalendar
SOURCES
tst_qcalendar.cpp
)
diff --git a/tests/auto/corelib/time/qdate/CMakeLists.txt b/tests/auto/corelib/time/qdate/CMakeLists.txt
index 2701fca6b8..484ea08a7a 100644
--- a/tests/auto/corelib/time/qdate/CMakeLists.txt
+++ b/tests/auto/corelib/time/qdate/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qdate Test:
#####################################################################
-add_qt_test(tst_qdate
+qt_add_test(tst_qdate
SOURCES
tst_qdate.cpp
DEFINES
diff --git a/tests/auto/corelib/time/qdatetime/CMakeLists.txt b/tests/auto/corelib/time/qdatetime/CMakeLists.txt
index 3b95ac279d..e27559c401 100644
--- a/tests/auto/corelib/time/qdatetime/CMakeLists.txt
+++ b/tests/auto/corelib/time/qdatetime/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qdatetime Test:
#####################################################################
-add_qt_test(tst_qdatetime
+qt_add_test(tst_qdatetime
SOURCES
tst_qdatetime.cpp
DEFINES
@@ -21,7 +21,7 @@ add_qt_test(tst_qdatetime
# QMAKE_CFLAGS_RELEASE = "--O1"
# QMAKE_CXXFLAGS_RELEASE = "--O1"
-extend_target(tst_qdatetime CONDITION APPLE
+qt_extend_target(tst_qdatetime CONDITION APPLE
SOURCES
tst_qdatetime_mac.mm
PUBLIC_LIBRARIES
diff --git a/tests/auto/corelib/time/qtime/CMakeLists.txt b/tests/auto/corelib/time/qtime/CMakeLists.txt
index 0bd4b611e0..df3adf3649 100644
--- a/tests/auto/corelib/time/qtime/CMakeLists.txt
+++ b/tests/auto/corelib/time/qtime/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qtime Test:
#####################################################################
-add_qt_test(tst_qtime
+qt_add_test(tst_qtime
SOURCES
tst_qtime.cpp
DEFINES
diff --git a/tests/auto/corelib/time/qtimezone/CMakeLists.txt b/tests/auto/corelib/time/qtimezone/CMakeLists.txt
index f723a8f880..b97b2f9fd1 100644
--- a/tests/auto/corelib/time/qtimezone/CMakeLists.txt
+++ b/tests/auto/corelib/time/qtimezone/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qtimezone Test:
#####################################################################
-add_qt_test(tst_qtimezone
+qt_add_test(tst_qtimezone
SOURCES
tst_qtimezone.cpp
DEFINES
@@ -17,12 +17,12 @@ add_qt_test(tst_qtimezone
## Scopes:
#####################################################################
-extend_target(tst_qtimezone CONDITION QT_FEATURE_icu
+qt_extend_target(tst_qtimezone CONDITION QT_FEATURE_icu
LIBRARIES
ICU::i18n ICU::uc ICU::data
)
-extend_target(tst_qtimezone CONDITION APPLE
+qt_extend_target(tst_qtimezone CONDITION APPLE
SOURCES
tst_qtimezone_darwin.mm
PUBLIC_LIBRARIES
diff --git a/tests/auto/corelib/tools/qalgorithms/CMakeLists.txt b/tests/auto/corelib/tools/qalgorithms/CMakeLists.txt
index 14b7c95f4b..2ddc47b5c0 100644
--- a/tests/auto/corelib/tools/qalgorithms/CMakeLists.txt
+++ b/tests/auto/corelib/tools/qalgorithms/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qalgorithms Test:
#####################################################################
-add_qt_test(tst_qalgorithms
+qt_add_test(tst_qalgorithms
SOURCES
tst_qalgorithms.cpp
)
diff --git a/tests/auto/corelib/tools/qarraydata/CMakeLists.txt b/tests/auto/corelib/tools/qarraydata/CMakeLists.txt
index f68c3714aa..94c97b8327 100644
--- a/tests/auto/corelib/tools/qarraydata/CMakeLists.txt
+++ b/tests/auto/corelib/tools/qarraydata/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qarraydata Test:
#####################################################################
-add_qt_test(tst_qarraydata
+qt_add_test(tst_qarraydata
SOURCES
simplevector.h
tst_qarraydata.cpp
diff --git a/tests/auto/corelib/tools/qbitarray/CMakeLists.txt b/tests/auto/corelib/tools/qbitarray/CMakeLists.txt
index 65150c02a2..439aa4af6c 100644
--- a/tests/auto/corelib/tools/qbitarray/CMakeLists.txt
+++ b/tests/auto/corelib/tools/qbitarray/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qbitarray Test:
#####################################################################
-add_qt_test(tst_qbitarray
+qt_add_test(tst_qbitarray
SOURCES
tst_qbitarray.cpp
)
diff --git a/tests/auto/corelib/tools/qcache/CMakeLists.txt b/tests/auto/corelib/tools/qcache/CMakeLists.txt
index 50fb2372c3..509056c06b 100644
--- a/tests/auto/corelib/tools/qcache/CMakeLists.txt
+++ b/tests/auto/corelib/tools/qcache/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qcache Test:
#####################################################################
-add_qt_test(tst_qcache
+qt_add_test(tst_qcache
SOURCES
tst_qcache.cpp
)
diff --git a/tests/auto/corelib/tools/qcommandlineparser/testhelper/CMakeLists.txt b/tests/auto/corelib/tools/qcommandlineparser/testhelper/CMakeLists.txt
index 3d0989d841..688c685ade 100644
--- a/tests/auto/corelib/tools/qcommandlineparser/testhelper/CMakeLists.txt
+++ b/tests/auto/corelib/tools/qcommandlineparser/testhelper/CMakeLists.txt
@@ -4,7 +4,7 @@
## qcommandlineparser_test_helper Binary:
#####################################################################
-add_qt_executable(qcommandlineparser_test_helper
+qt_add_executable(qcommandlineparser_test_helper
OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
SOURCES
qcommandlineparser_test_helper.cpp
diff --git a/tests/auto/corelib/tools/qcontiguouscache/CMakeLists.txt b/tests/auto/corelib/tools/qcontiguouscache/CMakeLists.txt
index bce8ce11bd..7754954457 100644
--- a/tests/auto/corelib/tools/qcontiguouscache/CMakeLists.txt
+++ b/tests/auto/corelib/tools/qcontiguouscache/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qcontiguouscache Test:
#####################################################################
-add_qt_test(tst_qcontiguouscache
+qt_add_test(tst_qcontiguouscache
SOURCES
tst_qcontiguouscache.cpp
)
diff --git a/tests/auto/corelib/tools/qeasingcurve/CMakeLists.txt b/tests/auto/corelib/tools/qeasingcurve/CMakeLists.txt
index c2611921ab..f93bfe6b94 100644
--- a/tests/auto/corelib/tools/qeasingcurve/CMakeLists.txt
+++ b/tests/auto/corelib/tools/qeasingcurve/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qeasingcurve Test:
#####################################################################
-add_qt_test(tst_qeasingcurve
+qt_add_test(tst_qeasingcurve
SOURCES
tst_qeasingcurve.cpp
)
diff --git a/tests/auto/corelib/tools/qexplicitlyshareddatapointer/CMakeLists.txt b/tests/auto/corelib/tools/qexplicitlyshareddatapointer/CMakeLists.txt
index cacc36beaa..9943f5200b 100644
--- a/tests/auto/corelib/tools/qexplicitlyshareddatapointer/CMakeLists.txt
+++ b/tests/auto/corelib/tools/qexplicitlyshareddatapointer/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qexplicitlyshareddatapointer Test:
#####################################################################
-add_qt_test(tst_qexplicitlyshareddatapointer
+qt_add_test(tst_qexplicitlyshareddatapointer
SOURCES
tst_qexplicitlyshareddatapointer.cpp
)
diff --git a/tests/auto/corelib/tools/qhash/.prev_CMakeLists.txt b/tests/auto/corelib/tools/qhash/.prev_CMakeLists.txt
index 5dfeedb322..cb0327c90f 100644
--- a/tests/auto/corelib/tools/qhash/.prev_CMakeLists.txt
+++ b/tests/auto/corelib/tools/qhash/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qhash Test:
#####################################################################
-add_qt_test(tst_qhash
+qt_add_test(tst_qhash
SOURCES
tst_qhash.cpp
DEFINES
diff --git a/tests/auto/corelib/tools/qhash/CMakeLists.txt b/tests/auto/corelib/tools/qhash/CMakeLists.txt
index 32edf72073..39b8e25e30 100644
--- a/tests/auto/corelib/tools/qhash/CMakeLists.txt
+++ b/tests/auto/corelib/tools/qhash/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qhash Test:
#####################################################################
-add_qt_test(tst_qhash
+qt_add_test(tst_qhash
SOURCES
tst_qhash.cpp
DEFINES
diff --git a/tests/auto/corelib/tools/qhashfunctions/CMakeLists.txt b/tests/auto/corelib/tools/qhashfunctions/CMakeLists.txt
index 87d109f997..a91a7c02ef 100644
--- a/tests/auto/corelib/tools/qhashfunctions/CMakeLists.txt
+++ b/tests/auto/corelib/tools/qhashfunctions/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qhashfunctions Test:
#####################################################################
-add_qt_test(tst_qhashfunctions
+qt_add_test(tst_qhashfunctions
SOURCES
tst_qhashfunctions.cpp
)
diff --git a/tests/auto/corelib/tools/qmakearray/CMakeLists.txt b/tests/auto/corelib/tools/qmakearray/CMakeLists.txt
index 36b20c3b4f..1c38a99d99 100644
--- a/tests/auto/corelib/tools/qmakearray/CMakeLists.txt
+++ b/tests/auto/corelib/tools/qmakearray/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qmakearray Test:
#####################################################################
-add_qt_test(tst_qmakearray
+qt_add_test(tst_qmakearray
SOURCES
tst_qmakearray.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/corelib/tools/qmap/.prev_CMakeLists.txt b/tests/auto/corelib/tools/qmap/.prev_CMakeLists.txt
index 96378d3278..4d1425251b 100644
--- a/tests/auto/corelib/tools/qmap/.prev_CMakeLists.txt
+++ b/tests/auto/corelib/tools/qmap/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qmap Test:
#####################################################################
-add_qt_test(tst_qmap
+qt_add_test(tst_qmap
SOURCES
tst_qmap.cpp
DEFINES
diff --git a/tests/auto/corelib/tools/qmap/CMakeLists.txt b/tests/auto/corelib/tools/qmap/CMakeLists.txt
index 677159ae0d..5de85b2fc2 100644
--- a/tests/auto/corelib/tools/qmap/CMakeLists.txt
+++ b/tests/auto/corelib/tools/qmap/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qmap Test:
#####################################################################
-add_qt_test(tst_qmap
+qt_add_test(tst_qmap
SOURCES
tst_qmap.cpp
DEFINES
diff --git a/tests/auto/corelib/tools/qmargins/CMakeLists.txt b/tests/auto/corelib/tools/qmargins/CMakeLists.txt
index 632e5dc8d2..fa1530b32c 100644
--- a/tests/auto/corelib/tools/qmargins/CMakeLists.txt
+++ b/tests/auto/corelib/tools/qmargins/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qmargins Test:
#####################################################################
-add_qt_test(tst_qmargins
+qt_add_test(tst_qmargins
SOURCES
tst_qmargins.cpp
)
diff --git a/tests/auto/corelib/tools/qmessageauthenticationcode/CMakeLists.txt b/tests/auto/corelib/tools/qmessageauthenticationcode/CMakeLists.txt
index 6e142facfb..75a6febf81 100644
--- a/tests/auto/corelib/tools/qmessageauthenticationcode/CMakeLists.txt
+++ b/tests/auto/corelib/tools/qmessageauthenticationcode/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qmessageauthenticationcode Test:
#####################################################################
-add_qt_test(tst_qmessageauthenticationcode
+qt_add_test(tst_qmessageauthenticationcode
SOURCES
tst_qmessageauthenticationcode.cpp
)
diff --git a/tests/auto/corelib/tools/qpair/CMakeLists.txt b/tests/auto/corelib/tools/qpair/CMakeLists.txt
index 4c226f5a02..b02f4feb0b 100644
--- a/tests/auto/corelib/tools/qpair/CMakeLists.txt
+++ b/tests/auto/corelib/tools/qpair/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qpair Test:
#####################################################################
-add_qt_test(tst_qpair
+qt_add_test(tst_qpair
SOURCES
tst_qpair.cpp
)
diff --git a/tests/auto/corelib/tools/qpoint/CMakeLists.txt b/tests/auto/corelib/tools/qpoint/CMakeLists.txt
index 6ef68c30cb..1667c0239c 100644
--- a/tests/auto/corelib/tools/qpoint/CMakeLists.txt
+++ b/tests/auto/corelib/tools/qpoint/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qpoint Test:
#####################################################################
-add_qt_test(tst_qpoint
+qt_add_test(tst_qpoint
SOURCES
tst_qpoint.cpp
)
diff --git a/tests/auto/corelib/tools/qpointf/CMakeLists.txt b/tests/auto/corelib/tools/qpointf/CMakeLists.txt
index b1784d999f..e7d1f1b0ff 100644
--- a/tests/auto/corelib/tools/qpointf/CMakeLists.txt
+++ b/tests/auto/corelib/tools/qpointf/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qpointf Test:
#####################################################################
-add_qt_test(tst_qpointf
+qt_add_test(tst_qpointf
SOURCES
tst_qpointf.cpp
)
diff --git a/tests/auto/corelib/tools/qqueue/CMakeLists.txt b/tests/auto/corelib/tools/qqueue/CMakeLists.txt
index 6d1aeda5b2..fc0517b69f 100644
--- a/tests/auto/corelib/tools/qqueue/CMakeLists.txt
+++ b/tests/auto/corelib/tools/qqueue/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qqueue Test:
#####################################################################
-add_qt_test(tst_qqueue
+qt_add_test(tst_qqueue
SOURCES
tst_qqueue.cpp
)
diff --git a/tests/auto/corelib/tools/qrect/CMakeLists.txt b/tests/auto/corelib/tools/qrect/CMakeLists.txt
index 47b8aced46..5acc4522b6 100644
--- a/tests/auto/corelib/tools/qrect/CMakeLists.txt
+++ b/tests/auto/corelib/tools/qrect/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qrect Test:
#####################################################################
-add_qt_test(tst_qrect
+qt_add_test(tst_qrect
SOURCES
tst_qrect.cpp
)
diff --git a/tests/auto/corelib/tools/qringbuffer/CMakeLists.txt b/tests/auto/corelib/tools/qringbuffer/CMakeLists.txt
index 4bab92b0c6..029d032d5c 100644
--- a/tests/auto/corelib/tools/qringbuffer/CMakeLists.txt
+++ b/tests/auto/corelib/tools/qringbuffer/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qringbuffer Test:
#####################################################################
-add_qt_test(tst_qringbuffer
+qt_add_test(tst_qringbuffer
SOURCES
tst_qringbuffer.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/corelib/tools/qscopedpointer/CMakeLists.txt b/tests/auto/corelib/tools/qscopedpointer/CMakeLists.txt
index 141bab267b..8bc4b7e43b 100644
--- a/tests/auto/corelib/tools/qscopedpointer/CMakeLists.txt
+++ b/tests/auto/corelib/tools/qscopedpointer/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qscopedpointer Test:
#####################################################################
-add_qt_test(tst_qscopedpointer
+qt_add_test(tst_qscopedpointer
SOURCES
tst_qscopedpointer.cpp
)
diff --git a/tests/auto/corelib/tools/qscopedvaluerollback/CMakeLists.txt b/tests/auto/corelib/tools/qscopedvaluerollback/CMakeLists.txt
index e23a4d55f9..653f0bc071 100644
--- a/tests/auto/corelib/tools/qscopedvaluerollback/CMakeLists.txt
+++ b/tests/auto/corelib/tools/qscopedvaluerollback/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qscopedvaluerollback Test:
#####################################################################
-add_qt_test(tst_qscopedvaluerollback
+qt_add_test(tst_qscopedvaluerollback
SOURCES
tst_qscopedvaluerollback.cpp
)
diff --git a/tests/auto/corelib/tools/qscopeguard/CMakeLists.txt b/tests/auto/corelib/tools/qscopeguard/CMakeLists.txt
index 11b425448b..79efcd4d86 100644
--- a/tests/auto/corelib/tools/qscopeguard/CMakeLists.txt
+++ b/tests/auto/corelib/tools/qscopeguard/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qscopeguard Test:
#####################################################################
-add_qt_test(tst_qscopeguard
+qt_add_test(tst_qscopeguard
SOURCES
tst_qscopeguard.cpp
)
diff --git a/tests/auto/corelib/tools/qset/.prev_CMakeLists.txt b/tests/auto/corelib/tools/qset/.prev_CMakeLists.txt
index 68a8f64822..8e7312b739 100644
--- a/tests/auto/corelib/tools/qset/.prev_CMakeLists.txt
+++ b/tests/auto/corelib/tools/qset/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qset Test:
#####################################################################
-add_qt_test(tst_qset
+qt_add_test(tst_qset
SOURCES
tst_qset.cpp
DEFINES
diff --git a/tests/auto/corelib/tools/qset/CMakeLists.txt b/tests/auto/corelib/tools/qset/CMakeLists.txt
index a423e4aa23..85845f76d2 100644
--- a/tests/auto/corelib/tools/qset/CMakeLists.txt
+++ b/tests/auto/corelib/tools/qset/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qset Test:
#####################################################################
-add_qt_test(tst_qset
+qt_add_test(tst_qset
SOURCES
tst_qset.cpp
#DEFINES # special case remove
diff --git a/tests/auto/corelib/tools/qsize/CMakeLists.txt b/tests/auto/corelib/tools/qsize/CMakeLists.txt
index f516941180..1d3018f066 100644
--- a/tests/auto/corelib/tools/qsize/CMakeLists.txt
+++ b/tests/auto/corelib/tools/qsize/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qsize Test:
#####################################################################
-add_qt_test(tst_qsize
+qt_add_test(tst_qsize
SOURCES
tst_qsize.cpp
)
diff --git a/tests/auto/corelib/tools/qsizef/CMakeLists.txt b/tests/auto/corelib/tools/qsizef/CMakeLists.txt
index d767ca92d7..cb942e10ec 100644
--- a/tests/auto/corelib/tools/qsizef/CMakeLists.txt
+++ b/tests/auto/corelib/tools/qsizef/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qsizef Test:
#####################################################################
-add_qt_test(tst_qsizef
+qt_add_test(tst_qsizef
SOURCES
tst_qsizef.cpp
)
diff --git a/tests/auto/corelib/tools/qstl/CMakeLists.txt b/tests/auto/corelib/tools/qstl/CMakeLists.txt
index 975ddfe0b5..65af48f1a2 100644
--- a/tests/auto/corelib/tools/qstl/CMakeLists.txt
+++ b/tests/auto/corelib/tools/qstl/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qstl Test:
#####################################################################
-add_qt_test(tst_qstl
+qt_add_test(tst_qstl
SOURCES
tst_qstl.cpp
)
diff --git a/tests/auto/corelib/tools/qtimeline/CMakeLists.txt b/tests/auto/corelib/tools/qtimeline/CMakeLists.txt
index 802cd56305..abf76e4b73 100644
--- a/tests/auto/corelib/tools/qtimeline/CMakeLists.txt
+++ b/tests/auto/corelib/tools/qtimeline/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qtimeline Test:
#####################################################################
-add_qt_test(tst_qtimeline
+qt_add_test(tst_qtimeline
SOURCES
tst_qtimeline.cpp
)
diff --git a/tests/auto/corelib/tools/qvarlengtharray/CMakeLists.txt b/tests/auto/corelib/tools/qvarlengtharray/CMakeLists.txt
index 17989ae31d..63bb827ec1 100644
--- a/tests/auto/corelib/tools/qvarlengtharray/CMakeLists.txt
+++ b/tests/auto/corelib/tools/qvarlengtharray/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qvarlengtharray Test:
#####################################################################
-add_qt_test(tst_qvarlengtharray
+qt_add_test(tst_qvarlengtharray
SOURCES
tst_qvarlengtharray.cpp
)
diff --git a/tests/auto/dbus/qdbusabstractadaptor/qmyserver/.prev_CMakeLists.txt b/tests/auto/dbus/qdbusabstractadaptor/qmyserver/.prev_CMakeLists.txt
index caea7b1e64..32af66f30c 100644
--- a/tests/auto/dbus/qdbusabstractadaptor/qmyserver/.prev_CMakeLists.txt
+++ b/tests/auto/dbus/qdbusabstractadaptor/qmyserver/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
## qmyserver Binary:
#####################################################################
-add_qt_executable(qmyserver
+qt_add_executable(qmyserver
OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
SOURCES
../myobject.h
diff --git a/tests/auto/dbus/qdbusabstractadaptor/qmyserver/CMakeLists.txt b/tests/auto/dbus/qdbusabstractadaptor/qmyserver/CMakeLists.txt
index 839b952591..d2bdb4434d 100644
--- a/tests/auto/dbus/qdbusabstractadaptor/qmyserver/CMakeLists.txt
+++ b/tests/auto/dbus/qdbusabstractadaptor/qmyserver/CMakeLists.txt
@@ -4,7 +4,7 @@
## qmyserver Binary:
#####################################################################
-add_qt_executable(qmyserver
+qt_add_executable(qmyserver
OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
NO_INSTALL # special case
SOURCES
diff --git a/tests/auto/dbus/qdbusabstractinterface/CMakeLists.txt b/tests/auto/dbus/qdbusabstractinterface/CMakeLists.txt
index facac1a7fc..55592832c1 100644
--- a/tests/auto/dbus/qdbusabstractinterface/CMakeLists.txt
+++ b/tests/auto/dbus/qdbusabstractinterface/CMakeLists.txt
@@ -2,7 +2,7 @@
add_subdirectory(qpinger)
-add_qt_test(tst_qdbusabstractinterface
+qt_add_test(tst_qdbusabstractinterface
SOURCES
interface.cpp
tst_qdbusabstractinterface.cpp
@@ -11,7 +11,7 @@ add_qt_test(tst_qdbusabstractinterface
Qt::DBus
)
-extend_target(tst_qdbusabstractinterface
+qt_extend_target(tst_qdbusabstractinterface
DBUS_INTERFACE_SOURCES
org.qtproject.QtDBus.Pinger.xml
DBUS_INTERFACE_BASENAME
diff --git a/tests/auto/dbus/qdbusabstractinterface/qdbusabstractinterface/.prev_CMakeLists.txt b/tests/auto/dbus/qdbusabstractinterface/qdbusabstractinterface/.prev_CMakeLists.txt
index ee5a7c4003..6db0362e59 100644
--- a/tests/auto/dbus/qdbusabstractinterface/qdbusabstractinterface/.prev_CMakeLists.txt
+++ b/tests/auto/dbus/qdbusabstractinterface/qdbusabstractinterface/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qdbusabstractinterface Test:
#####################################################################
-add_qt_test(tst_qdbusabstractinterface
+qt_add_test(tst_qdbusabstractinterface
OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../"
SOURCES
../interface.cpp ../interface.h
diff --git a/tests/auto/dbus/qdbusabstractinterface/qpinger/.prev_CMakeLists.txt b/tests/auto/dbus/qdbusabstractinterface/qpinger/.prev_CMakeLists.txt
index 4e2b5fe567..7f65f85afb 100644
--- a/tests/auto/dbus/qdbusabstractinterface/qpinger/.prev_CMakeLists.txt
+++ b/tests/auto/dbus/qdbusabstractinterface/qpinger/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
## qpinger Binary:
#####################################################################
-add_qt_executable(qpinger
+qt_add_executable(qpinger
OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
SOURCES
../interface.cpp ../interface.h
diff --git a/tests/auto/dbus/qdbusabstractinterface/qpinger/CMakeLists.txt b/tests/auto/dbus/qdbusabstractinterface/qpinger/CMakeLists.txt
index 47e3cfbb69..5ebb914c01 100644
--- a/tests/auto/dbus/qdbusabstractinterface/qpinger/CMakeLists.txt
+++ b/tests/auto/dbus/qdbusabstractinterface/qpinger/CMakeLists.txt
@@ -4,7 +4,7 @@
## qpinger Binary:
#####################################################################
-add_qt_executable(qpinger
+qt_add_executable(qpinger
OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
NO_INSTALL # special case
SOURCES
diff --git a/tests/auto/dbus/qdbusconnection/CMakeLists.txt b/tests/auto/dbus/qdbusconnection/CMakeLists.txt
index b1927e5d10..e40f18387e 100644
--- a/tests/auto/dbus/qdbusconnection/CMakeLists.txt
+++ b/tests/auto/dbus/qdbusconnection/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qdbusconnection Test:
#####################################################################
-add_qt_test(tst_qdbusconnection
+qt_add_test(tst_qdbusconnection
SOURCES
tst_qdbusconnection.cpp tst_qdbusconnection.h
PUBLIC_LIBRARIES
diff --git a/tests/auto/dbus/qdbusconnection_delayed/CMakeLists.txt b/tests/auto/dbus/qdbusconnection_delayed/CMakeLists.txt
index 0602c67fbb..793c7907e5 100644
--- a/tests/auto/dbus/qdbusconnection_delayed/CMakeLists.txt
+++ b/tests/auto/dbus/qdbusconnection_delayed/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qdbusconnection_delayed Test:
#####################################################################
-add_qt_test(tst_qdbusconnection_delayed
+qt_add_test(tst_qdbusconnection_delayed
SOURCES
tst_qdbusconnection_delayed.cpp
DEFINES
diff --git a/tests/auto/dbus/qdbusconnection_no_app/CMakeLists.txt b/tests/auto/dbus/qdbusconnection_no_app/CMakeLists.txt
index 061c59579d..aad766362c 100644
--- a/tests/auto/dbus/qdbusconnection_no_app/CMakeLists.txt
+++ b/tests/auto/dbus/qdbusconnection_no_app/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qdbusconnection_no_app Test:
#####################################################################
-add_qt_test(tst_qdbusconnection_no_app
+qt_add_test(tst_qdbusconnection_no_app
SOURCES
../qdbusconnection/tst_qdbusconnection.h
tst_qdbusconnection_no_app.cpp
diff --git a/tests/auto/dbus/qdbusconnection_no_bus/CMakeLists.txt b/tests/auto/dbus/qdbusconnection_no_bus/CMakeLists.txt
index b05ac03b2d..111f8907c8 100644
--- a/tests/auto/dbus/qdbusconnection_no_bus/CMakeLists.txt
+++ b/tests/auto/dbus/qdbusconnection_no_bus/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qdbusconnection_no_bus Test:
#####################################################################
-add_qt_test(tst_qdbusconnection_no_bus
+qt_add_test(tst_qdbusconnection_no_bus
SOURCES
tst_qdbusconnection_no_bus.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/dbus/qdbusconnection_no_libdbus/CMakeLists.txt b/tests/auto/dbus/qdbusconnection_no_libdbus/CMakeLists.txt
index c372f16d12..2a7e1dc80d 100644
--- a/tests/auto/dbus/qdbusconnection_no_libdbus/CMakeLists.txt
+++ b/tests/auto/dbus/qdbusconnection_no_libdbus/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qdbusconnection_no_libdbus Test:
#####################################################################
-add_qt_test(tst_qdbusconnection_no_libdbus
+qt_add_test(tst_qdbusconnection_no_libdbus
SOURCES
../qdbusconnection_no_bus/tst_qdbusconnection_no_bus.cpp
DEFINES
diff --git a/tests/auto/dbus/qdbusconnection_spyhook/CMakeLists.txt b/tests/auto/dbus/qdbusconnection_spyhook/CMakeLists.txt
index 0005c36c36..a3b1d8d10c 100644
--- a/tests/auto/dbus/qdbusconnection_spyhook/CMakeLists.txt
+++ b/tests/auto/dbus/qdbusconnection_spyhook/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qdbusconnection_spyhook Test:
#####################################################################
-add_qt_test(tst_qdbusconnection_spyhook
+qt_add_test(tst_qdbusconnection_spyhook
SOURCES
../qdbusconnection/tst_qdbusconnection.h
tst_qdbusconnection_spyhook.cpp
diff --git a/tests/auto/dbus/qdbuscontext/CMakeLists.txt b/tests/auto/dbus/qdbuscontext/CMakeLists.txt
index d8adf50bd2..ee84e633af 100644
--- a/tests/auto/dbus/qdbuscontext/CMakeLists.txt
+++ b/tests/auto/dbus/qdbuscontext/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qdbuscontext Test:
#####################################################################
-add_qt_test(tst_qdbuscontext
+qt_add_test(tst_qdbuscontext
SOURCES
tst_qdbuscontext.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/dbus/qdbusinterface/qmyserver/.prev_CMakeLists.txt b/tests/auto/dbus/qdbusinterface/qmyserver/.prev_CMakeLists.txt
index 671403999b..9c898fecf6 100644
--- a/tests/auto/dbus/qdbusinterface/qmyserver/.prev_CMakeLists.txt
+++ b/tests/auto/dbus/qdbusinterface/qmyserver/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
## qmyserver_qdbusinterface Binary:
#####################################################################
-add_qt_executable(qmyserver_qdbusinterface
+qt_add_executable(qmyserver_qdbusinterface
OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
SOURCES
../myobject.h
diff --git a/tests/auto/dbus/qdbusinterface/qmyserver/CMakeLists.txt b/tests/auto/dbus/qdbusinterface/qmyserver/CMakeLists.txt
index de633f2aa9..916735bf59 100644
--- a/tests/auto/dbus/qdbusinterface/qmyserver/CMakeLists.txt
+++ b/tests/auto/dbus/qdbusinterface/qmyserver/CMakeLists.txt
@@ -4,7 +4,7 @@
## qmyserver_qdbusinterface Binary:
#####################################################################
-add_qt_executable(qmyserver_qdbusinterface
+qt_add_executable(qmyserver_qdbusinterface
OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
NO_INSTALL # special case
SOURCES
diff --git a/tests/auto/dbus/qdbuslocalcalls/CMakeLists.txt b/tests/auto/dbus/qdbuslocalcalls/CMakeLists.txt
index c65b48f948..378475dc46 100644
--- a/tests/auto/dbus/qdbuslocalcalls/CMakeLists.txt
+++ b/tests/auto/dbus/qdbuslocalcalls/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qdbuslocalcalls Test:
#####################################################################
-add_qt_test(tst_qdbuslocalcalls
+qt_add_test(tst_qdbuslocalcalls
SOURCES
tst_qdbuslocalcalls.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/dbus/qdbusmarshall/qdbusmarshall/.prev_CMakeLists.txt b/tests/auto/dbus/qdbusmarshall/qdbusmarshall/.prev_CMakeLists.txt
index fc5f59990f..9130f434b5 100644
--- a/tests/auto/dbus/qdbusmarshall/qdbusmarshall/.prev_CMakeLists.txt
+++ b/tests/auto/dbus/qdbusmarshall/qdbusmarshall/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qdbusmarshall Test:
#####################################################################
-add_qt_test(tst_qdbusmarshall
+qt_add_test(tst_qdbusmarshall
OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../"
SOURCES
../tst_qdbusmarshall.cpp
@@ -16,14 +16,14 @@ add_qt_test(tst_qdbusmarshall
## Scopes:
#####################################################################
-extend_target(tst_qdbusmarshall CONDITION QT_FEATURE_dbus_linked
+qt_extend_target(tst_qdbusmarshall CONDITION QT_FEATURE_dbus_linked
DEFINES
QT_LINKED_LIBDBUS
PUBLIC_LIBRARIES
dbus-1
)
-extend_target(tst_qdbusmarshall CONDITION NOT QT_FEATURE_dbus_linked
+qt_extend_target(tst_qdbusmarshall CONDITION NOT QT_FEATURE_dbus_linked
SOURCES
../../../../../src/dbus/qdbus_symbols.cpp
)
diff --git a/tests/auto/dbus/qdbusmarshall/qdbusmarshall/CMakeLists.txt b/tests/auto/dbus/qdbusmarshall/qdbusmarshall/CMakeLists.txt
index bd615ab900..86ef627276 100644
--- a/tests/auto/dbus/qdbusmarshall/qdbusmarshall/CMakeLists.txt
+++ b/tests/auto/dbus/qdbusmarshall/qdbusmarshall/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qdbusmarshall Test:
#####################################################################
-add_qt_test(tst_qdbusmarshall
+qt_add_test(tst_qdbusmarshall
OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../"
SOURCES
../tst_qdbusmarshall.cpp
@@ -20,14 +20,14 @@ add_qt_test(tst_qdbusmarshall
# This test case interacts with dbus code directly via the private
# headers. The include path is also not exposed via Qt:DBus.
# special case end
-extend_target(tst_qdbusmarshall CONDITION QT_FEATURE_dbus_linked
+qt_extend_target(tst_qdbusmarshall CONDITION QT_FEATURE_dbus_linked
DEFINES
QT_LINKED_LIBDBUS
PUBLIC_LIBRARIES
dbus-1
)
-extend_target(tst_qdbusmarshall CONDITION NOT QT_FEATURE_dbus_linked
+qt_extend_target(tst_qdbusmarshall CONDITION NOT QT_FEATURE_dbus_linked
SOURCES
../../../../../src/dbus/qdbus_symbols.cpp
)
diff --git a/tests/auto/dbus/qdbusmarshall/qpong/CMakeLists.txt b/tests/auto/dbus/qdbusmarshall/qpong/CMakeLists.txt
index e53c11aabe..28e96caf15 100644
--- a/tests/auto/dbus/qdbusmarshall/qpong/CMakeLists.txt
+++ b/tests/auto/dbus/qdbusmarshall/qpong/CMakeLists.txt
@@ -4,7 +4,7 @@
## qpong Binary:
#####################################################################
-add_qt_executable(qpong
+qt_add_executable(qpong
OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
SOURCES
qpong.cpp
diff --git a/tests/auto/dbus/qdbusmetaobject/CMakeLists.txt b/tests/auto/dbus/qdbusmetaobject/CMakeLists.txt
index 31cf3aff44..9fe730c533 100644
--- a/tests/auto/dbus/qdbusmetaobject/CMakeLists.txt
+++ b/tests/auto/dbus/qdbusmetaobject/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qdbusmetaobject Test:
#####################################################################
-add_qt_test(tst_qdbusmetaobject
+qt_add_test(tst_qdbusmetaobject
SOURCES
tst_qdbusmetaobject.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/dbus/qdbusmetatype/CMakeLists.txt b/tests/auto/dbus/qdbusmetatype/CMakeLists.txt
index 1bc7871f8c..d4878f681c 100644
--- a/tests/auto/dbus/qdbusmetatype/CMakeLists.txt
+++ b/tests/auto/dbus/qdbusmetatype/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qdbusmetatype Test:
#####################################################################
-add_qt_test(tst_qdbusmetatype
+qt_add_test(tst_qdbusmetatype
SOURCES
tst_qdbusmetatype.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/dbus/qdbuspendingcall/CMakeLists.txt b/tests/auto/dbus/qdbuspendingcall/CMakeLists.txt
index d432fd3f6c..47c4261313 100644
--- a/tests/auto/dbus/qdbuspendingcall/CMakeLists.txt
+++ b/tests/auto/dbus/qdbuspendingcall/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qdbuspendingcall Test:
#####################################################################
-add_qt_test(tst_qdbuspendingcall
+qt_add_test(tst_qdbuspendingcall
SOURCES
tst_qdbuspendingcall.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/dbus/qdbuspendingreply/CMakeLists.txt b/tests/auto/dbus/qdbuspendingreply/CMakeLists.txt
index f6ff6afe8c..2ece3ac4bf 100644
--- a/tests/auto/dbus/qdbuspendingreply/CMakeLists.txt
+++ b/tests/auto/dbus/qdbuspendingreply/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qdbuspendingreply Test:
#####################################################################
-add_qt_test(tst_qdbuspendingreply
+qt_add_test(tst_qdbuspendingreply
SOURCES
tst_qdbuspendingreply.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/dbus/qdbusreply/CMakeLists.txt b/tests/auto/dbus/qdbusreply/CMakeLists.txt
index 11770e16d5..5f75e52d4f 100644
--- a/tests/auto/dbus/qdbusreply/CMakeLists.txt
+++ b/tests/auto/dbus/qdbusreply/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qdbusreply Test:
#####################################################################
-add_qt_test(tst_qdbusreply
+qt_add_test(tst_qdbusreply
SOURCES
tst_qdbusreply.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/dbus/qdbusservicewatcher/CMakeLists.txt b/tests/auto/dbus/qdbusservicewatcher/CMakeLists.txt
index 436629ab80..d4b16feebd 100644
--- a/tests/auto/dbus/qdbusservicewatcher/CMakeLists.txt
+++ b/tests/auto/dbus/qdbusservicewatcher/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qdbusservicewatcher Test:
#####################################################################
-add_qt_test(tst_qdbusservicewatcher
+qt_add_test(tst_qdbusservicewatcher
SOURCES
tst_qdbusservicewatcher.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/dbus/qdbusthreading/CMakeLists.txt b/tests/auto/dbus/qdbusthreading/CMakeLists.txt
index 1c8f8a6053..f0a0bebb20 100644
--- a/tests/auto/dbus/qdbusthreading/CMakeLists.txt
+++ b/tests/auto/dbus/qdbusthreading/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qdbusthreading Test:
#####################################################################
-add_qt_test(tst_qdbusthreading
+qt_add_test(tst_qdbusthreading
SOURCES
tst_qdbusthreading.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/dbus/qdbustype/CMakeLists.txt b/tests/auto/dbus/qdbustype/CMakeLists.txt
index 34456d6331..a7d8104ec7 100644
--- a/tests/auto/dbus/qdbustype/CMakeLists.txt
+++ b/tests/auto/dbus/qdbustype/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qdbustype Test:
#####################################################################
-add_qt_test(tst_qdbustype
+qt_add_test(tst_qdbustype
SOURCES
tst_qdbustype.cpp
PUBLIC_LIBRARIES
@@ -15,14 +15,14 @@ add_qt_test(tst_qdbustype
## Scopes:
#####################################################################
-extend_target(tst_qdbustype CONDITION QT_FEATURE_dbus_linked
+qt_extend_target(tst_qdbustype CONDITION QT_FEATURE_dbus_linked
DEFINES
QT_LINKED_LIBDBUS
PUBLIC_LIBRARIES
dbus-1
)
-extend_target(tst_qdbustype CONDITION NOT QT_FEATURE_dbus_linked
+qt_extend_target(tst_qdbustype CONDITION NOT QT_FEATURE_dbus_linked
SOURCES
../../../../src/dbus/qdbus_symbols.cpp
)
diff --git a/tests/auto/dbus/qdbusxmlparser/CMakeLists.txt b/tests/auto/dbus/qdbusxmlparser/CMakeLists.txt
index 879f8d28e4..7390c25cb4 100644
--- a/tests/auto/dbus/qdbusxmlparser/CMakeLists.txt
+++ b/tests/auto/dbus/qdbusxmlparser/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qdbusxmlparser Test:
#####################################################################
-add_qt_test(tst_qdbusxmlparser
+qt_add_test(tst_qdbusxmlparser
SOURCES
tst_qdbusxmlparser.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/image/qicoimageformat/CMakeLists.txt b/tests/auto/gui/image/qicoimageformat/CMakeLists.txt
index 0c8393631a..b97733003b 100644
--- a/tests/auto/gui/image/qicoimageformat/CMakeLists.txt
+++ b/tests/auto/gui/image/qicoimageformat/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
icons/*)
list(APPEND test_data ${test_data_glob})
-add_qt_test(tst_qicoimageformat
+qt_add_test(tst_qicoimageformat
SOURCES
tst_qicoimageformat.cpp
PUBLIC_LIBRARIES
@@ -40,7 +40,7 @@ if(ANDROID)
"icons/valid/yellow.cur"
)
- add_qt_resource(tst_qicoimageformat "qicoimageformat"
+ qt_add_resource(tst_qicoimageformat "qicoimageformat"
PREFIX
"/"
FILES
diff --git a/tests/auto/gui/image/qicon/CMakeLists.txt b/tests/auto/gui/image/qicon/CMakeLists.txt
index 81f5390d79..5f629fb3ed 100644
--- a/tests/auto/gui/image/qicon/CMakeLists.txt
+++ b/tests/auto/gui/image/qicon/CMakeLists.txt
@@ -30,7 +30,7 @@ file(GLOB_RECURSE test_data_glob
*.svgz)
list(APPEND test_data ${test_data_glob})
-add_qt_test(tst_qicon
+qt_add_test(tst_qicon
SOURCES
tst_qicon.cpp
PUBLIC_LIBRARIES
@@ -67,7 +67,7 @@ set(tst_qicon_resource_files
"tst_qicon.cpp"
)
-add_qt_resource(tst_qicon "tst_qicon"
+qt_add_resource(tst_qicon "tst_qicon"
PREFIX
"/"
FILES
@@ -77,7 +77,7 @@ set(qmake_immediate_resource_files
"tst_qicon.cpp"
)
-add_qt_resource(tst_qicon "qmake_immediate"
+qt_add_resource(tst_qicon "qmake_immediate"
PREFIX
"/"
FILES
@@ -88,7 +88,7 @@ add_qt_resource(tst_qicon "qmake_immediate"
## Scopes:
#####################################################################
-extend_target(tst_qicon CONDITION TARGET Qt::Widgets
+qt_extend_target(tst_qicon CONDITION TARGET Qt::Widgets
PUBLIC_LIBRARIES
Qt::Widgets
)
diff --git a/tests/auto/gui/image/qiconhighdpi/CMakeLists.txt b/tests/auto/gui/image/qiconhighdpi/CMakeLists.txt
index 6f6aaedca5..8113422c1e 100644
--- a/tests/auto/gui/image/qiconhighdpi/CMakeLists.txt
+++ b/tests/auto/gui/image/qiconhighdpi/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
icons/*)
list(APPEND test_data ${test_data_glob})
-add_qt_test(tst_qiconhighdpi
+qt_add_test(tst_qiconhighdpi
SOURCES
tst_qiconhighdpi.cpp
PUBLIC_LIBRARIES
@@ -28,7 +28,7 @@ set(tst_qiconhighdpi_resource_files
"icons/testtheme/index.theme"
)
-add_qt_resource(tst_qiconhighdpi "tst_qiconhighdpi"
+qt_add_resource(tst_qiconhighdpi "tst_qiconhighdpi"
PREFIX
"/"
FILES
diff --git a/tests/auto/gui/image/qimage/CMakeLists.txt b/tests/auto/gui/image/qimage/CMakeLists.txt
index f6125d0fe9..a9e3b783a7 100644
--- a/tests/auto/gui/image/qimage/CMakeLists.txt
+++ b/tests/auto/gui/image/qimage/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
images/*)
list(APPEND test_data ${test_data_glob})
-add_qt_test(tst_qimage
+qt_add_test(tst_qimage
SOURCES
tst_qimage.cpp
PUBLIC_LIBRARIES
@@ -46,7 +46,7 @@ if(ANDROID AND NOT ANDROID_EMBEDDED)
"images/jpeg_exif_orientation_value_8.jpg"
)
- add_qt_resource(tst_qimage "qimage"
+ qt_add_resource(tst_qimage "qimage"
PREFIX
"/"
FILES
@@ -54,13 +54,13 @@ if(ANDROID AND NOT ANDROID_EMBEDDED)
)
endif()
-extend_target(tst_qimage CONDITION WIN32
+qt_extend_target(tst_qimage CONDITION WIN32
PUBLIC_LIBRARIES
gdi32
user32
)
-extend_target(tst_qimage CONDITION APPLE
+qt_extend_target(tst_qimage CONDITION APPLE
PUBLIC_LIBRARIES
${FWCoreGraphics}
)
diff --git a/tests/auto/gui/image/qimageiohandler/CMakeLists.txt b/tests/auto/gui/image/qimageiohandler/CMakeLists.txt
index 23e5e98b16..53bfb384aa 100644
--- a/tests/auto/gui/image/qimageiohandler/CMakeLists.txt
+++ b/tests/auto/gui/image/qimageiohandler/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qimageiohandler Test:
#####################################################################
-add_qt_test(tst_qimageiohandler
+qt_add_test(tst_qimageiohandler
SOURCES
tst_qimageiohandler.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/image/qimagereader/CMakeLists.txt b/tests/auto/gui/image/qimagereader/CMakeLists.txt
index 8a96fa18cf..a477252e73 100644
--- a/tests/auto/gui/image/qimagereader/CMakeLists.txt
+++ b/tests/auto/gui/image/qimagereader/CMakeLists.txt
@@ -14,7 +14,7 @@ file(GLOB_RECURSE test_data_glob
baseline/*)
list(APPEND test_data ${test_data_glob})
-add_qt_test(tst_qimagereader
+qt_add_test(tst_qimagereader
SOURCES
tst_qimagereader.cpp
PUBLIC_LIBRARIES
@@ -35,7 +35,7 @@ set(qmake_immediate_resource_files
${resource_glob_0}
)
-add_qt_resource(tst_qimagereader "qmake_immediate"
+qt_add_resource(tst_qimagereader "qmake_immediate"
PREFIX
"/"
FILES
@@ -56,7 +56,7 @@ if(ANDROID AND NOT ANDROID_EMBEDDED)
"images/trans.gif"
)
- add_qt_resource(tst_qimagereader "android_testdata"
+ qt_add_resource(tst_qimagereader "android_testdata"
PREFIX
"/"
FILES
diff --git a/tests/auto/gui/image/qimagewriter/CMakeLists.txt b/tests/auto/gui/image/qimagewriter/CMakeLists.txt
index 1a04dfbce0..9e5c7362a8 100644
--- a/tests/auto/gui/image/qimagewriter/CMakeLists.txt
+++ b/tests/auto/gui/image/qimagewriter/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
images/*)
list(APPEND test_data ${test_data_glob})
-add_qt_test(tst_qimagewriter
+qt_add_test(tst_qimagewriter
SOURCES
tst_qimagewriter.cpp
PUBLIC_LIBRARIES
@@ -41,7 +41,7 @@ if(ANDROID AND NOT ANDROID_EMBEDDED)
"images/trolltech.gif"
)
- add_qt_resource(tst_qimagewriter "qimagewriter"
+ qt_add_resource(tst_qimagewriter "qimagewriter"
PREFIX
"/"
FILES
diff --git a/tests/auto/gui/image/qmovie/CMakeLists.txt b/tests/auto/gui/image/qmovie/CMakeLists.txt
index bc841b5d29..3e9b2ad100 100644
--- a/tests/auto/gui/image/qmovie/CMakeLists.txt
+++ b/tests/auto/gui/image/qmovie/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
animations/*)
list(APPEND test_data ${test_data_glob})
-add_qt_test(tst_qmovie
+qt_add_test(tst_qmovie
SOURCES
tst_qmovie.cpp
PUBLIC_LIBRARIES
@@ -25,7 +25,7 @@ set(resources_resource_files
"animations/trolltech.gif"
)
-add_qt_resource(tst_qmovie "resources"
+qt_add_resource(tst_qmovie "resources"
PREFIX
"/"
FILES
@@ -40,17 +40,17 @@ add_qt_resource(tst_qmovie "resources"
## Scopes:
#####################################################################
-extend_target(tst_qmovie CONDITION TARGET Qt::Widgets
+qt_extend_target(tst_qmovie CONDITION TARGET Qt::Widgets
PUBLIC_LIBRARIES
Qt::Widgets
)
-extend_target(tst_qmovie CONDITION QT_FEATURE_gif
+qt_extend_target(tst_qmovie CONDITION QT_FEATURE_gif
DEFINES
QTEST_HAVE_GIF
)
-extend_target(tst_qmovie CONDITION QT_FEATURE_jpeg
+qt_extend_target(tst_qmovie CONDITION QT_FEATURE_jpeg
DEFINES
QTEST_HAVE_JPEG
)
diff --git a/tests/auto/gui/image/qpicture/CMakeLists.txt b/tests/auto/gui/image/qpicture/CMakeLists.txt
index 625d19b3a5..f79c72974a 100644
--- a/tests/auto/gui/image/qpicture/CMakeLists.txt
+++ b/tests/auto/gui/image/qpicture/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qpicture Test:
#####################################################################
-add_qt_test(tst_qpicture
+qt_add_test(tst_qpicture
SOURCES
tst_qpicture.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/image/qpixmap/CMakeLists.txt b/tests/auto/gui/image/qpixmap/CMakeLists.txt
index efdfb3b98e..b58609a760 100644
--- a/tests/auto/gui/image/qpixmap/CMakeLists.txt
+++ b/tests/auto/gui/image/qpixmap/CMakeLists.txt
@@ -22,7 +22,7 @@ file(GLOB_RECURSE test_data_glob
images/*)
list(APPEND test_data ${test_data_glob})
-add_qt_test(tst_qpixmap
+qt_add_test(tst_qpixmap
SOURCES
tst_qpixmap.cpp
PUBLIC_LIBRARIES
@@ -83,7 +83,7 @@ set(qpixmap_resource_files
"loadFromData/designer_rgb32.png"
)
-add_qt_resource(tst_qpixmap "qpixmap"
+qt_add_resource(tst_qpixmap "qpixmap"
PREFIX
"/"
FILES
@@ -94,13 +94,13 @@ add_qt_resource(tst_qpixmap "qpixmap"
## Scopes:
#####################################################################
-extend_target(tst_qpixmap CONDITION TARGET Qt::Widgets
+qt_extend_target(tst_qpixmap CONDITION TARGET Qt::Widgets
PUBLIC_LIBRARIES
Qt::Widgets
Qt::WidgetsPrivate
)
-extend_target(tst_qpixmap CONDITION WIN32
+qt_extend_target(tst_qpixmap CONDITION WIN32
PUBLIC_LIBRARIES
gdi32
user32
diff --git a/tests/auto/gui/image/qpixmapcache/CMakeLists.txt b/tests/auto/gui/image/qpixmapcache/CMakeLists.txt
index ef73f60ca6..33c1faf865 100644
--- a/tests/auto/gui/image/qpixmapcache/CMakeLists.txt
+++ b/tests/auto/gui/image/qpixmapcache/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qpixmapcache Test:
#####################################################################
-add_qt_test(tst_qpixmapcache
+qt_add_test(tst_qpixmapcache
SOURCES
tst_qpixmapcache.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/itemmodels/qstandarditem/CMakeLists.txt b/tests/auto/gui/itemmodels/qstandarditem/CMakeLists.txt
index 8a19f6afaf..65f13a10c8 100644
--- a/tests/auto/gui/itemmodels/qstandarditem/CMakeLists.txt
+++ b/tests/auto/gui/itemmodels/qstandarditem/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qstandarditem Test:
#####################################################################
-add_qt_test(tst_qstandarditem
+qt_add_test(tst_qstandarditem
SOURCES
tst_qstandarditem.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/kernel/noqteventloop/CMakeLists.txt b/tests/auto/gui/kernel/noqteventloop/CMakeLists.txt
index 4a6ea22d13..262b2ad2f2 100644
--- a/tests/auto/gui/kernel/noqteventloop/CMakeLists.txt
+++ b/tests/auto/gui/kernel/noqteventloop/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_noqteventloop Test:
#####################################################################
-add_qt_test(tst_noqteventloop
+qt_add_test(tst_noqteventloop
SOURCES
tst_noqteventloop.cpp
PUBLIC_LIBRARIES
@@ -17,7 +17,7 @@ add_qt_test(tst_noqteventloop
## Scopes:
#####################################################################
-extend_target(tst_noqteventloop CONDITION QT_FEATURE_dynamicgl AND WIN32
+qt_extend_target(tst_noqteventloop CONDITION QT_FEATURE_dynamicgl AND WIN32
PUBLIC_LIBRARIES
user32
)
diff --git a/tests/auto/gui/kernel/qaction/CMakeLists.txt b/tests/auto/gui/kernel/qaction/CMakeLists.txt
index bdd1a1d165..70065156ca 100644
--- a/tests/auto/gui/kernel/qaction/CMakeLists.txt
+++ b/tests/auto/gui/kernel/qaction/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qaction_kernel Test:
#####################################################################
-add_qt_test(tst_qaction_kernel
+qt_add_test(tst_qaction_kernel
SOURCES
tst_qaction.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/kernel/qactiongroup/CMakeLists.txt b/tests/auto/gui/kernel/qactiongroup/CMakeLists.txt
index bcab5e05a2..e313aebec5 100644
--- a/tests/auto/gui/kernel/qactiongroup/CMakeLists.txt
+++ b/tests/auto/gui/kernel/qactiongroup/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qactiongroup_kernel Test:
#####################################################################
-add_qt_test(tst_qactiongroup_kernel
+qt_add_test(tst_qactiongroup_kernel
SOURCES
tst_qactiongroup.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/kernel/qbackingstore/CMakeLists.txt b/tests/auto/gui/kernel/qbackingstore/CMakeLists.txt
index 639e88fb4c..55d53545bb 100644
--- a/tests/auto/gui/kernel/qbackingstore/CMakeLists.txt
+++ b/tests/auto/gui/kernel/qbackingstore/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qbackingstore Test:
#####################################################################
-add_qt_test(tst_qbackingstore
+qt_add_test(tst_qbackingstore
SOURCES
tst_qbackingstore.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/kernel/qclipboard/test/CMakeLists.txt b/tests/auto/gui/kernel/qclipboard/test/CMakeLists.txt
index e7c1313c7b..dfacb03517 100644
--- a/tests/auto/gui/kernel/qclipboard/test/CMakeLists.txt
+++ b/tests/auto/gui/kernel/qclipboard/test/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qclipboard Test:
#####################################################################
-add_qt_test(tst_qclipboard
+qt_add_test(tst_qclipboard
OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../"
SOURCES
../tst_qclipboard.cpp
@@ -15,7 +15,7 @@ add_qt_test(tst_qclipboard
## Scopes:
#####################################################################
-extend_target(tst_qclipboard CONDITION MACOS
+qt_extend_target(tst_qclipboard CONDITION MACOS
PUBLIC_LIBRARIES
${FWAppKit}
)
diff --git a/tests/auto/gui/kernel/qcursor/CMakeLists.txt b/tests/auto/gui/kernel/qcursor/CMakeLists.txt
index 8f4062a42a..2c3cf28c1a 100644
--- a/tests/auto/gui/kernel/qcursor/CMakeLists.txt
+++ b/tests/auto/gui/kernel/qcursor/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qcursor Test:
#####################################################################
-add_qt_test(tst_qcursor
+qt_add_test(tst_qcursor
SOURCES
tst_qcursor.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/kernel/qdrag/CMakeLists.txt b/tests/auto/gui/kernel/qdrag/CMakeLists.txt
index 84bceaf0de..1b13df54d3 100644
--- a/tests/auto/gui/kernel/qdrag/CMakeLists.txt
+++ b/tests/auto/gui/kernel/qdrag/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qdrag Test:
#####################################################################
-add_qt_test(tst_qdrag
+qt_add_test(tst_qdrag
SOURCES
tst_qdrag.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/kernel/qevent/CMakeLists.txt b/tests/auto/gui/kernel/qevent/CMakeLists.txt
index 01d6db7225..21a2ddad66 100644
--- a/tests/auto/gui/kernel/qevent/CMakeLists.txt
+++ b/tests/auto/gui/kernel/qevent/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qevent Test:
#####################################################################
-add_qt_test(tst_qevent
+qt_add_test(tst_qevent
SOURCES
tst_qevent.cpp
)
diff --git a/tests/auto/gui/kernel/qfileopenevent/qfileopeneventexternal/CMakeLists.txt b/tests/auto/gui/kernel/qfileopenevent/qfileopeneventexternal/CMakeLists.txt
index 0c50f7ff56..0b9cd6d481 100644
--- a/tests/auto/gui/kernel/qfileopenevent/qfileopeneventexternal/CMakeLists.txt
+++ b/tests/auto/gui/kernel/qfileopenevent/qfileopeneventexternal/CMakeLists.txt
@@ -4,7 +4,7 @@
## qfileopeneventexternal Binary:
#####################################################################
-add_qt_executable(qfileopeneventexternal
+qt_add_executable(qfileopeneventexternal
GUI
SOURCES
qfileopeneventexternal.cpp
diff --git a/tests/auto/gui/kernel/qfileopenevent/test/CMakeLists.txt b/tests/auto/gui/kernel/qfileopenevent/test/CMakeLists.txt
index 6695ef42b3..a306a3eae6 100644
--- a/tests/auto/gui/kernel/qfileopenevent/test/CMakeLists.txt
+++ b/tests/auto/gui/kernel/qfileopenevent/test/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qfileopenevent Test:
#####################################################################
-add_qt_test(tst_qfileopenevent
+qt_add_test(tst_qfileopenevent
SOURCES
tst_qfileopenevent.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/kernel/qguiapplication/.prev_CMakeLists.txt b/tests/auto/gui/kernel/qguiapplication/.prev_CMakeLists.txt
index 30a6436ece..0da40c5aa3 100644
--- a/tests/auto/gui/kernel/qguiapplication/.prev_CMakeLists.txt
+++ b/tests/auto/gui/kernel/qguiapplication/.prev_CMakeLists.txt
@@ -8,7 +8,7 @@ endif()
## tst_qguiapplication Test:
#####################################################################
-add_qt_test(tst_qguiapplication
+qt_add_test(tst_qguiapplication
SOURCES
tst_qcoreapplication.cpp tst_qcoreapplication.h
tst_qguiapplication.cpp
@@ -27,7 +27,7 @@ set(tst_qguiapplication_resource_files
"icons/usericon.png"
)
-add_qt_resource(tst_qguiapplication "tst_qguiapplication"
+qt_add_resource(tst_qguiapplication "tst_qguiapplication"
PREFIX
"/"
FILES
diff --git a/tests/auto/gui/kernel/qguiapplication/CMakeLists.txt b/tests/auto/gui/kernel/qguiapplication/CMakeLists.txt
index 24fa6572c1..a98123aa64 100644
--- a/tests/auto/gui/kernel/qguiapplication/CMakeLists.txt
+++ b/tests/auto/gui/kernel/qguiapplication/CMakeLists.txt
@@ -16,8 +16,8 @@ else()
endif()
# special case end
-add_qt_test(tst_qguiapplication
- VERSION ${target_version}
+qt_add_test(tst_qguiapplication
+ VERSION ${target_version} # special case
SOURCES
../../../corelib/kernel/qcoreapplication/tst_qcoreapplication.cpp ../../../corelib/kernel/qcoreapplication/tst_qcoreapplication.h # special case
tst_qguiapplication.cpp
@@ -37,7 +37,7 @@ set(tst_qguiapplication_resource_files
"icons/usericon.png"
)
-add_qt_resource(tst_qguiapplication "tst_qguiapplication"
+qt_add_resource(tst_qguiapplication "tst_qguiapplication"
PREFIX
"/"
FILES
diff --git a/tests/auto/gui/kernel/qguieventdispatcher/CMakeLists.txt b/tests/auto/gui/kernel/qguieventdispatcher/CMakeLists.txt
index eb36e0ece7..14babc165c 100644
--- a/tests/auto/gui/kernel/qguieventdispatcher/CMakeLists.txt
+++ b/tests/auto/gui/kernel/qguieventdispatcher/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qguieventdispatcher Test:
#####################################################################
-add_qt_test(tst_qguieventdispatcher
+qt_add_test(tst_qguieventdispatcher
SOURCES
../../../corelib/kernel/qeventdispatcher/tst_qeventdispatcher.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/kernel/qguieventloop/CMakeLists.txt b/tests/auto/gui/kernel/qguieventloop/CMakeLists.txt
index 3fd943c83c..8d62d716a5 100644
--- a/tests/auto/gui/kernel/qguieventloop/CMakeLists.txt
+++ b/tests/auto/gui/kernel/qguieventloop/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qguieventloop Test:
#####################################################################
-add_qt_test(tst_qguieventloop
+qt_add_test(tst_qguieventloop
SOURCES
../../../corelib/kernel/qeventloop/tst_qeventloop.cpp
PUBLIC_LIBRARIES
@@ -16,12 +16,12 @@ add_qt_test(tst_qguieventloop
## Scopes:
#####################################################################
-extend_target(tst_qguieventloop CONDITION WIN32
+qt_extend_target(tst_qguieventloop CONDITION WIN32
PUBLIC_LIBRARIES
user32
)
-extend_target(tst_qguieventloop CONDITION QT_FEATURE_glib
+qt_extend_target(tst_qguieventloop CONDITION QT_FEATURE_glib
DEFINES
HAVE_GLIB
)
diff --git a/tests/auto/gui/kernel/qguimetatype/CMakeLists.txt b/tests/auto/gui/kernel/qguimetatype/CMakeLists.txt
index 3701b3983a..d124b08828 100644
--- a/tests/auto/gui/kernel/qguimetatype/CMakeLists.txt
+++ b/tests/auto/gui/kernel/qguimetatype/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qguimetatype Test:
#####################################################################
-add_qt_test(tst_qguimetatype
+qt_add_test(tst_qguimetatype
SOURCES
tst_qguimetatype.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/kernel/qguitimer/.prev_CMakeLists.txt b/tests/auto/gui/kernel/qguitimer/.prev_CMakeLists.txt
index c4e5117e8c..8c2ec60bdf 100644
--- a/tests/auto/gui/kernel/qguitimer/.prev_CMakeLists.txt
+++ b/tests/auto/gui/kernel/qguitimer/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qguitimer Test:
#####################################################################
-add_qt_test(tst_qguitimer
+qt_add_test(tst_qguitimer
SOURCES
../../../corelib/kernel/qtimer/tst_qtimer.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/kernel/qguitimer/CMakeLists.txt b/tests/auto/gui/kernel/qguitimer/CMakeLists.txt
index 2be3339fe3..52be3ed547 100644
--- a/tests/auto/gui/kernel/qguitimer/CMakeLists.txt
+++ b/tests/auto/gui/kernel/qguitimer/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qguitimer Test:
#####################################################################
-add_qt_test(tst_qguitimer
+qt_add_test(tst_qguitimer
SOURCES
../../../corelib/kernel/qtimer/tst_qtimer.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/kernel/qguivariant/no_application/CMakeLists.txt b/tests/auto/gui/kernel/qguivariant/no_application/CMakeLists.txt
index 8261212801..344b81bf6d 100644
--- a/tests/auto/gui/kernel/qguivariant/no_application/CMakeLists.txt
+++ b/tests/auto/gui/kernel/qguivariant/no_application/CMakeLists.txt
@@ -4,7 +4,7 @@
## no_application Test:
#####################################################################
-add_qt_test(no_application
+qt_add_test(no_application
SOURCES
main.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/kernel/qguivariant/test/CMakeLists.txt b/tests/auto/gui/kernel/qguivariant/test/CMakeLists.txt
index af2cea60e6..93efaf2aeb 100644
--- a/tests/auto/gui/kernel/qguivariant/test/CMakeLists.txt
+++ b/tests/auto/gui/kernel/qguivariant/test/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qguivariant Test:
#####################################################################
-add_qt_test(tst_qguivariant
+qt_add_test(tst_qguivariant
SOURCES
tst_qguivariant.cpp
INCLUDE_DIRECTORIES
@@ -19,7 +19,7 @@ set(tst_qguivariant_resource_files
"black2.png"
)
-add_qt_resource(tst_qguivariant "tst_qguivariant"
+qt_add_resource(tst_qguivariant "tst_qguivariant"
PREFIX
"/"
FILES
@@ -29,7 +29,7 @@ set(qguivariant_resource_files
"data"
)
-add_qt_resource(tst_qguivariant "qguivariant"
+qt_add_resource(tst_qguivariant "qguivariant"
PREFIX
"/"
FILES
diff --git a/tests/auto/gui/kernel/qinputdevice/CMakeLists.txt b/tests/auto/gui/kernel/qinputdevice/CMakeLists.txt
index 18d4968695..5c368838ab 100644
--- a/tests/auto/gui/kernel/qinputdevice/CMakeLists.txt
+++ b/tests/auto/gui/kernel/qinputdevice/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qinputdevice Test:
#####################################################################
-add_qt_test(tst_qinputdevice
+qt_add_test(tst_qinputdevice
SOURCES
tst_qinputdevice.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/kernel/qinputmethod/CMakeLists.txt b/tests/auto/gui/kernel/qinputmethod/CMakeLists.txt
index 2eee15b816..bdd4940392 100644
--- a/tests/auto/gui/kernel/qinputmethod/CMakeLists.txt
+++ b/tests/auto/gui/kernel/qinputmethod/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qinputmethod Test:
#####################################################################
-add_qt_test(tst_qinputmethod
+qt_add_test(tst_qinputmethod
SOURCES
tst_qinputmethod.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/kernel/qkeyevent/CMakeLists.txt b/tests/auto/gui/kernel/qkeyevent/CMakeLists.txt
index 2e36795375..3c48a6492b 100644
--- a/tests/auto/gui/kernel/qkeyevent/CMakeLists.txt
+++ b/tests/auto/gui/kernel/qkeyevent/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qkeyevent Test:
#####################################################################
-add_qt_test(tst_qkeyevent
+qt_add_test(tst_qkeyevent
SOURCES
tst_qkeyevent.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/kernel/qkeysequence/CMakeLists.txt b/tests/auto/gui/kernel/qkeysequence/CMakeLists.txt
index 07e480c9dd..f5a0c38fe4 100644
--- a/tests/auto/gui/kernel/qkeysequence/CMakeLists.txt
+++ b/tests/auto/gui/kernel/qkeysequence/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qkeysequence Test:
#####################################################################
-add_qt_test(tst_qkeysequence
+qt_add_test(tst_qkeysequence
SOURCES
tst_qkeysequence.cpp
PUBLIC_LIBRARIES
@@ -19,7 +19,7 @@ set(qkeysequence_resource_files
"qt_de.qm"
)
-add_qt_resource(tst_qkeysequence "qkeysequence"
+qt_add_resource(tst_qkeysequence "qkeysequence"
PREFIX
"/"
FILES
diff --git a/tests/auto/gui/kernel/qmouseevent/CMakeLists.txt b/tests/auto/gui/kernel/qmouseevent/CMakeLists.txt
index 4e1081c6ad..4d31363d64 100644
--- a/tests/auto/gui/kernel/qmouseevent/CMakeLists.txt
+++ b/tests/auto/gui/kernel/qmouseevent/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qmouseevent Test:
#####################################################################
-add_qt_test(tst_qmouseevent
+qt_add_test(tst_qmouseevent
SOURCES
tst_qmouseevent.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/kernel/qmouseevent_modal/CMakeLists.txt b/tests/auto/gui/kernel/qmouseevent_modal/CMakeLists.txt
index c7f447ffeb..afe9fe33ed 100644
--- a/tests/auto/gui/kernel/qmouseevent_modal/CMakeLists.txt
+++ b/tests/auto/gui/kernel/qmouseevent_modal/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qmouseevent_modal Test:
#####################################################################
-add_qt_test(tst_qmouseevent_modal
+qt_add_test(tst_qmouseevent_modal
SOURCES
tst_qmouseevent_modal.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/kernel/qopenglwindow/CMakeLists.txt b/tests/auto/gui/kernel/qopenglwindow/CMakeLists.txt
index 4176be9840..1a460a567f 100644
--- a/tests/auto/gui/kernel/qopenglwindow/CMakeLists.txt
+++ b/tests/auto/gui/kernel/qopenglwindow/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qopenglwindow Test:
#####################################################################
-add_qt_test(tst_qopenglwindow
+qt_add_test(tst_qopenglwindow
SOURCES
tst_qopenglwindow.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/kernel/qpalette/CMakeLists.txt b/tests/auto/gui/kernel/qpalette/CMakeLists.txt
index 4bd2ce7cc5..acb413007e 100644
--- a/tests/auto/gui/kernel/qpalette/CMakeLists.txt
+++ b/tests/auto/gui/kernel/qpalette/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qpalette Test:
#####################################################################
-add_qt_test(tst_qpalette
+qt_add_test(tst_qpalette
SOURCES
tst_qpalette.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/kernel/qpixelformat/CMakeLists.txt b/tests/auto/gui/kernel/qpixelformat/CMakeLists.txt
index 43deb02af1..907564dc3d 100644
--- a/tests/auto/gui/kernel/qpixelformat/CMakeLists.txt
+++ b/tests/auto/gui/kernel/qpixelformat/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qpixelformat Test:
#####################################################################
-add_qt_test(tst_qpixelformat
+qt_add_test(tst_qpixelformat
SOURCES
tst_qpixelformat.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/kernel/qrasterwindow/CMakeLists.txt b/tests/auto/gui/kernel/qrasterwindow/CMakeLists.txt
index 9b586ce4c8..6b34b71dac 100644
--- a/tests/auto/gui/kernel/qrasterwindow/CMakeLists.txt
+++ b/tests/auto/gui/kernel/qrasterwindow/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qrasterwindow Test:
#####################################################################
-add_qt_test(tst_qrasterwindow
+qt_add_test(tst_qrasterwindow
SOURCES
tst_qrasterwindow.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/kernel/qscreen/CMakeLists.txt b/tests/auto/gui/kernel/qscreen/CMakeLists.txt
index dd54db4753..b073070155 100644
--- a/tests/auto/gui/kernel/qscreen/CMakeLists.txt
+++ b/tests/auto/gui/kernel/qscreen/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qscreen Test:
#####################################################################
-add_qt_test(tst_qscreen
+qt_add_test(tst_qscreen
SOURCES
tst_qscreen.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/kernel/qshortcut/CMakeLists.txt b/tests/auto/gui/kernel/qshortcut/CMakeLists.txt
index fab20dceed..8c3c2556fe 100644
--- a/tests/auto/gui/kernel/qshortcut/CMakeLists.txt
+++ b/tests/auto/gui/kernel/qshortcut/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qshortcut_kernel Test:
#####################################################################
-add_qt_test(tst_qshortcut_kernel
+qt_add_test(tst_qshortcut_kernel
SOURCES
tst_qshortcut.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/kernel/qsurfaceformat/CMakeLists.txt b/tests/auto/gui/kernel/qsurfaceformat/CMakeLists.txt
index d12e1da106..1d319aaddd 100644
--- a/tests/auto/gui/kernel/qsurfaceformat/CMakeLists.txt
+++ b/tests/auto/gui/kernel/qsurfaceformat/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qsurfaceformat Test:
#####################################################################
-add_qt_test(tst_qsurfaceformat
+qt_add_test(tst_qsurfaceformat
SOURCES
tst_qsurfaceformat.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/kernel/qtouchevent/CMakeLists.txt b/tests/auto/gui/kernel/qtouchevent/CMakeLists.txt
index 7d489e3066..a2976c351f 100644
--- a/tests/auto/gui/kernel/qtouchevent/CMakeLists.txt
+++ b/tests/auto/gui/kernel/qtouchevent/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qtouchevent Test:
#####################################################################
-add_qt_test(tst_qtouchevent
+qt_add_test(tst_qtouchevent
SOURCES
tst_qtouchevent.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/kernel/qwindow/CMakeLists.txt b/tests/auto/gui/kernel/qwindow/CMakeLists.txt
index 60603a219b..84b46b76f5 100644
--- a/tests/auto/gui/kernel/qwindow/CMakeLists.txt
+++ b/tests/auto/gui/kernel/qwindow/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qwindow Test:
#####################################################################
-add_qt_test(tst_qwindow
+qt_add_test(tst_qwindow
SOURCES
tst_qwindow.cpp
PUBLIC_LIBRARIES
@@ -16,7 +16,7 @@ add_qt_test(tst_qwindow
## Scopes:
#####################################################################
-extend_target(tst_qwindow CONDITION QT_FEATURE_dynamicgl AND WIN32
+qt_extend_target(tst_qwindow CONDITION QT_FEATURE_dynamicgl AND WIN32
PUBLIC_LIBRARIES
user32
)
diff --git a/tests/auto/gui/math3d/qmatrixnxn/CMakeLists.txt b/tests/auto/gui/math3d/qmatrixnxn/CMakeLists.txt
index 71daeba361..fb2c3ef813 100644
--- a/tests/auto/gui/math3d/qmatrixnxn/CMakeLists.txt
+++ b/tests/auto/gui/math3d/qmatrixnxn/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qmatrixnxn Test:
#####################################################################
-add_qt_test(tst_qmatrixnxn
+qt_add_test(tst_qmatrixnxn
SOURCES
tst_qmatrixnxn.cpp
DEFINES
diff --git a/tests/auto/gui/math3d/qquaternion/CMakeLists.txt b/tests/auto/gui/math3d/qquaternion/CMakeLists.txt
index 77d035cbf9..dec4a3d352 100644
--- a/tests/auto/gui/math3d/qquaternion/CMakeLists.txt
+++ b/tests/auto/gui/math3d/qquaternion/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qquaternion Test:
#####################################################################
-add_qt_test(tst_qquaternion
+qt_add_test(tst_qquaternion
SOURCES
tst_qquaternion.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/math3d/qvectornd/CMakeLists.txt b/tests/auto/gui/math3d/qvectornd/CMakeLists.txt
index 5d8a373234..7dd6fe0dcb 100644
--- a/tests/auto/gui/math3d/qvectornd/CMakeLists.txt
+++ b/tests/auto/gui/math3d/qvectornd/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qvectornd Test:
#####################################################################
-add_qt_test(tst_qvectornd
+qt_add_test(tst_qvectornd
SOURCES
tst_qvectornd.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/painting/qpagesize/CMakeLists.txt b/tests/auto/gui/painting/qpagesize/CMakeLists.txt
index 260abfbc0f..706fa3e402 100644
--- a/tests/auto/gui/painting/qpagesize/CMakeLists.txt
+++ b/tests/auto/gui/painting/qpagesize/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qpagesize Test:
#####################################################################
-add_qt_test(tst_qpagesize
+qt_add_test(tst_qpagesize
SOURCES
tst_qpagesize.cpp
DEFINES
diff --git a/tests/auto/gui/painting/qpaintengine/CMakeLists.txt b/tests/auto/gui/painting/qpaintengine/CMakeLists.txt
index 8125a98d3e..602bfe7316 100644
--- a/tests/auto/gui/painting/qpaintengine/CMakeLists.txt
+++ b/tests/auto/gui/painting/qpaintengine/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qpaintengine Test:
#####################################################################
-add_qt_test(tst_qpaintengine
+qt_add_test(tst_qpaintengine
SOURCES
tst_qpaintengine.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/painting/qpainterpath/CMakeLists.txt b/tests/auto/gui/painting/qpainterpath/CMakeLists.txt
index c2c88cc258..edc1ab14bf 100644
--- a/tests/auto/gui/painting/qpainterpath/CMakeLists.txt
+++ b/tests/auto/gui/painting/qpainterpath/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qpainterpath Test:
#####################################################################
-add_qt_test(tst_qpainterpath
+qt_add_test(tst_qpainterpath
SOURCES
tst_qpainterpath.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/painting/qpainterpathstroker/CMakeLists.txt b/tests/auto/gui/painting/qpainterpathstroker/CMakeLists.txt
index a1c5f6547f..1344682991 100644
--- a/tests/auto/gui/painting/qpainterpathstroker/CMakeLists.txt
+++ b/tests/auto/gui/painting/qpainterpathstroker/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qpainterpathstroker Test:
#####################################################################
-add_qt_test(tst_qpainterpathstroker
+qt_add_test(tst_qpainterpathstroker
SOURCES
tst_qpainterpathstroker.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/painting/qpen/CMakeLists.txt b/tests/auto/gui/painting/qpen/CMakeLists.txt
index d096f7a6ce..076d15b1d1 100644
--- a/tests/auto/gui/painting/qpen/CMakeLists.txt
+++ b/tests/auto/gui/painting/qpen/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qpen Test:
#####################################################################
-add_qt_test(tst_qpen
+qt_add_test(tst_qpen
SOURCES
tst_qpen.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/qopengl/CMakeLists.txt b/tests/auto/gui/qopengl/CMakeLists.txt
index 1c7c9b6ec0..a32730fd70 100644
--- a/tests/auto/gui/qopengl/CMakeLists.txt
+++ b/tests/auto/gui/qopengl/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qopengl Test:
#####################################################################
-add_qt_test(tst_qopengl
+qt_add_test(tst_qopengl
SOURCES
tst_qopengl.cpp
PUBLIC_LIBRARIES
@@ -17,7 +17,7 @@ add_qt_test(tst_qopengl
## Scopes:
#####################################################################
-extend_target(tst_qopengl CONDITION LINUX AND QT_FEATURE_xcb AND QT_FEATURE_xcb_glx_plugin
+qt_extend_target(tst_qopengl CONDITION LINUX AND QT_FEATURE_xcb AND QT_FEATURE_xcb_glx_plugin
DEFINES
USE_GLX
)
diff --git a/tests/auto/gui/qopenglconfig/CMakeLists.txt b/tests/auto/gui/qopenglconfig/CMakeLists.txt
index 26ce58d98c..60fcdb67df 100644
--- a/tests/auto/gui/qopenglconfig/CMakeLists.txt
+++ b/tests/auto/gui/qopenglconfig/CMakeLists.txt
@@ -7,7 +7,7 @@
# Collect test data
list(APPEND test_data "buglist.json")
-add_qt_test(tst_qopenglconfig
+qt_add_test(tst_qopenglconfig
SOURCES
tst_qopenglconfig.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/qvulkan/CMakeLists.txt b/tests/auto/gui/qvulkan/CMakeLists.txt
index 6316aa8f68..e3a6643f3d 100644
--- a/tests/auto/gui/qvulkan/CMakeLists.txt
+++ b/tests/auto/gui/qvulkan/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qvulkan Test:
#####################################################################
-add_qt_test(tst_qvulkan
+qt_add_test(tst_qvulkan
SOURCES
tst_qvulkan.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/rhi/qrhi/CMakeLists.txt b/tests/auto/gui/rhi/qrhi/CMakeLists.txt
index 8c3026c176..8ea9bf36af 100644
--- a/tests/auto/gui/rhi/qrhi/CMakeLists.txt
+++ b/tests/auto/gui/rhi/qrhi/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qrhi Test:
#####################################################################
-add_qt_test(tst_qrhi
+qt_add_test(tst_qrhi
SOURCES
tst_qrhi.cpp
PUBLIC_LIBRARIES
@@ -17,7 +17,7 @@ set(qrhi_resource_files
"data"
)
-add_qt_resource(tst_qrhi "qrhi"
+qt_add_resource(tst_qrhi "qrhi"
PREFIX
"/"
FILES
diff --git a/tests/auto/gui/rhi/qshader/CMakeLists.txt b/tests/auto/gui/rhi/qshader/CMakeLists.txt
index 472fc3b7e4..ae35f7e84e 100644
--- a/tests/auto/gui/rhi/qshader/CMakeLists.txt
+++ b/tests/auto/gui/rhi/qshader/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qshader Test:
#####################################################################
-add_qt_test(tst_qshader
+qt_add_test(tst_qshader
SOURCES
tst_qshader.cpp
PUBLIC_LIBRARIES
@@ -17,7 +17,7 @@ set(qshader_resource_files
"data"
)
-add_qt_resource(tst_qshader "qshader"
+qt_add_resource(tst_qshader "qshader"
PREFIX
"/"
FILES
diff --git a/tests/auto/gui/text/qabstracttextdocumentlayout/CMakeLists.txt b/tests/auto/gui/text/qabstracttextdocumentlayout/CMakeLists.txt
index 62d4ce9d32..28df19d195 100644
--- a/tests/auto/gui/text/qabstracttextdocumentlayout/CMakeLists.txt
+++ b/tests/auto/gui/text/qabstracttextdocumentlayout/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qabstracttextdocumentlayout Test:
#####################################################################
-add_qt_test(tst_qabstracttextdocumentlayout
+qt_add_test(tst_qabstracttextdocumentlayout
SOURCES
tst_qabstracttextdocumentlayout.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/text/qcssparser/CMakeLists.txt b/tests/auto/gui/text/qcssparser/CMakeLists.txt
index 09e1672bc4..dc86787c45 100644
--- a/tests/auto/gui/text/qcssparser/CMakeLists.txt
+++ b/tests/auto/gui/text/qcssparser/CMakeLists.txt
@@ -11,7 +11,7 @@ endif()
# Collect test data
list(APPEND test_data "testdata")
-add_qt_test(tst_qcssparser
+qt_add_test(tst_qcssparser
SOURCES
tst_qcssparser.cpp
DEFINES
@@ -48,7 +48,7 @@ if(ANDROID)
"testdata/scanner/unicode/output"
)
- add_qt_resource(tst_qcssparser "testdata"
+ qt_add_resource(tst_qcssparser "testdata"
PREFIX
"/"
FILES
diff --git a/tests/auto/gui/text/qfont/CMakeLists.txt b/tests/auto/gui/text/qfont/CMakeLists.txt
index a04f8365b1..b7e30318fb 100644
--- a/tests/auto/gui/text/qfont/CMakeLists.txt
+++ b/tests/auto/gui/text/qfont/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qfont Test:
#####################################################################
-add_qt_test(tst_qfont
+qt_add_test(tst_qfont
SOURCES
tst_qfont.cpp
PUBLIC_LIBRARIES
@@ -18,7 +18,7 @@ set(testfont_resource_files
"weirdfont.otf"
)
-add_qt_resource(tst_qfont "testfont"
+qt_add_resource(tst_qfont "testfont"
PREFIX
"/"
FILES
@@ -29,7 +29,7 @@ add_qt_resource(tst_qfont "testfont"
## Scopes:
#####################################################################
-extend_target(tst_qfont CONDITION TARGET Qt::Widgets
+qt_extend_target(tst_qfont CONDITION TARGET Qt::Widgets
PUBLIC_LIBRARIES
Qt::Widgets
)
diff --git a/tests/auto/gui/text/qfontcache/CMakeLists.txt b/tests/auto/gui/text/qfontcache/CMakeLists.txt
index 84f6373328..374854b410 100644
--- a/tests/auto/gui/text/qfontcache/CMakeLists.txt
+++ b/tests/auto/gui/text/qfontcache/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qfontcache Test:
#####################################################################
-add_qt_test(tst_qfontcache
+qt_add_test(tst_qfontcache
SOURCES
tst_qfontcache.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/text/qfontdatabase/CMakeLists.txt b/tests/auto/gui/text/qfontdatabase/CMakeLists.txt
index 65c6224a00..f6ff9e8e7d 100644
--- a/tests/auto/gui/text/qfontdatabase/CMakeLists.txt
+++ b/tests/auto/gui/text/qfontdatabase/CMakeLists.txt
@@ -7,7 +7,7 @@
# Collect test data
list(APPEND test_data "LED_REAL.TTF")
-add_qt_test(tst_qfontdatabase
+qt_add_test(tst_qfontdatabase
SOURCES
tst_qfontdatabase.cpp
PUBLIC_LIBRARIES
@@ -38,7 +38,7 @@ set(testdata_resource_files
"LED_REAL.TTF"
)
-add_qt_resource(tst_qfontdatabase "testdata"
+qt_add_resource(tst_qfontdatabase "testdata"
PREFIX
"/"
FILES
diff --git a/tests/auto/gui/text/qfontmetrics/CMakeLists.txt b/tests/auto/gui/text/qfontmetrics/CMakeLists.txt
index 029f5d5ce3..b0b8eb3f42 100644
--- a/tests/auto/gui/text/qfontmetrics/CMakeLists.txt
+++ b/tests/auto/gui/text/qfontmetrics/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qfontmetrics Test:
#####################################################################
-add_qt_test(tst_qfontmetrics
+qt_add_test(tst_qfontmetrics
SOURCES
tst_qfontmetrics.cpp
PUBLIC_LIBRARIES
@@ -22,7 +22,7 @@ set(testfont_resource_files
"ucs4font.ttf"
)
-add_qt_resource(tst_qfontmetrics "testfont"
+qt_add_resource(tst_qfontmetrics "testfont"
PREFIX
"/fonts"
FILES
diff --git a/tests/auto/gui/text/qglyphrun/CMakeLists.txt b/tests/auto/gui/text/qglyphrun/CMakeLists.txt
index 8efcfc0cf9..7ea92f2924 100644
--- a/tests/auto/gui/text/qglyphrun/CMakeLists.txt
+++ b/tests/auto/gui/text/qglyphrun/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qglyphrun Test:
#####################################################################
-add_qt_test(tst_qglyphrun
+qt_add_test(tst_qglyphrun
SOURCES
tst_qglyphrun.cpp
PUBLIC_LIBRARIES
@@ -19,7 +19,7 @@ set(testdata_resource_files
"../../../shared/resources/test.ttf"
)
-add_qt_resource(tst_qglyphrun "testdata"
+qt_add_resource(tst_qglyphrun "testdata"
PREFIX
"/"
FILES
diff --git a/tests/auto/gui/text/qinputcontrol/CMakeLists.txt b/tests/auto/gui/text/qinputcontrol/CMakeLists.txt
index e544fb313c..f5cdd63ec0 100644
--- a/tests/auto/gui/text/qinputcontrol/CMakeLists.txt
+++ b/tests/auto/gui/text/qinputcontrol/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qinputcontrol Test:
#####################################################################
-add_qt_test(tst_qinputcontrol
+qt_add_test(tst_qinputcontrol
SOURCES
tst_qinputcontrol.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/text/qrawfont/CMakeLists.txt b/tests/auto/gui/text/qrawfont/CMakeLists.txt
index 5044866c49..f51d4ec13d 100644
--- a/tests/auto/gui/text/qrawfont/CMakeLists.txt
+++ b/tests/auto/gui/text/qrawfont/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qrawfont Test:
#####################################################################
-add_qt_test(tst_qrawfont
+qt_add_test(tst_qrawfont
SOURCES
tst_qrawfont.cpp
PUBLIC_LIBRARIES
@@ -23,7 +23,7 @@ set(testdata_resource_files
"testfont_os2_v1.ttf"
)
-add_qt_resource(tst_qrawfont "testdata"
+qt_add_resource(tst_qrawfont "testdata"
PREFIX
"/"
FILES
diff --git a/tests/auto/gui/text/qstatictext/CMakeLists.txt b/tests/auto/gui/text/qstatictext/CMakeLists.txt
index 80eef2f254..1c182b3659 100644
--- a/tests/auto/gui/text/qstatictext/CMakeLists.txt
+++ b/tests/auto/gui/text/qstatictext/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qstatictext Test:
#####################################################################
-add_qt_test(tst_qstatictext
+qt_add_test(tst_qstatictext
SOURCES
tst_qstatictext.cpp
PUBLIC_LIBRARIES
@@ -14,7 +14,7 @@ add_qt_test(tst_qstatictext
## Scopes:
#####################################################################
-extend_target(tst_qstatictext CONDITION QT_FEATURE_private_tests
+qt_extend_target(tst_qstatictext CONDITION QT_FEATURE_private_tests
PUBLIC_LIBRARIES
Qt::CorePrivate
Qt::GuiPrivate
diff --git a/tests/auto/gui/text/qsyntaxhighlighter/CMakeLists.txt b/tests/auto/gui/text/qsyntaxhighlighter/CMakeLists.txt
index c4ea8b4a1e..4c66cf94a7 100644
--- a/tests/auto/gui/text/qsyntaxhighlighter/CMakeLists.txt
+++ b/tests/auto/gui/text/qsyntaxhighlighter/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qsyntaxhighlighter Test:
#####################################################################
-add_qt_test(tst_qsyntaxhighlighter
+qt_add_test(tst_qsyntaxhighlighter
SOURCES
tst_qsyntaxhighlighter.cpp
PUBLIC_LIBRARIES
@@ -14,7 +14,7 @@ add_qt_test(tst_qsyntaxhighlighter
## Scopes:
#####################################################################
-extend_target(tst_qsyntaxhighlighter CONDITION TARGET Qt::Widgets
+qt_extend_target(tst_qsyntaxhighlighter CONDITION TARGET Qt::Widgets
PUBLIC_LIBRARIES
Qt::Widgets
)
diff --git a/tests/auto/gui/text/qtextblock/CMakeLists.txt b/tests/auto/gui/text/qtextblock/CMakeLists.txt
index 18e0be18c6..c186fa8a75 100644
--- a/tests/auto/gui/text/qtextblock/CMakeLists.txt
+++ b/tests/auto/gui/text/qtextblock/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qtextblock Test:
#####################################################################
-add_qt_test(tst_qtextblock
+qt_add_test(tst_qtextblock
SOURCES
tst_qtextblock.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/text/qtextcursor/CMakeLists.txt b/tests/auto/gui/text/qtextcursor/CMakeLists.txt
index 78b6ed191d..2a48931662 100644
--- a/tests/auto/gui/text/qtextcursor/CMakeLists.txt
+++ b/tests/auto/gui/text/qtextcursor/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qtextcursor Test:
#####################################################################
-add_qt_test(tst_qtextcursor
+qt_add_test(tst_qtextcursor
SOURCES
tst_qtextcursor.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/text/qtextdocument/CMakeLists.txt b/tests/auto/gui/text/qtextdocument/CMakeLists.txt
index 7ea22d3fb0..e99604e32a 100644
--- a/tests/auto/gui/text/qtextdocument/CMakeLists.txt
+++ b/tests/auto/gui/text/qtextdocument/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qtextdocument Test:
#####################################################################
-add_qt_test(tst_qtextdocument
+qt_add_test(tst_qtextdocument
SOURCES
common.h
tst_qtextdocument.cpp
diff --git a/tests/auto/gui/text/qtextdocumentfragment/CMakeLists.txt b/tests/auto/gui/text/qtextdocumentfragment/CMakeLists.txt
index f92a82a262..03f36c3f6a 100644
--- a/tests/auto/gui/text/qtextdocumentfragment/CMakeLists.txt
+++ b/tests/auto/gui/text/qtextdocumentfragment/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qtextdocumentfragment Test:
#####################################################################
-add_qt_test(tst_qtextdocumentfragment
+qt_add_test(tst_qtextdocumentfragment
SOURCES
tst_qtextdocumentfragment.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/text/qtextdocumentlayout/CMakeLists.txt b/tests/auto/gui/text/qtextdocumentlayout/CMakeLists.txt
index c7212209ee..11dda5929e 100644
--- a/tests/auto/gui/text/qtextdocumentlayout/CMakeLists.txt
+++ b/tests/auto/gui/text/qtextdocumentlayout/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qtextdocumentlayout Test:
#####################################################################
-add_qt_test(tst_qtextdocumentlayout
+qt_add_test(tst_qtextdocumentlayout
SOURCES
tst_qtextdocumentlayout.cpp
PUBLIC_LIBRARIES
@@ -14,7 +14,7 @@ add_qt_test(tst_qtextdocumentlayout
## Scopes:
#####################################################################
-extend_target(tst_qtextdocumentlayout CONDITION TARGET Qt::Widgets
+qt_extend_target(tst_qtextdocumentlayout CONDITION TARGET Qt::Widgets
PUBLIC_LIBRARIES
Qt::Widgets
)
diff --git a/tests/auto/gui/text/qtextformat/CMakeLists.txt b/tests/auto/gui/text/qtextformat/CMakeLists.txt
index be7653abd4..31320cd14b 100644
--- a/tests/auto/gui/text/qtextformat/CMakeLists.txt
+++ b/tests/auto/gui/text/qtextformat/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qtextformat Test:
#####################################################################
-add_qt_test(tst_qtextformat
+qt_add_test(tst_qtextformat
SOURCES
tst_qtextformat.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/text/qtextlayout/CMakeLists.txt b/tests/auto/gui/text/qtextlayout/CMakeLists.txt
index c87d5bdd4d..a899375497 100644
--- a/tests/auto/gui/text/qtextlayout/CMakeLists.txt
+++ b/tests/auto/gui/text/qtextlayout/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qtextlayout Test:
#####################################################################
-add_qt_test(tst_qtextlayout
+qt_add_test(tst_qtextlayout
SOURCES
tst_qtextlayout.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/text/qtextlist/CMakeLists.txt b/tests/auto/gui/text/qtextlist/CMakeLists.txt
index f22de38a8c..9ba6d82660 100644
--- a/tests/auto/gui/text/qtextlist/CMakeLists.txt
+++ b/tests/auto/gui/text/qtextlist/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qtextlist Test:
#####################################################################
-add_qt_test(tst_qtextlist
+qt_add_test(tst_qtextlist
SOURCES
../qtextdocument/common.h
tst_qtextlist.cpp
diff --git a/tests/auto/gui/text/qtextmarkdownimporter/CMakeLists.txt b/tests/auto/gui/text/qtextmarkdownimporter/CMakeLists.txt
index 29cafad93f..eb5d34cbac 100644
--- a/tests/auto/gui/text/qtextmarkdownimporter/CMakeLists.txt
+++ b/tests/auto/gui/text/qtextmarkdownimporter/CMakeLists.txt
@@ -10,7 +10,7 @@ list(APPEND test_data "data/headingBulletsContinuations.md")
list(APPEND test_data "data/fuzz20450.md")
list(APPEND test_data "data/fuzz20580.md")
-add_qt_test(tst_qtextmarkdownimporter
+qt_add_test(tst_qtextmarkdownimporter
SOURCES
tst_qtextmarkdownimporter.cpp
DEFINES
diff --git a/tests/auto/gui/text/qtextmarkdownwriter/CMakeLists.txt b/tests/auto/gui/text/qtextmarkdownwriter/CMakeLists.txt
index 7360b40994..008f501e23 100644
--- a/tests/auto/gui/text/qtextmarkdownwriter/CMakeLists.txt
+++ b/tests/auto/gui/text/qtextmarkdownwriter/CMakeLists.txt
@@ -8,7 +8,7 @@
list(APPEND test_data "data/example.md")
list(APPEND test_data "data/blockquotes.md")
-add_qt_test(tst_qtextmarkdownwriter
+qt_add_test(tst_qtextmarkdownwriter
SOURCES
tst_qtextmarkdownwriter.cpp
DEFINES
diff --git a/tests/auto/gui/text/qtextobject/CMakeLists.txt b/tests/auto/gui/text/qtextobject/CMakeLists.txt
index b8d7f7b548..94cd60d6a6 100644
--- a/tests/auto/gui/text/qtextobject/CMakeLists.txt
+++ b/tests/auto/gui/text/qtextobject/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qtextobject Test:
#####################################################################
-add_qt_test(tst_qtextobject
+qt_add_test(tst_qtextobject
SOURCES
tst_qtextobject.cpp
PUBLIC_LIBRARIES
@@ -14,7 +14,7 @@ add_qt_test(tst_qtextobject
## Scopes:
#####################################################################
-extend_target(tst_qtextobject CONDITION TARGET Qt::Widgets
+qt_extend_target(tst_qtextobject CONDITION TARGET Qt::Widgets
PUBLIC_LIBRARIES
Qt::Widgets
)
diff --git a/tests/auto/gui/text/qtextodfwriter/CMakeLists.txt b/tests/auto/gui/text/qtextodfwriter/CMakeLists.txt
index 18c84e5a45..70f73f0bad 100644
--- a/tests/auto/gui/text/qtextodfwriter/CMakeLists.txt
+++ b/tests/auto/gui/text/qtextodfwriter/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qtextodfwriter Test:
#####################################################################
-add_qt_test(tst_qtextodfwriter
+qt_add_test(tst_qtextodfwriter
SOURCES
tst_qtextodfwriter.cpp
DEFINES
diff --git a/tests/auto/gui/text/qtextpiecetable/CMakeLists.txt b/tests/auto/gui/text/qtextpiecetable/CMakeLists.txt
index 5fb8db5405..82861b9b8c 100644
--- a/tests/auto/gui/text/qtextpiecetable/CMakeLists.txt
+++ b/tests/auto/gui/text/qtextpiecetable/CMakeLists.txt
@@ -11,7 +11,7 @@ endif()
## tst_qtextpiecetable Test:
#####################################################################
-add_qt_test(tst_qtextpiecetable
+qt_add_test(tst_qtextpiecetable
SOURCES
../qtextdocument/common.h
tst_qtextpiecetable.cpp
diff --git a/tests/auto/gui/text/qtextscriptengine/CMakeLists.txt b/tests/auto/gui/text/qtextscriptengine/CMakeLists.txt
index 8d94e33b6c..8bd9909fe1 100644
--- a/tests/auto/gui/text/qtextscriptengine/CMakeLists.txt
+++ b/tests/auto/gui/text/qtextscriptengine/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qtextscriptengine Test:
#####################################################################
-add_qt_test(tst_qtextscriptengine
+qt_add_test(tst_qtextscriptengine
SOURCES
tst_qtextscriptengine.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/text/qtextscriptengine/generate/CMakeLists.txt b/tests/auto/gui/text/qtextscriptengine/generate/CMakeLists.txt
index b2434569d4..9bc97be6a3 100644
--- a/tests/auto/gui/text/qtextscriptengine/generate/CMakeLists.txt
+++ b/tests/auto/gui/text/qtextscriptengine/generate/CMakeLists.txt
@@ -4,7 +4,7 @@
## generate Binary:
#####################################################################
-add_qt_executable(generate
+qt_add_executable(generate
GUI
SOURCES
main.cpp
diff --git a/tests/auto/gui/text/qtexttable/CMakeLists.txt b/tests/auto/gui/text/qtexttable/CMakeLists.txt
index de82c94233..036d39bbff 100644
--- a/tests/auto/gui/text/qtexttable/CMakeLists.txt
+++ b/tests/auto/gui/text/qtexttable/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qtexttable Test:
#####################################################################
-add_qt_test(tst_qtexttable
+qt_add_test(tst_qtexttable
SOURCES
tst_qtexttable.cpp
PUBLIC_LIBRARIES
@@ -15,7 +15,7 @@ add_qt_test(tst_qtexttable
## Scopes:
#####################################################################
-extend_target(tst_qtexttable CONDITION TARGET Qt::Widgets
+qt_extend_target(tst_qtexttable CONDITION TARGET Qt::Widgets
PUBLIC_LIBRARIES
Qt::Widgets
)
diff --git a/tests/auto/gui/text/qzip/CMakeLists.txt b/tests/auto/gui/text/qzip/CMakeLists.txt
index dfeb968cc1..02620d5e64 100644
--- a/tests/auto/gui/text/qzip/CMakeLists.txt
+++ b/tests/auto/gui/text/qzip/CMakeLists.txt
@@ -7,7 +7,7 @@
# Collect test data
list(APPEND test_data "testdata")
-add_qt_test(tst_qzip
+qt_add_test(tst_qzip
SOURCES
tst_qzip.cpp
PUBLIC_LIBRARIES
@@ -26,7 +26,7 @@ if(ANDROID)
"testdata/test.zip"
)
- add_qt_resource(tst_qzip "testdata"
+ qt_add_resource(tst_qzip "testdata"
PREFIX
"/"
FILES
diff --git a/tests/auto/gui/util/qdesktopservices/.prev_CMakeLists.txt b/tests/auto/gui/util/qdesktopservices/.prev_CMakeLists.txt
index 8163ec80b6..ce1db36f16 100644
--- a/tests/auto/gui/util/qdesktopservices/.prev_CMakeLists.txt
+++ b/tests/auto/gui/util/qdesktopservices/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qdesktopservices Test:
#####################################################################
-add_qt_test(tst_qdesktopservices
+qt_add_test(tst_qdesktopservices
SOURCES
tst_qdesktopservices.cpp
DEFINES
diff --git a/tests/auto/gui/util/qdesktopservices/CMakeLists.txt b/tests/auto/gui/util/qdesktopservices/CMakeLists.txt
index c62cecac30..433e97414a 100644
--- a/tests/auto/gui/util/qdesktopservices/CMakeLists.txt
+++ b/tests/auto/gui/util/qdesktopservices/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qdesktopservices Test:
#####################################################################
-add_qt_test(tst_qdesktopservices
+qt_add_test(tst_qdesktopservices
SOURCES
tst_qdesktopservices.cpp
DEFINES
diff --git a/tests/auto/gui/util/qdoublevalidator/CMakeLists.txt b/tests/auto/gui/util/qdoublevalidator/CMakeLists.txt
index 6cccd082a9..01ed8772ea 100644
--- a/tests/auto/gui/util/qdoublevalidator/CMakeLists.txt
+++ b/tests/auto/gui/util/qdoublevalidator/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qdoublevalidator Test:
#####################################################################
-add_qt_test(tst_qdoublevalidator
+qt_add_test(tst_qdoublevalidator
SOURCES
tst_qdoublevalidator.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/util/qintvalidator/CMakeLists.txt b/tests/auto/gui/util/qintvalidator/CMakeLists.txt
index 69a5503d8e..841fd02bb0 100644
--- a/tests/auto/gui/util/qintvalidator/CMakeLists.txt
+++ b/tests/auto/gui/util/qintvalidator/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qintvalidator Test:
#####################################################################
-add_qt_test(tst_qintvalidator
+qt_add_test(tst_qintvalidator
SOURCES
tst_qintvalidator.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/util/qregularexpressionvalidator/CMakeLists.txt b/tests/auto/gui/util/qregularexpressionvalidator/CMakeLists.txt
index 8633a171e5..9a1491681e 100644
--- a/tests/auto/gui/util/qregularexpressionvalidator/CMakeLists.txt
+++ b/tests/auto/gui/util/qregularexpressionvalidator/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qregularexpressionvalidator Test:
#####################################################################
-add_qt_test(tst_qregularexpressionvalidator
+qt_add_test(tst_qregularexpressionvalidator
SOURCES
tst_qregularexpressionvalidator.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/util/qshadergenerator/CMakeLists.txt b/tests/auto/gui/util/qshadergenerator/CMakeLists.txt
index e9cb62377f..8a6f95da57 100644
--- a/tests/auto/gui/util/qshadergenerator/CMakeLists.txt
+++ b/tests/auto/gui/util/qshadergenerator/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qshadergenerator Test:
#####################################################################
-add_qt_test(tst_qshadergenerator
+qt_add_test(tst_qshadergenerator
SOURCES
tst_qshadergenerator.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/util/qshadergraph/CMakeLists.txt b/tests/auto/gui/util/qshadergraph/CMakeLists.txt
index ede24f2a40..f59e85af6c 100644
--- a/tests/auto/gui/util/qshadergraph/CMakeLists.txt
+++ b/tests/auto/gui/util/qshadergraph/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qshadergraph Test:
#####################################################################
-add_qt_test(tst_qshadergraph
+qt_add_test(tst_qshadergraph
SOURCES
tst_qshadergraph.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/util/qshadergraphloader/CMakeLists.txt b/tests/auto/gui/util/qshadergraphloader/CMakeLists.txt
index caf863d42d..8e2b63213c 100644
--- a/tests/auto/gui/util/qshadergraphloader/CMakeLists.txt
+++ b/tests/auto/gui/util/qshadergraphloader/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qshadergraphloader Test:
#####################################################################
-add_qt_test(tst_qshadergraphloader
+qt_add_test(tst_qshadergraphloader
SOURCES
tst_qshadergraphloader.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/util/qshadernodes/CMakeLists.txt b/tests/auto/gui/util/qshadernodes/CMakeLists.txt
index d7cc14b09c..153e9fa09a 100644
--- a/tests/auto/gui/util/qshadernodes/CMakeLists.txt
+++ b/tests/auto/gui/util/qshadernodes/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qshadernodes Test:
#####################################################################
-add_qt_test(tst_qshadernodes
+qt_add_test(tst_qshadernodes
SOURCES
tst_qshadernodes.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/util/qshadernodesloader/CMakeLists.txt b/tests/auto/gui/util/qshadernodesloader/CMakeLists.txt
index e381af4f7b..915e8b4a58 100644
--- a/tests/auto/gui/util/qshadernodesloader/CMakeLists.txt
+++ b/tests/auto/gui/util/qshadernodesloader/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qshadernodesloader Test:
#####################################################################
-add_qt_test(tst_qshadernodesloader
+qt_add_test(tst_qshadernodesloader
SOURCES
tst_qshadernodesloader.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/util/qtexturefilereader/CMakeLists.txt b/tests/auto/gui/util/qtexturefilereader/CMakeLists.txt
index 3b6d99c0e8..23dc595d96 100644
--- a/tests/auto/gui/util/qtexturefilereader/CMakeLists.txt
+++ b/tests/auto/gui/util/qtexturefilereader/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qtexturefilereader Test:
#####################################################################
-add_qt_test(tst_qtexturefilereader
+qt_add_test(tst_qtexturefilereader
SOURCES
tst_qtexturefilereader.cpp
PUBLIC_LIBRARIES
@@ -21,7 +21,7 @@ set(qtexturefilereader_resource_files
"texturefiles/pattern.pkm"
)
-add_qt_resource(tst_qtexturefilereader "qtexturefilereader"
+qt_add_resource(tst_qtexturefilereader "qtexturefilereader"
PREFIX
"/"
FILES
diff --git a/tests/auto/gui/util/qundogroup/CMakeLists.txt b/tests/auto/gui/util/qundogroup/CMakeLists.txt
index 3325556a3e..9aa35ba9a7 100644
--- a/tests/auto/gui/util/qundogroup/CMakeLists.txt
+++ b/tests/auto/gui/util/qundogroup/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qundogroup Test:
#####################################################################
-add_qt_test(tst_qundogroup
+qt_add_test(tst_qundogroup
SOURCES
tst_qundogroup.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/util/qundostack/CMakeLists.txt b/tests/auto/gui/util/qundostack/CMakeLists.txt
index d6cf36187e..9e8ac65c97 100644
--- a/tests/auto/gui/util/qundostack/CMakeLists.txt
+++ b/tests/auto/gui/util/qundostack/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qundostack Test:
#####################################################################
-add_qt_test(tst_qundostack
+qt_add_test(tst_qundostack
SOURCES
tst_qundostack.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/network/access/hpack/CMakeLists.txt b/tests/auto/network/access/hpack/CMakeLists.txt
index e1c5c1a469..08ff2a6798 100644
--- a/tests/auto/network/access/hpack/CMakeLists.txt
+++ b/tests/auto/network/access/hpack/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_hpack Test:
#####################################################################
-add_qt_test(tst_hpack
+qt_add_test(tst_hpack
SOURCES
tst_hpack.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/network/access/hsts/CMakeLists.txt b/tests/auto/network/access/hsts/CMakeLists.txt
index 804ebedf61..323fb84bc7 100644
--- a/tests/auto/network/access/hsts/CMakeLists.txt
+++ b/tests/auto/network/access/hsts/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qhsts Test:
#####################################################################
-add_qt_test(tst_qhsts
+qt_add_test(tst_qhsts
SOURCES
tst_qhsts.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/network/access/http2/CMakeLists.txt b/tests/auto/network/access/http2/CMakeLists.txt
index 51c7c18eac..ed5f7c8275 100644
--- a/tests/auto/network/access/http2/CMakeLists.txt
+++ b/tests/auto/network/access/http2/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_http2 Test:
#####################################################################
-add_qt_test(tst_http2
+qt_add_test(tst_http2
SOURCES
../../../../shared/emulationdetector.h
http2srv.cpp http2srv.h
diff --git a/tests/auto/network/access/qabstractnetworkcache/CMakeLists.txt b/tests/auto/network/access/qabstractnetworkcache/CMakeLists.txt
index 07128e40bb..3196ccca59 100644
--- a/tests/auto/network/access/qabstractnetworkcache/CMakeLists.txt
+++ b/tests/auto/network/access/qabstractnetworkcache/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
tests/*)
list(APPEND test_data ${test_data_glob})
-add_qt_test(tst_qabstractnetworkcache
+qt_add_test(tst_qabstractnetworkcache
SOURCES
tst_qabstractnetworkcache.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/network/access/qftp/CMakeLists.txt b/tests/auto/network/access/qftp/CMakeLists.txt
index 877c3a229b..f67ddd3326 100644
--- a/tests/auto/network/access/qftp/CMakeLists.txt
+++ b/tests/auto/network/access/qftp/CMakeLists.txt
@@ -11,7 +11,7 @@ endif()
## tst_qftp Test:
#####################################################################
-add_qt_test(tst_qftp
+qt_add_test(tst_qftp
SOURCES
tst_qftp.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/network/access/qhttpnetworkconnection/CMakeLists.txt b/tests/auto/network/access/qhttpnetworkconnection/CMakeLists.txt
index 6ab8876c82..621e339c1a 100644
--- a/tests/auto/network/access/qhttpnetworkconnection/CMakeLists.txt
+++ b/tests/auto/network/access/qhttpnetworkconnection/CMakeLists.txt
@@ -8,7 +8,7 @@ endif()
## tst_qhttpnetworkconnection Test:
#####################################################################
-add_qt_test(tst_qhttpnetworkconnection
+qt_add_test(tst_qhttpnetworkconnection
SOURCES
tst_qhttpnetworkconnection.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/network/access/qhttpnetworkreply/CMakeLists.txt b/tests/auto/network/access/qhttpnetworkreply/CMakeLists.txt
index 8c68a18da6..f9ba96cf13 100644
--- a/tests/auto/network/access/qhttpnetworkreply/CMakeLists.txt
+++ b/tests/auto/network/access/qhttpnetworkreply/CMakeLists.txt
@@ -8,7 +8,7 @@ endif()
## tst_qhttpnetworkreply Test:
#####################################################################
-add_qt_test(tst_qhttpnetworkreply
+qt_add_test(tst_qhttpnetworkreply
SOURCES
tst_qhttpnetworkreply.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/network/access/qnetworkaccessmanager/CMakeLists.txt b/tests/auto/network/access/qnetworkaccessmanager/CMakeLists.txt
index 4b58c449c6..8fc928e8cf 100644
--- a/tests/auto/network/access/qnetworkaccessmanager/CMakeLists.txt
+++ b/tests/auto/network/access/qnetworkaccessmanager/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qnetworkaccessmanager Test:
#####################################################################
-add_qt_test(tst_qnetworkaccessmanager
+qt_add_test(tst_qnetworkaccessmanager
SOURCES
tst_qnetworkaccessmanager.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/network/access/qnetworkcachemetadata/CMakeLists.txt b/tests/auto/network/access/qnetworkcachemetadata/CMakeLists.txt
index 08e80d8e0d..bcd47c7bcf 100644
--- a/tests/auto/network/access/qnetworkcachemetadata/CMakeLists.txt
+++ b/tests/auto/network/access/qnetworkcachemetadata/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qnetworkcachemetadata Test:
#####################################################################
-add_qt_test(tst_qnetworkcachemetadata
+qt_add_test(tst_qnetworkcachemetadata
SOURCES
tst_qnetworkcachemetadata.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/network/access/qnetworkcookie/CMakeLists.txt b/tests/auto/network/access/qnetworkcookie/CMakeLists.txt
index ab90a61bb3..24446c90ef 100644
--- a/tests/auto/network/access/qnetworkcookie/CMakeLists.txt
+++ b/tests/auto/network/access/qnetworkcookie/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qnetworkcookie Test:
#####################################################################
-add_qt_test(tst_qnetworkcookie
+qt_add_test(tst_qnetworkcookie
SOURCES
tst_qnetworkcookie.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/network/access/qnetworkcookiejar/CMakeLists.txt b/tests/auto/network/access/qnetworkcookiejar/CMakeLists.txt
index 929388a10a..f6aafcb69b 100644
--- a/tests/auto/network/access/qnetworkcookiejar/CMakeLists.txt
+++ b/tests/auto/network/access/qnetworkcookiejar/CMakeLists.txt
@@ -7,7 +7,7 @@
# Collect test data
list(APPEND test_data "parser.json")
-add_qt_test(tst_qnetworkcookiejar
+qt_add_test(tst_qnetworkcookiejar
SOURCES
tst_qnetworkcookiejar.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/network/access/qnetworkdiskcache/CMakeLists.txt b/tests/auto/network/access/qnetworkdiskcache/CMakeLists.txt
index b206686139..484cb47e2b 100644
--- a/tests/auto/network/access/qnetworkdiskcache/CMakeLists.txt
+++ b/tests/auto/network/access/qnetworkdiskcache/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qnetworkdiskcache Test:
#####################################################################
-add_qt_test(tst_qnetworkdiskcache
+qt_add_test(tst_qnetworkdiskcache
SOURCES
tst_qnetworkdiskcache.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/network/access/qnetworkreply/echo/.prev_CMakeLists.txt b/tests/auto/network/access/qnetworkreply/echo/.prev_CMakeLists.txt
index e43272d7e8..17b6b275c9 100644
--- a/tests/auto/network/access/qnetworkreply/echo/.prev_CMakeLists.txt
+++ b/tests/auto/network/access/qnetworkreply/echo/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
## echo Binary:
#####################################################################
-add_qt_executable(echo
+qt_add_executable(echo
SOURCES
main.cpp
)
diff --git a/tests/auto/network/access/qnetworkreply/echo/CMakeLists.txt b/tests/auto/network/access/qnetworkreply/echo/CMakeLists.txt
index f260b97b8d..e06066ea4f 100644
--- a/tests/auto/network/access/qnetworkreply/echo/CMakeLists.txt
+++ b/tests/auto/network/access/qnetworkreply/echo/CMakeLists.txt
@@ -4,7 +4,7 @@
## echo Binary:
#####################################################################
-add_qt_executable(echo
+qt_add_executable(echo
OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
SOURCES
main.cpp
diff --git a/tests/auto/network/access/qnetworkreply/test/.prev_CMakeLists.txt b/tests/auto/network/access/qnetworkreply/test/.prev_CMakeLists.txt
index 9350c9afbf..19b430b159 100644
--- a/tests/auto/network/access/qnetworkreply/test/.prev_CMakeLists.txt
+++ b/tests/auto/network/access/qnetworkreply/test/.prev_CMakeLists.txt
@@ -17,7 +17,7 @@ list(APPEND test_data "../certs")
list(APPEND test_data "../index.html")
list(APPEND test_data "../smb-file.txt")
-add_qt_test(tst_qnetworkreply
+qt_add_test(tst_qnetworkreply
SOURCES
../../../../../shared/emulationdetector.h
../tst_qnetworkreply.cpp
@@ -37,7 +37,7 @@ set(qnetworkreply_resource_files
"resource"
)
-add_qt_resource(tst_qnetworkreply "qnetworkreply"
+qt_add_resource(tst_qnetworkreply "qnetworkreply"
PREFIX
"/"
BASE
diff --git a/tests/auto/network/access/qnetworkreply/test/CMakeLists.txt b/tests/auto/network/access/qnetworkreply/test/CMakeLists.txt
index 50572444a1..568eb2adf6 100644
--- a/tests/auto/network/access/qnetworkreply/test/CMakeLists.txt
+++ b/tests/auto/network/access/qnetworkreply/test/CMakeLists.txt
@@ -17,7 +17,7 @@ list(APPEND test_data "../certs")
list(APPEND test_data "../index.html")
list(APPEND test_data "../smb-file.txt")
-add_qt_test(tst_qnetworkreply
+qt_add_test(tst_qnetworkreply
OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../" # special case
SOURCES
../../../../../shared/emulationdetector.h
@@ -38,7 +38,7 @@ set(qnetworkreply_resource_files
"resource"
)
-add_qt_resource(tst_qnetworkreply "qnetworkreply"
+qt_add_resource(tst_qnetworkreply "qnetworkreply"
PREFIX
"/"
BASE
diff --git a/tests/auto/network/access/qnetworkrequest/CMakeLists.txt b/tests/auto/network/access/qnetworkrequest/CMakeLists.txt
index f089c5a43e..2334165c3a 100644
--- a/tests/auto/network/access/qnetworkrequest/CMakeLists.txt
+++ b/tests/auto/network/access/qnetworkrequest/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qnetworkrequest Test:
#####################################################################
-add_qt_test(tst_qnetworkrequest
+qt_add_test(tst_qnetworkrequest
SOURCES
tst_qnetworkrequest.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/network/kernel/qauthenticator/CMakeLists.txt b/tests/auto/network/kernel/qauthenticator/CMakeLists.txt
index f461591884..a4d5d7f277 100644
--- a/tests/auto/network/kernel/qauthenticator/CMakeLists.txt
+++ b/tests/auto/network/kernel/qauthenticator/CMakeLists.txt
@@ -8,7 +8,7 @@ endif()
## tst_qauthenticator Test:
#####################################################################
-add_qt_test(tst_qauthenticator
+qt_add_test(tst_qauthenticator
SOURCES
tst_qauthenticator.cpp
DEFINES
diff --git a/tests/auto/network/kernel/qdnslookup/CMakeLists.txt b/tests/auto/network/kernel/qdnslookup/CMakeLists.txt
index 896b4431d8..6736b480b2 100644
--- a/tests/auto/network/kernel/qdnslookup/CMakeLists.txt
+++ b/tests/auto/network/kernel/qdnslookup/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qdnslookup Test:
#####################################################################
-add_qt_test(tst_qdnslookup
+qt_add_test(tst_qdnslookup
SOURCES
tst_qdnslookup.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/network/kernel/qdnslookup_appless/CMakeLists.txt b/tests/auto/network/kernel/qdnslookup_appless/CMakeLists.txt
index 847e1a6d90..1730879bd2 100644
--- a/tests/auto/network/kernel/qdnslookup_appless/CMakeLists.txt
+++ b/tests/auto/network/kernel/qdnslookup_appless/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qdnslookup_appless Test:
#####################################################################
-add_qt_test(tst_qdnslookup_appless
+qt_add_test(tst_qdnslookup_appless
SOURCES
tst_qdnslookup_appless.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/network/kernel/qhostaddress/CMakeLists.txt b/tests/auto/network/kernel/qhostaddress/CMakeLists.txt
index f967625d38..c1999c8db2 100644
--- a/tests/auto/network/kernel/qhostaddress/CMakeLists.txt
+++ b/tests/auto/network/kernel/qhostaddress/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qhostaddress Test:
#####################################################################
-add_qt_test(tst_qhostaddress
+qt_add_test(tst_qhostaddress
SOURCES
tst_qhostaddress.cpp
PUBLIC_LIBRARIES
@@ -14,7 +14,7 @@ add_qt_test(tst_qhostaddress
## Scopes:
#####################################################################
-extend_target(tst_qhostaddress CONDITION WIN32
+qt_extend_target(tst_qhostaddress CONDITION WIN32
PUBLIC_LIBRARIES
ws2_32
)
diff --git a/tests/auto/network/kernel/qhostinfo/CMakeLists.txt b/tests/auto/network/kernel/qhostinfo/CMakeLists.txt
index 891312ae5e..b571718d25 100644
--- a/tests/auto/network/kernel/qhostinfo/CMakeLists.txt
+++ b/tests/auto/network/kernel/qhostinfo/CMakeLists.txt
@@ -8,7 +8,7 @@ endif()
## tst_qhostinfo Test:
#####################################################################
-add_qt_test(tst_qhostinfo
+qt_add_test(tst_qhostinfo
SOURCES
tst_qhostinfo.cpp
PUBLIC_LIBRARIES
@@ -22,7 +22,7 @@ add_qt_test(tst_qhostinfo
## Scopes:
#####################################################################
-extend_target(tst_qhostinfo CONDITION WIN32
+qt_extend_target(tst_qhostinfo CONDITION WIN32
PUBLIC_LIBRARIES
ws2_32
)
diff --git a/tests/auto/network/kernel/qnetworkaddressentry/CMakeLists.txt b/tests/auto/network/kernel/qnetworkaddressentry/CMakeLists.txt
index 5a72d4e4a5..3dcfd2ac9b 100644
--- a/tests/auto/network/kernel/qnetworkaddressentry/CMakeLists.txt
+++ b/tests/auto/network/kernel/qnetworkaddressentry/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qnetworkaddressentry Test:
#####################################################################
-add_qt_test(tst_qnetworkaddressentry
+qt_add_test(tst_qnetworkaddressentry
SOURCES
tst_qnetworkaddressentry.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/network/kernel/qnetworkdatagram/CMakeLists.txt b/tests/auto/network/kernel/qnetworkdatagram/CMakeLists.txt
index ae24d32917..4ae11ab146 100644
--- a/tests/auto/network/kernel/qnetworkdatagram/CMakeLists.txt
+++ b/tests/auto/network/kernel/qnetworkdatagram/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qnetworkdatagram Test:
#####################################################################
-add_qt_test(tst_qnetworkdatagram
+qt_add_test(tst_qnetworkdatagram
SOURCES
tst_qnetworkdatagram.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/network/kernel/qnetworkinterface/CMakeLists.txt b/tests/auto/network/kernel/qnetworkinterface/CMakeLists.txt
index f23a17f077..7bf840881a 100644
--- a/tests/auto/network/kernel/qnetworkinterface/CMakeLists.txt
+++ b/tests/auto/network/kernel/qnetworkinterface/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qnetworkinterface Test:
#####################################################################
-add_qt_test(tst_qnetworkinterface
+qt_add_test(tst_qnetworkinterface
SOURCES
../../../../shared/emulationdetector.h
tst_qnetworkinterface.cpp
diff --git a/tests/auto/network/kernel/qnetworkproxy/CMakeLists.txt b/tests/auto/network/kernel/qnetworkproxy/CMakeLists.txt
index e0cbe133af..4402ba4a72 100644
--- a/tests/auto/network/kernel/qnetworkproxy/CMakeLists.txt
+++ b/tests/auto/network/kernel/qnetworkproxy/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qnetworkproxy Test:
#####################################################################
-add_qt_test(tst_qnetworkproxy
+qt_add_test(tst_qnetworkproxy
SOURCES
tst_qnetworkproxy.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/network/kernel/qnetworkproxyfactory/CMakeLists.txt b/tests/auto/network/kernel/qnetworkproxyfactory/CMakeLists.txt
index ecacd338ab..e8bc9beefb 100644
--- a/tests/auto/network/kernel/qnetworkproxyfactory/CMakeLists.txt
+++ b/tests/auto/network/kernel/qnetworkproxyfactory/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qnetworkproxyfactory Test:
#####################################################################
-add_qt_test(tst_qnetworkproxyfactory
+qt_add_test(tst_qnetworkproxyfactory
SOURCES
tst_qnetworkproxyfactory.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/network/socket/platformsocketengine/CMakeLists.txt b/tests/auto/network/socket/platformsocketengine/CMakeLists.txt
index bb29119011..780826f211 100644
--- a/tests/auto/network/socket/platformsocketengine/CMakeLists.txt
+++ b/tests/auto/network/socket/platformsocketengine/CMakeLists.txt
@@ -8,7 +8,7 @@ endif()
## tst_platformsocketengine Test:
#####################################################################
-add_qt_test(tst_platformsocketengine
+qt_add_test(tst_platformsocketengine
SOURCES
tst_platformsocketengine.cpp
INCLUDE_DIRECTORIES
@@ -25,7 +25,7 @@ add_qt_test(tst_platformsocketengine
## Scopes:
#####################################################################
-extend_target(tst_platformsocketengine CONDITION WIN32
+qt_extend_target(tst_platformsocketengine CONDITION WIN32
PUBLIC_LIBRARIES
ws2_32
)
diff --git a/tests/auto/network/socket/qabstractsocket/CMakeLists.txt b/tests/auto/network/socket/qabstractsocket/CMakeLists.txt
index ca7d64a2ff..b5de9360c3 100644
--- a/tests/auto/network/socket/qabstractsocket/CMakeLists.txt
+++ b/tests/auto/network/socket/qabstractsocket/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qabstractsocket Test:
#####################################################################
-add_qt_test(tst_qabstractsocket
+qt_add_test(tst_qabstractsocket
SOURCES
tst_qabstractsocket.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/network/socket/qhttpsocketengine/CMakeLists.txt b/tests/auto/network/socket/qhttpsocketengine/CMakeLists.txt
index 22007a31d1..8afcdc3376 100644
--- a/tests/auto/network/socket/qhttpsocketengine/CMakeLists.txt
+++ b/tests/auto/network/socket/qhttpsocketengine/CMakeLists.txt
@@ -8,7 +8,7 @@ endif()
## tst_qhttpsocketengine Test:
#####################################################################
-add_qt_test(tst_qhttpsocketengine
+qt_add_test(tst_qhttpsocketengine
SOURCES
tst_qhttpsocketengine.cpp
INCLUDE_DIRECTORIES
@@ -28,7 +28,7 @@ add_qt_test(tst_qhttpsocketengine
#### Keys ignored in scope 2:.:.:qhttpsocketengine.pro:LINUX:
# QT_TEST_SERVER_LIST = "squid" "danted" "cyrus" "apache2"
-extend_target(tst_qhttpsocketengine CONDITION WIN32
+qt_extend_target(tst_qhttpsocketengine CONDITION WIN32
PUBLIC_LIBRARIES
ws2_32
)
diff --git a/tests/auto/network/socket/qlocalsocket/socketprocess/CMakeLists.txt b/tests/auto/network/socket/qlocalsocket/socketprocess/CMakeLists.txt
index cb339eb2fa..5f382b114a 100644
--- a/tests/auto/network/socket/qlocalsocket/socketprocess/CMakeLists.txt
+++ b/tests/auto/network/socket/qlocalsocket/socketprocess/CMakeLists.txt
@@ -4,7 +4,7 @@
## socketprocess Binary:
#####################################################################
-add_qt_executable(socketprocess
+qt_add_executable(socketprocess
OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
SOURCES
main.cpp
diff --git a/tests/auto/network/socket/qlocalsocket/test/CMakeLists.txt b/tests/auto/network/socket/qlocalsocket/test/CMakeLists.txt
index eb427796ae..02017adbca 100644
--- a/tests/auto/network/socket/qlocalsocket/test/CMakeLists.txt
+++ b/tests/auto/network/socket/qlocalsocket/test/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qlocalsocket Test:
#####################################################################
-add_qt_test(tst_qlocalsocket
+qt_add_test(tst_qlocalsocket
SOURCES
../tst_qlocalsocket.cpp
DEFINES
diff --git a/tests/auto/network/socket/qsctpsocket/CMakeLists.txt b/tests/auto/network/socket/qsctpsocket/CMakeLists.txt
index d272d018b6..d2d849aa05 100644
--- a/tests/auto/network/socket/qsctpsocket/CMakeLists.txt
+++ b/tests/auto/network/socket/qsctpsocket/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qsctpsocket Test:
#####################################################################
-add_qt_test(tst_qsctpsocket
+qt_add_test(tst_qsctpsocket
SOURCES
tst_qsctpsocket.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/network/socket/qsocks5socketengine/CMakeLists.txt b/tests/auto/network/socket/qsocks5socketengine/CMakeLists.txt
index 7c4a56031b..0b2430c81a 100644
--- a/tests/auto/network/socket/qsocks5socketengine/CMakeLists.txt
+++ b/tests/auto/network/socket/qsocks5socketengine/CMakeLists.txt
@@ -8,7 +8,7 @@ endif()
## tst_qsocks5socketengine Test:
#####################################################################
-add_qt_test(tst_qsocks5socketengine
+qt_add_test(tst_qsocks5socketengine
SOURCES
tst_qsocks5socketengine.cpp
INCLUDE_DIRECTORIES
@@ -28,7 +28,7 @@ add_qt_test(tst_qsocks5socketengine
#### Keys ignored in scope 2:.:.:qsocks5socketengine.pro:LINUX:
# QT_TEST_SERVER_LIST = "danted" "apache2" "cyrus"
-extend_target(tst_qsocks5socketengine CONDITION WIN32
+qt_extend_target(tst_qsocks5socketengine CONDITION WIN32
PUBLIC_LIBRARIES
ws2_32
)
diff --git a/tests/auto/network/socket/qtcpserver/crashingServer/CMakeLists.txt b/tests/auto/network/socket/qtcpserver/crashingServer/CMakeLists.txt
index ad291f2ad8..fab02435a6 100644
--- a/tests/auto/network/socket/qtcpserver/crashingServer/CMakeLists.txt
+++ b/tests/auto/network/socket/qtcpserver/crashingServer/CMakeLists.txt
@@ -4,7 +4,7 @@
## crashingServer Binary:
#####################################################################
-add_qt_executable(crashingServer
+qt_add_executable(crashingServer
OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
SOURCES
main.cpp
diff --git a/tests/auto/network/socket/qtcpserver/test/.prev_CMakeLists.txt b/tests/auto/network/socket/qtcpserver/test/.prev_CMakeLists.txt
index df05c5012b..f80fdedcac 100644
--- a/tests/auto/network/socket/qtcpserver/test/.prev_CMakeLists.txt
+++ b/tests/auto/network/socket/qtcpserver/test/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qtcpserver Test:
#####################################################################
-add_qt_test(tst_qtcpserver
+qt_add_test(tst_qtcpserver
SOURCES
../tst_qtcpserver.cpp
PUBLIC_LIBRARIES
@@ -17,7 +17,7 @@ add_qt_test(tst_qtcpserver
## Scopes:
#####################################################################
-extend_target(tst_qtcpserver CONDITION WIN32
+qt_extend_target(tst_qtcpserver CONDITION WIN32
PUBLIC_LIBRARIES
ws2_32
)
diff --git a/tests/auto/network/socket/qtcpserver/test/CMakeLists.txt b/tests/auto/network/socket/qtcpserver/test/CMakeLists.txt
index b559024724..ae345b99f4 100644
--- a/tests/auto/network/socket/qtcpserver/test/CMakeLists.txt
+++ b/tests/auto/network/socket/qtcpserver/test/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qtcpserver Test:
#####################################################################
-add_qt_test(tst_qtcpserver
+qt_add_test(tst_qtcpserver
OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../" # special case
SOURCES
../tst_qtcpserver.cpp
@@ -18,7 +18,7 @@ add_qt_test(tst_qtcpserver
## Scopes:
#####################################################################
-extend_target(tst_qtcpserver CONDITION WIN32
+qt_extend_target(tst_qtcpserver CONDITION WIN32
PUBLIC_LIBRARIES
ws2_32
)
diff --git a/tests/auto/network/socket/qtcpsocket/stressTest/CMakeLists.txt b/tests/auto/network/socket/qtcpsocket/stressTest/CMakeLists.txt
index da9d3a324f..784cee453d 100644
--- a/tests/auto/network/socket/qtcpsocket/stressTest/CMakeLists.txt
+++ b/tests/auto/network/socket/qtcpsocket/stressTest/CMakeLists.txt
@@ -4,7 +4,7 @@
## stressTest Binary:
#####################################################################
-add_qt_executable(stressTest
+qt_add_executable(stressTest
OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
SOURCES
Test.cpp Test.h
diff --git a/tests/auto/network/socket/qtcpsocket/test/.prev_CMakeLists.txt b/tests/auto/network/socket/qtcpsocket/test/.prev_CMakeLists.txt
index 61b8d25736..22a105887d 100644
--- a/tests/auto/network/socket/qtcpsocket/test/.prev_CMakeLists.txt
+++ b/tests/auto/network/socket/qtcpsocket/test/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qtcpsocket Test:
#####################################################################
-add_qt_test(tst_qtcpsocket
+qt_add_test(tst_qtcpsocket
SOURCES
../tst_qtcpsocket.cpp
PUBLIC_LIBRARIES
@@ -15,7 +15,7 @@ add_qt_test(tst_qtcpsocket
## Scopes:
#####################################################################
-extend_target(tst_qtcpsocket CONDITION WIN32
+qt_extend_target(tst_qtcpsocket CONDITION WIN32
PUBLIC_LIBRARIES
ws2_32
)
diff --git a/tests/auto/network/socket/qtcpsocket/test/CMakeLists.txt b/tests/auto/network/socket/qtcpsocket/test/CMakeLists.txt
index 2acb8b5948..3903670156 100644
--- a/tests/auto/network/socket/qtcpsocket/test/CMakeLists.txt
+++ b/tests/auto/network/socket/qtcpsocket/test/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qtcpsocket Test:
#####################################################################
-add_qt_test(tst_qtcpsocket
+qt_add_test(tst_qtcpsocket
OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../" # special case
SOURCES
../tst_qtcpsocket.cpp
@@ -16,7 +16,7 @@ add_qt_test(tst_qtcpsocket
## Scopes:
#####################################################################
-extend_target(tst_qtcpsocket CONDITION WIN32
+qt_extend_target(tst_qtcpsocket CONDITION WIN32
PUBLIC_LIBRARIES
ws2_32
)
diff --git a/tests/auto/network/socket/qudpsocket/clientserver/CMakeLists.txt b/tests/auto/network/socket/qudpsocket/clientserver/CMakeLists.txt
index 8b594c6913..12fe8a453a 100644
--- a/tests/auto/network/socket/qudpsocket/clientserver/CMakeLists.txt
+++ b/tests/auto/network/socket/qudpsocket/clientserver/CMakeLists.txt
@@ -4,7 +4,7 @@
## clientserver Binary:
#####################################################################
-add_qt_executable(clientserver
+qt_add_executable(clientserver
OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
SOURCES
main.cpp
diff --git a/tests/auto/network/socket/qudpsocket/test/.prev_CMakeLists.txt b/tests/auto/network/socket/qudpsocket/test/.prev_CMakeLists.txt
index f5ec5f50ce..4c393d67a8 100644
--- a/tests/auto/network/socket/qudpsocket/test/.prev_CMakeLists.txt
+++ b/tests/auto/network/socket/qudpsocket/test/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qudpsocket Test:
#####################################################################
-add_qt_test(tst_qudpsocket
+qt_add_test(tst_qudpsocket
SOURCES
../tst_qudpsocket.cpp
INCLUDE_DIRECTORIES
diff --git a/tests/auto/network/socket/qudpsocket/test/CMakeLists.txt b/tests/auto/network/socket/qudpsocket/test/CMakeLists.txt
index 3c2df284fc..a2fa36b078 100644
--- a/tests/auto/network/socket/qudpsocket/test/CMakeLists.txt
+++ b/tests/auto/network/socket/qudpsocket/test/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qudpsocket Test:
#####################################################################
-add_qt_test(tst_qudpsocket
+qt_add_test(tst_qudpsocket
OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../" # special case
SOURCES
../tst_qudpsocket.cpp
diff --git a/tests/auto/network/socket/qudpsocket/udpServer/.prev_CMakeLists.txt b/tests/auto/network/socket/qudpsocket/udpServer/.prev_CMakeLists.txt
index be9819466f..7796fbe476 100644
--- a/tests/auto/network/socket/qudpsocket/udpServer/.prev_CMakeLists.txt
+++ b/tests/auto/network/socket/qudpsocket/udpServer/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
## udpServer Binary:
#####################################################################
-add_qt_executable(udpServer
+qt_add_executable(udpServer
SOURCES
main.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/network/socket/qudpsocket/udpServer/CMakeLists.txt b/tests/auto/network/socket/qudpsocket/udpServer/CMakeLists.txt
index d9da87126f..d4909f94b2 100644
--- a/tests/auto/network/socket/qudpsocket/udpServer/CMakeLists.txt
+++ b/tests/auto/network/socket/qudpsocket/udpServer/CMakeLists.txt
@@ -4,7 +4,7 @@
## udpServer Binary:
#####################################################################
-add_qt_executable(udpServer
+qt_add_executable(udpServer
OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/./" # special case
SOURCES
main.cpp
diff --git a/tests/auto/network/ssl/qasn1element/CMakeLists.txt b/tests/auto/network/ssl/qasn1element/CMakeLists.txt
index aa9ff58012..a97a213603 100644
--- a/tests/auto/network/ssl/qasn1element/CMakeLists.txt
+++ b/tests/auto/network/ssl/qasn1element/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qasn1element Test:
#####################################################################
-add_qt_test(tst_qasn1element
+qt_add_test(tst_qasn1element
SOURCES
tst_qasn1element.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/network/ssl/qdtls/CMakeLists.txt b/tests/auto/network/ssl/qdtls/CMakeLists.txt
index 77bf65f199..8072d8d0e0 100644
--- a/tests/auto/network/ssl/qdtls/CMakeLists.txt
+++ b/tests/auto/network/ssl/qdtls/CMakeLists.txt
@@ -7,7 +7,7 @@
# Collect test data
list(APPEND test_data "certs")
-add_qt_test(tst_qdtls
+qt_add_test(tst_qdtls
SOURCES
tst_qdtls.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/network/ssl/qdtlscookie/CMakeLists.txt b/tests/auto/network/ssl/qdtlscookie/CMakeLists.txt
index 827716c3b7..c08bf6150a 100644
--- a/tests/auto/network/ssl/qdtlscookie/CMakeLists.txt
+++ b/tests/auto/network/ssl/qdtlscookie/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qdtlscookie Test:
#####################################################################
-add_qt_test(tst_qdtlscookie
+qt_add_test(tst_qdtlscookie
SOURCES
tst_qdtlscookie.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/network/ssl/qocsp/CMakeLists.txt b/tests/auto/network/ssl/qocsp/CMakeLists.txt
index 399711f9a0..7997461004 100644
--- a/tests/auto/network/ssl/qocsp/CMakeLists.txt
+++ b/tests/auto/network/ssl/qocsp/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qocsp Test:
#####################################################################
-add_qt_test(tst_qocsp
+qt_add_test(tst_qocsp
SOURCES
tst_qocsp.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/network/ssl/qpassworddigestor/CMakeLists.txt b/tests/auto/network/ssl/qpassworddigestor/CMakeLists.txt
index e0997fc26e..1bb8b2f29b 100644
--- a/tests/auto/network/ssl/qpassworddigestor/CMakeLists.txt
+++ b/tests/auto/network/ssl/qpassworddigestor/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qpassworddigestor Test:
#####################################################################
-add_qt_test(tst_qpassworddigestor
+qt_add_test(tst_qpassworddigestor
SOURCES
tst_qpassworddigestor.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/network/ssl/qsslcertificate/.prev_CMakeLists.txt b/tests/auto/network/ssl/qsslcertificate/.prev_CMakeLists.txt
index 1509c2e809..c55b2a86a3 100644
--- a/tests/auto/network/ssl/qsslcertificate/.prev_CMakeLists.txt
+++ b/tests/auto/network/ssl/qsslcertificate/.prev_CMakeLists.txt
@@ -22,7 +22,7 @@ file(GLOB_RECURSE test_data_glob
pkcs12/*)
list(APPEND test_data ${test_data_glob})
-add_qt_test(tst_qsslcertificate
+qt_add_test(tst_qsslcertificate
SOURCES
tst_qsslcertificate.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/network/ssl/qsslcertificate/CMakeLists.txt b/tests/auto/network/ssl/qsslcertificate/CMakeLists.txt
index 4b8fefc499..7dd8fa00db 100644
--- a/tests/auto/network/ssl/qsslcertificate/CMakeLists.txt
+++ b/tests/auto/network/ssl/qsslcertificate/CMakeLists.txt
@@ -29,7 +29,7 @@ file(GLOB_RECURSE test_data_glob
pkcs12/*)
list(APPEND test_data ${test_data_glob})
-add_qt_test(tst_qsslcertificate
+qt_add_test(tst_qsslcertificate
SOURCES
tst_qsslcertificate.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/network/ssl/qsslcipher/CMakeLists.txt b/tests/auto/network/ssl/qsslcipher/CMakeLists.txt
index 44e0e78220..b6a2348fca 100644
--- a/tests/auto/network/ssl/qsslcipher/CMakeLists.txt
+++ b/tests/auto/network/ssl/qsslcipher/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qsslcipher Test:
#####################################################################
-add_qt_test(tst_qsslcipher
+qt_add_test(tst_qsslcipher
SOURCES
tst_qsslcipher.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/network/ssl/qssldiffiehellmanparameters/CMakeLists.txt b/tests/auto/network/ssl/qssldiffiehellmanparameters/CMakeLists.txt
index f6785a6736..0beb896018 100644
--- a/tests/auto/network/ssl/qssldiffiehellmanparameters/CMakeLists.txt
+++ b/tests/auto/network/ssl/qssldiffiehellmanparameters/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qssldiffiehellmanparameters Test:
#####################################################################
-add_qt_test(tst_qssldiffiehellmanparameters
+qt_add_test(tst_qssldiffiehellmanparameters
SOURCES
tst_qssldiffiehellmanparameters.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/network/ssl/qsslellipticcurve/CMakeLists.txt b/tests/auto/network/ssl/qsslellipticcurve/CMakeLists.txt
index 4df88ff305..89ee2a1b91 100644
--- a/tests/auto/network/ssl/qsslellipticcurve/CMakeLists.txt
+++ b/tests/auto/network/ssl/qsslellipticcurve/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qsslellipticcurve Test:
#####################################################################
-add_qt_test(tst_qsslellipticcurve
+qt_add_test(tst_qsslellipticcurve
SOURCES
tst_qsslellipticcurve.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/network/ssl/qsslerror/CMakeLists.txt b/tests/auto/network/ssl/qsslerror/CMakeLists.txt
index e8b07ab049..8324220b46 100644
--- a/tests/auto/network/ssl/qsslerror/CMakeLists.txt
+++ b/tests/auto/network/ssl/qsslerror/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qsslerror Test:
#####################################################################
-add_qt_test(tst_qsslerror
+qt_add_test(tst_qsslerror
SOURCES
tst_qsslerror.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/network/ssl/qsslkey/CMakeLists.txt b/tests/auto/network/ssl/qsslkey/CMakeLists.txt
index 04634d1997..e83f4c1f40 100644
--- a/tests/auto/network/ssl/qsslkey/CMakeLists.txt
+++ b/tests/auto/network/ssl/qsslkey/CMakeLists.txt
@@ -14,7 +14,7 @@ file(GLOB_RECURSE test_data_glob
rsa-*.pem)
list(APPEND test_data ${test_data_glob})
-add_qt_test(tst_qsslkey
+qt_add_test(tst_qsslkey
SOURCES
tst_qsslkey.cpp
PUBLIC_LIBRARIES
@@ -25,7 +25,7 @@ add_qt_test(tst_qsslkey
## Scopes:
#####################################################################
-extend_target(tst_qsslkey CONDITION QT_FEATURE_private_tests
+qt_extend_target(tst_qsslkey CONDITION QT_FEATURE_private_tests
PUBLIC_LIBRARIES
Qt::CorePrivate
Qt::NetworkPrivate
diff --git a/tests/auto/network/ssl/qsslsocket/CMakeLists.txt b/tests/auto/network/ssl/qsslsocket/CMakeLists.txt
index 99ec2ad823..59ab6ff93a 100644
--- a/tests/auto/network/ssl/qsslsocket/CMakeLists.txt
+++ b/tests/auto/network/ssl/qsslsocket/CMakeLists.txt
@@ -11,7 +11,7 @@ endif()
# Collect test data
list(APPEND test_data "certs")
-add_qt_test(tst_qsslsocket
+qt_add_test(tst_qsslsocket
SOURCES
tst_qsslsocket.cpp
DEFINES
diff --git a/tests/auto/network/ssl/qsslsocket_onDemandCertificates_member/CMakeLists.txt b/tests/auto/network/ssl/qsslsocket_onDemandCertificates_member/CMakeLists.txt
index c377e0a46a..9a1beaeb76 100644
--- a/tests/auto/network/ssl/qsslsocket_onDemandCertificates_member/CMakeLists.txt
+++ b/tests/auto/network/ssl/qsslsocket_onDemandCertificates_member/CMakeLists.txt
@@ -8,7 +8,7 @@ endif()
## tst_qsslsocket_onDemandCertificates_member Test:
#####################################################################
-add_qt_test(tst_qsslsocket_onDemandCertificates_member
+qt_add_test(tst_qsslsocket_onDemandCertificates_member
SOURCES
tst_qsslsocket_onDemandCertificates_member.cpp
DEFINES
diff --git a/tests/auto/network/ssl/qsslsocket_onDemandCertificates_static/CMakeLists.txt b/tests/auto/network/ssl/qsslsocket_onDemandCertificates_static/CMakeLists.txt
index f3a3178879..f8d6735c20 100644
--- a/tests/auto/network/ssl/qsslsocket_onDemandCertificates_static/CMakeLists.txt
+++ b/tests/auto/network/ssl/qsslsocket_onDemandCertificates_static/CMakeLists.txt
@@ -8,7 +8,7 @@ endif()
## tst_qsslsocket_onDemandCertificates_static Test:
#####################################################################
-add_qt_test(tst_qsslsocket_onDemandCertificates_static
+qt_add_test(tst_qsslsocket_onDemandCertificates_static
SOURCES
tst_qsslsocket_onDemandCertificates_static.cpp
DEFINES
diff --git a/tests/auto/other/android/CMakeLists.txt b/tests/auto/other/android/CMakeLists.txt
index e59111bb40..437a4ee9d2 100644
--- a/tests/auto/other/android/CMakeLists.txt
+++ b/tests/auto/other/android/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_android Test:
#####################################################################
-add_qt_test(tst_android
+qt_add_test(tst_android
SOURCES
tst_android.cpp
)
diff --git a/tests/auto/other/compiler/.prev_CMakeLists.txt b/tests/auto/other/compiler/.prev_CMakeLists.txt
index 6824640d93..4a9cdcef14 100644
--- a/tests/auto/other/compiler/.prev_CMakeLists.txt
+++ b/tests/auto/other/compiler/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_compiler Test:
#####################################################################
-add_qt_test(tst_compiler
+qt_add_test(tst_compiler
SOURCES
baseclass.cpp baseclass.h
derivedclass.cpp derivedclass.h
diff --git a/tests/auto/other/compiler/CMakeLists.txt b/tests/auto/other/compiler/CMakeLists.txt
index 1849b7ec2c..6aa7c43966 100644
--- a/tests/auto/other/compiler/CMakeLists.txt
+++ b/tests/auto/other/compiler/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_compiler Test:
#####################################################################
-add_qt_test(tst_compiler
+qt_add_test(tst_compiler
EXCEPTIONS # special case
SOURCES
baseclass.cpp baseclass.h
diff --git a/tests/auto/other/gestures/CMakeLists.txt b/tests/auto/other/gestures/CMakeLists.txt
index b1a07e6cb3..71bcc22f01 100644
--- a/tests/auto/other/gestures/CMakeLists.txt
+++ b/tests/auto/other/gestures/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_gestures Test:
#####################################################################
-add_qt_test(tst_gestures
+qt_add_test(tst_gestures
SOURCES
tst_gestures.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/other/lancelot/CMakeLists.txt b/tests/auto/other/lancelot/CMakeLists.txt
index 6f15ff7990..f485a48ebe 100644
--- a/tests/auto/other/lancelot/CMakeLists.txt
+++ b/tests/auto/other/lancelot/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
scripts/*)
list(APPEND test_data ${test_data_glob})
-add_qt_test(tst_lancelot
+qt_add_test(tst_lancelot
SOURCES
../../../baselineserver/shared/baselineprotocol.cpp ../../../baselineserver/shared/baselineprotocol.h
../../../baselineserver/shared/lookup3.cpp
@@ -61,7 +61,7 @@ set(images_resource_files
"images/zebra.png"
)
-add_qt_resource(tst_lancelot "images"
+qt_add_resource(tst_lancelot "images"
PREFIX
"/"
FILES
@@ -72,7 +72,7 @@ add_qt_resource(tst_lancelot "images"
## Scopes:
#####################################################################
-extend_target(tst_lancelot CONDITION QT_FEATURE_opengl
+qt_extend_target(tst_lancelot CONDITION QT_FEATURE_opengl
PUBLIC_LIBRARIES
Qt::OpenGL
)
diff --git a/tests/auto/other/languagechange/CMakeLists.txt b/tests/auto/other/languagechange/CMakeLists.txt
index f5c43b0ed1..0ace85d654 100644
--- a/tests/auto/other/languagechange/CMakeLists.txt
+++ b/tests/auto/other/languagechange/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_languagechange Test:
#####################################################################
-add_qt_test(tst_languagechange
+qt_add_test(tst_languagechange
SOURCES
tst_languagechange.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/other/macgui/.prev_CMakeLists.txt b/tests/auto/other/macgui/.prev_CMakeLists.txt
index 1ae468c40e..e9b794dcdc 100644
--- a/tests/auto/other/macgui/.prev_CMakeLists.txt
+++ b/tests/auto/other/macgui/.prev_CMakeLists.txt
@@ -11,7 +11,7 @@ endif()
## tst_macgui Test:
#####################################################################
-add_qt_test(tst_macgui
+qt_add_test(tst_macgui
SOURCES
guitest.cpp guitest.h
tst_macgui.cpp
@@ -26,7 +26,7 @@ add_qt_test(tst_macgui
## Scopes:
#####################################################################
-extend_target(tst_macgui CONDITION MACOS
+qt_extend_target(tst_macgui CONDITION MACOS
PUBLIC_LIBRARIES
${FWApplicationServices}
)
diff --git a/tests/auto/other/macgui/CMakeLists.txt b/tests/auto/other/macgui/CMakeLists.txt
index 4a5aa0aaef..116049bd85 100644
--- a/tests/auto/other/macgui/CMakeLists.txt
+++ b/tests/auto/other/macgui/CMakeLists.txt
@@ -11,7 +11,7 @@ endif()
## tst_macgui Test:
#####################################################################
-add_qt_test(tst_macgui
+qt_add_test(tst_macgui
SOURCES
guitest.cpp guitest.h
tst_macgui.cpp
@@ -26,7 +26,7 @@ add_qt_test(tst_macgui
## Scopes:
#####################################################################
-extend_target(tst_macgui CONDITION MACOS
+qt_extend_target(tst_macgui CONDITION MACOS
PUBLIC_LIBRARIES
${FWApplicationServices}
)
diff --git a/tests/auto/other/macnativeevents/CMakeLists.txt b/tests/auto/other/macnativeevents/CMakeLists.txt
index 167e46055a..f22996a66e 100644
--- a/tests/auto/other/macnativeevents/CMakeLists.txt
+++ b/tests/auto/other/macnativeevents/CMakeLists.txt
@@ -8,7 +8,7 @@ endif()
## tst_macnativeevents Test:
#####################################################################
-add_qt_test(tst_macnativeevents
+qt_add_test(tst_macnativeevents
SOURCES
expectedeventlist.cpp expectedeventlist.h
nativeeventlist.cpp nativeeventlist.h
diff --git a/tests/auto/other/macplist/app/.prev_CMakeLists.txt b/tests/auto/other/macplist/app/.prev_CMakeLists.txt
index f04afb4311..0cf205bf55 100644
--- a/tests/auto/other/macplist/app/.prev_CMakeLists.txt
+++ b/tests/auto/other/macplist/app/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
## app Binary:
#####################################################################
-add_qt_executable(app
+qt_add_executable(app
GUI
SOURCES
main.cpp
diff --git a/tests/auto/other/macplist/app/CMakeLists.txt b/tests/auto/other/macplist/app/CMakeLists.txt
index 2effb2aa34..65ccfee32b 100644
--- a/tests/auto/other/macplist/app/CMakeLists.txt
+++ b/tests/auto/other/macplist/app/CMakeLists.txt
@@ -4,7 +4,7 @@
## app Binary:
#####################################################################
-add_qt_executable(app
+qt_add_executable(app
GUI
OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
SOURCES
diff --git a/tests/auto/other/macplist/test/CMakeLists.txt b/tests/auto/other/macplist/test/CMakeLists.txt
index 3cb8066adf..23faffbdcf 100644
--- a/tests/auto/other/macplist/test/CMakeLists.txt
+++ b/tests/auto/other/macplist/test/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_macplist Test:
#####################################################################
-add_qt_test(tst_macplist
+qt_add_test(tst_macplist
OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../"
SOURCES
../tst_macplist.cpp
diff --git a/tests/auto/other/networkselftest/CMakeLists.txt b/tests/auto/other/networkselftest/CMakeLists.txt
index 7765557248..7093ed0160 100644
--- a/tests/auto/other/networkselftest/CMakeLists.txt
+++ b/tests/auto/other/networkselftest/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_networkselftest Test:
#####################################################################
-add_qt_test(tst_networkselftest
+qt_add_test(tst_networkselftest
SOURCES
tst_networkselftest.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/other/qaccessibility/.prev_CMakeLists.txt b/tests/auto/other/qaccessibility/.prev_CMakeLists.txt
index 340a2f14ec..edbea40cc2 100644
--- a/tests/auto/other/qaccessibility/.prev_CMakeLists.txt
+++ b/tests/auto/other/qaccessibility/.prev_CMakeLists.txt
@@ -8,7 +8,7 @@ endif()
## tst_qaccessibility Test:
#####################################################################
-add_qt_test(tst_qaccessibility
+qt_add_test(tst_qaccessibility
SOURCES
accessiblewidgets.h
tst_qaccessibility.cpp
@@ -26,12 +26,12 @@ add_qt_test(tst_qaccessibility
## Scopes:
#####################################################################
-extend_target(tst_qaccessibility CONDITION UNIX AND NOT APPLE AND NOT HAIKU AND NOT integity
+qt_extend_target(tst_qaccessibility CONDITION UNIX AND NOT APPLE AND NOT HAIKU AND NOT integity
PUBLIC_LIBRARIES
m
)
-extend_target(tst_qaccessibility CONDITION WIN32
+qt_extend_target(tst_qaccessibility CONDITION WIN32
PUBLIC_LIBRARIES
ole32
oleacc
diff --git a/tests/auto/other/qaccessibility/CMakeLists.txt b/tests/auto/other/qaccessibility/CMakeLists.txt
index 18785e4e86..53960845ab 100644
--- a/tests/auto/other/qaccessibility/CMakeLists.txt
+++ b/tests/auto/other/qaccessibility/CMakeLists.txt
@@ -14,7 +14,7 @@ endif()
## tst_qaccessibility Test:
#####################################################################
-add_qt_test(tst_qaccessibility
+qt_add_test(tst_qaccessibility
SOURCES
accessiblewidgets.h
tst_qaccessibility.cpp
@@ -32,12 +32,12 @@ add_qt_test(tst_qaccessibility
## Scopes:
#####################################################################
-extend_target(tst_qaccessibility CONDITION UNIX AND NOT APPLE AND NOT HAIKU AND NOT integity
+qt_extend_target(tst_qaccessibility CONDITION UNIX AND NOT APPLE AND NOT HAIKU AND NOT integity
PUBLIC_LIBRARIES
m
)
-extend_target(tst_qaccessibility CONDITION WIN32
+qt_extend_target(tst_qaccessibility CONDITION WIN32
PUBLIC_LIBRARIES
ole32
oleacc
diff --git a/tests/auto/other/qaccessibilitylinux/.prev_CMakeLists.txt b/tests/auto/other/qaccessibilitylinux/.prev_CMakeLists.txt
index 343df83dc0..8d48b5a0fa 100644
--- a/tests/auto/other/qaccessibilitylinux/.prev_CMakeLists.txt
+++ b/tests/auto/other/qaccessibilitylinux/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qaccessibilitylinux Test:
#####################################################################
-add_qt_test(tst_qaccessibilitylinux
+qt_add_test(tst_qaccessibilitylinux
SOURCES
tst_qaccessibilitylinux.cpp
DBUS_INTERFACE_SOURCES
diff --git a/tests/auto/other/qaccessibilitylinux/CMakeLists.txt b/tests/auto/other/qaccessibilitylinux/CMakeLists.txt
index 2785b93738..70f0c67f98 100644
--- a/tests/auto/other/qaccessibilitylinux/CMakeLists.txt
+++ b/tests/auto/other/qaccessibilitylinux/CMakeLists.txt
@@ -10,7 +10,7 @@ endif()
## tst_qaccessibilitylinux Test:
#####################################################################
-add_qt_test(tst_qaccessibilitylinux
+qt_add_test(tst_qaccessibilitylinux
SOURCES
tst_qaccessibilitylinux.cpp
DBUS_INTERFACE_SOURCES
diff --git a/tests/auto/other/qaccessibilitymac/CMakeLists.txt b/tests/auto/other/qaccessibilitymac/CMakeLists.txt
index ab8b9fcb9b..40a4527011 100644
--- a/tests/auto/other/qaccessibilitymac/CMakeLists.txt
+++ b/tests/auto/other/qaccessibilitymac/CMakeLists.txt
@@ -8,7 +8,7 @@ endif()
## tst_qaccessibilitymac Test:
#####################################################################
-add_qt_test(tst_qaccessibilitymac
+qt_add_test(tst_qaccessibilitymac
SOURCES
tst_qaccessibilitymac.cpp
tst_qaccessibilitymac_helpers.h
@@ -23,7 +23,7 @@ add_qt_test(tst_qaccessibilitymac
## Scopes:
#####################################################################
-extend_target(tst_qaccessibilitymac CONDITION APPLE
+qt_extend_target(tst_qaccessibilitymac CONDITION APPLE
SOURCES
tst_qaccessibilitymac_helpers.mm
PUBLIC_LIBRARIES
diff --git a/tests/auto/other/qcomplextext/CMakeLists.txt b/tests/auto/other/qcomplextext/CMakeLists.txt
index ee504faaf7..2b5f951267 100644
--- a/tests/auto/other/qcomplextext/CMakeLists.txt
+++ b/tests/auto/other/qcomplextext/CMakeLists.txt
@@ -7,7 +7,7 @@
# Collect test data
list(APPEND test_data "data")
-add_qt_test(tst_qcomplextext
+qt_add_test(tst_qcomplextext
SOURCES
tst_qcomplextext.cpp
PUBLIC_LIBRARIES
@@ -27,7 +27,7 @@ if(ANDROID)
"data/BidiTest.txt"
)
- add_qt_resource(tst_qcomplextext "android_testdata"
+ qt_add_resource(tst_qcomplextext "android_testdata"
PREFIX
"/android_testdata"
FILES
@@ -35,7 +35,7 @@ if(ANDROID)
)
endif()
-extend_target(tst_qcomplextext CONDITION builtin_testdata
+qt_extend_target(tst_qcomplextext CONDITION builtin_testdata
DEFINES
BUILTIN_TESTDATA
)
diff --git a/tests/auto/other/qfocusevent/CMakeLists.txt b/tests/auto/other/qfocusevent/CMakeLists.txt
index a2406c034a..01275d7665 100644
--- a/tests/auto/other/qfocusevent/CMakeLists.txt
+++ b/tests/auto/other/qfocusevent/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qfocusevent Test:
#####################################################################
-add_qt_test(tst_qfocusevent
+qt_add_test(tst_qfocusevent
SOURCES
tst_qfocusevent.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/other/qnetworkaccessmanager_and_qprogressdialog/CMakeLists.txt b/tests/auto/other/qnetworkaccessmanager_and_qprogressdialog/CMakeLists.txt
index c4b9b186a1..1e806d4589 100644
--- a/tests/auto/other/qnetworkaccessmanager_and_qprogressdialog/CMakeLists.txt
+++ b/tests/auto/other/qnetworkaccessmanager_and_qprogressdialog/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qnetworkaccessmanager_and_qprogressdialog Test:
#####################################################################
-add_qt_test(tst_qnetworkaccessmanager_and_qprogressdialog
+qt_add_test(tst_qnetworkaccessmanager_and_qprogressdialog
SOURCES
tst_qnetworkaccessmanager_and_qprogressdialog.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/other/qobjectrace/CMakeLists.txt b/tests/auto/other/qobjectrace/CMakeLists.txt
index 972fdcfcac..c3189b1da6 100644
--- a/tests/auto/other/qobjectrace/CMakeLists.txt
+++ b/tests/auto/other/qobjectrace/CMakeLists.txt
@@ -4,7 +4,7 @@
## qobjectrace Test:
#####################################################################
-add_qt_test(qobjectrace
+qt_add_test(qobjectrace
SOURCES
../../../shared/emulationdetector.h
tst_qobjectrace.cpp
diff --git a/tests/auto/other/qprocess_and_guieventloop/write-read-write/CMakeLists.txt b/tests/auto/other/qprocess_and_guieventloop/write-read-write/CMakeLists.txt
index dfea85f3e3..e5b746297f 100644
--- a/tests/auto/other/qprocess_and_guieventloop/write-read-write/CMakeLists.txt
+++ b/tests/auto/other/qprocess_and_guieventloop/write-read-write/CMakeLists.txt
@@ -4,7 +4,7 @@
## write-read-write Binary:
#####################################################################
-add_qt_executable(write-read-write
+qt_add_executable(write-read-write
OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
SOURCES
main.cpp
diff --git a/tests/auto/other/qsharedpointer_and_qwidget/CMakeLists.txt b/tests/auto/other/qsharedpointer_and_qwidget/CMakeLists.txt
index 5175bb68fe..9abf6a010d 100644
--- a/tests/auto/other/qsharedpointer_and_qwidget/CMakeLists.txt
+++ b/tests/auto/other/qsharedpointer_and_qwidget/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qsharedpointer_and_qwidget Test:
#####################################################################
-add_qt_test(tst_qsharedpointer_and_qwidget
+qt_add_test(tst_qsharedpointer_and_qwidget
SOURCES
tst_qsharedpointer_and_qwidget.cpp
DEFINES
diff --git a/tests/auto/other/toolsupport/CMakeLists.txt b/tests/auto/other/toolsupport/CMakeLists.txt
index 51af17d866..d13580799c 100644
--- a/tests/auto/other/toolsupport/CMakeLists.txt
+++ b/tests/auto/other/toolsupport/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_toolsupport Test:
#####################################################################
-add_qt_test(tst_toolsupport
+qt_add_test(tst_toolsupport
SOURCES
tst_toolsupport.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/other/xkbkeyboard/CMakeLists.txt b/tests/auto/other/xkbkeyboard/CMakeLists.txt
index 93a02eea12..9c92ff65ba 100644
--- a/tests/auto/other/xkbkeyboard/CMakeLists.txt
+++ b/tests/auto/other/xkbkeyboard/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_xkbkeyboard Test:
#####################################################################
-add_qt_test(tst_xkbkeyboard
+qt_add_test(tst_xkbkeyboard
SOURCES
tst_xkbkeyboard.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/printsupport/dialogs/qabstractprintdialog/CMakeLists.txt b/tests/auto/printsupport/dialogs/qabstractprintdialog/CMakeLists.txt
index 91b699f648..93dbcec5d3 100644
--- a/tests/auto/printsupport/dialogs/qabstractprintdialog/CMakeLists.txt
+++ b/tests/auto/printsupport/dialogs/qabstractprintdialog/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qabstractprintdialog Test:
#####################################################################
-add_qt_test(tst_qabstractprintdialog
+qt_add_test(tst_qabstractprintdialog
SOURCES
tst_qabstractprintdialog.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/printsupport/kernel/qprintdevice/CMakeLists.txt b/tests/auto/printsupport/kernel/qprintdevice/CMakeLists.txt
index 1ddb49d8e9..1319828c6b 100644
--- a/tests/auto/printsupport/kernel/qprintdevice/CMakeLists.txt
+++ b/tests/auto/printsupport/kernel/qprintdevice/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qprintdevice Test:
#####################################################################
-add_qt_test(tst_qprintdevice
+qt_add_test(tst_qprintdevice
SOURCES
tst_qprintdevice.cpp
DEFINES
diff --git a/tests/auto/printsupport/kernel/qprinter/CMakeLists.txt b/tests/auto/printsupport/kernel/qprinter/CMakeLists.txt
index 6d15bab349..bd1b5d1033 100644
--- a/tests/auto/printsupport/kernel/qprinter/CMakeLists.txt
+++ b/tests/auto/printsupport/kernel/qprinter/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qprinter Test:
#####################################################################
-add_qt_test(tst_qprinter
+qt_add_test(tst_qprinter
SOURCES
tst_qprinter.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/printsupport/kernel/qprinterinfo/CMakeLists.txt b/tests/auto/printsupport/kernel/qprinterinfo/CMakeLists.txt
index 5923d57ef5..b1fb41c491 100644
--- a/tests/auto/printsupport/kernel/qprinterinfo/CMakeLists.txt
+++ b/tests/auto/printsupport/kernel/qprinterinfo/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qprinterinfo Test:
#####################################################################
-add_qt_test(tst_qprinterinfo
+qt_add_test(tst_qprinterinfo
SOURCES
tst_qprinterinfo.cpp
DEFINES
diff --git a/tests/auto/sql/kernel/qsql/CMakeLists.txt b/tests/auto/sql/kernel/qsql/CMakeLists.txt
index c3c3eac7d2..24ae110fd3 100644
--- a/tests/auto/sql/kernel/qsql/CMakeLists.txt
+++ b/tests/auto/sql/kernel/qsql/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qsql Test:
#####################################################################
-add_qt_test(tst_qsql
+qt_add_test(tst_qsql
SOURCES
tst_qsql.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/sql/kernel/qsqldatabase/CMakeLists.txt b/tests/auto/sql/kernel/qsqldatabase/CMakeLists.txt
index ae64269c11..9eccc47e52 100644
--- a/tests/auto/sql/kernel/qsqldatabase/CMakeLists.txt
+++ b/tests/auto/sql/kernel/qsqldatabase/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qsqldatabase Test:
#####################################################################
-add_qt_test(tst_qsqldatabase
+qt_add_test(tst_qsqldatabase
SOURCES
tst_qsqldatabase.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/sql/kernel/qsqldriver/CMakeLists.txt b/tests/auto/sql/kernel/qsqldriver/CMakeLists.txt
index 30ce3c1053..9d7d61487c 100644
--- a/tests/auto/sql/kernel/qsqldriver/CMakeLists.txt
+++ b/tests/auto/sql/kernel/qsqldriver/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qsqldriver Test:
#####################################################################
-add_qt_test(tst_qsqldriver
+qt_add_test(tst_qsqldriver
SOURCES
tst_qsqldriver.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/sql/kernel/qsqlerror/CMakeLists.txt b/tests/auto/sql/kernel/qsqlerror/CMakeLists.txt
index 45e7bb383b..b9d4fbb24e 100644
--- a/tests/auto/sql/kernel/qsqlerror/CMakeLists.txt
+++ b/tests/auto/sql/kernel/qsqlerror/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qsqlerror Test:
#####################################################################
-add_qt_test(tst_qsqlerror
+qt_add_test(tst_qsqlerror
SOURCES
tst_qsqlerror.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/sql/kernel/qsqlfield/CMakeLists.txt b/tests/auto/sql/kernel/qsqlfield/CMakeLists.txt
index 0a570ed1f2..5459b9bb9a 100644
--- a/tests/auto/sql/kernel/qsqlfield/CMakeLists.txt
+++ b/tests/auto/sql/kernel/qsqlfield/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qsqlfield Test:
#####################################################################
-add_qt_test(tst_qsqlfield
+qt_add_test(tst_qsqlfield
SOURCES
tst_qsqlfield.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/sql/kernel/qsqlquery/CMakeLists.txt b/tests/auto/sql/kernel/qsqlquery/CMakeLists.txt
index a5d3c96baa..8b2ff37644 100644
--- a/tests/auto/sql/kernel/qsqlquery/CMakeLists.txt
+++ b/tests/auto/sql/kernel/qsqlquery/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qsqlquery Test:
#####################################################################
-add_qt_test(tst_qsqlquery
+qt_add_test(tst_qsqlquery
SOURCES
tst_qsqlquery.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/sql/kernel/qsqlrecord/CMakeLists.txt b/tests/auto/sql/kernel/qsqlrecord/CMakeLists.txt
index 743dc27e9d..b6caf1b1fa 100644
--- a/tests/auto/sql/kernel/qsqlrecord/CMakeLists.txt
+++ b/tests/auto/sql/kernel/qsqlrecord/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qsqlrecord Test:
#####################################################################
-add_qt_test(tst_qsqlrecord
+qt_add_test(tst_qsqlrecord
SOURCES
tst_qsqlrecord.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/sql/kernel/qsqlresult/CMakeLists.txt b/tests/auto/sql/kernel/qsqlresult/CMakeLists.txt
index c150c8a9d7..3a68a227b9 100644
--- a/tests/auto/sql/kernel/qsqlresult/CMakeLists.txt
+++ b/tests/auto/sql/kernel/qsqlresult/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qsqlresult Test:
#####################################################################
-add_qt_test(tst_qsqlresult
+qt_add_test(tst_qsqlresult
SOURCES
testsqldriver.h
tst_qsqlresult.cpp
diff --git a/tests/auto/sql/kernel/qsqlthread/CMakeLists.txt b/tests/auto/sql/kernel/qsqlthread/CMakeLists.txt
index 17e66f42dd..a2f66c7ed3 100644
--- a/tests/auto/sql/kernel/qsqlthread/CMakeLists.txt
+++ b/tests/auto/sql/kernel/qsqlthread/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qsqlthread Test:
#####################################################################
-add_qt_test(tst_qsqlthread
+qt_add_test(tst_qsqlthread
SOURCES
tst_qsqlthread.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/sql/models/qsqlquerymodel/CMakeLists.txt b/tests/auto/sql/models/qsqlquerymodel/CMakeLists.txt
index f2da569f8f..75ce0fb6bc 100644
--- a/tests/auto/sql/models/qsqlquerymodel/CMakeLists.txt
+++ b/tests/auto/sql/models/qsqlquerymodel/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qsqlquerymodel Test:
#####################################################################
-add_qt_test(tst_qsqlquerymodel
+qt_add_test(tst_qsqlquerymodel
SOURCES
tst_qsqlquerymodel.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/sql/models/qsqlrelationaldelegate/CMakeLists.txt b/tests/auto/sql/models/qsqlrelationaldelegate/CMakeLists.txt
index caadae1df5..ce7f129a91 100644
--- a/tests/auto/sql/models/qsqlrelationaldelegate/CMakeLists.txt
+++ b/tests/auto/sql/models/qsqlrelationaldelegate/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qsqlrelationaldelegate Test:
#####################################################################
-add_qt_test(tst_qsqlrelationaldelegate
+qt_add_test(tst_qsqlrelationaldelegate
SOURCES
tst_qsqlrelationaldelegate.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/sql/models/qsqlrelationaltablemodel/CMakeLists.txt b/tests/auto/sql/models/qsqlrelationaltablemodel/CMakeLists.txt
index f695a6173e..67aad097bb 100644
--- a/tests/auto/sql/models/qsqlrelationaltablemodel/CMakeLists.txt
+++ b/tests/auto/sql/models/qsqlrelationaltablemodel/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qsqlrelationaltablemodel Test:
#####################################################################
-add_qt_test(tst_qsqlrelationaltablemodel
+qt_add_test(tst_qsqlrelationaltablemodel
SOURCES
tst_qsqlrelationaltablemodel.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/sql/models/qsqltablemodel/CMakeLists.txt b/tests/auto/sql/models/qsqltablemodel/CMakeLists.txt
index f3e703591f..1da555d341 100644
--- a/tests/auto/sql/models/qsqltablemodel/CMakeLists.txt
+++ b/tests/auto/sql/models/qsqltablemodel/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qsqltablemodel Test:
#####################################################################
-add_qt_test(tst_qsqltablemodel
+qt_add_test(tst_qsqltablemodel
SOURCES
tst_qsqltablemodel.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/testlib/qabstractitemmodeltester/CMakeLists.txt b/tests/auto/testlib/qabstractitemmodeltester/CMakeLists.txt
index c4c9b7d044..a28cf1f65a 100644
--- a/tests/auto/testlib/qabstractitemmodeltester/CMakeLists.txt
+++ b/tests/auto/testlib/qabstractitemmodeltester/CMakeLists.txt
@@ -4,7 +4,7 @@
## qabstractitemmodeltester Test:
#####################################################################
-add_qt_test(qabstractitemmodeltester
+qt_add_test(qabstractitemmodeltester
SOURCES
../../other/qabstractitemmodelutils/dynamictreemodel.cpp ../../other/qabstractitemmodelutils/dynamictreemodel.h
tst_qabstractitemmodeltester.cpp
diff --git a/tests/auto/testlib/qsignalspy/CMakeLists.txt b/tests/auto/testlib/qsignalspy/CMakeLists.txt
index b3832d44fa..1d50fbcf0c 100644
--- a/tests/auto/testlib/qsignalspy/CMakeLists.txt
+++ b/tests/auto/testlib/qsignalspy/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qsignalspy Test:
#####################################################################
-add_qt_test(tst_qsignalspy
+qt_add_test(tst_qsignalspy
SOURCES
tst_qsignalspy.cpp
)
diff --git a/tests/auto/testlib/selftests/assert/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/assert/.prev_CMakeLists.txt
index 65ef6ac126..765750bb71 100644
--- a/tests/auto/testlib/selftests/assert/.prev_CMakeLists.txt
+++ b/tests/auto/testlib/selftests/assert/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
## assert Binary:
#####################################################################
-add_qt_executable(assert
+qt_add_executable(assert
SOURCES
tst_assert.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/testlib/selftests/assert/CMakeLists.txt b/tests/auto/testlib/selftests/assert/CMakeLists.txt
index 561dc995b2..56a1b33bb4 100644
--- a/tests/auto/testlib/selftests/assert/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/assert/CMakeLists.txt
@@ -4,7 +4,7 @@
## assert Binary:
#####################################################################
-add_qt_executable(assert
+qt_add_executable(assert
NO_INSTALL # special case
OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
SOURCES
diff --git a/tests/auto/testlib/selftests/badxml/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/badxml/.prev_CMakeLists.txt
index 755cbecd2e..78ae572e03 100644
--- a/tests/auto/testlib/selftests/badxml/.prev_CMakeLists.txt
+++ b/tests/auto/testlib/selftests/badxml/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
## badxml Binary:
#####################################################################
-add_qt_executable(badxml
+qt_add_executable(badxml
SOURCES
tst_badxml.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/testlib/selftests/badxml/CMakeLists.txt b/tests/auto/testlib/selftests/badxml/CMakeLists.txt
index 7f641e8863..8535ceb3cd 100644
--- a/tests/auto/testlib/selftests/badxml/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/badxml/CMakeLists.txt
@@ -4,7 +4,7 @@
## badxml Binary:
#####################################################################
-add_qt_executable(badxml
+qt_add_executable(badxml
NO_INSTALL # special case
OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
SOURCES
diff --git a/tests/auto/testlib/selftests/benchlibcallgrind/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/benchlibcallgrind/.prev_CMakeLists.txt
index d6f35cd1de..0dca3616e1 100644
--- a/tests/auto/testlib/selftests/benchlibcallgrind/.prev_CMakeLists.txt
+++ b/tests/auto/testlib/selftests/benchlibcallgrind/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
## benchlibcallgrind Binary:
#####################################################################
-add_qt_executable(benchlibcallgrind
+qt_add_executable(benchlibcallgrind
SOURCES
tst_benchlibcallgrind.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/testlib/selftests/benchlibcallgrind/CMakeLists.txt b/tests/auto/testlib/selftests/benchlibcallgrind/CMakeLists.txt
index e7448cad84..f86bb4ae05 100644
--- a/tests/auto/testlib/selftests/benchlibcallgrind/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/benchlibcallgrind/CMakeLists.txt
@@ -4,7 +4,7 @@
## benchlibcallgrind Binary:
#####################################################################
-add_qt_executable(benchlibcallgrind
+qt_add_executable(benchlibcallgrind
NO_INSTALL # special case
OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
SOURCES
diff --git a/tests/auto/testlib/selftests/benchlibcounting/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/benchlibcounting/.prev_CMakeLists.txt
index 6b592f7515..69ecc99b51 100644
--- a/tests/auto/testlib/selftests/benchlibcounting/.prev_CMakeLists.txt
+++ b/tests/auto/testlib/selftests/benchlibcounting/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
## benchlibcounting Binary:
#####################################################################
-add_qt_executable(benchlibcounting
+qt_add_executable(benchlibcounting
SOURCES
tst_benchlibcounting.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/testlib/selftests/benchlibcounting/CMakeLists.txt b/tests/auto/testlib/selftests/benchlibcounting/CMakeLists.txt
index 6976d9aa22..39d5a6e721 100644
--- a/tests/auto/testlib/selftests/benchlibcounting/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/benchlibcounting/CMakeLists.txt
@@ -4,7 +4,7 @@
## benchlibcounting Binary:
#####################################################################
-add_qt_executable(benchlibcounting
+qt_add_executable(benchlibcounting
NO_INSTALL # special case
OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
SOURCES
diff --git a/tests/auto/testlib/selftests/benchlibeventcounter/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/benchlibeventcounter/.prev_CMakeLists.txt
index a1c6d6711b..e61fc6f93e 100644
--- a/tests/auto/testlib/selftests/benchlibeventcounter/.prev_CMakeLists.txt
+++ b/tests/auto/testlib/selftests/benchlibeventcounter/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
## benchlibeventcounter Binary:
#####################################################################
-add_qt_executable(benchlibeventcounter
+qt_add_executable(benchlibeventcounter
SOURCES
tst_benchlibeventcounter.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/testlib/selftests/benchlibeventcounter/CMakeLists.txt b/tests/auto/testlib/selftests/benchlibeventcounter/CMakeLists.txt
index aa744e5a49..0b626def35 100644
--- a/tests/auto/testlib/selftests/benchlibeventcounter/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/benchlibeventcounter/CMakeLists.txt
@@ -4,7 +4,7 @@
## benchlibeventcounter Binary:
#####################################################################
-add_qt_executable(benchlibeventcounter
+qt_add_executable(benchlibeventcounter
NO_INSTALL # special case
OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
SOURCES
diff --git a/tests/auto/testlib/selftests/benchliboptions/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/benchliboptions/.prev_CMakeLists.txt
index d38392c896..73c72a5621 100644
--- a/tests/auto/testlib/selftests/benchliboptions/.prev_CMakeLists.txt
+++ b/tests/auto/testlib/selftests/benchliboptions/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
## benchliboptions Binary:
#####################################################################
-add_qt_executable(benchliboptions
+qt_add_executable(benchliboptions
SOURCES
tst_benchliboptions.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/testlib/selftests/benchliboptions/CMakeLists.txt b/tests/auto/testlib/selftests/benchliboptions/CMakeLists.txt
index 67ac2fe05c..fdb8218406 100644
--- a/tests/auto/testlib/selftests/benchliboptions/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/benchliboptions/CMakeLists.txt
@@ -4,7 +4,7 @@
## benchliboptions Binary:
#####################################################################
-add_qt_executable(benchliboptions
+qt_add_executable(benchliboptions
NO_INSTALL # special case
OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
SOURCES
diff --git a/tests/auto/testlib/selftests/benchlibtickcounter/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/benchlibtickcounter/.prev_CMakeLists.txt
index ec0981c306..10696754dc 100644
--- a/tests/auto/testlib/selftests/benchlibtickcounter/.prev_CMakeLists.txt
+++ b/tests/auto/testlib/selftests/benchlibtickcounter/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
## benchlibtickcounter Binary:
#####################################################################
-add_qt_executable(benchlibtickcounter
+qt_add_executable(benchlibtickcounter
SOURCES
tst_benchlibtickcounter.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/testlib/selftests/benchlibtickcounter/CMakeLists.txt b/tests/auto/testlib/selftests/benchlibtickcounter/CMakeLists.txt
index c55c94c776..9c689584f8 100644
--- a/tests/auto/testlib/selftests/benchlibtickcounter/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/benchlibtickcounter/CMakeLists.txt
@@ -4,7 +4,7 @@
## benchlibtickcounter Binary:
#####################################################################
-add_qt_executable(benchlibtickcounter
+qt_add_executable(benchlibtickcounter
NO_INSTALL # special case
OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
SOURCES
diff --git a/tests/auto/testlib/selftests/benchlibwalltime/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/benchlibwalltime/.prev_CMakeLists.txt
index 0e098ace32..372dfe014f 100644
--- a/tests/auto/testlib/selftests/benchlibwalltime/.prev_CMakeLists.txt
+++ b/tests/auto/testlib/selftests/benchlibwalltime/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
## benchlibwalltime Binary:
#####################################################################
-add_qt_executable(benchlibwalltime
+qt_add_executable(benchlibwalltime
SOURCES
tst_benchlibwalltime.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/testlib/selftests/benchlibwalltime/CMakeLists.txt b/tests/auto/testlib/selftests/benchlibwalltime/CMakeLists.txt
index 84fc8d46bc..3266361433 100644
--- a/tests/auto/testlib/selftests/benchlibwalltime/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/benchlibwalltime/CMakeLists.txt
@@ -4,7 +4,7 @@
## benchlibwalltime Binary:
#####################################################################
-add_qt_executable(benchlibwalltime
+qt_add_executable(benchlibwalltime
NO_INSTALL # special case
OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
SOURCES
diff --git a/tests/auto/testlib/selftests/blacklisted/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/blacklisted/.prev_CMakeLists.txt
index 9fe9796a79..5083fe8a52 100644
--- a/tests/auto/testlib/selftests/blacklisted/.prev_CMakeLists.txt
+++ b/tests/auto/testlib/selftests/blacklisted/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
## blacklisted Binary:
#####################################################################
-add_qt_executable(blacklisted
+qt_add_executable(blacklisted
SOURCES
tst_blacklisted.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/testlib/selftests/blacklisted/CMakeLists.txt b/tests/auto/testlib/selftests/blacklisted/CMakeLists.txt
index d405512565..3b924c12bc 100644
--- a/tests/auto/testlib/selftests/blacklisted/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/blacklisted/CMakeLists.txt
@@ -4,7 +4,7 @@
## blacklisted Binary:
#####################################################################
-add_qt_executable(blacklisted
+qt_add_executable(blacklisted
NO_INSTALL # special case
OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
SOURCES
diff --git a/tests/auto/testlib/selftests/cmptest/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/cmptest/.prev_CMakeLists.txt
index 417b99571d..abc5f9b023 100644
--- a/tests/auto/testlib/selftests/cmptest/.prev_CMakeLists.txt
+++ b/tests/auto/testlib/selftests/cmptest/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
## cmptest Binary:
#####################################################################
-add_qt_executable(cmptest
+qt_add_executable(cmptest
SOURCES
tst_cmptest.cpp
PUBLIC_LIBRARIES
@@ -14,7 +14,7 @@ add_qt_executable(cmptest
## Scopes:
#####################################################################
-extend_target(cmptest CONDITION TARGET Qt::Gui
+qt_extend_target(cmptest CONDITION TARGET Qt::Gui
PUBLIC_LIBRARIES
Qt::Gui
)
diff --git a/tests/auto/testlib/selftests/cmptest/CMakeLists.txt b/tests/auto/testlib/selftests/cmptest/CMakeLists.txt
index 891b410c40..336fb01e74 100644
--- a/tests/auto/testlib/selftests/cmptest/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/cmptest/CMakeLists.txt
@@ -4,7 +4,7 @@
## cmptest Binary:
#####################################################################
-add_qt_executable(cmptest
+qt_add_executable(cmptest
NO_INSTALL # special case
OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
SOURCES
@@ -16,7 +16,7 @@ add_qt_executable(cmptest
## Scopes:
#####################################################################
-extend_target(cmptest CONDITION TARGET Qt::Gui
+qt_extend_target(cmptest CONDITION TARGET Qt::Gui
PUBLIC_LIBRARIES
Qt::Gui
)
diff --git a/tests/auto/testlib/selftests/commandlinedata/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/commandlinedata/.prev_CMakeLists.txt
index a49902c26b..2f08f35c03 100644
--- a/tests/auto/testlib/selftests/commandlinedata/.prev_CMakeLists.txt
+++ b/tests/auto/testlib/selftests/commandlinedata/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
## commandlinedata Binary:
#####################################################################
-add_qt_executable(commandlinedata
+qt_add_executable(commandlinedata
SOURCES
tst_commandlinedata.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/testlib/selftests/commandlinedata/CMakeLists.txt b/tests/auto/testlib/selftests/commandlinedata/CMakeLists.txt
index ddd10f2bfc..889ef5377f 100644
--- a/tests/auto/testlib/selftests/commandlinedata/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/commandlinedata/CMakeLists.txt
@@ -4,7 +4,7 @@
## commandlinedata Binary:
#####################################################################
-add_qt_executable(commandlinedata
+qt_add_executable(commandlinedata
NO_INSTALL # special case
OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
SOURCES
diff --git a/tests/auto/testlib/selftests/counting/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/counting/.prev_CMakeLists.txt
index 8ad3c38e88..88b5ffb603 100644
--- a/tests/auto/testlib/selftests/counting/.prev_CMakeLists.txt
+++ b/tests/auto/testlib/selftests/counting/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
## counting Binary:
#####################################################################
-add_qt_executable(counting
+qt_add_executable(counting
SOURCES
tst_counting.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/testlib/selftests/counting/CMakeLists.txt b/tests/auto/testlib/selftests/counting/CMakeLists.txt
index 7a7ffa75a9..1a7af9ba4f 100644
--- a/tests/auto/testlib/selftests/counting/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/counting/CMakeLists.txt
@@ -4,7 +4,7 @@
## counting Binary:
#####################################################################
-add_qt_executable(counting
+qt_add_executable(counting
NO_INSTALL # special case
OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
SOURCES
diff --git a/tests/auto/testlib/selftests/crashes/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/crashes/.prev_CMakeLists.txt
index 2e54976ebc..eb1e941c5c 100644
--- a/tests/auto/testlib/selftests/crashes/.prev_CMakeLists.txt
+++ b/tests/auto/testlib/selftests/crashes/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
## crashes Binary:
#####################################################################
-add_qt_executable(crashes
+qt_add_executable(crashes
SOURCES
tst_crashes.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/testlib/selftests/crashes/CMakeLists.txt b/tests/auto/testlib/selftests/crashes/CMakeLists.txt
index 2d201d4fb2..6e340067ec 100644
--- a/tests/auto/testlib/selftests/crashes/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/crashes/CMakeLists.txt
@@ -4,7 +4,7 @@
## crashes Binary:
#####################################################################
-add_qt_executable(crashes
+qt_add_executable(crashes
NO_INSTALL # special case
OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
SOURCES
diff --git a/tests/auto/testlib/selftests/datatable/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/datatable/.prev_CMakeLists.txt
index fbe3bfca40..c7e2532c47 100644
--- a/tests/auto/testlib/selftests/datatable/.prev_CMakeLists.txt
+++ b/tests/auto/testlib/selftests/datatable/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
## datatable Binary:
#####################################################################
-add_qt_executable(datatable
+qt_add_executable(datatable
SOURCES
tst_datatable.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/testlib/selftests/datatable/CMakeLists.txt b/tests/auto/testlib/selftests/datatable/CMakeLists.txt
index f99dee1644..8d7abc7fbf 100644
--- a/tests/auto/testlib/selftests/datatable/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/datatable/CMakeLists.txt
@@ -4,7 +4,7 @@
## datatable Binary:
#####################################################################
-add_qt_executable(datatable
+qt_add_executable(datatable
NO_INSTALL # special case
OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
SOURCES
diff --git a/tests/auto/testlib/selftests/datetime/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/datetime/.prev_CMakeLists.txt
index 8f0bca0d89..eb0040c218 100644
--- a/tests/auto/testlib/selftests/datetime/.prev_CMakeLists.txt
+++ b/tests/auto/testlib/selftests/datetime/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
## datetime Binary:
#####################################################################
-add_qt_executable(datetime
+qt_add_executable(datetime
SOURCES
tst_datetime.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/testlib/selftests/datetime/CMakeLists.txt b/tests/auto/testlib/selftests/datetime/CMakeLists.txt
index eb46c3e3c6..ade9978801 100644
--- a/tests/auto/testlib/selftests/datetime/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/datetime/CMakeLists.txt
@@ -4,7 +4,7 @@
## datetime Binary:
#####################################################################
-add_qt_executable(datetime
+qt_add_executable(datetime
NO_INSTALL # special case
OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
SOURCES
diff --git a/tests/auto/testlib/selftests/deleteLater/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/deleteLater/.prev_CMakeLists.txt
index 6195be45ee..0b41340fdc 100644
--- a/tests/auto/testlib/selftests/deleteLater/.prev_CMakeLists.txt
+++ b/tests/auto/testlib/selftests/deleteLater/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
## deleteLater Binary:
#####################################################################
-add_qt_executable(deleteLater
+qt_add_executable(deleteLater
SOURCES
tst_deleteLater.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/testlib/selftests/deleteLater/CMakeLists.txt b/tests/auto/testlib/selftests/deleteLater/CMakeLists.txt
index 48eee2eb14..8ba9a7ed2b 100644
--- a/tests/auto/testlib/selftests/deleteLater/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/deleteLater/CMakeLists.txt
@@ -4,7 +4,7 @@
## deleteLater Binary:
#####################################################################
-add_qt_executable(deleteLater
+qt_add_executable(deleteLater
NO_INSTALL # special case
OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
SOURCES
diff --git a/tests/auto/testlib/selftests/deleteLater_noApp/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/deleteLater_noApp/.prev_CMakeLists.txt
index bd90a192ac..88bb80bd67 100644
--- a/tests/auto/testlib/selftests/deleteLater_noApp/.prev_CMakeLists.txt
+++ b/tests/auto/testlib/selftests/deleteLater_noApp/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
## deleteLater_noApp Binary:
#####################################################################
-add_qt_executable(deleteLater_noApp
+qt_add_executable(deleteLater_noApp
SOURCES
tst_deleteLater_noApp.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/testlib/selftests/deleteLater_noApp/CMakeLists.txt b/tests/auto/testlib/selftests/deleteLater_noApp/CMakeLists.txt
index 4fe6d01a58..f681aafc35 100644
--- a/tests/auto/testlib/selftests/deleteLater_noApp/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/deleteLater_noApp/CMakeLists.txt
@@ -4,7 +4,7 @@
## deleteLater_noApp Binary:
#####################################################################
-add_qt_executable(deleteLater_noApp
+qt_add_executable(deleteLater_noApp
NO_INSTALL # special case
OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
SOURCES
diff --git a/tests/auto/testlib/selftests/differentexec/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/differentexec/.prev_CMakeLists.txt
index 9cab4de93b..69e37e0699 100644
--- a/tests/auto/testlib/selftests/differentexec/.prev_CMakeLists.txt
+++ b/tests/auto/testlib/selftests/differentexec/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
## differentexec Binary:
#####################################################################
-add_qt_executable(differentexec
+qt_add_executable(differentexec
SOURCES
tst_differentexec.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/testlib/selftests/differentexec/CMakeLists.txt b/tests/auto/testlib/selftests/differentexec/CMakeLists.txt
index 49bcb6e4f0..45e0a948fd 100644
--- a/tests/auto/testlib/selftests/differentexec/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/differentexec/CMakeLists.txt
@@ -4,7 +4,7 @@
## differentexec Binary:
#####################################################################
-add_qt_executable(differentexec
+qt_add_executable(differentexec
NO_INSTALL # special case
OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
SOURCES
diff --git a/tests/auto/testlib/selftests/exceptionthrow/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/exceptionthrow/.prev_CMakeLists.txt
index fdd95e0805..db2c576930 100644
--- a/tests/auto/testlib/selftests/exceptionthrow/.prev_CMakeLists.txt
+++ b/tests/auto/testlib/selftests/exceptionthrow/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
## exceptionthrow Binary:
#####################################################################
-add_qt_executable(exceptionthrow
+qt_add_executable(exceptionthrow
EXCEPTIONS
SOURCES
tst_exceptionthrow.cpp
diff --git a/tests/auto/testlib/selftests/exceptionthrow/CMakeLists.txt b/tests/auto/testlib/selftests/exceptionthrow/CMakeLists.txt
index c6e37864f1..33ecfe585c 100644
--- a/tests/auto/testlib/selftests/exceptionthrow/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/exceptionthrow/CMakeLists.txt
@@ -4,7 +4,7 @@
## exceptionthrow Binary:
#####################################################################
-add_qt_executable(exceptionthrow
+qt_add_executable(exceptionthrow
EXCEPTIONS
NO_INSTALL # special case
OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
diff --git a/tests/auto/testlib/selftests/expectfail/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/expectfail/.prev_CMakeLists.txt
index 175bd8129a..faa09bbc6c 100644
--- a/tests/auto/testlib/selftests/expectfail/.prev_CMakeLists.txt
+++ b/tests/auto/testlib/selftests/expectfail/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
## expectfail Binary:
#####################################################################
-add_qt_executable(expectfail
+qt_add_executable(expectfail
SOURCES
tst_expectfail.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/testlib/selftests/expectfail/CMakeLists.txt b/tests/auto/testlib/selftests/expectfail/CMakeLists.txt
index d4b0ee3f62..a7b072cfd3 100644
--- a/tests/auto/testlib/selftests/expectfail/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/expectfail/CMakeLists.txt
@@ -4,7 +4,7 @@
## expectfail Binary:
#####################################################################
-add_qt_executable(expectfail
+qt_add_executable(expectfail
NO_INSTALL # special case
OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
SOURCES
diff --git a/tests/auto/testlib/selftests/failcleanup/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/failcleanup/.prev_CMakeLists.txt
index 6369874983..6a8238af81 100644
--- a/tests/auto/testlib/selftests/failcleanup/.prev_CMakeLists.txt
+++ b/tests/auto/testlib/selftests/failcleanup/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
## failcleanup Binary:
#####################################################################
-add_qt_executable(failcleanup
+qt_add_executable(failcleanup
SOURCES
tst_failcleanup.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/testlib/selftests/failcleanup/CMakeLists.txt b/tests/auto/testlib/selftests/failcleanup/CMakeLists.txt
index 8c7c02bb5d..fc02ec1fed 100644
--- a/tests/auto/testlib/selftests/failcleanup/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/failcleanup/CMakeLists.txt
@@ -4,7 +4,7 @@
## failcleanup Binary:
#####################################################################
-add_qt_executable(failcleanup
+qt_add_executable(failcleanup
NO_INSTALL # special case
OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
SOURCES
diff --git a/tests/auto/testlib/selftests/faildatatype/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/faildatatype/.prev_CMakeLists.txt
index e03a4333bd..2c67f1d445 100644
--- a/tests/auto/testlib/selftests/faildatatype/.prev_CMakeLists.txt
+++ b/tests/auto/testlib/selftests/faildatatype/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
## faildatatype Binary:
#####################################################################
-add_qt_executable(faildatatype
+qt_add_executable(faildatatype
SOURCES
tst_faildatatype.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/testlib/selftests/faildatatype/CMakeLists.txt b/tests/auto/testlib/selftests/faildatatype/CMakeLists.txt
index 65051d3183..45c8e46777 100644
--- a/tests/auto/testlib/selftests/faildatatype/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/faildatatype/CMakeLists.txt
@@ -4,7 +4,7 @@
## faildatatype Binary:
#####################################################################
-add_qt_executable(faildatatype
+qt_add_executable(faildatatype
NO_INSTALL # special case
OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
SOURCES
diff --git a/tests/auto/testlib/selftests/failfetchtype/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/failfetchtype/.prev_CMakeLists.txt
index 6ab21d845f..0323acd635 100644
--- a/tests/auto/testlib/selftests/failfetchtype/.prev_CMakeLists.txt
+++ b/tests/auto/testlib/selftests/failfetchtype/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
## failfetchtype Binary:
#####################################################################
-add_qt_executable(failfetchtype
+qt_add_executable(failfetchtype
SOURCES
tst_failfetchtype.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/testlib/selftests/failfetchtype/CMakeLists.txt b/tests/auto/testlib/selftests/failfetchtype/CMakeLists.txt
index 2bd6ed310b..7f02dac54b 100644
--- a/tests/auto/testlib/selftests/failfetchtype/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/failfetchtype/CMakeLists.txt
@@ -4,7 +4,7 @@
## failfetchtype Binary:
#####################################################################
-add_qt_executable(failfetchtype
+qt_add_executable(failfetchtype
NO_INSTALL # special case
OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
SOURCES
diff --git a/tests/auto/testlib/selftests/failinit/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/failinit/.prev_CMakeLists.txt
index 22817fa186..42909ca3c5 100644
--- a/tests/auto/testlib/selftests/failinit/.prev_CMakeLists.txt
+++ b/tests/auto/testlib/selftests/failinit/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
## failinit Binary:
#####################################################################
-add_qt_executable(failinit
+qt_add_executable(failinit
SOURCES
tst_failinit.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/testlib/selftests/failinit/CMakeLists.txt b/tests/auto/testlib/selftests/failinit/CMakeLists.txt
index b6c076dbaa..8ad3130c3c 100644
--- a/tests/auto/testlib/selftests/failinit/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/failinit/CMakeLists.txt
@@ -4,7 +4,7 @@
## failinit Binary:
#####################################################################
-add_qt_executable(failinit
+qt_add_executable(failinit
NO_INSTALL # special case
OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
SOURCES
diff --git a/tests/auto/testlib/selftests/failinitdata/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/failinitdata/.prev_CMakeLists.txt
index 5d519c9196..4ae38831a1 100644
--- a/tests/auto/testlib/selftests/failinitdata/.prev_CMakeLists.txt
+++ b/tests/auto/testlib/selftests/failinitdata/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
## failinitdata Binary:
#####################################################################
-add_qt_executable(failinitdata
+qt_add_executable(failinitdata
SOURCES
tst_failinitdata.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/testlib/selftests/failinitdata/CMakeLists.txt b/tests/auto/testlib/selftests/failinitdata/CMakeLists.txt
index a10ad36e08..2679d2eed5 100644
--- a/tests/auto/testlib/selftests/failinitdata/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/failinitdata/CMakeLists.txt
@@ -4,7 +4,7 @@
## failinitdata Binary:
#####################################################################
-add_qt_executable(failinitdata
+qt_add_executable(failinitdata
NO_INSTALL # special case
OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
SOURCES
diff --git a/tests/auto/testlib/selftests/fetchbogus/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/fetchbogus/.prev_CMakeLists.txt
index af1ea19d32..76fee4606d 100644
--- a/tests/auto/testlib/selftests/fetchbogus/.prev_CMakeLists.txt
+++ b/tests/auto/testlib/selftests/fetchbogus/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
## fetchbogus Binary:
#####################################################################
-add_qt_executable(fetchbogus
+qt_add_executable(fetchbogus
SOURCES
tst_fetchbogus.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/testlib/selftests/fetchbogus/CMakeLists.txt b/tests/auto/testlib/selftests/fetchbogus/CMakeLists.txt
index c6a4611e98..7ad4fe65ae 100644
--- a/tests/auto/testlib/selftests/fetchbogus/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/fetchbogus/CMakeLists.txt
@@ -4,7 +4,7 @@
## fetchbogus Binary:
#####################################################################
-add_qt_executable(fetchbogus
+qt_add_executable(fetchbogus
NO_INSTALL # special case
OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
SOURCES
diff --git a/tests/auto/testlib/selftests/findtestdata/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/findtestdata/.prev_CMakeLists.txt
index dc21a4d25f..768abb6824 100644
--- a/tests/auto/testlib/selftests/findtestdata/.prev_CMakeLists.txt
+++ b/tests/auto/testlib/selftests/findtestdata/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
## findtestdata Binary:
#####################################################################
-add_qt_executable(findtestdata
+qt_add_executable(findtestdata
SOURCES
findtestdata.cpp
PUBLIC_LIBRARIES
@@ -16,7 +16,7 @@ set(findtestdata_resource_files
"qt.conf"
)
-add_qt_resource(findtestdata "findtestdata"
+qt_add_resource(findtestdata "findtestdata"
PREFIX
"/qt/etc/"
FILES
diff --git a/tests/auto/testlib/selftests/findtestdata/CMakeLists.txt b/tests/auto/testlib/selftests/findtestdata/CMakeLists.txt
index e565d611c2..2a3302fb3e 100644
--- a/tests/auto/testlib/selftests/findtestdata/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/findtestdata/CMakeLists.txt
@@ -4,7 +4,7 @@
## findtestdata Binary:
#####################################################################
-add_qt_executable(findtestdata
+qt_add_executable(findtestdata
NO_INSTALL # special case
OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
SOURCES
@@ -18,7 +18,7 @@ set(findtestdata_resource_files
"qt.conf"
)
-add_qt_resource(findtestdata "findtestdata"
+qt_add_resource(findtestdata "findtestdata"
PREFIX
"/qt/etc/"
FILES
diff --git a/tests/auto/testlib/selftests/float/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/float/.prev_CMakeLists.txt
index dfcf2349ad..8b47df4c03 100644
--- a/tests/auto/testlib/selftests/float/.prev_CMakeLists.txt
+++ b/tests/auto/testlib/selftests/float/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
## float Binary:
#####################################################################
-add_qt_executable(float
+qt_add_executable(float
SOURCES
../../../../shared/emulationdetector.h
tst_float.cpp
diff --git a/tests/auto/testlib/selftests/float/CMakeLists.txt b/tests/auto/testlib/selftests/float/CMakeLists.txt
index 0fd7e4f455..2eb3264acd 100644
--- a/tests/auto/testlib/selftests/float/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/float/CMakeLists.txt
@@ -4,7 +4,7 @@
## float Binary:
#####################################################################
-add_qt_executable(float
+qt_add_executable(float
NO_INSTALL # special case
OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
SOURCES
diff --git a/tests/auto/testlib/selftests/globaldata/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/globaldata/.prev_CMakeLists.txt
index 1cff8f1b27..0ad5394732 100644
--- a/tests/auto/testlib/selftests/globaldata/.prev_CMakeLists.txt
+++ b/tests/auto/testlib/selftests/globaldata/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
## globaldata Binary:
#####################################################################
-add_qt_executable(globaldata
+qt_add_executable(globaldata
SOURCES
tst_globaldata.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/testlib/selftests/globaldata/CMakeLists.txt b/tests/auto/testlib/selftests/globaldata/CMakeLists.txt
index 679b54cbb4..a2035f4bcf 100644
--- a/tests/auto/testlib/selftests/globaldata/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/globaldata/CMakeLists.txt
@@ -4,7 +4,7 @@
## globaldata Binary:
#####################################################################
-add_qt_executable(globaldata
+qt_add_executable(globaldata
NO_INSTALL # special case
OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
SOURCES
diff --git a/tests/auto/testlib/selftests/keyboard/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/keyboard/.prev_CMakeLists.txt
index 86c58467bf..3eb954cfa6 100644
--- a/tests/auto/testlib/selftests/keyboard/.prev_CMakeLists.txt
+++ b/tests/auto/testlib/selftests/keyboard/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
## keyboard Binary:
#####################################################################
-add_qt_executable(keyboard
+qt_add_executable(keyboard
SOURCES
tst_keyboard.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/testlib/selftests/keyboard/CMakeLists.txt b/tests/auto/testlib/selftests/keyboard/CMakeLists.txt
index 88fab9284a..120cf1f82c 100644
--- a/tests/auto/testlib/selftests/keyboard/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/keyboard/CMakeLists.txt
@@ -4,7 +4,7 @@
## keyboard Binary:
#####################################################################
-add_qt_executable(keyboard
+qt_add_executable(keyboard
NO_INSTALL # special case
OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
SOURCES
diff --git a/tests/auto/testlib/selftests/longstring/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/longstring/.prev_CMakeLists.txt
index 9f1c6bc8ad..f2757e9760 100644
--- a/tests/auto/testlib/selftests/longstring/.prev_CMakeLists.txt
+++ b/tests/auto/testlib/selftests/longstring/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
## longstring Binary:
#####################################################################
-add_qt_executable(longstring
+qt_add_executable(longstring
SOURCES
tst_longstring.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/testlib/selftests/longstring/CMakeLists.txt b/tests/auto/testlib/selftests/longstring/CMakeLists.txt
index f4a0defd1c..66554f871e 100644
--- a/tests/auto/testlib/selftests/longstring/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/longstring/CMakeLists.txt
@@ -4,7 +4,7 @@
## longstring Binary:
#####################################################################
-add_qt_executable(longstring
+qt_add_executable(longstring
NO_INSTALL # special case
OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
SOURCES
diff --git a/tests/auto/testlib/selftests/maxwarnings/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/maxwarnings/.prev_CMakeLists.txt
index a05c9afb13..a0d3f9f1e0 100644
--- a/tests/auto/testlib/selftests/maxwarnings/.prev_CMakeLists.txt
+++ b/tests/auto/testlib/selftests/maxwarnings/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
## maxwarnings Binary:
#####################################################################
-add_qt_executable(maxwarnings
+qt_add_executable(maxwarnings
SOURCES
maxwarnings.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/testlib/selftests/maxwarnings/CMakeLists.txt b/tests/auto/testlib/selftests/maxwarnings/CMakeLists.txt
index 272188ab76..25c40909de 100644
--- a/tests/auto/testlib/selftests/maxwarnings/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/maxwarnings/CMakeLists.txt
@@ -4,7 +4,7 @@
## maxwarnings Binary:
#####################################################################
-add_qt_executable(maxwarnings
+qt_add_executable(maxwarnings
NO_INSTALL # special case
OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
SOURCES
diff --git a/tests/auto/testlib/selftests/mouse/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/mouse/.prev_CMakeLists.txt
index 4308195d73..88749cbd57 100644
--- a/tests/auto/testlib/selftests/mouse/.prev_CMakeLists.txt
+++ b/tests/auto/testlib/selftests/mouse/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
## mouse Binary:
#####################################################################
-add_qt_executable(mouse
+qt_add_executable(mouse
SOURCES
tst_mouse.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/testlib/selftests/mouse/CMakeLists.txt b/tests/auto/testlib/selftests/mouse/CMakeLists.txt
index 7a99f3d55f..3059947fe2 100644
--- a/tests/auto/testlib/selftests/mouse/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/mouse/CMakeLists.txt
@@ -4,7 +4,7 @@
## mouse Binary:
#####################################################################
-add_qt_executable(mouse
+qt_add_executable(mouse
NO_INSTALL # special case
OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
SOURCES
diff --git a/tests/auto/testlib/selftests/multiexec/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/multiexec/.prev_CMakeLists.txt
index 6c237edd05..746399f451 100644
--- a/tests/auto/testlib/selftests/multiexec/.prev_CMakeLists.txt
+++ b/tests/auto/testlib/selftests/multiexec/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
## multiexec Binary:
#####################################################################
-add_qt_executable(multiexec
+qt_add_executable(multiexec
SOURCES
tst_multiexec.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/testlib/selftests/multiexec/CMakeLists.txt b/tests/auto/testlib/selftests/multiexec/CMakeLists.txt
index 88dbc7b53b..5ccd011975 100644
--- a/tests/auto/testlib/selftests/multiexec/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/multiexec/CMakeLists.txt
@@ -4,7 +4,7 @@
## multiexec Binary:
#####################################################################
-add_qt_executable(multiexec
+qt_add_executable(multiexec
NO_INSTALL # special case
OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
SOURCES
diff --git a/tests/auto/testlib/selftests/pairdiagnostics/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/pairdiagnostics/.prev_CMakeLists.txt
index 05e8518413..30ca138997 100644
--- a/tests/auto/testlib/selftests/pairdiagnostics/.prev_CMakeLists.txt
+++ b/tests/auto/testlib/selftests/pairdiagnostics/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
## pairdiagnostics Binary:
#####################################################################
-add_qt_executable(pairdiagnostics
+qt_add_executable(pairdiagnostics
SOURCES
tst_pairdiagnostics.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/testlib/selftests/pairdiagnostics/CMakeLists.txt b/tests/auto/testlib/selftests/pairdiagnostics/CMakeLists.txt
index 11de82b1c5..ce5faf810b 100644
--- a/tests/auto/testlib/selftests/pairdiagnostics/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/pairdiagnostics/CMakeLists.txt
@@ -4,7 +4,7 @@
## pairdiagnostics Binary:
#####################################################################
-add_qt_executable(pairdiagnostics
+qt_add_executable(pairdiagnostics
NO_INSTALL # special case
OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
SOURCES
diff --git a/tests/auto/testlib/selftests/printdatatags/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/printdatatags/.prev_CMakeLists.txt
index 8c9174ca44..174a6faf7c 100644
--- a/tests/auto/testlib/selftests/printdatatags/.prev_CMakeLists.txt
+++ b/tests/auto/testlib/selftests/printdatatags/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
## printdatatags Binary:
#####################################################################
-add_qt_executable(printdatatags
+qt_add_executable(printdatatags
SOURCES
tst_printdatatags.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/testlib/selftests/printdatatags/CMakeLists.txt b/tests/auto/testlib/selftests/printdatatags/CMakeLists.txt
index 0c23a422c7..7ab050857f 100644
--- a/tests/auto/testlib/selftests/printdatatags/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/printdatatags/CMakeLists.txt
@@ -4,7 +4,7 @@
## printdatatags Binary:
#####################################################################
-add_qt_executable(printdatatags
+qt_add_executable(printdatatags
NO_INSTALL # special case
OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
SOURCES
diff --git a/tests/auto/testlib/selftests/printdatatagswithglobaltags/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/printdatatagswithglobaltags/.prev_CMakeLists.txt
index 161051cec4..0922d380d3 100644
--- a/tests/auto/testlib/selftests/printdatatagswithglobaltags/.prev_CMakeLists.txt
+++ b/tests/auto/testlib/selftests/printdatatagswithglobaltags/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
## printdatatagswithglobaltags Binary:
#####################################################################
-add_qt_executable(printdatatagswithglobaltags
+qt_add_executable(printdatatagswithglobaltags
SOURCES
tst_printdatatagswithglobaltags.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/testlib/selftests/printdatatagswithglobaltags/CMakeLists.txt b/tests/auto/testlib/selftests/printdatatagswithglobaltags/CMakeLists.txt
index 5046a59fe7..9d9edf1fae 100644
--- a/tests/auto/testlib/selftests/printdatatagswithglobaltags/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/printdatatagswithglobaltags/CMakeLists.txt
@@ -4,7 +4,7 @@
## printdatatagswithglobaltags Binary:
#####################################################################
-add_qt_executable(printdatatagswithglobaltags
+qt_add_executable(printdatatagswithglobaltags
NO_INSTALL # special case
OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
SOURCES
diff --git a/tests/auto/testlib/selftests/qexecstringlist/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/qexecstringlist/.prev_CMakeLists.txt
index 2a33f2dc4d..50cf4d8473 100644
--- a/tests/auto/testlib/selftests/qexecstringlist/.prev_CMakeLists.txt
+++ b/tests/auto/testlib/selftests/qexecstringlist/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
## qexecstringlist Binary:
#####################################################################
-add_qt_executable(qexecstringlist
+qt_add_executable(qexecstringlist
SOURCES
tst_qexecstringlist.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/testlib/selftests/qexecstringlist/CMakeLists.txt b/tests/auto/testlib/selftests/qexecstringlist/CMakeLists.txt
index ea890641ef..22ad5b7911 100644
--- a/tests/auto/testlib/selftests/qexecstringlist/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/qexecstringlist/CMakeLists.txt
@@ -4,7 +4,7 @@
## qexecstringlist Binary:
#####################################################################
-add_qt_executable(qexecstringlist
+qt_add_executable(qexecstringlist
NO_INSTALL # special case
OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
SOURCES
diff --git a/tests/auto/testlib/selftests/signaldumper/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/signaldumper/.prev_CMakeLists.txt
index b3244b899d..e0f9e38293 100644
--- a/tests/auto/testlib/selftests/signaldumper/.prev_CMakeLists.txt
+++ b/tests/auto/testlib/selftests/signaldumper/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
## signaldumper Binary:
#####################################################################
-add_qt_executable(signaldumper
+qt_add_executable(signaldumper
SOURCES
tst_signaldumper.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/testlib/selftests/signaldumper/CMakeLists.txt b/tests/auto/testlib/selftests/signaldumper/CMakeLists.txt
index 588325b7a7..67ae4e690a 100644
--- a/tests/auto/testlib/selftests/signaldumper/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/signaldumper/CMakeLists.txt
@@ -4,7 +4,7 @@
## signaldumper Binary:
#####################################################################
-add_qt_executable(signaldumper
+qt_add_executable(signaldumper
NO_INSTALL # special case
OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
SOURCES
diff --git a/tests/auto/testlib/selftests/silent/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/silent/.prev_CMakeLists.txt
index 113f8aac80..205586621a 100644
--- a/tests/auto/testlib/selftests/silent/.prev_CMakeLists.txt
+++ b/tests/auto/testlib/selftests/silent/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
## silent Binary:
#####################################################################
-add_qt_executable(silent
+qt_add_executable(silent
SOURCES
tst_silent.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/testlib/selftests/silent/CMakeLists.txt b/tests/auto/testlib/selftests/silent/CMakeLists.txt
index c62a590181..873e7e1fe9 100644
--- a/tests/auto/testlib/selftests/silent/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/silent/CMakeLists.txt
@@ -4,7 +4,7 @@
## silent Binary:
#####################################################################
-add_qt_executable(silent
+qt_add_executable(silent
NO_INSTALL # special case
OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
SOURCES
diff --git a/tests/auto/testlib/selftests/singleskip/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/singleskip/.prev_CMakeLists.txt
index 60d4984df8..8813e9a759 100644
--- a/tests/auto/testlib/selftests/singleskip/.prev_CMakeLists.txt
+++ b/tests/auto/testlib/selftests/singleskip/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
## singleskip Binary:
#####################################################################
-add_qt_executable(singleskip
+qt_add_executable(singleskip
SOURCES
tst_singleskip.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/testlib/selftests/singleskip/CMakeLists.txt b/tests/auto/testlib/selftests/singleskip/CMakeLists.txt
index a025bd923f..158c8dd094 100644
--- a/tests/auto/testlib/selftests/singleskip/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/singleskip/CMakeLists.txt
@@ -4,7 +4,7 @@
## singleskip Binary:
#####################################################################
-add_qt_executable(singleskip
+qt_add_executable(singleskip
NO_INSTALL # special case
OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
SOURCES
diff --git a/tests/auto/testlib/selftests/skip/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/skip/.prev_CMakeLists.txt
index 2eaac745a8..74d7e19cf3 100644
--- a/tests/auto/testlib/selftests/skip/.prev_CMakeLists.txt
+++ b/tests/auto/testlib/selftests/skip/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
## skip Binary:
#####################################################################
-add_qt_executable(skip
+qt_add_executable(skip
SOURCES
tst_skip.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/testlib/selftests/skip/CMakeLists.txt b/tests/auto/testlib/selftests/skip/CMakeLists.txt
index cf7767ad65..5b7e35e4ce 100644
--- a/tests/auto/testlib/selftests/skip/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/skip/CMakeLists.txt
@@ -4,7 +4,7 @@
## skip Binary:
#####################################################################
-add_qt_executable(skip
+qt_add_executable(skip
NO_INSTALL # special case
OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
SOURCES
diff --git a/tests/auto/testlib/selftests/skipcleanup/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/skipcleanup/.prev_CMakeLists.txt
index 77673004b2..fba23174bd 100644
--- a/tests/auto/testlib/selftests/skipcleanup/.prev_CMakeLists.txt
+++ b/tests/auto/testlib/selftests/skipcleanup/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
## skipcleanup Binary:
#####################################################################
-add_qt_executable(skipcleanup
+qt_add_executable(skipcleanup
SOURCES
tst_skipcleanup.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/testlib/selftests/skipcleanup/CMakeLists.txt b/tests/auto/testlib/selftests/skipcleanup/CMakeLists.txt
index 7e594f7745..fd64c94d9e 100644
--- a/tests/auto/testlib/selftests/skipcleanup/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/skipcleanup/CMakeLists.txt
@@ -4,7 +4,7 @@
## skipcleanup Binary:
#####################################################################
-add_qt_executable(skipcleanup
+qt_add_executable(skipcleanup
NO_INSTALL # special case
OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
SOURCES
diff --git a/tests/auto/testlib/selftests/skipinit/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/skipinit/.prev_CMakeLists.txt
index 4a36d0fa1c..c9af8b4a2c 100644
--- a/tests/auto/testlib/selftests/skipinit/.prev_CMakeLists.txt
+++ b/tests/auto/testlib/selftests/skipinit/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
## skipinit Binary:
#####################################################################
-add_qt_executable(skipinit
+qt_add_executable(skipinit
SOURCES
tst_skipinit.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/testlib/selftests/skipinit/CMakeLists.txt b/tests/auto/testlib/selftests/skipinit/CMakeLists.txt
index 8d302e4328..564b1cc8a3 100644
--- a/tests/auto/testlib/selftests/skipinit/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/skipinit/CMakeLists.txt
@@ -4,7 +4,7 @@
## skipinit Binary:
#####################################################################
-add_qt_executable(skipinit
+qt_add_executable(skipinit
NO_INSTALL # special case
OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
SOURCES
diff --git a/tests/auto/testlib/selftests/skipinitdata/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/skipinitdata/.prev_CMakeLists.txt
index 7f7773c87c..b369f2f8c0 100644
--- a/tests/auto/testlib/selftests/skipinitdata/.prev_CMakeLists.txt
+++ b/tests/auto/testlib/selftests/skipinitdata/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
## skipinitdata Binary:
#####################################################################
-add_qt_executable(skipinitdata
+qt_add_executable(skipinitdata
SOURCES
tst_skipinitdata.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/testlib/selftests/skipinitdata/CMakeLists.txt b/tests/auto/testlib/selftests/skipinitdata/CMakeLists.txt
index 7f5472fb3e..fb1d77ba12 100644
--- a/tests/auto/testlib/selftests/skipinitdata/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/skipinitdata/CMakeLists.txt
@@ -4,7 +4,7 @@
## skipinitdata Binary:
#####################################################################
-add_qt_executable(skipinitdata
+qt_add_executable(skipinitdata
NO_INSTALL # special case
OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
SOURCES
diff --git a/tests/auto/testlib/selftests/sleep/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/sleep/.prev_CMakeLists.txt
index c176681068..69e4dd0b58 100644
--- a/tests/auto/testlib/selftests/sleep/.prev_CMakeLists.txt
+++ b/tests/auto/testlib/selftests/sleep/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
## sleep Binary:
#####################################################################
-add_qt_executable(sleep
+qt_add_executable(sleep
SOURCES
tst_sleep.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/testlib/selftests/sleep/CMakeLists.txt b/tests/auto/testlib/selftests/sleep/CMakeLists.txt
index 37e05ef360..f77da08532 100644
--- a/tests/auto/testlib/selftests/sleep/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/sleep/CMakeLists.txt
@@ -4,7 +4,7 @@
## sleep Binary:
#####################################################################
-add_qt_executable(sleep
+qt_add_executable(sleep
NO_INSTALL # special case
OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
SOURCES
diff --git a/tests/auto/testlib/selftests/strcmp/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/strcmp/.prev_CMakeLists.txt
index ff5b402328..a02ae81b76 100644
--- a/tests/auto/testlib/selftests/strcmp/.prev_CMakeLists.txt
+++ b/tests/auto/testlib/selftests/strcmp/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
## strcmp Binary:
#####################################################################
-add_qt_executable(strcmp
+qt_add_executable(strcmp
SOURCES
tst_strcmp.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/testlib/selftests/strcmp/CMakeLists.txt b/tests/auto/testlib/selftests/strcmp/CMakeLists.txt
index b942da3320..02898232c5 100644
--- a/tests/auto/testlib/selftests/strcmp/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/strcmp/CMakeLists.txt
@@ -4,7 +4,7 @@
## strcmp Binary:
#####################################################################
-add_qt_executable(strcmp
+qt_add_executable(strcmp
NO_INSTALL # special case
OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
SOURCES
diff --git a/tests/auto/testlib/selftests/subtest/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/subtest/.prev_CMakeLists.txt
index dd4ad850c6..39243acfc9 100644
--- a/tests/auto/testlib/selftests/subtest/.prev_CMakeLists.txt
+++ b/tests/auto/testlib/selftests/subtest/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
## subtest Binary:
#####################################################################
-add_qt_executable(subtest
+qt_add_executable(subtest
SOURCES
tst_subtest.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/testlib/selftests/subtest/CMakeLists.txt b/tests/auto/testlib/selftests/subtest/CMakeLists.txt
index 4b0c892bc3..e27c3a1b4a 100644
--- a/tests/auto/testlib/selftests/subtest/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/subtest/CMakeLists.txt
@@ -4,7 +4,7 @@
## subtest Binary:
#####################################################################
-add_qt_executable(subtest
+qt_add_executable(subtest
NO_INSTALL # special case
OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
SOURCES
diff --git a/tests/auto/testlib/selftests/testlib/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/testlib/.prev_CMakeLists.txt
index 14a5175693..8e95483b3c 100644
--- a/tests/auto/testlib/selftests/testlib/.prev_CMakeLists.txt
+++ b/tests/auto/testlib/selftests/testlib/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
## testlib Binary:
#####################################################################
-add_qt_executable(testlib
+qt_add_executable(testlib
SOURCES
tst_testlib.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/testlib/selftests/testlib/CMakeLists.txt b/tests/auto/testlib/selftests/testlib/CMakeLists.txt
index baa9d908a1..0144bd8eee 100644
--- a/tests/auto/testlib/selftests/testlib/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/testlib/CMakeLists.txt
@@ -4,7 +4,7 @@
## testlib Binary:
#####################################################################
-add_qt_executable(testlib
+qt_add_executable(testlib
NO_INSTALL # special case
OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
SOURCES
diff --git a/tests/auto/testlib/selftests/tuplediagnostics/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/tuplediagnostics/.prev_CMakeLists.txt
index 7b6b107dff..90dd3bf6a9 100644
--- a/tests/auto/testlib/selftests/tuplediagnostics/.prev_CMakeLists.txt
+++ b/tests/auto/testlib/selftests/tuplediagnostics/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
## tuplediagnostics Binary:
#####################################################################
-add_qt_executable(tuplediagnostics
+qt_add_executable(tuplediagnostics
SOURCES
tst_tuplediagnostics.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/testlib/selftests/tuplediagnostics/CMakeLists.txt b/tests/auto/testlib/selftests/tuplediagnostics/CMakeLists.txt
index cdc342cef9..f26a1ea5d6 100644
--- a/tests/auto/testlib/selftests/tuplediagnostics/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/tuplediagnostics/CMakeLists.txt
@@ -4,7 +4,7 @@
## tuplediagnostics Binary:
#####################################################################
-add_qt_executable(tuplediagnostics
+qt_add_executable(tuplediagnostics
NO_INSTALL # special case
OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
SOURCES
diff --git a/tests/auto/testlib/selftests/verbose1/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/verbose1/.prev_CMakeLists.txt
index 2f43297908..bb821ab639 100644
--- a/tests/auto/testlib/selftests/verbose1/.prev_CMakeLists.txt
+++ b/tests/auto/testlib/selftests/verbose1/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
## verbose1 Binary:
#####################################################################
-add_qt_executable(verbose1
+qt_add_executable(verbose1
SOURCES
../counting/tst_counting.cpp
DEFINES
diff --git a/tests/auto/testlib/selftests/verbose1/CMakeLists.txt b/tests/auto/testlib/selftests/verbose1/CMakeLists.txt
index fea93a589f..2a827d4247 100644
--- a/tests/auto/testlib/selftests/verbose1/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/verbose1/CMakeLists.txt
@@ -4,7 +4,7 @@
## verbose1 Binary:
#####################################################################
-add_qt_executable(verbose1
+qt_add_executable(verbose1
NO_INSTALL # special case
OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
SOURCES
diff --git a/tests/auto/testlib/selftests/verbose2/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/verbose2/.prev_CMakeLists.txt
index d55948ee73..fcef3dc5ec 100644
--- a/tests/auto/testlib/selftests/verbose2/.prev_CMakeLists.txt
+++ b/tests/auto/testlib/selftests/verbose2/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
## verbose2 Binary:
#####################################################################
-add_qt_executable(verbose2
+qt_add_executable(verbose2
SOURCES
../counting/tst_counting.cpp
DEFINES
diff --git a/tests/auto/testlib/selftests/verbose2/CMakeLists.txt b/tests/auto/testlib/selftests/verbose2/CMakeLists.txt
index 8be1ebe8a8..99a821d452 100644
--- a/tests/auto/testlib/selftests/verbose2/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/verbose2/CMakeLists.txt
@@ -4,7 +4,7 @@
## verbose2 Binary:
#####################################################################
-add_qt_executable(verbose2
+qt_add_executable(verbose2
NO_INSTALL # special case
OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
SOURCES
diff --git a/tests/auto/testlib/selftests/verifyexceptionthrown/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/verifyexceptionthrown/.prev_CMakeLists.txt
index f4e20fcfc6..a5c4c6c156 100644
--- a/tests/auto/testlib/selftests/verifyexceptionthrown/.prev_CMakeLists.txt
+++ b/tests/auto/testlib/selftests/verifyexceptionthrown/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
## verifyexceptionthrown Binary:
#####################################################################
-add_qt_executable(verifyexceptionthrown
+qt_add_executable(verifyexceptionthrown
EXCEPTIONS
SOURCES
tst_verifyexceptionthrown.cpp
diff --git a/tests/auto/testlib/selftests/verifyexceptionthrown/CMakeLists.txt b/tests/auto/testlib/selftests/verifyexceptionthrown/CMakeLists.txt
index ca0d7dcc07..b6467bdba8 100644
--- a/tests/auto/testlib/selftests/verifyexceptionthrown/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/verifyexceptionthrown/CMakeLists.txt
@@ -4,7 +4,7 @@
## verifyexceptionthrown Binary:
#####################################################################
-add_qt_executable(verifyexceptionthrown
+qt_add_executable(verifyexceptionthrown
EXCEPTIONS
NO_INSTALL # special case
OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
diff --git a/tests/auto/testlib/selftests/warnings/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/warnings/.prev_CMakeLists.txt
index 11fb5098d6..f87eb13b42 100644
--- a/tests/auto/testlib/selftests/warnings/.prev_CMakeLists.txt
+++ b/tests/auto/testlib/selftests/warnings/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
## warnings Binary:
#####################################################################
-add_qt_executable(warnings
+qt_add_executable(warnings
SOURCES
tst_warnings.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/testlib/selftests/warnings/CMakeLists.txt b/tests/auto/testlib/selftests/warnings/CMakeLists.txt
index bc0f4dfdd7..ca8268bd37 100644
--- a/tests/auto/testlib/selftests/warnings/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/warnings/CMakeLists.txt
@@ -4,7 +4,7 @@
## warnings Binary:
#####################################################################
-add_qt_executable(warnings
+qt_add_executable(warnings
NO_INSTALL # special case
OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
SOURCES
diff --git a/tests/auto/testlib/selftests/watchdog/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/watchdog/.prev_CMakeLists.txt
index 1ea502875e..3d21decf53 100644
--- a/tests/auto/testlib/selftests/watchdog/.prev_CMakeLists.txt
+++ b/tests/auto/testlib/selftests/watchdog/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
## watchdog Binary:
#####################################################################
-add_qt_executable(watchdog
+qt_add_executable(watchdog
SOURCES
tst_watchdog.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/testlib/selftests/watchdog/CMakeLists.txt b/tests/auto/testlib/selftests/watchdog/CMakeLists.txt
index 25491dc3d4..8fed7f8d79 100644
--- a/tests/auto/testlib/selftests/watchdog/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/watchdog/CMakeLists.txt
@@ -4,7 +4,7 @@
## watchdog Binary:
#####################################################################
-add_qt_executable(watchdog
+qt_add_executable(watchdog
NO_INSTALL # special case
OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
SOURCES
diff --git a/tests/auto/testlib/selftests/xunit/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/xunit/.prev_CMakeLists.txt
index 6a55c59e00..7ba9f32691 100644
--- a/tests/auto/testlib/selftests/xunit/.prev_CMakeLists.txt
+++ b/tests/auto/testlib/selftests/xunit/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
## xunit Binary:
#####################################################################
-add_qt_executable(xunit
+qt_add_executable(xunit
SOURCES
tst_xunit.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/testlib/selftests/xunit/CMakeLists.txt b/tests/auto/testlib/selftests/xunit/CMakeLists.txt
index 5ed90af264..5474ae91f6 100644
--- a/tests/auto/testlib/selftests/xunit/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/xunit/CMakeLists.txt
@@ -4,7 +4,7 @@
## xunit Binary:
#####################################################################
-add_qt_executable(xunit
+qt_add_executable(xunit
NO_INSTALL # special case
OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
SOURCES
diff --git a/tests/auto/tools/qdbuscpp2xml/CMakeLists.txt b/tests/auto/tools/qdbuscpp2xml/CMakeLists.txt
index eaceac37b3..83819cf2c6 100644
--- a/tests/auto/tools/qdbuscpp2xml/CMakeLists.txt
+++ b/tests/auto/tools/qdbuscpp2xml/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qdbuscpp2xml Test:
#####################################################################
-add_qt_test(tst_qdbuscpp2xml
+qt_add_test(tst_qdbuscpp2xml
SOURCES
test1.h
tst_qdbuscpp2xml.cpp
@@ -17,7 +17,7 @@ set(qdbuscpp2xml_resource_files
"test1.h"
)
-add_qt_resource(tst_qdbuscpp2xml "qdbuscpp2xml"
+qt_add_resource(tst_qdbuscpp2xml "qdbuscpp2xml"
PREFIX
"/tst_qdbuscpp2xml/"
FILES
diff --git a/tests/auto/tools/qdbusxml2cpp/CMakeLists.txt b/tests/auto/tools/qdbusxml2cpp/CMakeLists.txt
index 8095421637..6a24094462 100644
--- a/tests/auto/tools/qdbusxml2cpp/CMakeLists.txt
+++ b/tests/auto/tools/qdbusxml2cpp/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qdbusxml2cpp Test:
#####################################################################
-add_qt_test(tst_qdbusxml2cpp
+qt_add_test(tst_qdbusxml2cpp
SOURCES
tst_qdbusxml2cpp.cpp
)
diff --git a/tests/auto/tools/qmake/CMakeLists.txt b/tests/auto/tools/qmake/CMakeLists.txt
index 48b88a2285..adb2da7916 100644
--- a/tests/auto/tools/qmake/CMakeLists.txt
+++ b/tests/auto/tools/qmake/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
testdata/*)
list(APPEND test_data ${test_data_glob})
-add_qt_test(tst_qmake
+qt_add_test(tst_qmake
SOURCES
testcompiler.cpp testcompiler.h
tst_qmake.cpp
diff --git a/tests/auto/tools/qmakelib/CMakeLists.txt b/tests/auto/tools/qmakelib/CMakeLists.txt
index abb8e62c95..c95ef2fe0f 100644
--- a/tests/auto/tools/qmakelib/CMakeLists.txt
+++ b/tests/auto/tools/qmakelib/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qmakelib Test:
#####################################################################
-add_qt_test(tst_qmakelib
+qt_add_test(tst_qmakelib
SOURCES
../../../../qmake/library/ioutils.cpp
../../../../qmake/library/proitems.cpp
@@ -29,7 +29,7 @@ add_qt_test(tst_qmakelib
## Scopes:
#####################################################################
-extend_target(tst_qmakelib CONDITION WIN32
+qt_extend_target(tst_qmakelib CONDITION WIN32
PUBLIC_LIBRARIES
advapi32
)
diff --git a/tests/auto/tools/uic/CMakeLists.txt b/tests/auto/tools/uic/CMakeLists.txt
index f7d91dccbe..2f8b8aa648 100644
--- a/tests/auto/tools/uic/CMakeLists.txt
+++ b/tests/auto/tools/uic/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_uic Test:
#####################################################################
-add_qt_test(tst_uic
+qt_add_test(tst_uic
SOURCES
tst_uic.cpp
)
diff --git a/tests/auto/widgets/dialogs/qcolordialog/CMakeLists.txt b/tests/auto/widgets/dialogs/qcolordialog/CMakeLists.txt
index 81ffdeff90..e0c25e381b 100644
--- a/tests/auto/widgets/dialogs/qcolordialog/CMakeLists.txt
+++ b/tests/auto/widgets/dialogs/qcolordialog/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qcolordialog Test:
#####################################################################
-add_qt_test(tst_qcolordialog
+qt_add_test(tst_qcolordialog
SOURCES
tst_qcolordialog.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/widgets/dialogs/qdialog/CMakeLists.txt b/tests/auto/widgets/dialogs/qdialog/CMakeLists.txt
index 2c003f6fb6..54bfb2aedb 100644
--- a/tests/auto/widgets/dialogs/qdialog/CMakeLists.txt
+++ b/tests/auto/widgets/dialogs/qdialog/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qdialog Test:
#####################################################################
-add_qt_test(tst_qdialog
+qt_add_test(tst_qdialog
SOURCES
tst_qdialog.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/widgets/dialogs/qerrormessage/CMakeLists.txt b/tests/auto/widgets/dialogs/qerrormessage/CMakeLists.txt
index 9463020c66..1120c2b53b 100644
--- a/tests/auto/widgets/dialogs/qerrormessage/CMakeLists.txt
+++ b/tests/auto/widgets/dialogs/qerrormessage/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qerrormessage Test:
#####################################################################
-add_qt_test(tst_qerrormessage
+qt_add_test(tst_qerrormessage
SOURCES
tst_qerrormessage.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/widgets/dialogs/qfiledialog/CMakeLists.txt b/tests/auto/widgets/dialogs/qfiledialog/CMakeLists.txt
index 7b6d004776..a1f37df137 100644
--- a/tests/auto/widgets/dialogs/qfiledialog/CMakeLists.txt
+++ b/tests/auto/widgets/dialogs/qfiledialog/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qfiledialog Test:
#####################################################################
-add_qt_test(tst_qfiledialog
+qt_add_test(tst_qfiledialog
SOURCES
tst_qfiledialog.cpp
DEFINES
diff --git a/tests/auto/widgets/dialogs/qfiledialog2/CMakeLists.txt b/tests/auto/widgets/dialogs/qfiledialog2/CMakeLists.txt
index 2fb610a784..6fae963999 100644
--- a/tests/auto/widgets/dialogs/qfiledialog2/CMakeLists.txt
+++ b/tests/auto/widgets/dialogs/qfiledialog2/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qfiledialog2 Test:
#####################################################################
-add_qt_test(tst_qfiledialog2
+qt_add_test(tst_qfiledialog2
SOURCES
tst_qfiledialog2.cpp
DEFINES
diff --git a/tests/auto/widgets/dialogs/qfilesystemmodel/CMakeLists.txt b/tests/auto/widgets/dialogs/qfilesystemmodel/CMakeLists.txt
index 346e2a7d5a..595b30bd56 100644
--- a/tests/auto/widgets/dialogs/qfilesystemmodel/CMakeLists.txt
+++ b/tests/auto/widgets/dialogs/qfilesystemmodel/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qfilesystemmodel Test:
#####################################################################
-add_qt_test(tst_qfilesystemmodel
+qt_add_test(tst_qfilesystemmodel
SOURCES
../../../../shared/emulationdetector.h
tst_qfilesystemmodel.cpp
diff --git a/tests/auto/widgets/dialogs/qfontdialog/CMakeLists.txt b/tests/auto/widgets/dialogs/qfontdialog/CMakeLists.txt
index af858c8946..e8a6d368b8 100644
--- a/tests/auto/widgets/dialogs/qfontdialog/CMakeLists.txt
+++ b/tests/auto/widgets/dialogs/qfontdialog/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qfontdialog Test:
#####################################################################
-add_qt_test(tst_qfontdialog
+qt_add_test(tst_qfontdialog
SOURCES
tst_qfontdialog.cpp
PUBLIC_LIBRARIES
@@ -27,7 +27,7 @@ set(testfonts_resource_files
"../../../shared/resources/testfont.ttf"
)
-add_qt_resource(tst_qfontdialog "testfonts"
+qt_add_resource(tst_qfontdialog "testfonts"
PREFIX
"/"
FILES
diff --git a/tests/auto/widgets/dialogs/qinputdialog/CMakeLists.txt b/tests/auto/widgets/dialogs/qinputdialog/CMakeLists.txt
index 7cd02a04c0..9cd73ef4f1 100644
--- a/tests/auto/widgets/dialogs/qinputdialog/CMakeLists.txt
+++ b/tests/auto/widgets/dialogs/qinputdialog/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qinputdialog Test:
#####################################################################
-add_qt_test(tst_qinputdialog
+qt_add_test(tst_qinputdialog
SOURCES
tst_qinputdialog.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/widgets/dialogs/qmessagebox/CMakeLists.txt b/tests/auto/widgets/dialogs/qmessagebox/CMakeLists.txt
index ae12c58ca2..f26171f08a 100644
--- a/tests/auto/widgets/dialogs/qmessagebox/CMakeLists.txt
+++ b/tests/auto/widgets/dialogs/qmessagebox/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qmessagebox Test:
#####################################################################
-add_qt_test(tst_qmessagebox
+qt_add_test(tst_qmessagebox
SOURCES
tst_qmessagebox.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/widgets/dialogs/qprogressdialog/CMakeLists.txt b/tests/auto/widgets/dialogs/qprogressdialog/CMakeLists.txt
index 2f20ff0d81..f3d7fc365b 100644
--- a/tests/auto/widgets/dialogs/qprogressdialog/CMakeLists.txt
+++ b/tests/auto/widgets/dialogs/qprogressdialog/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qprogressdialog Test:
#####################################################################
-add_qt_test(tst_qprogressdialog
+qt_add_test(tst_qprogressdialog
SOURCES
tst_qprogressdialog.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/widgets/dialogs/qsidebar/CMakeLists.txt b/tests/auto/widgets/dialogs/qsidebar/CMakeLists.txt
index d1e2a6686c..d92fac5253 100644
--- a/tests/auto/widgets/dialogs/qsidebar/CMakeLists.txt
+++ b/tests/auto/widgets/dialogs/qsidebar/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qsidebar Test:
#####################################################################
-add_qt_test(tst_qsidebar
+qt_add_test(tst_qsidebar
SOURCES
tst_qsidebar.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/widgets/dialogs/qwizard/CMakeLists.txt b/tests/auto/widgets/dialogs/qwizard/CMakeLists.txt
index bbe7bddd9d..f385812b40 100644
--- a/tests/auto/widgets/dialogs/qwizard/CMakeLists.txt
+++ b/tests/auto/widgets/dialogs/qwizard/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qwizard Test:
#####################################################################
-add_qt_test(tst_qwizard
+qt_add_test(tst_qwizard
SOURCES
tst_qwizard.cpp
tst_qwizard_2.cpp
@@ -21,7 +21,7 @@ set(qwizard_resource_files
"images/watermark.png"
)
-add_qt_resource(tst_qwizard "qwizard"
+qt_add_resource(tst_qwizard "qwizard"
PREFIX
"/"
FILES
diff --git a/tests/auto/widgets/effects/qgraphicseffect/CMakeLists.txt b/tests/auto/widgets/effects/qgraphicseffect/CMakeLists.txt
index 4cdeb6b4e5..b8665dc2d2 100644
--- a/tests/auto/widgets/effects/qgraphicseffect/CMakeLists.txt
+++ b/tests/auto/widgets/effects/qgraphicseffect/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qgraphicseffect Test:
#####################################################################
-add_qt_test(tst_qgraphicseffect
+qt_add_test(tst_qgraphicseffect
SOURCES
tst_qgraphicseffect.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/widgets/effects/qpixmapfilter/CMakeLists.txt b/tests/auto/widgets/effects/qpixmapfilter/CMakeLists.txt
index 6ffd2c4029..56feb2c09e 100644
--- a/tests/auto/widgets/effects/qpixmapfilter/CMakeLists.txt
+++ b/tests/auto/widgets/effects/qpixmapfilter/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qpixmapfilter Test:
#####################################################################
-add_qt_test(tst_qpixmapfilter
+qt_add_test(tst_qpixmapfilter
SOURCES
tst_qpixmapfilter.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/widgets/graphicsview/qgraphicsanchorlayout/CMakeLists.txt b/tests/auto/widgets/graphicsview/qgraphicsanchorlayout/CMakeLists.txt
index db323fcb15..8bf6a5b5ad 100644
--- a/tests/auto/widgets/graphicsview/qgraphicsanchorlayout/CMakeLists.txt
+++ b/tests/auto/widgets/graphicsview/qgraphicsanchorlayout/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qgraphicsanchorlayout Test:
#####################################################################
-add_qt_test(tst_qgraphicsanchorlayout
+qt_add_test(tst_qgraphicsanchorlayout
SOURCES
tst_qgraphicsanchorlayout.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/widgets/graphicsview/qgraphicsanchorlayout1/CMakeLists.txt b/tests/auto/widgets/graphicsview/qgraphicsanchorlayout1/CMakeLists.txt
index 9d9fc68832..a945cbf86f 100644
--- a/tests/auto/widgets/graphicsview/qgraphicsanchorlayout1/CMakeLists.txt
+++ b/tests/auto/widgets/graphicsview/qgraphicsanchorlayout1/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qgraphicsanchorlayout1 Test:
#####################################################################
-add_qt_test(tst_qgraphicsanchorlayout1
+qt_add_test(tst_qgraphicsanchorlayout1
SOURCES
tst_qgraphicsanchorlayout1.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/widgets/graphicsview/qgraphicseffectsource/CMakeLists.txt b/tests/auto/widgets/graphicsview/qgraphicseffectsource/CMakeLists.txt
index ac1ac91f8b..a508934554 100644
--- a/tests/auto/widgets/graphicsview/qgraphicseffectsource/CMakeLists.txt
+++ b/tests/auto/widgets/graphicsview/qgraphicseffectsource/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qgraphicseffectsource Test:
#####################################################################
-add_qt_test(tst_qgraphicseffectsource
+qt_add_test(tst_qgraphicseffectsource
SOURCES
tst_qgraphicseffectsource.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/widgets/graphicsview/qgraphicsgridlayout/CMakeLists.txt b/tests/auto/widgets/graphicsview/qgraphicsgridlayout/CMakeLists.txt
index c02f142182..778f30d7bf 100644
--- a/tests/auto/widgets/graphicsview/qgraphicsgridlayout/CMakeLists.txt
+++ b/tests/auto/widgets/graphicsview/qgraphicsgridlayout/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qgraphicsgridlayout Test:
#####################################################################
-add_qt_test(tst_qgraphicsgridlayout
+qt_add_test(tst_qgraphicsgridlayout
SOURCES
tst_qgraphicsgridlayout.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/widgets/graphicsview/qgraphicsitem/CMakeLists.txt b/tests/auto/widgets/graphicsview/qgraphicsitem/CMakeLists.txt
index 81cdeeb84a..013315c9b2 100644
--- a/tests/auto/widgets/graphicsview/qgraphicsitem/CMakeLists.txt
+++ b/tests/auto/widgets/graphicsview/qgraphicsitem/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qgraphicsitem Test:
#####################################################################
-add_qt_test(tst_qgraphicsitem
+qt_add_test(tst_qgraphicsitem
SOURCES
tst_qgraphicsitem.cpp
DEFINES
@@ -21,7 +21,7 @@ add_qt_test(tst_qgraphicsitem
## Scopes:
#####################################################################
-extend_target(tst_qgraphicsitem CONDITION WIN32
+qt_extend_target(tst_qgraphicsitem CONDITION WIN32
PUBLIC_LIBRARIES
user32
)
diff --git a/tests/auto/widgets/graphicsview/qgraphicsitemanimation/CMakeLists.txt b/tests/auto/widgets/graphicsview/qgraphicsitemanimation/CMakeLists.txt
index 179b6c8497..63adc2ea78 100644
--- a/tests/auto/widgets/graphicsview/qgraphicsitemanimation/CMakeLists.txt
+++ b/tests/auto/widgets/graphicsview/qgraphicsitemanimation/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qgraphicsitemanimation Test:
#####################################################################
-add_qt_test(tst_qgraphicsitemanimation
+qt_add_test(tst_qgraphicsitemanimation
SOURCES
tst_qgraphicsitemanimation.cpp
DEFINES
diff --git a/tests/auto/widgets/graphicsview/qgraphicslayout/CMakeLists.txt b/tests/auto/widgets/graphicsview/qgraphicslayout/CMakeLists.txt
index 9a149f9df1..f11bcfe0a1 100644
--- a/tests/auto/widgets/graphicsview/qgraphicslayout/CMakeLists.txt
+++ b/tests/auto/widgets/graphicsview/qgraphicslayout/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qgraphicslayout Test:
#####################################################################
-add_qt_test(tst_qgraphicslayout
+qt_add_test(tst_qgraphicslayout
SOURCES
tst_qgraphicslayout.cpp
DEFINES
diff --git a/tests/auto/widgets/graphicsview/qgraphicslayoutitem/CMakeLists.txt b/tests/auto/widgets/graphicsview/qgraphicslayoutitem/CMakeLists.txt
index 56b9f73127..36d7177f22 100644
--- a/tests/auto/widgets/graphicsview/qgraphicslayoutitem/CMakeLists.txt
+++ b/tests/auto/widgets/graphicsview/qgraphicslayoutitem/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qgraphicslayoutitem Test:
#####################################################################
-add_qt_test(tst_qgraphicslayoutitem
+qt_add_test(tst_qgraphicslayoutitem
SOURCES
tst_qgraphicslayoutitem.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/widgets/graphicsview/qgraphicslinearlayout/CMakeLists.txt b/tests/auto/widgets/graphicsview/qgraphicslinearlayout/CMakeLists.txt
index 1a44be75a1..96dbadc4b9 100644
--- a/tests/auto/widgets/graphicsview/qgraphicslinearlayout/CMakeLists.txt
+++ b/tests/auto/widgets/graphicsview/qgraphicslinearlayout/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qgraphicslinearlayout Test:
#####################################################################
-add_qt_test(tst_qgraphicslinearlayout
+qt_add_test(tst_qgraphicslinearlayout
SOURCES
tst_qgraphicslinearlayout.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/widgets/graphicsview/qgraphicsobject/CMakeLists.txt b/tests/auto/widgets/graphicsview/qgraphicsobject/CMakeLists.txt
index 0e29191792..f999e13162 100644
--- a/tests/auto/widgets/graphicsview/qgraphicsobject/CMakeLists.txt
+++ b/tests/auto/widgets/graphicsview/qgraphicsobject/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qgraphicsobject Test:
#####################################################################
-add_qt_test(tst_qgraphicsobject
+qt_add_test(tst_qgraphicsobject
SOURCES
tst_qgraphicsobject.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/widgets/graphicsview/qgraphicspixmapitem/CMakeLists.txt b/tests/auto/widgets/graphicsview/qgraphicspixmapitem/CMakeLists.txt
index cca35623e8..8cb278720b 100644
--- a/tests/auto/widgets/graphicsview/qgraphicspixmapitem/CMakeLists.txt
+++ b/tests/auto/widgets/graphicsview/qgraphicspixmapitem/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qgraphicspixmapitem Test:
#####################################################################
-add_qt_test(tst_qgraphicspixmapitem
+qt_add_test(tst_qgraphicspixmapitem
SOURCES
tst_qgraphicspixmapitem.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/widgets/graphicsview/qgraphicspolygonitem/CMakeLists.txt b/tests/auto/widgets/graphicsview/qgraphicspolygonitem/CMakeLists.txt
index 86c6965756..5742353892 100644
--- a/tests/auto/widgets/graphicsview/qgraphicspolygonitem/CMakeLists.txt
+++ b/tests/auto/widgets/graphicsview/qgraphicspolygonitem/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qgraphicspolygonitem Test:
#####################################################################
-add_qt_test(tst_qgraphicspolygonitem
+qt_add_test(tst_qgraphicspolygonitem
SOURCES
tst_qgraphicspolygonitem.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/widgets/graphicsview/qgraphicsproxywidget/CMakeLists.txt b/tests/auto/widgets/graphicsview/qgraphicsproxywidget/CMakeLists.txt
index accec5ff40..67509dae98 100644
--- a/tests/auto/widgets/graphicsview/qgraphicsproxywidget/CMakeLists.txt
+++ b/tests/auto/widgets/graphicsview/qgraphicsproxywidget/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qgraphicsproxywidget Test:
#####################################################################
-add_qt_test(tst_qgraphicsproxywidget
+qt_add_test(tst_qgraphicsproxywidget
SOURCES
tst_qgraphicsproxywidget.cpp
DEFINES
diff --git a/tests/auto/widgets/graphicsview/qgraphicsscene/CMakeLists.txt b/tests/auto/widgets/graphicsview/qgraphicsscene/CMakeLists.txt
index efcb4598e5..3208cf2b36 100644
--- a/tests/auto/widgets/graphicsview/qgraphicsscene/CMakeLists.txt
+++ b/tests/auto/widgets/graphicsview/qgraphicsscene/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qgraphicsscene Test:
#####################################################################
-add_qt_test(tst_qgraphicsscene
+qt_add_test(tst_qgraphicsscene
SOURCES
tst_qgraphicsscene.cpp
DEFINES
@@ -23,7 +23,7 @@ set(images_resource_files
"Ash_European.jpg"
)
-add_qt_resource(tst_qgraphicsscene "images"
+qt_add_resource(tst_qgraphicsscene "images"
PREFIX
"/"
FILES
@@ -60,7 +60,7 @@ set(testdata_resource_files
"testData/render/topright-topleft-untransformed.png"
)
-add_qt_resource(tst_qgraphicsscene "testdata"
+qt_add_resource(tst_qgraphicsscene "testdata"
PREFIX
"/"
FILES
@@ -71,7 +71,7 @@ add_qt_resource(tst_qgraphicsscene "testdata"
## Scopes:
#####################################################################
-extend_target(tst_qgraphicsscene CONDITION WIN32
+qt_extend_target(tst_qgraphicsscene CONDITION WIN32
PUBLIC_LIBRARIES
user32
)
diff --git a/tests/auto/widgets/graphicsview/qgraphicssceneindex/CMakeLists.txt b/tests/auto/widgets/graphicsview/qgraphicssceneindex/CMakeLists.txt
index 5fa72f7b46..607bcd0ea4 100644
--- a/tests/auto/widgets/graphicsview/qgraphicssceneindex/CMakeLists.txt
+++ b/tests/auto/widgets/graphicsview/qgraphicssceneindex/CMakeLists.txt
@@ -8,7 +8,7 @@ endif()
## tst_qgraphicssceneindex Test:
#####################################################################
-add_qt_test(tst_qgraphicssceneindex
+qt_add_test(tst_qgraphicssceneindex
SOURCES
tst_qgraphicssceneindex.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/widgets/graphicsview/qgraphicstransform/CMakeLists.txt b/tests/auto/widgets/graphicsview/qgraphicstransform/CMakeLists.txt
index 450c0269f3..a3a19931e6 100644
--- a/tests/auto/widgets/graphicsview/qgraphicstransform/CMakeLists.txt
+++ b/tests/auto/widgets/graphicsview/qgraphicstransform/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qgraphicstransform Test:
#####################################################################
-add_qt_test(tst_qgraphicstransform
+qt_add_test(tst_qgraphicstransform
SOURCES
tst_qgraphicstransform.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/widgets/graphicsview/qgraphicsview/CMakeLists.txt b/tests/auto/widgets/graphicsview/qgraphicsview/CMakeLists.txt
index 48064c2bf4..c8ead072a2 100644
--- a/tests/auto/widgets/graphicsview/qgraphicsview/CMakeLists.txt
+++ b/tests/auto/widgets/graphicsview/qgraphicsview/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qgraphicsview Test:
#####################################################################
-add_qt_test(tst_qgraphicsview
+qt_add_test(tst_qgraphicsview
SOURCES
tst_qgraphicsview.cpp tst_qgraphicsview.h
tst_qgraphicsview_2.cpp
@@ -25,7 +25,7 @@ add_qt_test(tst_qgraphicsview
## Scopes:
#####################################################################
-extend_target(tst_qgraphicsview CONDITION QT_FEATURE_opengl
+qt_extend_target(tst_qgraphicsview CONDITION QT_FEATURE_opengl
PUBLIC_LIBRARIES
Qt::OpenGL
Qt::OpenGLWidgets
diff --git a/tests/auto/widgets/graphicsview/qgraphicswidget/CMakeLists.txt b/tests/auto/widgets/graphicsview/qgraphicswidget/CMakeLists.txt
index 7325f7eb21..d519985662 100644
--- a/tests/auto/widgets/graphicsview/qgraphicswidget/CMakeLists.txt
+++ b/tests/auto/widgets/graphicsview/qgraphicswidget/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qgraphicswidget Test:
#####################################################################
-add_qt_test(tst_qgraphicswidget
+qt_add_test(tst_qgraphicswidget
SOURCES
tst_qgraphicswidget.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/widgets/itemviews/qabstractitemview/CMakeLists.txt b/tests/auto/widgets/itemviews/qabstractitemview/CMakeLists.txt
index 2fc8c14eb6..0b292e06f8 100644
--- a/tests/auto/widgets/itemviews/qabstractitemview/CMakeLists.txt
+++ b/tests/auto/widgets/itemviews/qabstractitemview/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qabstractitemview Test:
#####################################################################
-add_qt_test(tst_qabstractitemview
+qt_add_test(tst_qabstractitemview
SOURCES
tst_qabstractitemview.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/widgets/itemviews/qcolumnview/CMakeLists.txt b/tests/auto/widgets/itemviews/qcolumnview/CMakeLists.txt
index d33e3b9c2e..002912d5cf 100644
--- a/tests/auto/widgets/itemviews/qcolumnview/CMakeLists.txt
+++ b/tests/auto/widgets/itemviews/qcolumnview/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qcolumnview Test:
#####################################################################
-add_qt_test(tst_qcolumnview
+qt_add_test(tst_qcolumnview
SOURCES
../../../../shared/fakedirmodel.h
tst_qcolumnview.cpp
diff --git a/tests/auto/widgets/itemviews/qdatawidgetmapper/CMakeLists.txt b/tests/auto/widgets/itemviews/qdatawidgetmapper/CMakeLists.txt
index f3e4af0c23..6cf9cbca43 100644
--- a/tests/auto/widgets/itemviews/qdatawidgetmapper/CMakeLists.txt
+++ b/tests/auto/widgets/itemviews/qdatawidgetmapper/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qdatawidgetmapper Test:
#####################################################################
-add_qt_test(tst_qdatawidgetmapper
+qt_add_test(tst_qdatawidgetmapper
SOURCES
tst_qdatawidgetmapper.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/widgets/itemviews/qfileiconprovider/CMakeLists.txt b/tests/auto/widgets/itemviews/qfileiconprovider/CMakeLists.txt
index 024519ad9c..4107c3584e 100644
--- a/tests/auto/widgets/itemviews/qfileiconprovider/CMakeLists.txt
+++ b/tests/auto/widgets/itemviews/qfileiconprovider/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qfileiconprovider Test:
#####################################################################
-add_qt_test(tst_qfileiconprovider
+qt_add_test(tst_qfileiconprovider
SOURCES
tst_qfileiconprovider.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/widgets/itemviews/qheaderview/CMakeLists.txt b/tests/auto/widgets/itemviews/qheaderview/CMakeLists.txt
index 8949ac4957..d90c12869f 100644
--- a/tests/auto/widgets/itemviews/qheaderview/CMakeLists.txt
+++ b/tests/auto/widgets/itemviews/qheaderview/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qheaderview Test:
#####################################################################
-add_qt_test(tst_qheaderview
+qt_add_test(tst_qheaderview
SOURCES
tst_qheaderview.cpp
DEFINES
diff --git a/tests/auto/widgets/itemviews/qitemdelegate/CMakeLists.txt b/tests/auto/widgets/itemviews/qitemdelegate/CMakeLists.txt
index dfdf263431..3ea37aa737 100644
--- a/tests/auto/widgets/itemviews/qitemdelegate/CMakeLists.txt
+++ b/tests/auto/widgets/itemviews/qitemdelegate/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qitemdelegate Test:
#####################################################################
-add_qt_test(tst_qitemdelegate
+qt_add_test(tst_qitemdelegate
SOURCES
tst_qitemdelegate.cpp
PUBLIC_LIBRARIES
@@ -16,7 +16,7 @@ add_qt_test(tst_qitemdelegate
## Scopes:
#####################################################################
-extend_target(tst_qitemdelegate CONDITION WIN32
+qt_extend_target(tst_qitemdelegate CONDITION WIN32
PUBLIC_LIBRARIES
user32
)
diff --git a/tests/auto/widgets/itemviews/qitemeditorfactory/CMakeLists.txt b/tests/auto/widgets/itemviews/qitemeditorfactory/CMakeLists.txt
index 4dfb46ff4d..e56ec2e865 100644
--- a/tests/auto/widgets/itemviews/qitemeditorfactory/CMakeLists.txt
+++ b/tests/auto/widgets/itemviews/qitemeditorfactory/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qitemeditorfactory Test:
#####################################################################
-add_qt_test(tst_qitemeditorfactory
+qt_add_test(tst_qitemeditorfactory
SOURCES
tst_qitemeditorfactory.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/widgets/itemviews/qitemview/CMakeLists.txt b/tests/auto/widgets/itemviews/qitemview/CMakeLists.txt
index b27f456246..b4331b87ca 100644
--- a/tests/auto/widgets/itemviews/qitemview/CMakeLists.txt
+++ b/tests/auto/widgets/itemviews/qitemview/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qitemview Test:
#####################################################################
-add_qt_test(tst_qitemview
+qt_add_test(tst_qitemview
SOURCES
tst_qitemview.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/widgets/itemviews/qlistview/CMakeLists.txt b/tests/auto/widgets/itemviews/qlistview/CMakeLists.txt
index 6e14ba5c99..4a098c88f2 100644
--- a/tests/auto/widgets/itemviews/qlistview/CMakeLists.txt
+++ b/tests/auto/widgets/itemviews/qlistview/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qlistview Test:
#####################################################################
-add_qt_test(tst_qlistview
+qt_add_test(tst_qlistview
SOURCES
tst_qlistview.cpp
PUBLIC_LIBRARIES
@@ -19,7 +19,7 @@ add_qt_test(tst_qlistview
## Scopes:
#####################################################################
-extend_target(tst_qlistview CONDITION WIN32
+qt_extend_target(tst_qlistview CONDITION WIN32
PUBLIC_LIBRARIES
user32
)
diff --git a/tests/auto/widgets/itemviews/qlistwidget/CMakeLists.txt b/tests/auto/widgets/itemviews/qlistwidget/CMakeLists.txt
index aebcb4c49e..426b9088bc 100644
--- a/tests/auto/widgets/itemviews/qlistwidget/CMakeLists.txt
+++ b/tests/auto/widgets/itemviews/qlistwidget/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qlistwidget Test:
#####################################################################
-add_qt_test(tst_qlistwidget
+qt_add_test(tst_qlistwidget
SOURCES
tst_qlistwidget.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/widgets/itemviews/qtableview/CMakeLists.txt b/tests/auto/widgets/itemviews/qtableview/CMakeLists.txt
index 20e50d2de3..d1291e709d 100644
--- a/tests/auto/widgets/itemviews/qtableview/CMakeLists.txt
+++ b/tests/auto/widgets/itemviews/qtableview/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qtableview Test:
#####################################################################
-add_qt_test(tst_qtableview
+qt_add_test(tst_qtableview
SOURCES
tst_qtableview.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/widgets/itemviews/qtablewidget/CMakeLists.txt b/tests/auto/widgets/itemviews/qtablewidget/CMakeLists.txt
index 66344e9d32..cdb393484a 100644
--- a/tests/auto/widgets/itemviews/qtablewidget/CMakeLists.txt
+++ b/tests/auto/widgets/itemviews/qtablewidget/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qtablewidget Test:
#####################################################################
-add_qt_test(tst_qtablewidget
+qt_add_test(tst_qtablewidget
SOURCES
tst_qtablewidget.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/widgets/itemviews/qtreeview/CMakeLists.txt b/tests/auto/widgets/itemviews/qtreeview/CMakeLists.txt
index 40a6a1a6d6..a6c5adb967 100644
--- a/tests/auto/widgets/itemviews/qtreeview/CMakeLists.txt
+++ b/tests/auto/widgets/itemviews/qtreeview/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qtreeview Test:
#####################################################################
-add_qt_test(tst_qtreeview
+qt_add_test(tst_qtreeview
SOURCES
../../../../shared/fakedirmodel.h
tst_qtreeview.cpp
diff --git a/tests/auto/widgets/itemviews/qtreewidget/CMakeLists.txt b/tests/auto/widgets/itemviews/qtreewidget/CMakeLists.txt
index dde2e9d