diff options
Diffstat (limited to 'tests/auto/corelib')
204 files changed, 288 insertions, 290 deletions
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 ) |