diff options
Diffstat (limited to 'tests/auto/other')
28 files changed, 38 insertions, 54 deletions
diff --git a/tests/auto/other/android/CMakeLists.txt b/tests/auto/other/android/CMakeLists.txt index 437a4ee9d2..d58103679b 100644 --- a/tests/auto/other/android/CMakeLists.txt +++ b/tests/auto/other/android/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_android Test: ##################################################################### -qt_add_test(tst_android +qt_internal_add_test(tst_android SOURCES tst_android.cpp ) diff --git a/tests/auto/other/compiler/.prev_CMakeLists.txt b/tests/auto/other/compiler/.prev_CMakeLists.txt index 4a9cdcef14..7de467460c 100644 --- a/tests/auto/other/compiler/.prev_CMakeLists.txt +++ b/tests/auto/other/compiler/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_compiler Test: ##################################################################### -qt_add_test(tst_compiler +qt_internal_add_test(tst_compiler SOURCES baseclass.cpp baseclass.h derivedclass.cpp derivedclass.h diff --git a/tests/auto/other/compiler/CMakeLists.txt b/tests/auto/other/compiler/CMakeLists.txt index 6aa7c43966..30c7ab1b52 100644 --- a/tests/auto/other/compiler/CMakeLists.txt +++ b/tests/auto/other/compiler/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_compiler Test: ##################################################################### -qt_add_test(tst_compiler +qt_internal_add_test(tst_compiler EXCEPTIONS # special case SOURCES baseclass.cpp baseclass.h diff --git a/tests/auto/other/gestures/CMakeLists.txt b/tests/auto/other/gestures/CMakeLists.txt index 71bcc22f01..e4ea953ee3 100644 --- a/tests/auto/other/gestures/CMakeLists.txt +++ b/tests/auto/other/gestures/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_gestures Test: ##################################################################### -qt_add_test(tst_gestures +qt_internal_add_test(tst_gestures SOURCES tst_gestures.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/other/lancelot/CMakeLists.txt b/tests/auto/other/lancelot/CMakeLists.txt index f485a48ebe..a4598ab65a 100644 --- a/tests/auto/other/lancelot/CMakeLists.txt +++ b/tests/auto/other/lancelot/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob scripts/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_lancelot +qt_internal_add_test(tst_lancelot SOURCES ../../../baselineserver/shared/baselineprotocol.cpp ../../../baselineserver/shared/baselineprotocol.h ../../../baselineserver/shared/lookup3.cpp @@ -61,7 +61,7 @@ set(images_resource_files "images/zebra.png" ) -qt_add_resource(tst_lancelot "images" +qt_internal_add_resource(tst_lancelot "images" PREFIX "/" FILES @@ -72,7 +72,7 @@ qt_add_resource(tst_lancelot "images" ## Scopes: ##################################################################### -qt_extend_target(tst_lancelot CONDITION QT_FEATURE_opengl +qt_internal_extend_target(tst_lancelot CONDITION QT_FEATURE_opengl PUBLIC_LIBRARIES Qt::OpenGL ) diff --git a/tests/auto/other/languagechange/CMakeLists.txt b/tests/auto/other/languagechange/CMakeLists.txt index 0ace85d654..0275ea05fd 100644 --- a/tests/auto/other/languagechange/CMakeLists.txt +++ b/tests/auto/other/languagechange/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_languagechange Test: ##################################################################### -qt_add_test(tst_languagechange +qt_internal_add_test(tst_languagechange SOURCES tst_languagechange.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/other/macgui/.prev_CMakeLists.txt b/tests/auto/other/macgui/.prev_CMakeLists.txt index e9b794dcdc..10facb3050 100644 --- a/tests/auto/other/macgui/.prev_CMakeLists.txt +++ b/tests/auto/other/macgui/.prev_CMakeLists.txt @@ -11,7 +11,7 @@ endif() ## tst_macgui Test: ##################################################################### -qt_add_test(tst_macgui +qt_internal_add_test(tst_macgui SOURCES guitest.cpp guitest.h tst_macgui.cpp @@ -26,7 +26,7 @@ qt_add_test(tst_macgui ## Scopes: ##################################################################### -qt_extend_target(tst_macgui CONDITION MACOS +qt_internal_extend_target(tst_macgui CONDITION MACOS PUBLIC_LIBRARIES ${FWApplicationServices} ) diff --git a/tests/auto/other/macgui/CMakeLists.txt b/tests/auto/other/macgui/CMakeLists.txt index 116049bd85..348d7f1241 100644 --- a/tests/auto/other/macgui/CMakeLists.txt +++ b/tests/auto/other/macgui/CMakeLists.txt @@ -11,7 +11,7 @@ endif() ## tst_macgui Test: ##################################################################### -qt_add_test(tst_macgui +qt_internal_add_test(tst_macgui SOURCES guitest.cpp guitest.h tst_macgui.cpp @@ -26,7 +26,7 @@ qt_add_test(tst_macgui ## Scopes: ##################################################################### -qt_extend_target(tst_macgui CONDITION MACOS +qt_internal_extend_target(tst_macgui CONDITION MACOS PUBLIC_LIBRARIES ${FWApplicationServices} ) diff --git a/tests/auto/other/macnativeevents/CMakeLists.txt b/tests/auto/other/macnativeevents/CMakeLists.txt index f22996a66e..dd049c245a 100644 --- a/tests/auto/other/macnativeevents/CMakeLists.txt +++ b/tests/auto/other/macnativeevents/CMakeLists.txt @@ -8,7 +8,7 @@ endif() ## tst_macnativeevents Test: ##################################################################### -qt_add_test(tst_macnativeevents +qt_internal_add_test(tst_macnativeevents SOURCES expectedeventlist.cpp expectedeventlist.h nativeeventlist.cpp nativeeventlist.h diff --git a/tests/auto/other/macplist/app/.prev_CMakeLists.txt b/tests/auto/other/macplist/app/.prev_CMakeLists.txt index 0cf205bf55..c3c49ffd84 100644 --- a/tests/auto/other/macplist/app/.prev_CMakeLists.txt +++ b/tests/auto/other/macplist/app/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## app Binary: ##################################################################### -qt_add_executable(app +qt_internal_add_executable(app GUI SOURCES main.cpp diff --git a/tests/auto/other/macplist/app/CMakeLists.txt b/tests/auto/other/macplist/app/CMakeLists.txt index 65ccfee32b..127d72b1e4 100644 --- a/tests/auto/other/macplist/app/CMakeLists.txt +++ b/tests/auto/other/macplist/app/CMakeLists.txt @@ -4,7 +4,7 @@ ## app Binary: ##################################################################### -qt_add_executable(app +qt_internal_add_executable(app GUI OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case SOURCES diff --git a/tests/auto/other/macplist/test/CMakeLists.txt b/tests/auto/other/macplist/test/CMakeLists.txt index 23faffbdcf..157df5767f 100644 --- a/tests/auto/other/macplist/test/CMakeLists.txt +++ b/tests/auto/other/macplist/test/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_macplist Test: ##################################################################### -qt_add_test(tst_macplist +qt_internal_add_test(tst_macplist OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../" SOURCES ../tst_macplist.cpp diff --git a/tests/auto/other/networkselftest/CMakeLists.txt b/tests/auto/other/networkselftest/CMakeLists.txt index 7093ed0160..17bbd7fae0 100644 --- a/tests/auto/other/networkselftest/CMakeLists.txt +++ b/tests/auto/other/networkselftest/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_networkselftest Test: ##################################################################### -qt_add_test(tst_networkselftest +qt_internal_add_test(tst_networkselftest SOURCES tst_networkselftest.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/other/qaccessibility/.prev_CMakeLists.txt b/tests/auto/other/qaccessibility/.prev_CMakeLists.txt index edbea40cc2..bbdb16ac89 100644 --- a/tests/auto/other/qaccessibility/.prev_CMakeLists.txt +++ b/tests/auto/other/qaccessibility/.prev_CMakeLists.txt @@ -8,7 +8,7 @@ endif() ## tst_qaccessibility Test: ##################################################################### -qt_add_test(tst_qaccessibility +qt_internal_add_test(tst_qaccessibility SOURCES accessiblewidgets.h tst_qaccessibility.cpp @@ -26,12 +26,12 @@ qt_add_test(tst_qaccessibility ## Scopes: ##################################################################### -qt_extend_target(tst_qaccessibility CONDITION UNIX AND NOT APPLE AND NOT HAIKU AND NOT integity +qt_internal_extend_target(tst_qaccessibility CONDITION UNIX AND NOT APPLE AND NOT HAIKU AND NOT integity PUBLIC_LIBRARIES m ) -qt_extend_target(tst_qaccessibility CONDITION WIN32 +qt_internal_extend_target(tst_qaccessibility CONDITION WIN32 PUBLIC_LIBRARIES ole32 oleacc diff --git a/tests/auto/other/qaccessibility/CMakeLists.txt b/tests/auto/other/qaccessibility/CMakeLists.txt index 53960845ab..9752b19639 100644 --- a/tests/auto/other/qaccessibility/CMakeLists.txt +++ b/tests/auto/other/qaccessibility/CMakeLists.txt @@ -14,7 +14,7 @@ endif() ## tst_qaccessibility Test: ##################################################################### -qt_add_test(tst_qaccessibility +qt_internal_add_test(tst_qaccessibility SOURCES accessiblewidgets.h tst_qaccessibility.cpp @@ -32,12 +32,12 @@ qt_add_test(tst_qaccessibility ## Scopes: ##################################################################### -qt_extend_target(tst_qaccessibility CONDITION UNIX AND NOT APPLE AND NOT HAIKU AND NOT integity +qt_internal_extend_target(tst_qaccessibility CONDITION UNIX AND NOT APPLE AND NOT HAIKU AND NOT integity PUBLIC_LIBRARIES m ) -qt_extend_target(tst_qaccessibility CONDITION WIN32 +qt_internal_extend_target(tst_qaccessibility CONDITION WIN32 PUBLIC_LIBRARIES ole32 oleacc diff --git a/tests/auto/other/qaccessibilitylinux/.prev_CMakeLists.txt b/tests/auto/other/qaccessibilitylinux/.prev_CMakeLists.txt index 8d48b5a0fa..5f7dc751a4 100644 --- a/tests/auto/other/qaccessibilitylinux/.prev_CMakeLists.txt +++ b/tests/auto/other/qaccessibilitylinux/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qaccessibilitylinux Test: ##################################################################### -qt_add_test(tst_qaccessibilitylinux +qt_internal_add_test(tst_qaccessibilitylinux SOURCES tst_qaccessibilitylinux.cpp DBUS_INTERFACE_SOURCES diff --git a/tests/auto/other/qaccessibilitylinux/CMakeLists.txt b/tests/auto/other/qaccessibilitylinux/CMakeLists.txt index 70f0c67f98..ba6443d364 100644 --- a/tests/auto/other/qaccessibilitylinux/CMakeLists.txt +++ b/tests/auto/other/qaccessibilitylinux/CMakeLists.txt @@ -10,7 +10,7 @@ endif() ## tst_qaccessibilitylinux Test: ##################################################################### -qt_add_test(tst_qaccessibilitylinux +qt_internal_add_test(tst_qaccessibilitylinux SOURCES tst_qaccessibilitylinux.cpp DBUS_INTERFACE_SOURCES diff --git a/tests/auto/other/qaccessibilitymac/CMakeLists.txt b/tests/auto/other/qaccessibilitymac/CMakeLists.txt index 40a4527011..6dd30a6fa1 100644 --- a/tests/auto/other/qaccessibilitymac/CMakeLists.txt +++ b/tests/auto/other/qaccessibilitymac/CMakeLists.txt @@ -8,7 +8,7 @@ endif() ## tst_qaccessibilitymac Test: ##################################################################### -qt_add_test(tst_qaccessibilitymac +qt_internal_add_test(tst_qaccessibilitymac SOURCES tst_qaccessibilitymac.cpp tst_qaccessibilitymac_helpers.h @@ -23,7 +23,7 @@ qt_add_test(tst_qaccessibilitymac ## Scopes: ##################################################################### -qt_extend_target(tst_qaccessibilitymac CONDITION APPLE +qt_internal_extend_target(tst_qaccessibilitymac CONDITION APPLE SOURCES tst_qaccessibilitymac_helpers.mm PUBLIC_LIBRARIES diff --git a/tests/auto/other/qcomplextext/CMakeLists.txt b/tests/auto/other/qcomplextext/CMakeLists.txt index 2b5f951267..3a86e9096b 100644 --- a/tests/auto/other/qcomplextext/CMakeLists.txt +++ b/tests/auto/other/qcomplextext/CMakeLists.txt @@ -7,7 +7,7 @@ # Collect test data list(APPEND test_data "data") -qt_add_test(tst_qcomplextext +qt_internal_add_test(tst_qcomplextext SOURCES tst_qcomplextext.cpp PUBLIC_LIBRARIES @@ -27,7 +27,7 @@ if(ANDROID) "data/BidiTest.txt" ) - qt_add_resource(tst_qcomplextext "android_testdata" + qt_internal_add_resource(tst_qcomplextext "android_testdata" PREFIX "/android_testdata" FILES @@ -35,7 +35,7 @@ if(ANDROID) ) endif() -qt_extend_target(tst_qcomplextext CONDITION builtin_testdata +qt_internal_extend_target(tst_qcomplextext CONDITION builtin_testdata DEFINES BUILTIN_TESTDATA ) diff --git a/tests/auto/other/qfocusevent/CMakeLists.txt b/tests/auto/other/qfocusevent/CMakeLists.txt index 01275d7665..d7f8d5982a 100644 --- a/tests/auto/other/qfocusevent/CMakeLists.txt +++ b/tests/auto/other/qfocusevent/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qfocusevent Test: ##################################################################### -qt_add_test(tst_qfocusevent +qt_internal_add_test(tst_qfocusevent SOURCES tst_qfocusevent.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/other/qnetworkaccessmanager_and_qprogressdialog/CMakeLists.txt b/tests/auto/other/qnetworkaccessmanager_and_qprogressdialog/CMakeLists.txt index 1e806d4589..e4041de233 100644 --- a/tests/auto/other/qnetworkaccessmanager_and_qprogressdialog/CMakeLists.txt +++ b/tests/auto/other/qnetworkaccessmanager_and_qprogressdialog/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qnetworkaccessmanager_and_qprogressdialog Test: ##################################################################### -qt_add_test(tst_qnetworkaccessmanager_and_qprogressdialog +qt_internal_add_test(tst_qnetworkaccessmanager_and_qprogressdialog SOURCES tst_qnetworkaccessmanager_and_qprogressdialog.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/other/qobjectrace/CMakeLists.txt b/tests/auto/other/qobjectrace/CMakeLists.txt index c3189b1da6..8069b40ad7 100644 --- a/tests/auto/other/qobjectrace/CMakeLists.txt +++ b/tests/auto/other/qobjectrace/CMakeLists.txt @@ -4,7 +4,7 @@ ## qobjectrace Test: ##################################################################### -qt_add_test(qobjectrace +qt_internal_add_test(qobjectrace SOURCES ../../../shared/emulationdetector.h tst_qobjectrace.cpp diff --git a/tests/auto/other/qprocess_and_guieventloop/CMakeLists.txt b/tests/auto/other/qprocess_and_guieventloop/CMakeLists.txt index cbb2d26a87..126feeeb2d 100644 --- a/tests/auto/other/qprocess_and_guieventloop/CMakeLists.txt +++ b/tests/auto/other/qprocess_and_guieventloop/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qprocess_and_guieventloop Test: ##################################################################### -qt_add_test(tst_qprocess_and_guieventloop +qt_internal_add_test(tst_qprocess_and_guieventloop SOURCES tst_qprocess_and_guieventloop.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/other/qprocess_and_guieventloop/write-read-write/CMakeLists.txt b/tests/auto/other/qprocess_and_guieventloop/write-read-write/CMakeLists.txt index e5b746297f..87a5e14fc3 100644 --- a/tests/auto/other/qprocess_and_guieventloop/write-read-write/CMakeLists.txt +++ b/tests/auto/other/qprocess_and_guieventloop/write-read-write/CMakeLists.txt @@ -4,7 +4,7 @@ ## write-read-write Binary: ##################################################################### -qt_add_executable(write-read-write +qt_internal_add_executable(write-read-write OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" SOURCES main.cpp diff --git a/tests/auto/other/qsharedpointer_and_qwidget/CMakeLists.txt b/tests/auto/other/qsharedpointer_and_qwidget/CMakeLists.txt index 9abf6a010d..8ee04910e7 100644 --- a/tests/auto/other/qsharedpointer_and_qwidget/CMakeLists.txt +++ b/tests/auto/other/qsharedpointer_and_qwidget/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qsharedpointer_and_qwidget Test: ##################################################################### -qt_add_test(tst_qsharedpointer_and_qwidget +qt_internal_add_test(tst_qsharedpointer_and_qwidget SOURCES tst_qsharedpointer_and_qwidget.cpp DEFINES diff --git a/tests/auto/other/qtokenautomaton/CMakeLists.txt b/tests/auto/other/qtokenautomaton/CMakeLists.txt deleted file mode 100644 index f495ddb1c6..0000000000 --- a/tests/auto/other/qtokenautomaton/CMakeLists.txt +++ /dev/null @@ -1,16 +0,0 @@ -# Generated from qtokenautomaton.pro. - -##################################################################### -## tst_qtokenautomaton Test: -##################################################################### - -add_qt_test(tst_qtokenautomaton - SOURCES - tokenizers/basic/basic.cpp tokenizers/basic/basic.h - tokenizers/basicNamespace/basicNamespace.cpp tokenizers/basicNamespace/basicNamespace.h - tokenizers/boilerplate/boilerplate.cpp tokenizers/boilerplate/boilerplate.h - tokenizers/noNamespace/noNamespace.cpp tokenizers/noNamespace/noNamespace.h - tokenizers/noToString/noToString.cpp tokenizers/noToString/noToString.h - tokenizers/withNamespace/withNamespace.cpp tokenizers/withNamespace/withNamespace.h - tst_qtokenautomaton.cpp -) diff --git a/tests/auto/other/toolsupport/CMakeLists.txt b/tests/auto/other/toolsupport/CMakeLists.txt index d13580799c..686d702a23 100644 --- a/tests/auto/other/toolsupport/CMakeLists.txt +++ b/tests/auto/other/toolsupport/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_toolsupport Test: ##################################################################### -qt_add_test(tst_toolsupport +qt_internal_add_test(tst_toolsupport SOURCES tst_toolsupport.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/other/xkbkeyboard/CMakeLists.txt b/tests/auto/other/xkbkeyboard/CMakeLists.txt index 9c92ff65ba..206f128cf8 100644 --- a/tests/auto/other/xkbkeyboard/CMakeLists.txt +++ b/tests/auto/other/xkbkeyboard/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_xkbkeyboard Test: ##################################################################### -qt_add_test(tst_xkbkeyboard +qt_internal_add_test(tst_xkbkeyboard SOURCES tst_xkbkeyboard.cpp PUBLIC_LIBRARIES |