diff options
Diffstat (limited to 'tests/auto/corelib')
21 files changed, 114 insertions, 59 deletions
diff --git a/tests/auto/corelib/animation/CMakeLists.txt b/tests/auto/corelib/animation/CMakeLists.txt index ed238bb4f7..79c2d6c4e9 100644 --- a/tests/auto/corelib/animation/CMakeLists.txt +++ b/tests/auto/corelib/animation/CMakeLists.txt @@ -1,6 +1,11 @@ +# Generated from animation.pro. + add_subdirectory(qabstractanimation) add_subdirectory(qanimationgroup) add_subdirectory(qparallelanimationgroup) add_subdirectory(qpauseanimation) add_subdirectory(qsequentialanimationgroup) add_subdirectory(qvariantanimation) +if(TARGET Qt::Widgets) + add_subdirectory(qpropertyanimation) +endif() diff --git a/tests/auto/corelib/animation/qpropertyanimation/CMakeLists.txt b/tests/auto/corelib/animation/qpropertyanimation/CMakeLists.txt new file mode 100644 index 0000000000..be27578dae --- /dev/null +++ b/tests/auto/corelib/animation/qpropertyanimation/CMakeLists.txt @@ -0,0 +1,14 @@ +# Generated from qpropertyanimation.pro. + +##################################################################### +## tst_qpropertyanimation Test: +##################################################################### + +qt_add_test(tst_qpropertyanimation + SOURCES + tst_qpropertyanimation.cpp + PUBLIC_LIBRARIES + Qt::CorePrivate + Qt::Gui + Qt::Widgets +) diff --git a/tests/auto/corelib/global/CMakeLists.txt b/tests/auto/corelib/global/CMakeLists.txt index 58e083d665..8f1a8171ea 100644 --- a/tests/auto/corelib/global/CMakeLists.txt +++ b/tests/auto/corelib/global/CMakeLists.txt @@ -1,12 +1,17 @@ -add_subdirectory(q_func_info) +# Generated from global.pro. + add_subdirectory(qflags) -add_subdirectory(qfloat16) +add_subdirectory(q_func_info) add_subdirectory(qgetputenv) -add_subdirectory(qglobalstatic) -add_subdirectory(qhooks) -add_subdirectory(qlogging) +add_subdirectory(qglobal) add_subdirectory(qnumeric) +add_subdirectory(qfloat16) add_subdirectory(qrand) add_subdirectory(qrandomgenerator) +add_subdirectory(qlogging) add_subdirectory(qtendian) - +add_subdirectory(qglobalstatic) +add_subdirectory(qhooks) +if(WIN32) + add_subdirectory(qwinregistry) +endif() diff --git a/tests/auto/corelib/global/qlogging/.prev_CMakeLists.txt b/tests/auto/corelib/global/qlogging/.prev_CMakeLists.txt new file mode 100644 index 0000000000..c95195c71e --- /dev/null +++ b/tests/auto/corelib/global/qlogging/.prev_CMakeLists.txt @@ -0,0 +1,4 @@ +# Generated from qlogging.pro. + +add_subdirectory(app) +add_subdirectory(test) diff --git a/tests/auto/corelib/global/qlogging/CMakeLists.txt b/tests/auto/corelib/global/qlogging/CMakeLists.txt index ce9235f91e..e47f62776d 100644 --- a/tests/auto/corelib/global/qlogging/CMakeLists.txt +++ b/tests/auto/corelib/global/qlogging/CMakeLists.txt @@ -1,11 +1,14 @@ -add_qt_executable(qlogging_helper +# Generated from qlogging.pro. +# This file is almost completely custom written # special case + +qt_add_executable(qlogging_helper NO_INSTALL # special case OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case SOURCES app/main.cpp DEFINES QT_MESSAGELOGCONTEXT LIBRARIES Qt::Core) -#special case begin +# special case begin # Fixes required for the backtrace stack to be correct if (${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU" AND NOT MINGW) target_link_options(qlogging_helper PRIVATE -rdynamic) @@ -13,7 +16,7 @@ endif() set_target_properties(qlogging_helper PROPERTIES CXX_VISIBILITY_PRESET default) # special case end -add_qt_test(tst_qlogging SOURCES tst_qlogging.cpp +qt_add_test(tst_qlogging SOURCES tst_qlogging.cpp DEFINES QT_MESSAGELOGCONTEXT QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/corelib/global/qwinregistry/CMakeLists.txt b/tests/auto/corelib/global/qwinregistry/CMakeLists.txt new file mode 100644 index 0000000000..fc88750c9c --- /dev/null +++ b/tests/auto/corelib/global/qwinregistry/CMakeLists.txt @@ -0,0 +1,12 @@ +# Generated from qwinregistry.pro. + +##################################################################### +## tst_qwinregistry Test: +##################################################################### + +qt_add_test(tst_qwinregistry + SOURCES + tst_qwinregistry.cpp + PUBLIC_LIBRARIES + Qt::CorePrivate +) diff --git a/tests/auto/corelib/io/qfile/.prev_CMakeLists.txt b/tests/auto/corelib/io/qfile/.prev_CMakeLists.txt index 196a0c056f..8e72a89649 100644 --- a/tests/auto/corelib/io/qfile/.prev_CMakeLists.txt +++ b/tests/auto/corelib/io/qfile/.prev_CMakeLists.txt @@ -17,7 +17,7 @@ list(APPEND test_data "forCopying.txt") list(APPEND test_data "forRenaming.txt") list(APPEND test_data "resources/file1.ext1") -add_qt_test(tst_qfile +qt_add_test(tst_qfile SOURCES ../../../../shared/emulationdetector.h tst_qfile.cpp @@ -33,7 +33,7 @@ set(qfile_resource_files "resources/" ) -add_qt_resource(tst_qfile "qfile" +qt_add_resource(tst_qfile "qfile" PREFIX "/tst_qfileinfo/" FILES @@ -43,7 +43,7 @@ set(rename-fallback_resource_files "rename-fallback.qrc" ) -add_qt_resource(tst_qfile "rename-fallback" +qt_add_resource(tst_qfile "rename-fallback" PREFIX "/" FILES @@ -53,7 +53,7 @@ set(copy-fallback_resource_files "copy-fallback.qrc" ) -add_qt_resource(tst_qfile "copy-fallback" +qt_add_resource(tst_qfile "copy-fallback" PREFIX "/" FILES @@ -64,22 +64,22 @@ add_qt_resource(tst_qfile "copy-fallback" ## Scopes: ##################################################################### -extend_target(tst_qfile CONDITION TARGET Qt::Network +qt_extend_target(tst_qfile CONDITION TARGET Qt::Network PUBLIC_LIBRARIES Qt::Network ) -extend_target(tst_qfile CONDITION NOT TARGET Qt::Network +qt_extend_target(tst_qfile CONDITION NOT TARGET Qt::Network DEFINES QT_NO_NETWORK ) -extend_target(tst_qfile CONDITION CONFIG___contains___builtin_testdata +qt_extend_target(tst_qfile CONDITION CONFIG___contains___builtin_testdata DEFINES BUILTIN_TESTDATA ) -extend_target(tst_qfile CONDITION WIN32 +qt_extend_target(tst_qfile CONDITION WIN32 PUBLIC_LIBRARIES ole32 uuid diff --git a/tests/auto/corelib/io/qfile/CMakeLists.txt b/tests/auto/corelib/io/qfile/CMakeLists.txt index bfea2c7f49..916b291f54 100644 --- a/tests/auto/corelib/io/qfile/CMakeLists.txt +++ b/tests/auto/corelib/io/qfile/CMakeLists.txt @@ -17,7 +17,7 @@ list(APPEND test_data "forCopying.txt") list(APPEND test_data "forRenaming.txt") list(APPEND test_data "resources/file1.ext1") -add_qt_test(tst_qfile +qt_add_test(tst_qfile SOURCES ../../../../shared/emulationdetector.h tst_qfile.cpp @@ -33,7 +33,7 @@ set(qfile_resource_files "resources/" ) -add_qt_resource(tst_qfile "qfile" +qt_add_resource(tst_qfile "qfile" PREFIX "/tst_qfileinfo/" FILES @@ -43,7 +43,7 @@ set(rename-fallback_resource_files "rename-fallback.qrc" ) -add_qt_resource(tst_qfile "rename-fallback" +qt_add_resource(tst_qfile "rename-fallback" PREFIX "/" FILES @@ -53,7 +53,7 @@ set(copy-fallback_resource_files "copy-fallback.qrc" ) -add_qt_resource(tst_qfile "copy-fallback" +qt_add_resource(tst_qfile "copy-fallback" PREFIX "/" FILES @@ -64,22 +64,22 @@ add_qt_resource(tst_qfile "copy-fallback" ## Scopes: ##################################################################### -extend_target(tst_qfile CONDITION TARGET Qt::Network +qt_extend_target(tst_qfile CONDITION TARGET Qt::Network PUBLIC_LIBRARIES Qt::Network ) -extend_target(tst_qfile CONDITION NOT TARGET Qt::Network +qt_extend_target(tst_qfile CONDITION NOT TARGET Qt::Network DEFINES QT_NO_NETWORK ) -extend_target(tst_qfile CONDITION CONFIG___contains___builtin_testdata +qt_extend_target(tst_qfile CONDITION CONFIG___contains___builtin_testdata DEFINES BUILTIN_TESTDATA ) -extend_target(tst_qfile CONDITION WIN32 +qt_extend_target(tst_qfile CONDITION WIN32 PUBLIC_LIBRARIES ole32 uuid diff --git a/tests/auto/corelib/io/qlockfile/CMakeLists.txt b/tests/auto/corelib/io/qlockfile/CMakeLists.txt index d422ae9d24..baab320b8c 100644 --- a/tests/auto/corelib/io/qlockfile/CMakeLists.txt +++ b/tests/auto/corelib/io/qlockfile/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qlockfile Test: ##################################################################### -add_qt_test(tst_qlockfile +qt_add_test(tst_qlockfile SOURCES tst_qlockfile.cpp PUBLIC_LIBRARIES @@ -15,7 +15,7 @@ add_qt_test(tst_qlockfile ## Scopes: ##################################################################### -extend_target(tst_qlockfile CONDITION WIN32 +qt_extend_target(tst_qlockfile CONDITION WIN32 PUBLIC_LIBRARIES advapi32 ) diff --git a/tests/auto/corelib/kernel/qobject/CMakeLists.txt b/tests/auto/corelib/kernel/qobject/CMakeLists.txt index ba8c67bd99..ea894ff3d3 100644 --- a/tests/auto/corelib/kernel/qobject/CMakeLists.txt +++ b/tests/auto/corelib/kernel/qobject/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qobject Test: ##################################################################### -add_qt_test(tst_qobject +qt_add_test(tst_qobject SOURCES tst_qobject.cpp DEFINES diff --git a/tests/auto/corelib/kernel/qsharedmemory/.prev_CMakeLists.txt b/tests/auto/corelib/kernel/qsharedmemory/.prev_CMakeLists.txt index 7cd08cd377..90a9c9e17c 100644 --- a/tests/auto/corelib/kernel/qsharedmemory/.prev_CMakeLists.txt +++ b/tests/auto/corelib/kernel/qsharedmemory/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qsharedmemory Test: ##################################################################### - add_qt_test(tst_qsharedmemory + qt_add_test(tst_qsharedmemory SOURCES tst_qsharedmemory.cpp PUBLIC_LIBRARIES @@ -14,7 +14,7 @@ ## Scopes: ##################################################################### - extend_target(tst_qsharedmemory CONDITION LINUX + qt_extend_target(tst_qsharedmemory CONDITION LINUX PUBLIC_LIBRARIES rt ) diff --git a/tests/auto/corelib/kernel/qsharedmemory/CMakeLists.txt b/tests/auto/corelib/kernel/qsharedmemory/CMakeLists.txt index c96e6a8825..8fb89d9af9 100644 --- a/tests/auto/corelib/kernel/qsharedmemory/CMakeLists.txt +++ b/tests/auto/corelib/kernel/qsharedmemory/CMakeLists.txt @@ -5,7 +5,7 @@ if(QT_FEATURE_sharedmemory) # special case ## tst_qsharedmemory Test: ##################################################################### - add_qt_test(tst_qsharedmemory + qt_add_test(tst_qsharedmemory SOURCES tst_qsharedmemory.cpp PUBLIC_LIBRARIES @@ -15,7 +15,7 @@ if(QT_FEATURE_sharedmemory) # special case ## Scopes: ##################################################################### - extend_target(tst_qsharedmemory CONDITION LINUX + qt_extend_target(tst_qsharedmemory CONDITION LINUX PUBLIC_LIBRARIES rt ) diff --git a/tests/auto/corelib/kernel/qsystemsemaphore/CMakeLists.txt b/tests/auto/corelib/kernel/qsystemsemaphore/CMakeLists.txt index 1e6889eec0..0024c522e4 100644 --- a/tests/auto/corelib/kernel/qsystemsemaphore/CMakeLists.txt +++ b/tests/auto/corelib/kernel/qsystemsemaphore/CMakeLists.txt @@ -1,20 +1,14 @@ # Generated from qsystemsemaphore.pro. -add_subdirectory(acquirerelease) ##################################################################### ## tst_qsystemsemaphore Test: ##################################################################### -add_qt_test(tst_qsystemsemaphore +qt_add_test(tst_qsystemsemaphore SOURCES tst_qsystemsemaphore.cpp ) -#### Keys ignored in scope 2:.:.:test.pro:<TRUE>: -# CONFIG = "testcase" - ## Scopes: ##################################################################### - -#### Keys ignored in scope 3:.:.:test.pro:WIN32: -# CONFIG = "console" +add_subdirectory(acquirerelease) diff --git a/tests/auto/corelib/mimetypes/.prev_CMakeLists.txt b/tests/auto/corelib/mimetypes/.prev_CMakeLists.txt new file mode 100644 index 0000000000..00c7dd7df2 --- /dev/null +++ b/tests/auto/corelib/mimetypes/.prev_CMakeLists.txt @@ -0,0 +1,6 @@ +# Generated from mimetypes.pro. + +if(QT_FEATURE_private_tests) + add_subdirectory(qmimetype) +endif() +add_subdirectory(qmimedatabase) diff --git a/tests/auto/corelib/mimetypes/CMakeLists.txt b/tests/auto/corelib/mimetypes/CMakeLists.txt index ea0463de36..00c7dd7df2 100644 --- a/tests/auto/corelib/mimetypes/CMakeLists.txt +++ b/tests/auto/corelib/mimetypes/CMakeLists.txt @@ -1,14 +1,6 @@ # Generated from mimetypes.pro. -# special case begin -if(FEATURE_private_tests) -# special case end +if(QT_FEATURE_private_tests) add_subdirectory(qmimetype) - add_subdirectory(qmimedatabase) -# special case begin -endif() -# special case end - -if(NOT QT_FEATURE_private_tests) - ### remove_subdirectory("qmimetype") endif() +add_subdirectory(qmimedatabase) diff --git a/tests/auto/corelib/mimetypes/qmimedatabase/CMakeLists.txt b/tests/auto/corelib/mimetypes/qmimedatabase/CMakeLists.txt index 6661952a68..14086efd59 100644 --- a/tests/auto/corelib/mimetypes/qmimedatabase/CMakeLists.txt +++ b/tests/auto/corelib/mimetypes/qmimedatabase/CMakeLists.txt @@ -1,10 +1,8 @@ # Generated from qmimedatabase.pro. - if(TARGET Qt::Concurrent) add_subdirectory(qmimedatabase-xml) - - if(UNIX AND NOT APPLE AND NOT QNX) - add_subdirectory(qmimedatabase-cache) - endif() +endif() +if(TARGET Qt::Concurrent AND UNIX AND NOT APPLE AND NOT QNX) + add_subdirectory(qmimedatabase-cache) endif() diff --git a/tests/auto/corelib/serialization/CMakeLists.txt b/tests/auto/corelib/serialization/CMakeLists.txt index f6af7fa256..60a4dc7c35 100644 --- a/tests/auto/corelib/serialization/CMakeLists.txt +++ b/tests/auto/corelib/serialization/CMakeLists.txt @@ -5,9 +5,9 @@ add_subdirectory(qcborstreamreader) add_subdirectory(qcborstreamwriter) add_subdirectory(qcborvalue) add_subdirectory(qcborvalue_json) -add_subdirectory(qdatastream_core_pixmap) if(TARGET Qt::Gui) add_subdirectory(qdatastream) + add_subdirectory(qdatastream_core_pixmap) endif() if(TARGET Qt::Network) add_subdirectory(qtextstream) diff --git a/tests/auto/corelib/statemachine/CMakeLists.txt b/tests/auto/corelib/statemachine/CMakeLists.txt index 52c956cd03..362bdbf113 100644 --- a/tests/auto/corelib/statemachine/CMakeLists.txt +++ b/tests/auto/corelib/statemachine/CMakeLists.txt @@ -1,2 +1,4 @@ -add_subdirectory(qstate) +# Generated from statemachine.pro. +add_subdirectory(qstate) +add_subdirectory(qstatemachine) diff --git a/tests/auto/corelib/statemachine/qstatemachine/CMakeLists.txt b/tests/auto/corelib/statemachine/qstatemachine/CMakeLists.txt new file mode 100644 index 0000000000..8cbe69dfdf --- /dev/null +++ b/tests/auto/corelib/statemachine/qstatemachine/CMakeLists.txt @@ -0,0 +1,20 @@ +# Generated from qstatemachine.pro. + +##################################################################### +## tst_qstatemachine Test: +##################################################################### + +qt_add_test(tst_qstatemachine + SOURCES + tst_qstatemachine.cpp + PUBLIC_LIBRARIES + Qt::CorePrivate +) + +## Scopes: +##################################################################### + +qt_extend_target(tst_qstatemachine CONDITION TARGET Qt::Widgets + PUBLIC_LIBRARIES + Qt::Widgets +) diff --git a/tests/auto/corelib/tools/.prev_CMakeLists.txt b/tests/auto/corelib/tools/.prev_CMakeLists.txt index 5350c29b79..02dec30c5d 100644 --- a/tests/auto/corelib/tools/.prev_CMakeLists.txt +++ b/tests/auto/corelib/tools/.prev_CMakeLists.txt @@ -16,6 +16,7 @@ add_subdirectory(qfreelist) add_subdirectory(qhash) add_subdirectory(qhashfunctions) add_subdirectory(qline) +add_subdirectory(qlist) add_subdirectory(qmakearray) add_subdirectory(qmap) add_subdirectory(qmargins) @@ -38,7 +39,6 @@ add_subdirectory(qsizef) add_subdirectory(qstl) add_subdirectory(qtimeline) add_subdirectory(qvarlengtharray) -add_subdirectory(qvector) add_subdirectory(qversionnumber) if(APPLE) add_subdirectory(qmacautoreleasepool) diff --git a/tests/auto/corelib/tools/qcommandlineparser/CMakeLists.txt b/tests/auto/corelib/tools/qcommandlineparser/CMakeLists.txt index 2fc50a7d89..75e9ebfc94 100644 --- a/tests/auto/corelib/tools/qcommandlineparser/CMakeLists.txt +++ b/tests/auto/corelib/tools/qcommandlineparser/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qcommandlineparser Test: ##################################################################### -add_qt_test(tst_qcommandlineparser +qt_add_test(tst_qcommandlineparser SOURCES tst_qcommandlineparser.cpp ) |