diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-09-22 15:23:08 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-10-06 13:19:37 +0200 |
| commit | 08adbefa131ef1c934f55cd61716c8ea836ddf02 (patch) | |
| tree | 0ae21548926596fb41e7e71c4bb14d1973245bde | |
| parent | c52a857c2b6b89abeddeee8489110ab9dd363e53 (diff) | |
CMake: Regenerate projects to use new qt_internal_ API
Modify special case locations to use the new API as well.
Task-number: QTBUG-86815
Change-Id: I3b964e3baf0cc7040830156dac30358ea1152801
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
424 files changed, 1039 insertions, 1086 deletions
diff --git a/src/imports/folderlistmodel/CMakeLists.txt b/src/imports/folderlistmodel/CMakeLists.txt index 0bc9f28da6..0c431374e8 100644 --- a/src/imports/folderlistmodel/CMakeLists.txt +++ b/src/imports/folderlistmodel/CMakeLists.txt @@ -4,7 +4,7 @@ ## qmlfolderlistmodelplugin Plugin: ##################################################################### -qt_add_qml_module(qmlfolderlistmodelplugin +qt_internal_add_qml_module(qmlfolderlistmodelplugin URI "Qt.labs.folderlistmodel" VERSION "${CMAKE_PROJECT_VERSION}" CLASSNAME QmlFolderListModelPlugin diff --git a/src/imports/labsanimation/CMakeLists.txt b/src/imports/labsanimation/CMakeLists.txt index a4de38267e..b1df75b946 100644 --- a/src/imports/labsanimation/CMakeLists.txt +++ b/src/imports/labsanimation/CMakeLists.txt @@ -4,7 +4,7 @@ ## labsanimationplugin Plugin: ##################################################################### -qt_add_qml_module(labsanimationplugin +qt_internal_add_qml_module(labsanimationplugin URI "Qt.labs.animation" VERSION "${CMAKE_PROJECT_VERSION}" CLASSNAME QtLabsAnimationPlugin diff --git a/src/imports/labsmodels/CMakeLists.txt b/src/imports/labsmodels/CMakeLists.txt index efd3339e2f..164583dd1e 100644 --- a/src/imports/labsmodels/CMakeLists.txt +++ b/src/imports/labsmodels/CMakeLists.txt @@ -4,7 +4,7 @@ ## labsmodelsplugin Plugin: ##################################################################### -qt_add_qml_module(labsmodelsplugin +qt_internal_add_qml_module(labsmodelsplugin URI "Qt.labs.qmlmodels" VERSION "${CMAKE_PROJECT_VERSION}" CLASSNAME QtQmlLabsModelsPlugin @@ -25,13 +25,13 @@ qt_add_qml_module(labsmodelsplugin ## Scopes: ##################################################################### -qt_extend_target(labsmodelsplugin CONDITION QT_FEATURE_qml_table_model +qt_internal_extend_target(labsmodelsplugin CONDITION QT_FEATURE_qml_table_model SOURCES qqmltablemodel.cpp qqmltablemodel_p.h qqmltablemodelcolumn.cpp qqmltablemodelcolumn_p.h ) -qt_extend_target(labsmodelsplugin CONDITION QT_FEATURE_qml_delegate_model +qt_internal_extend_target(labsmodelsplugin CONDITION QT_FEATURE_qml_delegate_model SOURCES qqmldelegatecomponent.cpp qqmldelegatecomponent_p.h ) diff --git a/src/imports/layouts/CMakeLists.txt b/src/imports/layouts/CMakeLists.txt index ffde82d340..445914b71e 100644 --- a/src/imports/layouts/CMakeLists.txt +++ b/src/imports/layouts/CMakeLists.txt @@ -4,7 +4,7 @@ ## qquicklayoutsplugin Plugin: ##################################################################### -qt_add_qml_module(qquicklayoutsplugin +qt_internal_add_qml_module(qquicklayoutsplugin URI "QtQuick.Layouts" VERSION "${CMAKE_PROJECT_VERSION}" DESIGNER_SUPPORTED diff --git a/src/imports/localstorage/CMakeLists.txt b/src/imports/localstorage/CMakeLists.txt index d3fd8ff290..abbe484874 100644 --- a/src/imports/localstorage/CMakeLists.txt +++ b/src/imports/localstorage/CMakeLists.txt @@ -4,7 +4,7 @@ ## qmllocalstorageplugin Plugin: ##################################################################### -qt_add_qml_module(qmllocalstorageplugin +qt_internal_add_qml_module(qmllocalstorageplugin URI "QtQuick.LocalStorage" VERSION "${CMAKE_PROJECT_VERSION}" CLASSNAME QQmlLocalStoragePlugin diff --git a/src/imports/models/CMakeLists.txt b/src/imports/models/CMakeLists.txt index 89d65a22dc..4070ad365b 100644 --- a/src/imports/models/CMakeLists.txt +++ b/src/imports/models/CMakeLists.txt @@ -4,7 +4,7 @@ ## modelsplugin Plugin: ##################################################################### -qt_add_qml_module(modelsplugin +qt_internal_add_qml_module(modelsplugin URI "QtQml.Models" VERSION "${CMAKE_PROJECT_VERSION}" DESIGNER_SUPPORTED diff --git a/src/imports/particles/CMakeLists.txt b/src/imports/particles/CMakeLists.txt index 6d5e71f7d1..7e754a2cee 100644 --- a/src/imports/particles/CMakeLists.txt +++ b/src/imports/particles/CMakeLists.txt @@ -4,7 +4,7 @@ ## particlesplugin Plugin: ##################################################################### -qt_add_qml_module(particlesplugin +qt_internal_add_qml_module(particlesplugin URI "QtQuick.Particles" VERSION "${CMAKE_PROJECT_VERSION}" CLASSNAME QtQuick2ParticlesPlugin diff --git a/src/imports/qtqml/.prev_CMakeLists.txt b/src/imports/qtqml/.prev_CMakeLists.txt index 52e6d3e1e0..99e76596ea 100644 --- a/src/imports/qtqml/.prev_CMakeLists.txt +++ b/src/imports/qtqml/.prev_CMakeLists.txt @@ -14,7 +14,7 @@ endif() ## qmlplugin Plugin: ##################################################################### -qt_add_qml_module(qmlplugin +qt_internal_add_qml_module(qmlplugin URI "QtQml" VERSION "${CMAKE_PROJECT_VERSION}" DESIGNER_SUPPORTED diff --git a/src/imports/qtqml/CMakeLists.txt b/src/imports/qtqml/CMakeLists.txt index 8ad8c0e111..15e66fd53e 100644 --- a/src/imports/qtqml/CMakeLists.txt +++ b/src/imports/qtqml/CMakeLists.txt @@ -14,7 +14,7 @@ endif() ## qmlplugin Plugin: ##################################################################### -qt_add_qml_module(qmlplugin +qt_internal_add_qml_module(qmlplugin URI "QtQml" VERSION "${CMAKE_PROJECT_VERSION}" DESIGNER_SUPPORTED diff --git a/src/imports/qtquick2/CMakeLists.txt b/src/imports/qtquick2/CMakeLists.txt index aed797189a..e7e29bf9ae 100644 --- a/src/imports/qtquick2/CMakeLists.txt +++ b/src/imports/qtquick2/CMakeLists.txt @@ -4,7 +4,7 @@ ## qtquick2plugin Plugin: ##################################################################### -qt_add_qml_module(qtquick2plugin +qt_internal_add_qml_module(qtquick2plugin URI "QtQuick" VERSION "${CMAKE_PROJECT_VERSION}" DESIGNER_SUPPORTED @@ -31,7 +31,7 @@ qt_add_qml_module(qtquick2plugin ## Scopes: ##################################################################### -qt_extend_target(qtquick2plugin CONDITION QT_FEATURE_qml_worker_script +qt_internal_extend_target(qtquick2plugin CONDITION QT_FEATURE_qml_worker_script PUBLIC_LIBRARIES Qt::QmlWorkerScriptPrivate ) diff --git a/src/imports/settings/CMakeLists.txt b/src/imports/settings/CMakeLists.txt index 0243e2cf8f..bb1c1aae8b 100644 --- a/src/imports/settings/CMakeLists.txt +++ b/src/imports/settings/CMakeLists.txt @@ -4,7 +4,7 @@ ## qmlsettingsplugin Plugin: ##################################################################### -qt_add_qml_module(qmlsettingsplugin +qt_internal_add_qml_module(qmlsettingsplugin URI "Qt.labs.settings" VERSION "${CMAKE_PROJECT_VERSION}" CLASSNAME QmlSettingsPlugin diff --git a/src/imports/shapes/CMakeLists.txt b/src/imports/shapes/CMakeLists.txt index 92ad133fd8..78f6d9f448 100644 --- a/src/imports/shapes/CMakeLists.txt +++ b/src/imports/shapes/CMakeLists.txt @@ -4,7 +4,7 @@ ## qmlshapesplugin Plugin: ##################################################################### -qt_add_qml_module(qmlshapesplugin +qt_internal_add_qml_module(qmlshapesplugin URI "QtQuick.Shapes" VERSION "${CMAKE_PROJECT_VERSION}" CLASSNAME QmlShapesPlugin diff --git a/src/imports/sharedimage/CMakeLists.txt b/src/imports/sharedimage/CMakeLists.txt index c840fda85f..5ec8533b23 100644 --- a/src/imports/sharedimage/CMakeLists.txt +++ b/src/imports/sharedimage/CMakeLists.txt @@ -4,7 +4,7 @@ ## sharedimageplugin Plugin: ##################################################################### -qt_add_qml_module(sharedimageplugin +qt_internal_add_qml_module(sharedimageplugin URI "Qt.labs.sharedimage" VERSION "${CMAKE_PROJECT_VERSION}" CLASSNAME QtQuickSharedImagePlugin diff --git a/src/imports/testlib/CMakeLists.txt b/src/imports/testlib/CMakeLists.txt index 2ce7598f62..27d0446405 100644 --- a/src/imports/testlib/CMakeLists.txt +++ b/src/imports/testlib/CMakeLists.txt @@ -4,7 +4,7 @@ ## qmltestplugin Plugin: ##################################################################### -qt_add_qml_module(qmltestplugin +qt_internal_add_qml_module(qmltestplugin URI "QtTest" VERSION "${CMAKE_PROJECT_VERSION}" CLASSNAME QTestQmlModule diff --git a/src/imports/wavefrontmesh/CMakeLists.txt b/src/imports/wavefrontmesh/CMakeLists.txt index 3790b7d53e..b6b0008fb6 100644 --- a/src/imports/wavefrontmesh/CMakeLists.txt +++ b/src/imports/wavefrontmesh/CMakeLists.txt @@ -4,7 +4,7 @@ ## qmlwavefrontmeshplugin Plugin: ##################################################################### -qt_add_qml_module(qmlwavefrontmeshplugin +qt_internal_add_qml_module(qmlwavefrontmeshplugin URI "Qt.labs.wavefrontmesh" VERSION "${CMAKE_PROJECT_VERSION}" CLASSNAME QmlWavefrontMeshPlugin diff --git a/src/imports/workerscript/CMakeLists.txt b/src/imports/workerscript/CMakeLists.txt index 2d437a04da..b2a6d0f444 100644 --- a/src/imports/workerscript/CMakeLists.txt +++ b/src/imports/workerscript/CMakeLists.txt @@ -4,7 +4,7 @@ ## workerscriptplugin Plugin: ##################################################################### -qt_add_qml_module(workerscriptplugin +qt_internal_add_qml_module(workerscriptplugin URI "QtQml.WorkerScript" VERSION "${CMAKE_PROJECT_VERSION}" DESIGNER_SUPPORTED diff --git a/src/particles/CMakeLists.txt b/src/particles/CMakeLists.txt index c0c72578bd..0eb0b89587 100644 --- a/src/particles/CMakeLists.txt +++ b/src/particles/CMakeLists.txt @@ -4,7 +4,7 @@ ## QuickParticles Module: ##################################################################### -qt_add_module(QuickParticles +qt_internal_add_module(QuickParticles INTERNAL_MODULE GENERATE_METATYPES SOURCES @@ -57,7 +57,7 @@ set(particles_resource_files "particleresources/star.png" ) -qt_add_resource(QuickParticles "particles" +qt_internal_add_resource(QuickParticles "particles" PREFIX "/" FILES @@ -76,7 +76,7 @@ set(particles1_resource_files "shaders_ng/imageparticle_tabled.vert.qsb" ) -qt_add_resource(QuickParticles "particles1" +qt_internal_add_resource(QuickParticles "particles1" PREFIX "/particles" FILES @@ -94,7 +94,7 @@ qt_add_resource(QuickParticles "particles1" ## Scopes: ##################################################################### -qt_extend_target(QuickParticles CONDITION MSVC +qt_internal_extend_target(QuickParticles CONDITION MSVC DEFINES _CRT_SECURE_NO_WARNINGS ) @@ -102,7 +102,7 @@ qt_extend_target(QuickParticles CONDITION MSVC #### Keys ignored in scope 3:.:.:particles.pro:solaris-cc_x_: # QMAKE_CXXFLAGS_RELEASE = "--O2" -qt_extend_target(QuickParticles CONDITION EXISTS "qqml_enable_gcov" +qt_internal_extend_target(QuickParticles CONDITION EXISTS "qqml_enable_gcov" LIBRARIES gcov COMPILE_OPTIONS diff --git a/src/plugins/qmltooling/packetprotocol/CMakeLists.txt b/src/plugins/qmltooling/packetprotocol/CMakeLists.txt index ddc2af6cfa..30e4296365 100644 --- a/src/plugins/qmltooling/packetprotocol/CMakeLists.txt +++ b/src/plugins/qmltooling/packetprotocol/CMakeLists.txt @@ -4,7 +4,7 @@ ## PacketProtocol Module: ##################################################################### -qt_add_module(PacketProtocol +qt_internal_add_module(PacketProtocol STATIC INTERNAL_MODULE SOURCES diff --git a/src/plugins/scenegraph/openvg/CMakeLists.txt b/src/plugins/scenegraph/openvg/CMakeLists.txt index a46c66cfaa..8be9b4fad3 100644 --- a/src/plugins/scenegraph/openvg/CMakeLists.txt +++ b/src/plugins/scenegraph/openvg/CMakeLists.txt @@ -46,22 +46,22 @@ qt_internal_add_plugin(QSGOpenVGAdaptation ## Scopes: ##################################################################### -qt_extend_target(QSGOpenVGAdaptation CONDITION CMAKE_BUILD_TYPE STREQUAL Debug AND debug_and_release +qt_internal_extend_target(QSGOpenVGAdaptation CONDITION CMAKE_BUILD_TYPE STREQUAL Debug AND debug_and_release INCLUDE_DIRECTORIES ${CMAKE_CURRENT_BINARY_DIR}/../../../quick/.tracegen/debug ) -qt_extend_target(QSGOpenVGAdaptation CONDITION debug_and_release AND NOT CMAKE_BUILD_TYPE STREQUAL Debug +qt_internal_extend_target(QSGOpenVGAdaptation CONDITION debug_and_release AND NOT CMAKE_BUILD_TYPE STREQUAL Debug INCLUDE_DIRECTORIES ${CMAKE_CURRENT_BINARY_DIR}/../../../quick/.tracegen/release ) -qt_extend_target(QSGOpenVGAdaptation CONDITION NOT debug_and_release +qt_internal_extend_target(QSGOpenVGAdaptation CONDITION NOT debug_and_release INCLUDE_DIRECTORIES ${CMAKE_CURRENT_BINARY_DIR}/../../../quick/.tracegen ) -qt_extend_target(QSGOpenVGAdaptation CONDITION QT_FEATURE_quick_sprite +qt_internal_extend_target(QSGOpenVGAdaptation CONDITION QT_FEATURE_quick_sprite SOURCES qsgopenvgspritenode.cpp qsgopenvgspritenode.h ) diff --git a/src/qml/.prev_CMakeLists.txt b/src/qml/.prev_CMakeLists.txt index 0d9704423c..676e8727e3 100644 --- a/src/qml/.prev_CMakeLists.txt +++ b/src/qml/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## Qml Module: ##################################################################### -qt_add_module(Qml +qt_internal_add_module(Qml GENERATE_METATYPES PLUGIN_TYPES qmltooling SOURCES @@ -372,24 +372,24 @@ qt_process_qlalr( ## Scopes: ##################################################################### -qt_extend_target(Qml CONDITION QT_FEATURE_qml_network +qt_internal_extend_target(Qml CONDITION QT_FEATURE_qml_network SOURCES qml/qqmltypeloadernetworkreplyproxy.cpp qml/qqmltypeloadernetworkreplyproxy_p.h PUBLIC_LIBRARIES Qt::Network ) -qt_extend_target(Qml CONDITION MSVC AND (TEST_architecture_arch STREQUAL "i386") +qt_internal_extend_target(Qml CONDITION MSVC AND (TEST_architecture_arch STREQUAL "i386") LINK_OPTIONS "/BASE:0x66000000" ) -qt_extend_target(Qml CONDITION MSVC +qt_internal_extend_target(Qml CONDITION MSVC DEFINES _CRT_SECURE_NO_WARNINGS ) -qt_extend_target(Qml CONDITION WIN32 +qt_internal_extend_target(Qml CONDITION WIN32 SOURCES ../3rdparty/masm/wtf/OSAllocatorWin.cpp jsruntime/qv4compilationunitmapper_win.cpp @@ -402,12 +402,12 @@ qt_extend_target(Qml CONDITION WIN32 #### Keys ignored in scope 7:.:.:qml.pro:solaris-cc_x_: # QMAKE_CXXFLAGS_RELEASE = "--O2" -qt_extend_target(Qml CONDITION GCC AND (TEST_architecture_arch STREQUAL "mips") +qt_internal_extend_target(Qml CONDITION GCC AND (TEST_architecture_arch STREQUAL "mips") COMPILE_OPTIONS -fno-reorder-blocks ) -qt_extend_target(Qml CONDITION EXISTS "qqml_enable_gcov" +qt_internal_extend_target(Qml CONDITION EXISTS "qqml_enable_gcov" LIBRARIES gcov COMPILE_OPTIONS @@ -416,7 +416,7 @@ qt_extend_target(Qml CONDITION EXISTS "qqml_enable_gcov" -ftest-coverage ) -qt_extend_target(Qml CONDITION release AND MSVC AND (QT_CL_MAJOR_VERSION EQUAL 19) AND (QT_CL_MINOR_VERSION EQUAL 00) AND (QT_CL_PATCH_VERSION GREATER 24212) +qt_internal_extend_target(Qml CONDITION release AND MSVC AND (QT_CL_MAJOR_VERSION EQUAL 19) AND (QT_CL_MINOR_VERSION EQUAL 00) AND (QT_CL_PATCH_VERSION GREATER 24212) COMPILE_OPTIONS -d2SSAOptimizer- ) @@ -427,7 +427,7 @@ qt_extend_target(Qml CONDITION release AND MSVC AND (QT_CL_MAJOR_VERSION EQUAL 1 #### Keys ignored in scope 12:.:.:qml.pro:(QT_CLANG_MAJOR_VERSION GREATER 3) OR (QT_CLANG_MINOR_VERSION GREATER 3) OR (QT_APPLE_CLANG_MAJOR_VERSION GREATER 5) OR ( (QT_APPLE_CLANG_MAJOR_VERSION EQUAL 5) AND (QT_APPLE_CLANG_MINOR_VERSION GREATER 0) ): # WERROR = "-Wno-error=unused-const-variable" -qt_extend_target(Qml CONDITION QT_FEATURE_qml_jit +qt_internal_extend_target(Qml CONDITION QT_FEATURE_qml_jit SOURCES jit/qv4assemblercommon.cpp jit/qv4assemblercommon_p.h jit/qv4baselineassembler.cpp jit/qv4baselineassembler_p.h @@ -437,7 +437,7 @@ qt_extend_target(Qml CONDITION QT_FEATURE_qml_jit jit ) -qt_extend_target(Qml CONDITION QT_FEATURE_qml_animation +qt_internal_extend_target(Qml CONDITION QT_FEATURE_qml_animation SOURCES animations/qabstractanimationjob.cpp animations/qabstractanimationjob_p.h animations/qanimationgroupjob.cpp animations/qanimationgroupjob_p.h @@ -467,12 +467,12 @@ qt_extend_target(Qml CONDITION QT_FEATURE_qml_animation # QML_COMPILE_HASH = "$$commit" # commit = "$$system(git rev-parse HEAD)" -qt_extend_target(Qml CONDITION GCC AND QT_COMPILER_VERSION_MAJOR STREQUAL 5 +qt_internal_extend_target(Qml CONDITION GCC AND QT_COMPILER_VERSION_MAJOR STREQUAL 5 COMPILE_OPTIONS -fno-strict-aliasing ) -qt_extend_target(Qml CONDITION QT_FEATURE_qml_debug +qt_internal_extend_target(Qml CONDITION QT_FEATURE_qml_debug SOURCES debugger/qqmlabstractprofileradapter.cpp debugger/qqmlabstractprofileradapter_p.h debugger/qqmlconfigurabledebugservice_p.h @@ -489,93 +489,93 @@ qt_extend_target(Qml CONDITION QT_FEATURE_qml_debug jsruntime/qv4profiling.cpp ) -qt_extend_target(Qml CONDITION QT_FEATURE_qml_sequence_object +qt_internal_extend_target(Qml CONDITION QT_FEATURE_qml_sequence_object SOURCES jsruntime/qv4sequenceobject.cpp jsruntime/qv4sequenceobject_p.h ) -qt_extend_target(Qml CONDITION UNIX +qt_internal_extend_target(Qml CONDITION UNIX SOURCES jsruntime/qv4compilationunitmapper_unix.cpp jsruntime/qv4functiontable_unix.cpp ) -qt_extend_target(Qml CONDITION (TEST_architecture_arch STREQUAL "x86_64") AND WIN32 +qt_internal_extend_target(Qml CONDITION (TEST_architecture_arch STREQUAL "x86_64") AND WIN32 SOURCES jsruntime/qv4functiontable_win64.cpp ) -qt_extend_target(Qml CONDITION WIN32 AND NOT (TEST_architecture_arch STREQUAL "x86_64") +qt_internal_extend_target(Qml CONDITION WIN32 AND NOT (TEST_architecture_arch STREQUAL "x86_64") SOURCES jsruntime/qv4functiontable_noop.cpp ) -qt_extend_target(Qml CONDITION valgrind +qt_internal_extend_target(Qml CONDITION valgrind DEFINES V4_USE_VALGRIND ) -qt_extend_target(Qml CONDITION heaptrack +qt_internal_extend_target(Qml CONDITION heaptrack DEFINES V4_USE_HEAPTRACK ) -qt_extend_target(Qml CONDITION QT_FEATURE_qml_xml_http_request +qt_internal_extend_target(Qml CONDITION QT_FEATURE_qml_xml_http_request SOURCES qml/qqmlxmlhttprequest.cpp qml/qqmlxmlhttprequest_p.h ) -qt_extend_target(Qml CONDITION QT_FEATURE_qml_locale +qt_internal_extend_target(Qml CONDITION QT_FEATURE_qml_locale SOURCES qml/qqmllocale.cpp qml/qqmllocale_p.h ) -qt_extend_target(Qml CONDITION ANDROID +qt_internal_extend_target(Qml CONDITION ANDROID DEFINES LIBS_SUFFIX="_${CMAKE_SYSTEM_PROCESSOR}.so" ) -qt_extend_target(Qml CONDITION hpux-_x_ OR solaris-_x_ OR (QT_FEATURE_clock_gettime AND linux-_x_) +qt_internal_extend_target(Qml CONDITION hpux-_x_ OR solaris-_x_ OR (QT_FEATURE_clock_gettime AND linux-_x_) LIBRARIES rt ) -qt_extend_target(Qml CONDITION QT_FEATURE_qml_itemmodel +qt_internal_extend_target(Qml CONDITION QT_FEATURE_qml_itemmodel SOURCES types/qqmlmodelindexvaluetype.cpp types/qqmlmodelindexvaluetype_p.h ) -qt_extend_target(Qml CONDITION disassembler AND ((TEST_architecture_arch STREQUAL "i386") OR (TEST_architecture_arch STREQUAL "x86_64")) +qt_internal_extend_target(Qml CONDITION disassembler AND ((TEST_architecture_arch STREQUAL "i386") OR (TEST_architecture_arch STREQUAL "x86_64")) DEFINES WTF_USE_UDIS86=1 ) -qt_extend_target(Qml CONDITION (TEST_architecture_arch STREQUAL "arm") AND disassembler +qt_internal_extend_target(Qml CONDITION (TEST_architecture_arch STREQUAL "arm") AND disassembler DEFINES WTF_USE_ARMV7_DISASSEMBLER=1 ) -qt_extend_target(Qml CONDITION (TEST_architecture_arch STREQUAL "arm64") AND disassembler +qt_internal_extend_target(Qml CONDITION (TEST_architecture_arch STREQUAL "arm64") AND disassembler DEFINES WTF_USE_ARM64_DISASSEMBLER=1 ) -qt_extend_target(Qml CONDITION (TEST_architecture_arch STREQUAL "mips") AND disassembler +qt_internal_extend_target(Qml CONDITION (TEST_architecture_arch STREQUAL "mips") AND disassembler DEFINES WTF_USE_MIPS32_DISASSEMBLER=1 ) -qt_extend_target(Qml CONDITION NOT disassembler +qt_internal_extend_target(Qml CONDITION NOT disassembler DEFINES WTF_USE_UDIS86=0 ) -qt_extend_target(Qml CONDITION CMAKE_BUILD_TYPE STREQUAL Release +qt_internal_extend_target(Qml CONDITION CMAKE_BUILD_TYPE STREQUAL Release DEFINES NDEBUG ) -qt_extend_target(Qml CONDITION GCC AND QT_COMPILER_VERSION_MAJOR STRGREATER 6 AND NOT CLANG AND NOT ICC +qt_internal_extend_target(Qml CONDITION GCC AND QT_COMPILER_VERSION_MAJOR STRGREATER 6 AND NOT CLANG AND NOT ICC COMPILE_OPTIONS -Wno-expansion-to-defined ) @@ -583,17 +583,17 @@ qt_extend_target(Qml CONDITION GCC AND QT_COMPILER_VERSION_MAJOR STRGREATER 6 AN #### Keys ignored in scope 66:.:../3rdparty/masm:../3rdparty/masm/masm-defs.pri:(QT_COMPILER_VERSION_MAJOR STRGREATER 6): # QMAKE_CXXFLAGS_WARN_ON = "-Wno-expansion-to-defined" -qt_extend_target(Qml CONDITION INTEGRITY +qt_internal_extend_target(Qml CONDITION INTEGRITY SOURCES ../3rdparty/masm/wtf/OSAllocatorIntegrity.cpp ) -qt_extend_target(Qml CONDITION UNIX AND NOT INTEGRITY +qt_internal_extend_target(Qml CONDITION UNIX AND NOT INTEGRITY SOURCES ../3rdparty/masm/wtf/OSAllocatorPosix.cpp ) -qt_extend_target(Qml CONDITION DEFINES___contains___WTF_USE_UDIS86=1 +qt_internal_extend_target(Qml CONDITION DEFINES___contains___WTF_USE_UDIS86=1 SOURCES ../3rdparty/masm/disassembler/udis86/udis86.c ../3rdparty/masm/disassembler/udis86/udis86_decode.c @@ -621,20 +621,20 @@ qt_extend_target(Qml CONDITION DEFINES___contains___WTF_USE_UDIS86=1 #### Keys ignored in scope 75:.:../3rdparty/masm:../3rdparty/masm/masm.pri:else: # GENERATEDDIR = "$$GENERATEDDIR/release" -qt_extend_target(Qml CONDITION (NOT c++11 AND NOT ICC) AND (CLANG) +qt_internal_extend_target(Qml CONDITION (NOT c++11 AND NOT ICC) AND (CLANG) COMPILE_OPTIONS -Wno-c++0x-extensions -Wno-c++11-extensions ) -qt_extend_target(Qml CONDITION (((NOT c++11 AND NOT ICC) AND (NOT (CLANG))) AND (GCC)) AND ((QT_COMPILER_VERSION_MAJOR STRGREATER 4) OR (QT_COMPILER_VERSION_MINOR STRGREATER 5)) +qt_internal_extend_target(Qml CONDITION (((NOT c++11 AND NOT ICC) AND (NOT (CLANG))) AND (GCC)) AND ((QT_COMPILER_VERSION_MAJOR STRGREATER 4) OR (QT_COMPILER_VERSION_MINOR STRGREATER 5)) COMPILE_OPTIONS -Wno-c++0x-compat ) -qt_create_tracepoints(Qml qtqml.tracepoints) -qt_add_docs(Qml +qt_internal_create_tracepoints(Qml qtqml.tracepoints) +qt_internal_add_docs(Qml doc/qtqml.qdocconf ) diff --git a/src/qml/CMakeLists.txt b/src/qml/CMakeLists.txt index e8a46849db..68e5a94734 100644 --- a/src/qml/CMakeLists.txt +++ b/src/qml/CMakeLists.txt @@ -4,7 +4,7 @@ ## Qml Module: ##################################################################### -qt_add_module(Qml +qt_internal_add_module(Qml GENERATE_METATYPES PLUGIN_TYPES qmltooling SOURCES @@ -380,24 +380,24 @@ qt_declarative_generate_reg_exp_jit_tables(Qml) ## Scopes: ##################################################################### -qt_extend_target(Qml CONDITION QT_FEATURE_qml_network +qt_internal_extend_target(Qml CONDITION QT_FEATURE_qml_network SOURCES qml/qqmltypeloadernetworkreplyproxy.cpp qml/qqmltypeloadernetworkreplyproxy_p.h PUBLIC_LIBRARIES Qt::Network ) -qt_extend_target(Qml CONDITION MSVC AND (TEST_architecture_arch STREQUAL "i386") +qt_internal_extend_target(Qml CONDITION MSVC AND (TEST_architecture_arch STREQUAL "i386") LINK_OPTIONS "/BASE:0x66000000" ) -qt_extend_target(Qml CONDITION MSVC +qt_internal_extend_target(Qml CONDITION MSVC DEFINES _CRT_SECURE_NO_WARNINGS ) -qt_extend_target(Qml CONDITION WIN32 +qt_internal_extend_target(Qml CONDITION WIN32 SOURCES ../3rdparty/masm/wtf/OSAllocatorWin.cpp jsruntime/qv4compilationunitmapper_win.cpp @@ -410,12 +410,12 @@ qt_extend_target(Qml CONDITION WIN32 #### Keys ignored in scope 7:.:.:qml.pro:solaris-cc_x_: # QMAKE_CXXFLAGS_RELEASE = "--O2" -qt_extend_target(Qml CONDITION GCC AND (TEST_architecture_arch STREQUAL "mips") +qt_internal_extend_target(Qml CONDITION GCC AND (TEST_architecture_arch STREQUAL "mips") COMPILE_OPTIONS -fno-reorder-blocks ) -qt_extend_target(Qml CONDITION EXISTS "qqml_enable_gcov" +qt_internal_extend_target(Qml CONDITION EXISTS "qqml_enable_gcov" LIBRARIES gcov COMPILE_OPTIONS @@ -424,7 +424,7 @@ qt_extend_target(Qml CONDITION EXISTS "qqml_enable_gcov" -ftest-coverage ) -qt_extend_target(Qml CONDITION release AND MSVC AND (QT_CL_MAJOR_VERSION EQUAL 19) AND (QT_CL_MINOR_VERSION EQUAL 00) AND (QT_CL_PATCH_VERSION GREATER 24212) +qt_internal_extend_target(Qml CONDITION release AND MSVC AND (QT_CL_MAJOR_VERSION EQUAL 19) AND (QT_CL_MINOR_VERSION EQUAL 00) AND (QT_CL_PATCH_VERSION GREATER 24212) COMPILE_OPTIONS -d2SSAOptimizer- ) @@ -435,7 +435,7 @@ qt_extend_target(Qml CONDITION release AND MSVC AND (QT_CL_MAJOR_VERSION EQUAL 1 #### Keys ignored in scope 12:.:.:qml.pro:(QT_CLANG_MAJOR_VERSION GREATER 3) OR (QT_CLANG_MINOR_VERSION GREATER 3) OR (QT_APPLE_CLANG_MAJOR_VERSION GREATER 5) OR ( (QT_APPLE_CLANG_MAJOR_VERSION EQUAL 5) AND (QT_APPLE_CLANG_MINOR_VERSION GREATER 0) ): # WERROR = "-Wno-error=unused-const-variable" -qt_extend_target(Qml CONDITION QT_FEATURE_qml_jit +qt_internal_extend_target(Qml CONDITION QT_FEATURE_qml_jit SOURCES jit/qv4assemblercommon.cpp jit/qv4assemblercommon_p.h jit/qv4baselineassembler.cpp jit/qv4baselineassembler_p.h @@ -445,7 +445,7 @@ qt_extend_target(Qml CONDITION QT_FEATURE_qml_jit jit ) -qt_extend_target(Qml CONDITION QT_FEATURE_qml_animation +qt_internal_extend_target(Qml CONDITION QT_FEATURE_qml_animation SOURCES animations/qabstractanimationjob.cpp animations/qabstractanimationjob_p.h animations/qanimationgroupjob.cpp animations/qanimationgroupjob_p.h @@ -475,12 +475,12 @@ qt_extend_target(Qml CONDITION QT_FEATURE_qml_animation # QML_COMPILE_HASH = "$$commit" # commit = "$$system(git rev-parse HEAD)" -qt_extend_target(Qml CONDITION GCC AND QT_COMPILER_VERSION_MAJOR STREQUAL 5 +qt_internal_extend_target(Qml CONDITION GCC AND QT_COMPILER_VERSION_MAJOR STREQUAL 5 COMPILE_OPTIONS -fno-strict-aliasing ) -qt_extend_target(Qml CONDITION QT_FEATURE_qml_debug +qt_internal_extend_target(Qml CONDITION QT_FEATURE_qml_debug SOURCES debugger/qqmlabstractprofileradapter.cpp debugger/qqmlabstractprofileradapter_p.h debugger/qqmlconfigurabledebugservice_p.h @@ -497,93 +497,93 @@ qt_extend_target(Qml CONDITION QT_FEATURE_qml_debug jsruntime/qv4profiling.cpp ) -qt_extend_target(Qml CONDITION QT_FEATURE_qml_sequence_object +qt_internal_extend_target(Qml CONDITION QT_FEATURE_qml_sequence_object SOURCES jsruntime/qv4sequenceobject.cpp jsruntime/qv4sequenceobject_p.h ) -qt_extend_target(Qml CONDITION UNIX +qt_internal_extend_target(Qml CONDITION UNIX SOURCES jsruntime/qv4compilationunitmapper_unix.cpp jsruntime/qv4functiontable_unix.cpp ) -qt_extend_target(Qml CONDITION (TEST_architecture_arch STREQUAL "x86_64") AND WIN32 +qt_internal_extend_target(Qml CONDITION (TEST_architecture_arch STREQUAL "x86_64") AND WIN32 SOURCES jsruntime/qv4functiontable_win64.cpp ) -qt_extend_target(Qml CONDITION WIN32 AND NOT (TEST_architecture_arch STREQUAL "x86_64") +qt_internal_extend_target(Qml CONDITION WIN32 AND NOT (TEST_architecture_arch STREQUAL "x86_64") SOURCES jsruntime/qv4functiontable_noop.cpp ) -qt_extend_target(Qml CONDITION valgrind +qt_internal_extend_target(Qml CONDITION valgrind DEFINES V4_USE_VALGRIND ) -qt_extend_target(Qml CONDITION heaptrack +qt_internal_extend_target(Qml CONDITION heaptrack DEFINES V4_USE_HEAPTRACK ) -qt_extend_target(Qml CONDITION QT_FEATURE_qml_xml_http_request +qt_internal_extend_target(Qml CONDITION QT_FEATURE_qml_xml_http_request SOURCES qml/qqmlxmlhttprequest.cpp qml/qqmlxmlhttprequest_p.h ) -qt_extend_target(Qml CONDITION QT_FEATURE_qml_locale +qt_internal_extend_target(Qml CONDITION QT_FEATURE_qml_locale SOURCES qml/qqmllocale.cpp qml/qqmllocale_p.h ) -qt_extend_target(Qml CONDITION ANDROID +qt_internal_extend_target(Qml CONDITION ANDROID DEFINES LIBS_SUFFIX="_${ANDROID_ABI}.so" # special case ) -qt_extend_target(Qml CONDITION hpux-_x_ OR solaris-_x_ OR (QT_FEATURE_clock_gettime AND linux-_x_) +qt_internal_extend_target(Qml CONDITION hpux-_x_ OR solaris-_x_ OR (QT_FEATURE_clock_gettime AND linux-_x_) LIBRARIES rt ) -qt_extend_target(Qml CONDITION QT_FEATURE_qml_itemmodel +qt_internal_extend_target(Qml CONDITION QT_FEATURE_qml_itemmodel SOURCES types/qqmlmodelindexvaluetype.cpp types/qqmlmodelindexvaluetype_p.h ) -qt_extend_target(Qml CONDITION disassembler AND ((TEST_architecture_arch STREQUAL "i386") OR (TEST_architecture_arch STREQUAL "x86_64")) +qt_internal_extend_target(Qml CONDITION disassembler AND ((TEST_architecture_arch STREQUAL "i386") OR (TEST_architecture_arch STREQUAL "x86_64")) DEFINES WTF_USE_UDIS86=1 ) -qt_extend_target(Qml CONDITION (TEST_architecture_arch STREQUAL "arm") AND disassembler +qt_internal_extend_target(Qml CONDITION (TEST_architecture_arch STREQUAL "arm") AND disassembler DEFINES WTF_USE_ARMV7_DISASSEMBLER=1 ) -qt_extend_target(Qml CONDITION (TEST_architecture_arch STREQUAL "arm64") AND disassembler +qt_internal_extend_target(Qml CONDITION (TEST_architecture_arch STREQUAL "arm64") AND disassembler DEFINES WTF_USE_ARM64_DISASSEMBLER=1 ) -qt_extend_target(Qml CONDITION (TEST_architecture_arch STREQUAL "mips") AND disassembler +qt_internal_extend_target(Qml CONDITION (TEST_architecture_arch STREQUAL "mips") AND disassembler DEFINES WTF_USE_MIPS32_DISASSEMBLER=1 ) -qt_extend_target(Qml CONDITION NOT disassembler +qt_internal_extend_target(Qml CONDITION NOT disassembler DEFINES WTF_USE_UDIS86=0 ) -qt_extend_target(Qml CONDITION CMAKE_BUILD_TYPE STREQUAL Release +qt_internal_extend_target(Qml CONDITION CMAKE_BUILD_TYPE STREQUAL Release DEFINES NDEBUG ) -qt_extend_target(Qml CONDITION GCC AND QT_COMPILER_VERSION_MAJOR STRGREATER 6 AND NOT CLANG AND NOT ICC +qt_internal_extend_target(Qml CONDITION GCC AND QT_COMPILER_VERSION_MAJOR STRGREATER 6 AND NOT CLANG AND NOT ICC COMPILE_OPTIONS -Wno-expansion-to-defined ) @@ -591,17 +591,17 @@ qt_extend_target(Qml CONDITION GCC AND QT_COMPILER_VERSION_MAJOR STRGREATER 6 AN #### Keys ignored in scope 66:.:../3rdparty/masm:../3rdparty/masm/masm-defs.pri:(QT_COMPILER_VERSION_MAJOR STRGREATER 6): # QMAKE_CXXFLAGS_WARN_ON = "-Wno-expansion-to-defined" -qt_extend_target(Qml CONDITION INTEGRITY +qt_internal_extend_target(Qml CONDITION INTEGRITY SOURCES ../3rdparty/masm/wtf/OSAllocatorIntegrity.cpp ) -qt_extend_target(Qml CONDITION UNIX AND NOT INTEGRITY +qt_internal_extend_target(Qml CONDITION UNIX AND NOT INTEGRITY SOURCES ../3rdparty/masm/wtf/OSAllocatorPosix.cpp ) -qt_extend_target(Qml CONDITION DEFINES___contains___WTF_USE_UDIS86=1 +qt_internal_extend_target(Qml CONDITION DEFINES___contains___WTF_USE_UDIS86=1 SOURCES ../3rdparty/masm/disassembler/udis86/udis86.c ../3rdparty/masm/disassembler/udis86/udis86_decode.c @@ -629,20 +629,20 @@ qt_extend_target(Qml CONDITION DEFINES___contains___WTF_USE_UDIS86=1 #### Keys ignored in scope 75:.:../3rdparty/masm:../3rdparty/masm/masm.pri:else: # GENERATEDDIR = "$$GENERATEDDIR/release" -qt_extend_target(Qml CONDITION (NOT c++11 AND NOT ICC) AND (CLANG) +qt_internal_extend_target(Qml CONDITION (NOT c++11 AND NOT ICC) AND (CLANG) COMPILE_OPTIONS -Wno-c++0x-extensions -Wno-c++11-extensions ) -qt_extend_target(Qml CONDITION (((NOT c++11 AND NOT ICC) AND (NOT (CLANG))) AND (GCC)) AND ((QT_COMPILER_VERSION_MAJOR STRGREATER 4) OR (QT_COMPILER_VERSION_MINOR STRGREATER 5)) +qt_internal_extend_target(Qml CONDITION (((NOT c++11 AND NOT ICC) AND (NOT (CLANG))) AND (GCC)) AND ((QT_COMPILER_VERSION_MAJOR STRGREATER 4) OR (QT_COMPILER_VERSION_MINOR STRGREATER 5)) COMPILE_OPTIONS -Wno-c++0x-compat ) -qt_create_tracepoints(Qml qtqml.tracepoints) -qt_add_docs(Qml +qt_internal_create_tracepoints(Qml qtqml.tracepoints) +qt_internal_add_docs(Qml doc/qtqml.qdocconf ) diff --git a/src/qmlcompiler/CMakeLists.txt b/src/qmlcompiler/CMakeLists.txt index 396d9c2ea2..8b7c6139f3 100644 --- a/src/qmlcompiler/CMakeLists.txt +++ b/src/qmlcompiler/CMakeLists.txt @@ -4,7 +4,7 @@ ## QmlCompiler Module: ##################################################################### -qt_add_module(QmlCompiler +qt_internal_add_module(QmlCompiler STATIC INTERNAL_MODULE SOURCES diff --git a/src/qmldebug/CMakeLists.txt b/src/qmldebug/CMakeLists.txt index da27e1da49..1801a77793 100644 --- a/src/qmldebug/CMakeLists.txt +++ b/src/qmldebug/CMakeLists.txt @@ -4,7 +4,7 @@ ## QmlDebug Module: ##################################################################### -qt_add_module(QmlDebug +qt_internal_add_module(QmlDebug STATIC INTERNAL_MODULE SOURCES diff --git a/src/qmldevtools/.prev_CMakeLists.txt b/src/qmldevtools/.prev_CMakeLists.txt index 5a26da799d..6ef3e9ec58 100644 --- a/src/qmldevtools/.prev_CMakeLists.txt +++ b/src/qmldevtools/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## QmlDevTools Module: ##################################################################### -qt_add_module(QmlDevTools +qt_internal_add_module(QmlDevTools STATIC INTERNAL_MODULE NO_SYNC_QT @@ -85,7 +85,7 @@ qt_process_qlalr( # QML_COMPILE_HASH = "$$commit" # commit = "$$system(git rev-parse HEAD)" -qt_extend_target(QmlDevTools CONDITION GCC AND QT_COMPILER_VERSION_MAJOR STREQUAL 5 +qt_internal_extend_target(QmlDevTools CONDITION GCC AND QT_COMPILER_VERSION_MAJOR STREQUAL 5 COMPILE_OPTIONS -fno-strict-aliasing ) diff --git a/src/qmldevtools/CMakeLists.txt b/src/qmldevtools/CMakeLists.txt index e792b84d99..7a04cf5c47 100644 --- a/src/qmldevtools/CMakeLists.txt +++ b/src/qmldevtools/CMakeLists.txt @@ -4,7 +4,7 @@ ## QmlDevTools Module: ##################################################################### -qt_add_module(QmlDevTools +qt_internal_add_module(QmlDevTools STATIC INTERNAL_MODULE NO_SYNC_QT @@ -132,7 +132,7 @@ add_dependencies(QmlDevTools Qml) # QML_COMPILE_HASH = "$$commit" # commit = "$$system(git rev-parse HEAD)" -qt_extend_target(QmlDevTools CONDITION GCC AND QT_COMPILER_VERSION_MAJOR STREQUAL 5 +qt_internal_extend_target(QmlDevTools CONDITION GCC AND QT_COMPILER_VERSION_MAJOR STREQUAL 5 COMPILE_OPTIONS -fno-strict-aliasing ) diff --git a/src/qmlmodels/CMakeLists.txt b/src/qmlmodels/CMakeLists.txt index e4d3903b4f..bb8974fe55 100644 --- a/src/qmlmodels/CMakeLists.txt +++ b/src/qmlmodels/CMakeLists.txt @@ -4,7 +4,7 @@ ## QmlModels Module: ##################################################################### -qt_add_module(QmlModels +qt_internal_add_module(QmlModels GENERATE_METATYPES SOURCES qqmlchangeset.cpp qqmlchangeset_p.h @@ -34,26 +34,26 @@ qt_add_module(QmlModels ## Scopes: ##################################################################### -qt_extend_target(QmlModels CONDITION QT_FEATURE_qml_object_model +qt_internal_extend_target(QmlModels CONDITION QT_FEATURE_qml_object_model SOURCES qqmlinstantiator.cpp qqmlinstantiator_p.h qqmlinstantiator_p_p.h qqmlobjectmodel.cpp qqmlobjectmodel_p.h ) -qt_extend_target(QmlModels CONDITION QT_FEATURE_qml_table_model +qt_internal_extend_target(QmlModels CONDITION QT_FEATURE_qml_table_model SOURCES qqmltableinstancemodel.cpp qqmltableinstancemodel_p.h ) -qt_extend_target(QmlModels CONDITION QT_FEATURE_qml_list_model +qt_internal_extend_target(QmlModels CONDITION QT_FEATURE_qml_list_model SOURCES qqmllistmodel.cpp qqmllistmodel_p.h qqmllistmodel_p_p.h qqmllistmodelworkeragent.cpp qqmllistmodelworkeragent_p.h ) -qt_extend_target(QmlModels CONDITION QT_FEATURE_qml_delegate_model +qt_internal_extend_target(QmlModels CONDITION QT_FEATURE_qml_delegate_model SOURCES qqmlabstractdelegatecomponent.cpp qqmlabstractdelegatecomponent_p.h qqmladaptormodel.cpp qqmladaptormodel_p.h @@ -63,7 +63,7 @@ qt_extend_target(QmlModels CONDITION QT_FEATURE_qml_delegate_model qqmllistcompositor.cpp qqmllistcompositor_p.h qquickpackage.cpp qquickpackage_p.h ) -qt_add_docs(QmlModels +qt_internal_add_docs(QmlModels doc/qtqmlmodels.qdocconf ) diff --git a/src/qmltest/.prev_CMakeLists.txt b/src/qmltest/.prev_CMakeLists.txt index 33e7bcbaab..f0913be5a1 100644 --- a/src/qmltest/.prev_CMakeLists.txt +++ b/src/qmltest/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## QuickTest Module: ##################################################################### -qt_add_module(QuickTest +qt_internal_add_module(QuickTest GENERATE_METATYPES QMAKE_MODULE_CONFIG $${QT.testlib.CONFIG} SOURCES @@ -41,14 +41,14 @@ qt_add_module(QuickTest ## Scopes: ##################################################################### -qt_extend_target(QuickTest CONDITION TARGET Qt::Widgets +qt_internal_extend_target(QuickTest CONDITION TARGET Qt::Widgets DEFINES QT_QMLTEST_WITH_WIDGETS PUBLIC_LIBRARIES Qt::Widgets ) -qt_extend_target(QuickTest CONDITION QT_FEATURE_qml_debug +qt_internal_extend_target(QuickTest CONDITION QT_FEATURE_qml_debug DEFINES QT_QML_DEBUG_NO_WARNING ) @@ -58,7 +58,7 @@ qt_extend_target(QuickTest CONDITION QT_FEATURE_qml_debug #### Keys ignored in scope 5:.:.:qmltest.pro:else: # COPIES = "qmldir" -qt_add_docs(QuickTest +qt_internal_add_docs(QuickTest doc/qtqmltest.qdocconf ) diff --git a/src/qmltest/CMakeLists.txt b/src/qmltest/CMakeLists.txt index 9e7d76fff8..a139b7abf4 100644 --- a/src/qmltest/CMakeLists.txt +++ b/src/qmltest/CMakeLists.txt @@ -4,7 +4,7 @@ ## QuickTest Module: ##################################################################### -qt_add_module(QuickTest +qt_internal_add_module(QuickTest GENERATE_METATYPES QMAKE_MODULE_CONFIG $${QT.testlib.CONFIG} SOURCES @@ -42,14 +42,14 @@ qt_add_module(QuickTest ## Scopes: ##################################################################### -qt_extend_target(QuickTest CONDITION TARGET Qt::Widgets +qt_internal_extend_target(QuickTest CONDITION TARGET Qt::Widgets DEFINES QT_QMLTEST_WITH_WIDGETS PUBLIC_LIBRARIES Qt::Widgets ) -qt_extend_target(QuickTest CONDITION QT_FEATURE_qml_debug +qt_internal_extend_target(QuickTest CONDITION QT_FEATURE_qml_debug DEFINES QT_QML_DEBUG_NO_WARNING ) @@ -59,7 +59,7 @@ qt_extend_target(QuickTest CONDITION QT_FEATURE_qml_debug #### Keys ignored in scope 5:.:.:qmltest.pro:else: # COPIES = "qmldir" -qt_add_docs(QuickTest +qt_internal_add_docs(QuickTest doc/qtqmltest.qdocconf ) diff --git a/src/qmltyperegistrar/.prev_CMakeLists.txt b/src/qmltyperegistrar/.prev_CMakeLists.txt index 5d77e64c67..7faf074456 100644 --- a/src/qmltyperegistrar/.prev_CMakeLists.txt +++ b/src/qmltyperegistrar/.prev_CMakeLists.txt @@ -5,7 +5,7 @@ ##################################################################### qt_get_tool_target_name(target_name qmltyperegistrar) -qt_add_tool(${target_name} +qt_internal_add_tool(${target_name} TARGET_DESCRIPTION "QML Types Registrar" SOURCES ../qmlcompiler/qqmljsstreamwriter.cpp ../qmlcompiler/qqmljsstreamwriter_p.h diff --git a/src/qmltyperegistrar/CMakeLists.txt b/src/qmltyperegistrar/CMakeLists.txt index 1269461c3a..cefb255cc6 100644 --- a/src/qmltyperegistrar/CMakeLists.txt +++ b/src/qmltyperegistrar/CMakeLists.txt @@ -5,7 +5,7 @@ ##################################################################### qt_get_tool_target_name(target_name qmltyperegistrar) -qt_add_tool(${target_name} +qt_internal_add_tool(${target_name} TARGET_DESCRIPTION "QML Types Registrar" TOOLS_TARGET Qml # special case SOURCES diff --git a/src/qmlworkerscript/.prev_CMakeLists.txt b/src/qmlworkerscript/.prev_CMakeLists.txt index 0ce8a06c72..edfc1a298a 100644 --- a/src/qmlworkerscript/.prev_CMakeLists.txt +++ b/src/qmlworkerscript/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## QmlWorkerScript Module: ##################################################################### -qt_add_module(QmlWorkerScript +qt_internal_add_module(QmlWorkerScript GENERATE_METATYPES SOURCES qquickworkerscript.cpp qquickworkerscript_p.h @@ -57,49 +57,49 @@ qt_add_module(QmlWorkerScript ## Scopes: ##################################################################### -qt_extend_target(QmlWorkerScript CONDITION WIN32 +qt_internal_extend_target(QmlWorkerScript CONDITION WIN32 DEFINES NOMINMAX ) -qt_extend_target(QmlWorkerScript CONDITION disassembler AND ((TEST_architecture_arch STREQUAL "i386") OR (TEST_architecture_arch STREQUAL "x86_64")) +qt_internal_extend_target(QmlWorkerScript CONDITION disassembler AND ((TEST_architecture_arch STREQUAL "i386") OR (TEST_architecture_arch STREQUAL "x86_64")) DEFINES WTF_USE_UDIS86=1 ) -qt_extend_target(QmlWorkerScript CONDITION (TEST_architecture_arch STREQUAL "arm") AND disassembler +qt_internal_extend_target(QmlWorkerScript CONDITION (TEST_architecture_arch STREQUAL "arm") AND disassembler DEFINES WTF_USE_ARMV7_DISASSEMBLER=1 ) -qt_extend_target(QmlWorkerScript CONDITION (TEST_architecture_arch STREQUAL "arm64") AND disassembler +qt_internal_extend_target(QmlWorkerScript CONDITION (TEST_architecture_arch STREQUAL "arm64") AND disassembler DEFINES WTF_USE_ARM64_DISASSEMBLER=1 ) -qt_extend_target(QmlWorkerScript CONDITION (TEST_architecture_arch STREQUAL "mips") AND disassembler +qt_internal_extend_target(QmlWorkerScript CONDITION (TEST_architecture_arch STREQUAL "mips") AND disassembler DEFINES WTF_USE_MIPS32_DISASSEMBLER=1 ) -qt_extend_target(QmlWorkerScript CONDITION NOT disassembler +qt_internal_extend_target(QmlWorkerScript CONDITION NOT disassembler DEFINES WTF_USE_UDIS86=0 ) -qt_extend_target(QmlWorkerScript CONDITION CMAKE_BUILD_TYPE STREQUAL Release +qt_internal_extend_target(QmlWorkerScript CONDITION CMAKE_BUILD_TYPE STREQUAL Release DEFINES NDEBUG ) -qt_extend_target(QmlWorkerScript CONDITION GCC AND QT_COMPILER_VERSION_MAJOR STRGREATER 6 AND NOT CLANG AND NOT ICC +qt_internal_extend_target(QmlWorkerScript CONDITION GCC AND QT_COMPILER_VERSION_MAJOR STRGREATER 6 AND NOT CLANG AND NOT ICC COMPILE_OPTIONS -Wno-expansion-to-defined ) #### Keys ignored in scope 12:.:../3rdparty/masm:../3rdparty/masm/masm-defs.pri:(QT_COMPILER_VERSION_MAJOR STRGREATER 6): # QMAKE_CXXFLAGS_WARN_ON = "-Wno-expansion-to-defined" -qt_add_docs(QmlWorkerScript +qt_internal_add_docs(QmlWorkerScript doc/qtqmlworkerscript.qdocconf ) diff --git a/src/qmlworkerscript/CMakeLists.txt b/src/qmlworkerscript/CMakeLists.txt index 36e2b0dc68..5143edabde 100644 --- a/src/qmlworkerscript/CMakeLists.txt +++ b/src/qmlworkerscript/CMakeLists.txt @@ -4,7 +4,7 @@ ## QmlWorkerScript Module: ##################################################################### -qt_add_module(QmlWorkerScript +qt_internal_add_module(QmlWorkerScript GENERATE_METATYPES SOURCES qquickworkerscript.cpp qquickworkerscript_p.h @@ -57,49 +57,49 @@ qt_add_module(QmlWorkerScript ## Scopes: ##################################################################### -qt_extend_target(QmlWorkerScript CONDITION WIN32 +qt_internal_extend_target(QmlWorkerScript CONDITION WIN32 DEFINES NOMINMAX ) -qt_extend_target(QmlWorkerScript CONDITION disassembler AND ((TEST_architecture_arch STREQUAL "i386") OR (TEST_architecture_arch STREQUAL "x86_64")) +qt_internal_extend_target(QmlWorkerScript CONDITION disassembler AND ((TEST_architecture_arch STREQUAL "i386") OR (TEST_architecture_arch STREQUAL "x86_64")) DEFINES WTF_USE_UDIS86=1 ) -qt_extend_target(QmlWorkerScript CONDITION (TEST_architecture_arch STREQUAL "arm") AND disassembler +qt_internal_extend_target(QmlWorkerScript CONDITION (TEST_architecture_arch STREQUAL "arm") AND disassembler DEFINES WTF_USE_ARMV7_DISASSEMBLER=1 ) -qt_extend_target(QmlWorkerScript CONDITION (TEST_architecture_arch STREQUAL "arm64") AND disassembler +qt_internal_extend_target(QmlWorkerScript CONDITION (TEST_architecture_arch STREQUAL "arm64") AND disassembler DEFINES WTF_USE_ARM64_DISASSEMBLER=1 ) -qt_extend_target(QmlWorkerScript CONDITION (TEST_architecture_arch STREQUAL "mips") AND disassembler +qt_internal_extend_target(QmlWorkerScript CONDITION (TEST_architecture_arch STREQUAL "mips") AND disassembler DEFINES WTF_USE_MIPS32_DISASSEMBLER=1 ) -qt_extend_target(QmlWorkerScript CONDITION NOT disassembler +qt_internal_extend_target(QmlWorkerScript CONDITION NOT disassembler DEFINES WTF_USE_UDIS86=0 ) -qt_extend_target(QmlWorkerScript CONDITION CMAKE_BUILD_TYPE STREQUAL Release +qt_internal_extend_target(QmlWorkerScript CONDITION CMAKE_BUILD_TYPE STREQUAL Release DEFINES NDEBUG ) -qt_extend_target(QmlWorkerScript CONDITION GCC AND QT_COMPILER_VERSION_MAJOR STRGREATER 6 AND NOT CLANG AND NOT ICC +qt_internal_extend_target(QmlWorkerScript CONDITION GCC AND QT_COMPILER_VERSION_MAJOR STRGREATER 6 AND NOT CLANG AND NOT ICC COMPILE_OPTIONS -Wno-expansion-to-defined ) #### Keys ignored in scope 12:.:../3rdparty/masm:../3rdparty/masm/masm-defs.pri:(QT_COMPILER_VERSION_MAJOR STRGREATER 6): # QMAKE_CXXFLAGS_WARN_ON = "-Wno-expansion-to-defined" -qt_add_docs(QmlWorkerScript +qt_internal_add_docs(QmlWorkerScript doc/qtqmlworkerscript.qdocconf ) diff --git a/src/quick/.prev_CMakeLists.txt b/src/quick/.prev_CMakeLists.txt index d9d099cce4..3e66181c03 100644 --- a/src/quick/.prev_CMakeLists.txt +++ b/src/quick/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## Quick Module: ##################################################################### -qt_add_module(Quick +qt_internal_add_module(Quick GENERATE_METATYPES PLUGIN_TYPES scenegraph SOURCES @@ -275,7 +275,7 @@ set(scenegraph_resource_files "shaders_ng/visualization.vert.qsb" ) -qt_add_resource(Quick "scenegraph" +qt_internal_add_resource(Quick "scenegraph" PREFIX "/qt-project.org/scenegraph" BASE @@ -302,19 +302,19 @@ endif() ## Scopes: ##################################################################### -qt_extend_target(Quick CONDITION QT_FEATURE_qml_network +qt_internal_extend_target(Quick CONDITION QT_FEATURE_qml_network LIBRARIES Qt::Network ) -qt_extend_target(Quick CONDITION QT_FEATURE_opengl +qt_internal_extend_target(Quick CONDITION QT_FEATURE_opengl LIBRARIES Qt::OpenGLPrivate PUBLIC_LIBRARIES Qt::OpenGL ) -qt_extend_target(Quick CONDITION MSVC +qt_internal_extend_target(Quick CONDITION MSVC DEFINES _CRT_SECURE_NO_WARNINGS ) @@ -322,12 +322,12 @@ qt_extend_target(Quick CONDITION MSVC #### Keys ignored in scope 5:.:.:quick.pro:solaris-cc_x_: # QMAKE_CXXFLAGS_RELEASE = "--O2" -qt_extend_target(Quick CONDITION WIN32 +qt_internal_extend_target(Quick CONDITION WIN32 PUBLIC_LIBRARIES user32 ) -qt_extend_target(Quick CONDITION EXISTS "qqml_enable_gcov" +qt_internal_extend_target(Quick CONDITION EXISTS "qqml_enable_gcov" LIBRARIES gcov COMPILE_OPTIONS @@ -336,7 +336,7 @@ qt_extend_target(Quick CONDITION EXISTS "qqml_enable_gcov" -ftest-coverage ) -qt_extend_target(Quick CONDITION QT_FEATURE_quick_designer +qt_internal_extend_target(Quick CONDITION QT_FEATURE_quick_designer SOURCES designer/qqmldesignermetaobject.cpp designer/qqmldesignermetaobject_p.h designer/qquickdesignercustomobjectdata.cpp designer/qquickdesignercustomobjectdata_p.h @@ -350,7 +350,7 @@ qt_extend_target(Quick CONDITION QT_FEATURE_quick_designer designer/qquickdesignerwindowmanager.cpp designer/qquickdesignerwindowmanager_p.h ) -qt_extend_target(Quick CONDITION QT_FEATURE_accessibility +qt_internal_extend_target(Quick CONDITION QT_FEATURE_accessibility SOURCES accessible/qaccessiblequickitem.cpp accessible/qaccessiblequickitem_p.h accessible/qaccessiblequickview.cpp accessible/qaccessiblequickview_p.h @@ -375,41 +375,41 @@ qt_extend_target(Quick CONDITION QT_FEATURE_accessibility #### Keys ignored in scope 11:.:.:quick.pro:else: # COPIES = "qmldir" -qt_extend_target(Quick CONDITION QT_FEATURE_qml_debug +qt_internal_extend_target(Quick CONDITION QT_FEATURE_qml_debug SOURCES util/qquickprofiler.cpp ) -qt_extend_target(Quick CONDITION QT_FEATURE_shortcut +qt_internal_extend_target(Quick CONDITION QT_FEATURE_shortcut SOURCES util/qquickshortcut.cpp util/qquickshortcut_p.h ) -qt_extend_target(Quick CONDITION QT_FEATURE_quick_path +qt_internal_extend_target(Quick CONDITION QT_FEATURE_quick_path SOURCES util/qquickpath.cpp util/qquickpath_p.h util/qquickpath_p_p.h util/qquickpathinterpolator.cpp util/qquickpathinterpolator_p.h ) -qt_extend_target(Quick CONDITION QT_FEATURE_opengl OR QT_FEATURE_opengles2 OR QT_FEATURE_opengles3 +qt_internal_extend_target(Quick CONDITION QT_FEATURE_opengl OR QT_FEATURE_opengles2 OR QT_FEATURE_opengles3 SOURCES items/qquickframebufferobject.cpp items/qquickframebufferobject.h util/qquickopenglutils.cpp util/qquickopenglutils.h ) -qt_extend_target(Quick CONDITION IOS OR MACOS +qt_internal_extend_target(Quick CONDITION IOS OR MACOS SOURCES scenegraph/coreapi/qsgtexture_mac.mm ) -qt_extend_target(Quick CONDITION QT_FEATURE_thread +qt_internal_extend_target(Quick CONDITION QT_FEATURE_thread SOURCES scenegraph/adaptations/software/qsgsoftwarethreadedrenderloop.cpp scenegraph/adaptations/software/qsgsoftwarethreadedrenderloop_p.h scenegraph/qsgthreadedrenderloop.cpp scenegraph/qsgthreadedrenderloop_p.h ) -qt_extend_target(Quick CONDITION QT_FEATURE_quick_sprite +qt_internal_extend_target(Quick CONDITION QT_FEATURE_quick_sprite SOURCES items/qquickanimatedsprite.cpp items/qquickanimatedsprite_p.h items/qquickanimatedsprite_p_p.h @@ -421,24 +421,24 @@ qt_extend_target(Quick CONDITION QT_FEATURE_quick_sprite scenegraph/qsgdefaultspritenode.cpp scenegraph/qsgdefaultspritenode_p.h ) -qt_extend_target(Quick CONDITION QT_FEATURE_quick_draganddrop +qt_internal_extend_target(Quick CONDITION QT_FEATURE_quick_draganddrop SOURCES items/qquickdrag.cpp items/qquickdrag_p.h items/qquickdroparea.cpp items/qquickdroparea_p.h ) -qt_extend_target(Quick CONDITION QT_FEATURE_quick_animatedimage +qt_internal_extend_target(Quick CONDITION QT_FEATURE_quick_animatedimage SOURCES items/qquickanimatedimage.cpp items/qquickanimatedimage_p.h items/qquickanimatedimage_p_p.h ) -qt_extend_target(Quick CONDITION QT_FEATURE_quick_gridview +qt_internal_extend_target(Quick CONDITION QT_FEATURE_quick_gridview SOURCES items/qquickgridview.cpp items/qquickgridview_p.h ) -qt_extend_target(Quick CONDITION QT_FEATURE_quick_itemview +qt_internal_extend_target(Quick CONDITION QT_FEATURE_quick_itemview SOURCES items/qquickitemview.cpp items/qquickitemview_p.h items/qquickitemview_p_p.h @@ -446,53 +446,53 @@ qt_extend_target(Quick CONDITION QT_FEATURE_quick_itemview items/qquickitemviewfxitem_p_p.h ) -qt_extend_target(Quick CONDITION QT_FEATURE_quick_viewtransitions +qt_internal_extend_target(Quick CONDITION QT_FEATURE_quick_viewtransitions SOURCES items/qquickitemviewtransition.cpp items/qquickitemviewtransition_p.h ) -qt_extend_target(Quick CONDITION QT_FEATURE_quick_listview +qt_internal_extend_target(Quick CONDITION QT_FEATURE_quick_listview SOURCES items/qquicklistview.cpp items/qquicklistview_p.h ) -qt_extend_target(Quick CONDITION QT_FEATURE_quick_tableview +qt_internal_extend_target(Quick CONDITION QT_FEATURE_quick_tableview SOURCES items/qquicktableview.cpp items/qquicktableview_p.h items/qquicktableview_p_p.h ) -qt_extend_target(Quick CONDITION QT_FEATURE_quick_pathview +qt_internal_extend_target(Quick CONDITION QT_FEATURE_quick_pathview SOURCES items/qquickpathview.cpp items/qquickpathview_p.h items/qquickpathview_p_p.h ) -qt_extend_target(Quick CONDITION QT_FEATURE_quick_positioners +qt_internal_extend_target(Quick CONDITION QT_FEATURE_quick_positioners SOURCES items/qquickpositioners.cpp items/qquickpositioners_p.h items/qquickpositioners_p_p.h ) -qt_extend_target(Quick CONDITION QT_FEATURE_quick_flipable +qt_internal_extend_target(Quick CONDITION QT_FEATURE_quick_flipable SOURCES items/qquickflipable.cpp items/qquickflipable_p.h ) -qt_extend_target(Quick CONDITION QT_FEATURE_quick_repeater +qt_internal_extend_target(Quick CONDITION QT_FEATURE_quick_repeater SOURCES items/qquickrepeater.cpp items/qquickrepeater_p.h items/qquickrepeater_p_p.h ) -qt_extend_target(Quick CONDITION QT_FEATURE_quick_shadereffect +qt_internal_extend_target(Quick CONDITION QT_FEATURE_quick_shadereffect SOURCES items/qquickshadereffect.cpp items/qquickshadereffect_p.h items/qquickshadereffectmesh.cpp items/qquickshadereffectmesh_p.h items/qquickshadereffectsource.cpp items/qquickshadereffectsource_p.h ) -qt_extend_target(Quick CONDITION QT_FEATURE_quick_canvas +qt_internal_extend_target(Quick CONDITION QT_FEATURE_quick_canvas SOURCES items/context2d/qquickcanvascontext.cpp items/context2d/qquickcanvascontext_p.h items/context2d/qquickcanvasitem.cpp items/context2d/qquickcanvasitem_p.h @@ -502,15 +502,15 @@ qt_extend_target(Quick CONDITION QT_FEATURE_quick_canvas items/context2d/qquickcontext2dtile.cpp items/context2d/qquickcontext2dtile_p.h ) -qt_extend_target(Quick CONDITION QT_FEATURE_wheelevent +qt_internal_extend_target(Quick CONDITION QT_FEATURE_wheelevent SOURCES handlers/qquickwheelhandler.cpp handlers/qquickwheelhandler_p.h handlers/qquickwheelhandler_p_p.h ) -qt_create_tracepoints(Quick qtquick.tracepoints) -qt_add_docs(Quick +qt_internal_create_tracepoints(Quick qtquick.tracepoints) +qt_internal_add_docs(Quick doc/qtquick.qdocconf ) diff --git a/src/quick/CMakeLists.txt b/src/quick/CMakeLists.txt index 67b6969467..5be34f3295 100644 --- a/src/quick/CMakeLists.txt +++ b/src/quick/CMakeLists.txt @@ -4,7 +4,7 @@ ## Quick Module: ##################################################################### -qt_add_module(Quick +qt_internal_add_module(Quick GENERATE_METATYPES PLUGIN_TYPES scenegraph SOURCES @@ -275,7 +275,7 @@ set(scenegraph_resource_files "shaders_ng/visualization.vert.qsb" ) -qt_add_resource(Quick "scenegraph" +qt_internal_add_resource(Quick "scenegraph" PREFIX "/qt-project.org/scenegraph" BASE @@ -302,19 +302,19 @@ endif() ## Scopes: ##################################################################### -qt_extend_target(Quick CONDITION QT_FEATURE_qml_network +qt_internal_extend_target(Quick CONDITION QT_FEATURE_qml_network LIBRARIES Qt::Network ) -qt_extend_target(Quick CONDITION QT_FEATURE_opengl +qt_internal_extend_target(Quick CONDITION QT_FEATURE_opengl LIBRARIES Qt::OpenGLPrivate PUBLIC_LIBRARIES Qt::OpenGL ) -qt_extend_target(Quick CONDITION MSVC +qt_internal_extend_target(Quick CONDITION MSVC DEFINES _CRT_SECURE_NO_WARNINGS ) @@ -322,12 +322,12 @@ qt_extend_target(Quick CONDITION MSVC #### Keys ignored in scope 5:.:.:quick.pro:solaris-cc_x_: # QMAKE_CXXFLAGS_RELEASE = "--O2" -qt_extend_target(Quick CONDITION WIN32 +qt_internal_extend_target(Quick CONDITION WIN32 PUBLIC_LIBRARIES user32 ) -qt_extend_target(Quick CONDITION EXISTS "qqml_enable_gcov" +qt_internal_extend_target(Quick CONDITION EXISTS "qqml_enable_gcov" LIBRARIES gcov COMPILE_OPTIONS @@ -336,7 +336,7 @@ qt_extend_target(Quick CONDITION EXISTS "qqml_enable_gcov" -ftest-coverage ) -qt_extend_target(Quick CONDITION QT_FEATURE_quick_designer +qt_internal_extend_target(Quick CONDITION QT_FEATURE_quick_designer SOURCES designer/qqmldesignermetaobject.cpp designer/qqmldesignermetaobject_p.h designer/qquickdesignercustomobjectdata.cpp designer/qquickdesignercustomobjectdata_p.h @@ -350,7 +350,7 @@ qt_extend_target(Quick CONDITION QT_FEATURE_quick_designer designer/qquickdesignerwindowmanager.cpp designer/qquickdesignerwindowmanager_p.h ) -qt_extend_target(Quick CONDITION QT_FEATURE_accessibility +qt_internal_extend_target(Quick CONDITION QT_FEATURE_accessibility SOURCES accessible/qaccessiblequickitem.cpp accessible/qaccessiblequickitem_p.h accessible/qaccessiblequickview.cpp accessible/qaccessiblequickview_p.h @@ -375,41 +375,41 @@ qt_extend_target(Quick CONDITION QT_FEATURE_accessibility #### Keys ignored in scope 11:.:.:quick.pro:else: # COPIES = "qmldir" -qt_extend_target(Quick CONDITION QT_FEATURE_qml_debug +qt_internal_extend_target(Quick CONDITION QT_FEATURE_qml_debug SOURCES util/qquickprofiler.cpp ) -qt_extend_target(Quick CONDITION QT_FEATURE_shortcut +qt_internal_extend_target(Quick CONDITION QT_FEATURE_shortcut SOURCES util/qquickshortcut.cpp util/qquickshortcut_p.h ) -qt_extend_target(Quick CONDITION QT_FEATURE_quick_path +qt_internal_extend_target(Quick CONDITION QT_FEATURE_quick_path SOURCES util/qquickpath.cpp util/qquickpath_p.h util/qquickpath_p_p.h util/qquickpathinterpolator.cpp util/qquickpathinterpolator_p.h ) -qt_extend_target(Quick CONDITION QT_FEATURE_opengl OR QT_FEATURE_opengles2 OR QT_FEATURE_opengles3 +qt_internal_extend_target(Quick CONDITION QT_FEATURE_opengl OR QT_FEATURE_opengles2 OR QT_FEATURE_opengles3 SOURCES items/qquickframebufferobject.cpp items/qquickframebufferobject.h util/qquickopenglutils.cpp util/qquickopenglutils.h ) -qt_extend_target(Quick CONDITION IOS OR MACOS +qt_internal_extend_target(Quick CONDITION IOS OR MACOS SOURCES scenegraph/coreapi/qsgtexture_mac.mm ) -qt_extend_target(Quick CONDITION QT_FEATURE_thread +qt_internal_extend_target(Quick CONDITION QT_FEATURE_thread SOURCES scenegraph/adaptations/software/qsgsoftwarethreadedrenderloop.cpp scenegraph/adaptations/software/qsgsoftwarethreadedrenderloop_p.h scenegraph/qsgthreadedrenderloop.cpp scenegraph/qsgthreadedrenderloop_p.h ) -qt_extend_target(Quick CONDITION QT_FEATURE_quick_sprite +qt_internal_extend_target(Quick CONDITION QT_FEATURE_quick_sprite SOURCES items/qquickanimatedsprite.cpp items/qquickanimatedsprite_p.h items/qquickanimatedsprite_p_p.h @@ -421,24 +421,24 @@ qt_extend_target(Quick CONDITION QT_FEATURE_quick_sprite scenegraph/qsgdefaultspritenode.cpp scenegraph/qsgdefaultspritenode_p.h ) -qt_extend_target(Quick CONDITION QT_FEATURE_quick_draganddrop +qt_internal_extend_target(Quick CONDITION QT_FEATURE_quick_draganddrop SOURCES items/qquickdrag.cpp items/qquickdrag_p.h items/qquickdroparea.cpp items/qquickdroparea_p.h ) -qt_extend_target(Quick CONDITION QT_FEATURE_quick_animatedimage +qt_internal_extend_target(Quick CONDITION QT_FEATURE_quick_animatedimage SOURCES items/qquickanimatedimage.cpp items/qquickanimatedimage_p.h items/qquickanimatedimage_p_p.h ) -qt_extend_target(Quick CONDITION QT_FEATURE_quick_gridview +qt_internal_extend_target(Quick CONDITION QT_FEATURE_quick_gridview SOURCES items/qquickgridview.cpp items/qquickgridview_p.h ) -qt_extend_target(Quick CONDITION QT_FEATURE_quick_itemview +qt_internal_extend_target(Quick CONDITION QT_FEATURE_quick_itemview SOURCES items/qquickitemview.cpp items/qquickitemview_p.h items/qquickitemview_p_p.h @@ -446,53 +446,53 @@ qt_extend_target(Quick CONDITION QT_FEATURE_quick_itemview items/qquickitemviewfxitem_p_p.h ) -qt_extend_target(Quick CONDITION QT_FEATURE_quick_viewtransitions +qt_internal_extend_target(Quick CONDITION QT_FEATURE_quick_viewtransitions SOURCES items/qquickitemviewtransition.cpp items/qquickitemviewtransition_p.h ) -qt_extend_target(Quick CONDITION QT_FEATURE_quick_listview +qt_internal_extend_target(Quick CONDITION QT_FEATURE_quick_listview SOURCES items/qquicklistview.cpp items/qquicklistview_p.h ) -qt_extend_target(Quick CONDITION QT_FEATURE_quick_tableview +qt_internal_extend_target(Quick CONDITION QT_FEATURE_quick_tableview SOURCES items/qquicktableview.cpp items/qquicktableview_p.h items/qquicktableview_p_p.h ) -qt_extend_target(Quick CONDITION QT_FEATURE_quick_pathview +qt_internal_extend_target(Quick CONDITION QT_FEATURE_quick_pathview SOURCES items/qquickpathview.cpp items/qquickpathview_p.h items/qquickpathview_p_p.h ) -qt_extend_target(Quick CONDITION QT_FEATURE_quick_positioners +qt_internal_extend_target(Quick CONDITION QT_FEATURE_quick_positioners SOURCES items/qquickpositioners.cpp items/qquickpositioners_p.h items/qquickpositioners_p_p.h ) -qt_extend_target(Quick CONDITION QT_FEATURE_quick_flipable +qt_internal_extend_target(Quick CONDITION QT_FEATURE_quick_flipable SOURCES items/qquickflipable.cpp items/qquickflipable_p.h ) -qt_extend_target(Quick CONDITION QT_FEATURE_quick_repeater +qt_internal_extend_target(Quick CONDITION QT_FEATURE_quick_repeater SOURCES items/qquickrepeater.cpp items/qquickrepeater_p.h items/qquickrepeater_p_p.h ) -qt_extend_target(Quick CONDITION QT_FEATURE_quick_shadereffect +qt_internal_extend_target(Quick CONDITION QT_FEATURE_quick_shadereffect SOURCES items/qquickshadereffect.cpp items/qquickshadereffect_p.h items/qquickshadereffectmesh.cpp items/qquickshadereffectmesh_p.h items/qquickshadereffectsource.cpp items/qquickshadereffectsource_p.h ) -qt_extend_target(Quick CONDITION QT_FEATURE_quick_canvas +qt_internal_extend_target(Quick CONDITION QT_FEATURE_quick_canvas SOURCES items/context2d/qquickcanvascontext.cpp items/context2d/qquickcanvascontext_p.h items/context2d/qquickcanvasitem.cpp items/context2d/qquickcanvasitem_p.h @@ -502,15 +502,15 @@ qt_extend_target(Quick CONDITION QT_FEATURE_quick_canvas items/context2d/qquickcontext2dtile.cpp items/context2d/qquickcontext2dtile_p.h ) -qt_extend_target(Quick CONDITION QT_FEATURE_wheelevent +qt_internal_extend_target(Quick CONDITION QT_FEATURE_wheelevent SOURCES handlers/qquickwheelhandler.cpp handlers/qquickwheelhandler_p.h handlers/qquickwheelhandler_p_p.h ) -qt_create_tracepoints(Quick qtquick.tracepoints) -qt_add_docs(Quick +qt_internal_create_tracepoints(Quick qtquick.tracepoints) +qt_internal_add_docs(Quick doc/qtquick.qdocconf ) diff --git a/src/quickshapes/CMakeLists.txt b/src/quickshapes/CMakeLists.txt index 0833d51e1b..ac2615c47b 100644 --- a/src/quickshapes/CMakeLists.txt +++ b/src/quickshapes/CMakeLists.txt @@ -4,7 +4,7 @@ ## QuickShapes Module: ##################################################################### -qt_add_module(QuickShapes +qt_internal_add_module(QuickShapes INTERNAL_MODULE GENERATE_METATYPES SOURCES @@ -30,7 +30,7 @@ set(qtquickshapes_resource_files "shaders_ng/radialgradient.vert.qsb" ) -qt_add_resource(QuickShapes "qtquickshapes" +qt_internal_add_resource(QuickShapes "qtquickshapes" PREFIX "/qt-project.org/shapes" FILES diff --git a/src/quickwidgets/CMakeLists.txt b/src/quickwidgets/CMakeLists.txt index db1f39caad..c107723e70 100644 --- a/src/quickwidgets/CMakeLists.txt +++ b/src/quickwidgets/CMakeLists.txt @@ -4,7 +4,7 @@ ## QuickWidgets Module: ##################################################################### -qt_add_module(QuickWidgets +qt_internal_add_module(QuickWidgets SOURCES qquickwidget.cpp qquickwidget.h qquickwidget_p.h qtquickwidgetsglobal.h @@ -35,7 +35,7 @@ qt_add_module(QuickWidgets ## Scopes: ##################################################################### -qt_extend_target(QuickWidgets CONDITION QT_FEATURE_opengl +qt_internal_extend_target(QuickWidgets CONDITION QT_FEATURE_opengl LIBRARIES Qt::OpenGLPrivate ) diff --git a/tests/auto/particles/qquickage/CMakeLists.txt b/tests/auto/particles/qquickage/CMakeLists.txt index ef76c37e1e..ef1cb8fe45 100644 --- a/tests/auto/particles/qquickage/CMakeLists.txt +++ b/tests/auto/particles/qquickage/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qquickage +qt_internal_add_test(tst_qquickage SOURCES ../../shared/util.cpp ../../shared/util.h tst_qquickage.cpp @@ -29,12 +29,12 @@ qt_add_test(tst_qquickage ## Scopes: ##################################################################### -qt_extend_target(tst_qquickage CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquickage CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickage CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquickage CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/particles/qquickangleddirection/CMakeLists.txt b/tests/auto/particles/qquickangleddirection/CMakeLists.txt index 7d8d98c948..a60dfa8d6b 100644 --- a/tests/auto/particles/qquickangleddirection/CMakeLists.txt +++ b/tests/auto/particles/qquickangleddirection/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qquickangleddirection +qt_internal_add_test(tst_qquickangleddirection SOURCES ../../shared/util.cpp ../../shared/util.h tst_qquickangleddirection.cpp @@ -29,12 +29,12 @@ qt_add_test(tst_qquickangleddirection ## Scopes: ##################################################################### -qt_extend_target(tst_qquickangleddirection CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquickangleddirection CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickangleddirection CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquickangleddirection CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/particles/qquickcumulativedirection/CMakeLists.txt b/tests/auto/particles/qquickcumulativedirection/CMakeLists.txt index 49e4eabcbc..0eecede9a5 100644 --- a/tests/auto/particles/qquickcumulativedirection/CMakeLists.txt +++ b/tests/auto/particles/qquickcumulativedirection/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qquickcumulativedirection +qt_internal_add_test(tst_qquickcumulativedirection SOURCES ../../shared/util.cpp ../../shared/util.h tst_qquickcumulativedirection.cpp @@ -29,12 +29,12 @@ qt_add_test(tst_qquickcumulativedirection ## Scopes: ##################################################################### -qt_extend_target(tst_qquickcumulativedirection CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquickcumulativedirection CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickcumulativedirection CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquickcumulativedirection CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/particles/qquickcustomaffector/CMakeLists.txt b/tests/auto/particles/qquickcustomaffector/CMakeLists.txt index bf65a1056f..7b09402ea4 100644 --- a/tests/auto/particles/qquickcustomaffector/CMakeLists.txt +++ b/tests/auto/particles/qquickcustomaffector/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qquickcustomaffector +qt_internal_add_test(tst_qquickcustomaffector SOURCES ../../shared/util.cpp ../../shared/util.h tst_qquickcustomaffector.cpp @@ -29,12 +29,12 @@ qt_add_test(tst_qquickcustomaffector ## Scopes: ##################################################################### -qt_extend_target(tst_qquickcustomaffector CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquickcustomaffector CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickcustomaffector CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquickcustomaffector CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/particles/qquickellipseextruder/CMakeLists.txt b/tests/auto/particles/qquickellipseextruder/CMakeLists.txt index 6b56fe027a..4d432f78d0 100644 --- a/tests/auto/particles/qquickellipseextruder/CMakeLists.txt +++ b/tests/auto/particles/qquickellipseextruder/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qquickellipseextruder +qt_internal_add_test(tst_qquickellipseextruder SOURCES ../../shared/util.cpp ../../shared/util.h tst_qquickellipseextruder.cpp @@ -29,12 +29,12 @@ qt_add_test(tst_qquickellipseextruder ## Scopes: ##################################################################### -qt_extend_target(tst_qquickellipseextruder CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquickellipseextruder CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickellipseextruder CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquickellipseextruder CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/particles/qquickfriction/CMakeLists.txt b/tests/auto/particles/qquickfriction/CMakeLists.txt index b72caa7e24..5e7e270d69 100644 --- a/tests/auto/particles/qquickfriction/CMakeLists.txt +++ b/tests/auto/particles/qquickfriction/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qquickfriction +qt_internal_add_test(tst_qquickfriction SOURCES ../../shared/util.cpp ../../shared/util.h tst_qquickfriction.cpp @@ -29,12 +29,12 @@ qt_add_test(tst_qquickfriction ## Scopes: ##################################################################### -qt_extend_target(tst_qquickfriction CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquickfriction CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickfriction CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquickfriction CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/particles/qquickgravity/CMakeLists.txt b/tests/auto/particles/qquickgravity/CMakeLists.txt index 3c5c294a95..e555dd9f80 100644 --- a/tests/auto/particles/qquickgravity/CMakeLists.txt +++ b/tests/auto/particles/qquickgravity/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qquickgravity +qt_internal_add_test(tst_qquickgravity SOURCES ../../shared/util.cpp ../../shared/util.h tst_qquickgravity.cpp @@ -29,12 +29,12 @@ qt_add_test(tst_qquickgravity ## Scopes: ##################################################################### -qt_extend_target(tst_qquickgravity CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquickgravity CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickgravity CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquickgravity CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/particles/qquickgroupgoal/CMakeLists.txt b/tests/auto/particles/qquickgroupgoal/CMakeLists.txt index 6c8ed8d0d4..dbacb28d29 100644 --- a/tests/auto/particles/qquickgroupgoal/CMakeLists.txt +++ b/tests/auto/particles/qquickgroupgoal/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qquickgroupgoal +qt_internal_add_test(tst_qquickgroupgoal SOURCES ../../shared/util.cpp ../../shared/util.h tst_qquickgroupgoal.cpp @@ -29,12 +29,12 @@ qt_add_test(tst_qquickgroupgoal ## Scopes: ##################################################################### -qt_extend_target(tst_qquickgroupgoal CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquickgroupgoal CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickgroupgoal CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquickgroupgoal CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/particles/qquickimageparticle/CMakeLists.txt b/tests/auto/particles/qquickimageparticle/CMakeLists.txt index 819ea52b6e..03f6ea0ef8 100644 --- a/tests/auto/particles/qquickimageparticle/CMakeLists.txt +++ b/tests/auto/particles/qquickimageparticle/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qquickimageparticle +qt_internal_add_test(tst_qquickimageparticle SOURCES ../../shared/util.cpp ../../shared/util.h tst_qquickimageparticle.cpp @@ -29,12 +29,12 @@ qt_add_test(tst_qquickimageparticle ## Scopes: ##################################################################### -qt_extend_target(tst_qquickimageparticle CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquickimageparticle CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickimageparticle CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquickimageparticle CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/particles/qquickitemparticle/CMakeLists.txt b/tests/auto/particles/qquickitemparticle/CMakeLists.txt index e13dfc8b3f..ff695eb8af 100644 --- a/tests/auto/particles/qquickitemparticle/CMakeLists.txt +++ b/tests/auto/particles/qquickitemparticle/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qquickitemparticle +qt_internal_add_test(tst_qquickitemparticle SOURCES ../../shared/util.cpp ../../shared/util.h tst_qquickitemparticle.cpp @@ -29,12 +29,12 @@ qt_add_test(tst_qquickitemparticle ## Scopes: ##################################################################### -qt_extend_target(tst_qquickitemparticle CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquickitemparticle CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickitemparticle CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquickitemparticle CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/particles/qquicklineextruder/CMakeLists.txt b/tests/auto/particles/qquicklineextruder/CMakeLists.txt index b6dc214949..d7791103be 100644 --- a/tests/auto/particles/qquicklineextruder/CMakeLists.txt +++ b/tests/auto/particles/qquicklineextruder/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qquicklineextruder +qt_internal_add_test(tst_qquicklineextruder SOURCES ../../shared/util.cpp ../../shared/util.h tst_qquicklineextruder.cpp @@ -29,12 +29,12 @@ qt_add_test(tst_qquicklineextruder ## Scopes: ##################################################################### -qt_extend_target(tst_qquicklineextruder CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquicklineextruder CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquicklineextruder CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquicklineextruder CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/particles/qquickmaskextruder/CMakeLists.txt b/tests/auto/particles/qquickmaskextruder/CMakeLists.txt index f85092317e..0ea7f18f6d 100644 --- a/tests/auto/particles/qquickmaskextruder/CMakeLists.txt +++ b/tests/auto/particles/qquickmaskextruder/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qquickmaskextruder +qt_internal_add_test(tst_qquickmaskextruder SOURCES ../../shared/util.cpp ../../shared/util.h tst_qquickmaskextruder.cpp @@ -29,12 +29,12 @@ qt_add_test(tst_qquickmaskextruder ## Scopes: ##################################################################### -qt_extend_target(tst_qquickmaskextruder CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquickmaskextruder CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickmaskextruder CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquickmaskextruder CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/particles/qquickparticlegroup/CMakeLists.txt b/tests/auto/particles/qquickparticlegroup/CMakeLists.txt index ca5664bc4c..4d335b18d0 100644 --- a/tests/auto/particles/qquickparticlegroup/CMakeLists.txt +++ b/tests/auto/particles/qquickparticlegroup/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qquickparticlegroup +qt_internal_add_test(tst_qquickparticlegroup SOURCES ../../shared/util.cpp ../../shared/util.h tst_qquickparticlegroup.cpp @@ -29,12 +29,12 @@ qt_add_test(tst_qquickparticlegroup ## Scopes: ##################################################################### -qt_extend_target(tst_qquickparticlegroup CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquickparticlegroup CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickparticlegroup CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquickparticlegroup CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/particles/qquickparticlesystem/CMakeLists.txt b/tests/auto/particles/qquickparticlesystem/CMakeLists.txt index 20dd7d4ec8..984a7350f0 100644 --- a/tests/auto/particles/qquickparticlesystem/CMakeLists.txt +++ b/tests/auto/particles/qquickparticlesystem/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qquickparticlesystem +qt_internal_add_test(tst_qquickparticlesystem SOURCES ../../shared/util.cpp ../../shared/util.h tst_qquickparticlesystem.cpp @@ -29,12 +29,12 @@ qt_add_test(tst_qquickparticlesystem ## Scopes: ##################################################################### -qt_extend_target(tst_qquickparticlesystem CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquickparticlesystem CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickparticlesystem CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquickparticlesystem CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/particles/qquickpointattractor/CMakeLists.txt b/tests/auto/particles/qquickpointattractor/CMakeLists.txt index 6f01e7df7e..6dfdc085af 100644 --- a/tests/auto/particles/qquickpointattractor/CMakeLists.txt +++ b/tests/auto/particles/qquickpointattractor/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qquickpointattractor +qt_internal_add_test(tst_qquickpointattractor SOURCES ../../shared/util.cpp ../../shared/util.h tst_qquickpointattractor.cpp @@ -29,12 +29,12 @@ qt_add_test(tst_qquickpointattractor ## Scopes: ##################################################################### -qt_extend_target(tst_qquickpointattractor CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquickpointattractor CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickpointattractor CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquickpointattractor CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/particles/qquickpointdirection/CMakeLists.txt b/tests/auto/particles/qquickpointdirection/CMakeLists.txt index ee66e0af9f..73867c74bb 100644 --- a/tests/auto/particles/qquickpointdirection/CMakeLists.txt +++ b/tests/auto/particles/qquickpointdirection/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qquickpointdirection +qt_internal_add_test(tst_qquickpointdirection SOURCES ../../shared/util.cpp ../../shared/util.h tst_qquickpointdirection.cpp @@ -29,12 +29,12 @@ qt_add_test(tst_qquickpointdirection ## Scopes: ##################################################################### -qt_extend_target(tst_qquickpointdirection CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquickpointdirection CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickpointdirection CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquickpointdirection CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/particles/qquickrectangleextruder/CMakeLists.txt b/tests/auto/particles/qquickrectangleextruder/CMakeLists.txt index 991fa0069a..9e48fd6d93 100644 --- a/tests/auto/particles/qquickrectangleextruder/CMakeLists.txt +++ b/tests/auto/particles/qquickrectangleextruder/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qquickrectangleextruder +qt_internal_add_test(tst_qquickrectangleextruder SOURCES ../../shared/util.cpp ../../shared/util.h tst_qquickrectangleextruder.cpp @@ -29,12 +29,12 @@ qt_add_test(tst_qquickrectangleextruder ## Scopes: ##################################################################### -qt_extend_target(tst_qquickrectangleextruder CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquickrectangleextruder CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickrectangleextruder CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquickrectangleextruder CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/particles/qquickspritegoal/CMakeLists.txt b/tests/auto/particles/qquickspritegoal/CMakeLists.txt index 9e7ee863c9..0f87615bb0 100644 --- a/tests/auto/particles/qquickspritegoal/CMakeLists.txt +++ b/tests/auto/particles/qquickspritegoal/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qquickspritegoal +qt_internal_add_test(tst_qquickspritegoal SOURCES ../../shared/util.cpp ../../shared/util.h tst_qquickspritegoal.cpp @@ -29,12 +29,12 @@ qt_add_test(tst_qquickspritegoal ## Scopes: ##################################################################### -qt_extend_target(tst_qquickspritegoal CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquickspritegoal CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickspritegoal CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquickspritegoal CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/particles/qquicktargetdirection/CMakeLists.txt b/tests/auto/particles/qquicktargetdirection/CMakeLists.txt index d7cdb68677..1bb462af66 100644 --- a/tests/auto/particles/qquicktargetdirection/CMakeLists.txt +++ b/tests/auto/particles/qquicktargetdirection/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qquicktargetdirection +qt_internal_add_test(tst_qquicktargetdirection SOURCES ../../shared/util.cpp ../../shared/util.h tst_qquicktargetdirection.cpp @@ -29,12 +29,12 @@ qt_add_test(tst_qquicktargetdirection ## Scopes: ##################################################################### -qt_extend_target(tst_qquicktargetdirection CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquicktargetdirection CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquicktargetdirection CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquicktargetdirection CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/particles/qquicktrailemitter/CMakeLists.txt b/tests/auto/particles/qquicktrailemitter/CMakeLists.txt index b4852f40eb..e7eb6ab607 100644 --- a/tests/auto/particles/qquicktrailemitter/CMakeLists.txt +++ b/tests/auto/particles/qquicktrailemitter/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qquicktrailemitter +qt_internal_add_test(tst_qquicktrailemitter SOURCES ../../shared/util.cpp ../../shared/util.h tst_qquicktrailemitter.cpp @@ -29,12 +29,12 @@ qt_add_test(tst_qquicktrailemitter ## Scopes: ##################################################################### -qt_extend_target(tst_qquicktrailemitter CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquicktrailemitter CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquicktrailemitter CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquicktrailemitter CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/particles/qquickturbulence/CMakeLists.txt b/tests/auto/particles/qquickturbulence/CMakeLists.txt index c5ae3db05c..166649214c 100644 --- a/tests/auto/particles/qquickturbulence/CMakeLists.txt +++ b/tests/auto/particles/qquickturbulence/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qquickturbulence +qt_internal_add_test(tst_qquickturbulence SOURCES ../../shared/util.cpp ../../shared/util.h tst_qquickturbulence.cpp @@ -29,12 +29,12 @@ qt_add_test(tst_qquickturbulence ## Scopes: ##################################################################### -qt_extend_target(tst_qquickturbulence CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquickturbulence CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickturbulence CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquickturbulence CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/particles/qquickwander/CMakeLists.txt b/tests/auto/particles/qquickwander/CMakeLists.txt index b6e2f95bc6..8ce66a2318 100644 --- a/tests/auto/particles/qquickwander/CMakeLists.txt +++ b/tests/auto/particles/qquickwander/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qquickwander +qt_internal_add_test(tst_qquickwander SOURCES ../../shared/util.cpp ../../shared/util.h tst_qquickwander.cpp @@ -29,12 +29,12 @@ qt_add_test(tst_qquickwander ## Scopes: ##################################################################### -qt_extend_target(tst_qquickwander CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquickwander CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickwander CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquickwander CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/qml/animation/qabstractanimationjob/CMakeLists.txt b/tests/auto/qml/animation/qabstractanimationjob/CMakeLists.txt index 638540fab3..eb70a77bfd 100644 --- a/tests/auto/qml/animation/qabstractanimationjob/CMakeLists.txt +++ b/tests/auto/qml/animation/qabstractanimationjob/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qabstractanimationjob Test: ##################################################################### -qt_add_test(tst_qabstractanimationjob +qt_internal_add_test(tst_qabstractanimationjob SOURCES tst_qabstractanimationjob.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/qml/animation/qanimationgroupjob/CMakeLists.txt b/tests/auto/qml/animation/qanimationgroupjob/CMakeLists.txt index 54c1abb691..e7b979decb 100644 --- a/tests/auto/qml/animation/qanimationgroupjob/CMakeLists.txt +++ b/tests/auto/qml/animation/qanimationgroupjob/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qanimationgroupjob Test: ##################################################################### -qt_add_test(tst_qanimationgroupjob +qt_internal_add_test(tst_qanimationgroupjob SOURCES tst_qanimationgroupjob.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/qml/animation/qparallelanimationgroupjob/CMakeLists.txt b/tests/auto/qml/animation/qparallelanimationgroupjob/CMakeLists.txt index ba64d8cf0e..07ef4c2224 100644 --- a/tests/auto/qml/animation/qparallelanimationgroupjob/CMakeLists.txt +++ b/tests/auto/qml/animation/qparallelanimationgroupjob/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qparallelanimationgroupjob Test: ##################################################################### -qt_add_test(tst_qparallelanimationgroupjob +qt_internal_add_test(tst_qparallelanimationgroupjob SOURCES tst_qparallelanimationgroupjob.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/qml/animation/qpauseanimationjob/CMakeLists.txt b/tests/auto/qml/animation/qpauseanimationjob/CMakeLists.txt index a1d07be77c..c63d3e936a 100644 --- a/tests/auto/qml/animation/qpauseanimationjob/CMakeLists.txt +++ b/tests/auto/qml/animation/qpauseanimationjob/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qpauseanimationjob Test: ##################################################################### -qt_add_test(tst_qpauseanimationjob +qt_internal_add_test(tst_qpauseanimationjob SOURCES tst_qpauseanimationjob.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/qml/animation/qsequentialanimationgroupjob/CMakeLists.txt b/tests/auto/qml/animation/qsequentialanimationgroupjob/CMakeLists.txt index b675121510..54da6e6569 100644 --- a/tests/auto/qml/animation/qsequentialanimationgroupjob/CMakeLists.txt +++ b/tests/auto/qml/animation/qsequentialanimationgroupjob/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qsequentialanimationgroupjob Test: ##################################################################### -qt_add_test(tst_qsequentialanimationgroupjob +qt_internal_add_test(tst_qsequentialanimationgroupjob SOURCES tst_qsequentialanimationgroupjob.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/qml/bindingdependencyapi/CMakeLists.txt b/tests/auto/qml/bindingdependencyapi/CMakeLists.txt index 60e58bb08f..775160e4c5 100644 --- a/tests/auto/qml/bindingdependencyapi/CMakeLists.txt +++ b/tests/auto/qml/bindingdependencyapi/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_bindingdependencyapi +qt_internal_add_test(tst_bindingdependencyapi SOURCES ../../shared/util.cpp ../../shared/util.h tst_bindingdependencyapi.cpp @@ -28,12 +28,12 @@ qt_add_test(tst_bindingdependencyapi ## Scopes: ##################################################################### -qt_extend_target(tst_bindingdependencyapi CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_bindingdependencyapi CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_bindingdependencyapi CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_bindingdependencyapi CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/qml/debugger/qdebugmessageservice/CMakeLists.txt b/tests/auto/qml/debugger/qdebugmessageservice/CMakeLists.txt index bc1d98bfb9..3ad886b0ad 100644 --- a/tests/auto/qml/debugger/qdebugmessageservice/CMakeLists.txt +++ b/tests/auto/qml/debugger/qdebugmessageservice/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qdebugmessageservice +qt_internal_add_test(tst_qdebugmessageservice SOURCES ../../../shared/util.cpp ../../../shared/util.h ../shared/debugutil.cpp ../shared/debugutil_p.h @@ -34,12 +34,12 @@ qt_add_test(tst_qdebugmessageservice ## Scopes: ##################################################################### -qt_extend_target(tst_qdebugmessageservice CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qdebugmessageservice CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qdebugmessageservice CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qdebugmessageservice CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/qml/debugger/qpacketprotocol/CMakeLists.txt b/tests/auto/qml/debugger/qpacketprotocol/CMakeLists.txt index 390cc30d0f..3ab44c2670 100644 --- a/tests/auto/qml/debugger/qpacketprotocol/CMakeLists.txt +++ b/tests/auto/qml/debugger/qpacketprotocol/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qpacketprotocol Test: ##################################################################### -qt_add_test(tst_qpacketprotocol +qt_internal_add_test(tst_qpacketprotocol SOURCES ../../../shared/util.cpp ../../../shared/util.h ../shared/debugutil.cpp ../shared/debugutil_p.h @@ -24,12 +24,12 @@ qt_add_test(tst_qpacketprotocol ## Scopes: ##################################################################### -qt_extend_target(tst_qpacketprotocol CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qpacketprotocol CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qpacketprotocol CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qpacketprotocol CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/qml/debugger/qqmldebugclient/CMakeLists.txt b/tests/auto/qml/debugger/qqmldebugclient/CMakeLists.txt index dfdaadb869..86009707a9 100644 --- a/tests/auto/qml/debugger/qqmldebugclient/CMakeLists.txt +++ b/tests/auto/qml/debugger/qqmldebugclient/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qqmldebugclient Test: ##################################################################### -qt_add_test(tst_qqmldebugclient +qt_internal_add_test(tst_qqmldebugclient SOURCES ../../../shared/util.cpp ../../../shared/util.h ../shared/debugutil.cpp ../shared/debugutil_p.h @@ -28,12 +28,12 @@ qt_add_test(tst_qqmldebugclient ## Scopes: ##################################################################### -qt_extend_target(tst_qqmldebugclient CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qqmldebugclient CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qqmldebugclient CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qqmldebugclient CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/qml/debugger/qqmldebuggingenabler/qqmldebuggingenabler/CMakeLists.txt b/tests/auto/qml/debugger/qqmldebuggingenabler/qqmldebuggingenabler/CMakeLists.txt index 1bdc1ec192..8b3f0b6d5c 100644 --- a/tests/auto/qml/debugger/qqmldebuggingenabler/qqmldebuggingenabler/CMakeLists.txt +++ b/tests/auto/qml/debugger/qqmldebuggingenabler/qqmldebuggingenabler/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qqmldebuggingenabler Test: ##################################################################### -qt_add_test(tst_qqmldebuggingenabler +qt_internal_add_test(tst_qqmldebuggingenabler SOURCES ../../../../shared/util.cpp ../../../../shared/util.h ../../shared/debugutil.cpp ../../shared/debugutil_p.h @@ -27,12 +27,12 @@ qt_add_test(tst_qqmldebuggingenabler ## Scopes: ##################################################################### -qt_extend_target(tst_qqmldebuggingenabler CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qqmldebuggingenabler CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qqmldebuggingenabler CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qqmldebuggingenabler CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/qml/debugger/qqmldebuggingenabler/qqmldebuggingenablerserver/.prev_CMakeLists.txt b/tests/auto/qml/debugger/qqmldebuggingenabler/qqmldebuggingenablerserver/.prev_CMakeLists.txt index 818e639fb5..fda8f11cc6 100644 --- a/tests/auto/qml/debugger/qqmldebuggingenabler/qqmldebuggingenablerserver/.prev_CMakeLists.txt +++ b/tests/auto/qml/debugger/qqmldebuggingenabler/qqmldebuggingenablerserver/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## qqmldebuggingenablerserver Binary: ##################################################################### -qt_add_executable(qqmldebuggingenablerserver +qt_internal_add_executable(qqmldebuggingenablerserver INSTALL_DIRECTORY "${INSTALL_TESTSDIR}/tst_qqmldebuggingenabler" OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../qqmldebuggingenabler" SOURCES diff --git a/tests/auto/qml/debugger/qqmldebuggingenabler/qqmldebuggingenablerserver/CMakeLists.txt b/tests/auto/qml/debugger/qqmldebuggingenabler/qqmldebuggingenablerserver/CMakeLists.txt index 16dfb7b494..0df1846e22 100644 --- a/tests/auto/qml/debugger/qqmldebuggingenabler/qqmldebuggingenablerserver/CMakeLists.txt +++ b/tests/auto/qml/debugger/qqmldebuggingenabler/qqmldebuggingenablerserver/CMakeLists.txt @@ -4,7 +4,7 @@ ## qqmldebuggingenablerserver Binary: ##################################################################### -qt_add_executable(qqmldebuggingenablerserver +qt_internal_add_executable(qqmldebuggingenablerserver OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../qqmldebuggingenabler" # special case begin # Remove INSTALL_DIRECTORY with $$[QT_INSTALL_TESTS] diff --git a/tests/auto/qml/debugger/qqmldebugjs/CMakeLists.txt b/tests/auto/qml/debugger/qqmldebugjs/CMakeLists.txt index 11d16879ed..99a885589e 100644 --- a/tests/auto/qml/debugger/qqmldebugjs/CMakeLists.txt +++ b/tests/auto/qml/debugger/qqmldebugjs/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qqmldebugjs +qt_internal_add_test(tst_qqmldebugjs SOURCES ../../../shared/util.cpp ../../../shared/util.h ../shared/debugutil.cpp ../shared/debugutil_p.h @@ -33,12 +33,12 @@ qt_add_test(tst_qqmldebugjs ## Scopes: ##################################################################### -qt_extend_target(tst_qqmldebugjs CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qqmldebugjs CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qqmldebugjs CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qqmldebugjs CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/qml/debugger/qqmldebugjsserver/.prev_CMakeLists.txt b/tests/auto/qml/debugger/qqmldebugjsserver/.prev_CMakeLists.txt index 7d82431f5d..12c3c5b4d3 100644 --- a/tests/auto/qml/debugger/qqmldebugjsserver/.prev_CMakeLists.txt +++ b/tests/auto/qml/debugger/qqmldebugjsserver/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## qqmldebugjsserver Binary: ##################################################################### -qt_add_executable(qqmldebugjsserver +qt_internal_add_executable(qqmldebugjsserver OUTPUT_DIRECTORY "${INSTALL_TESTSDIR}/qqmldebugjsserver" INSTALL_DIRECTORY "${INSTALL_TESTSDIR}/qqmldebugjsserver" SOURCES diff --git a/tests/auto/qml/debugger/qqmldebugjsserver/CMakeLists.txt b/tests/auto/qml/debugger/qqmldebugjsserver/CMakeLists.txt index 605ad3562e..bbab6d9da2 100644 --- a/tests/auto/qml/debugger/qqmldebugjsserver/CMakeLists.txt +++ b/tests/auto/qml/debugger/qqmldebugjsserver/CMakeLists.txt @@ -4,7 +4,7 @@ ## qqmldebugjsserver Binary: ##################################################################### -qt_add_executable(qqmldebugjsserver +qt_internal_add_executable(qqmldebugjsserver # special case begin OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # INSTALL_DIRECTORY "${INSTALL_TESTSDIR}/qqmldebugjsserver" diff --git a/tests/auto/qml/debugger/qqmldebuglocal/CMakeLists.txt b/tests/auto/qml/debugger/qqmldebuglocal/CMakeLists.txt index 2b25248b0b..80836f5f6a 100644 --- a/tests/auto/qml/debugger/qqmldebuglocal/CMakeLists.txt +++ b/tests/auto/qml/debugger/qqmldebuglocal/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qqmldebuglocal Test: ##################################################################### -qt_add_test(tst_qqmldebuglocal +qt_internal_add_test(tst_qqmldebuglocal SOURCES ../../../shared/util.cpp ../../../shared/util.h ../shared/debugutil.cpp ../shared/debugutil_p.h @@ -27,12 +27,12 @@ qt_add_test(tst_qqmldebuglocal ## Scopes: ##################################################################### -qt_extend_target(tst_qqmldebuglocal CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qqmldebuglocal CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qqmldebuglocal CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qqmldebuglocal CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/qml/debugger/qqmldebugprocess/qqmldebugprocess/CMakeLists.txt b/tests/auto/qml/debugger/qqmldebugprocess/qqmldebugprocess/CMakeLists.txt index a98a809c7b..d4f1ce48ab 100644 --- a/tests/auto/qml/debugger/qqmldebugprocess/qqmldebugprocess/CMakeLists.txt +++ b/tests/auto/qml/debugger/qqmldebugprocess/qqmldebugprocess/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qqmldebugprocess Test: ##################################################################### -qt_add_test(tst_qqmldebugprocess +qt_internal_add_test(tst_qqmldebugprocess SOURCES ../../shared/qqmldebugprocess.cpp ../../shared/qqmldebugprocess_p.h tst_qqmldebugprocess.cpp diff --git a/tests/auto/qml/debugger/qqmldebugprocess/qqmldebugprocessprocess/.prev_CMakeLists.txt b/tests/auto/qml/debugger/qqmldebugprocess/qqmldebugprocessprocess/.prev_CMakeLists.txt index f5b04b18b5..c6daa58d24 100644 --- a/tests/auto/qml/debugger/qqmldebugprocess/qqmldebugprocessprocess/.prev_CMakeLists.txt +++ b/tests/auto/qml/debugger/qqmldebugprocess/qqmldebugprocessprocess/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## qqmldebugprocessprocess Binary: ##################################################################### -qt_add_executable(qqmldebugprocessprocess +qt_internal_add_executable(qqmldebugprocessprocess INSTALL_DIRECTORY "${INSTALL_TESTSDIR}/tst_qqmldebugprocess" OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../qqmldebugprocess" SOURCES diff --git a/tests/auto/qml/debugger/qqmldebugprocess/qqmldebugprocessprocess/CMakeLists.txt b/tests/auto/qml/debugger/qqmldebugprocess/qqmldebugprocessprocess/CMakeLists.txt index 35e602d4f9..69d5498b6b 100644 --- a/tests/auto/qml/debugger/qqmldebugprocess/qqmldebugprocessprocess/CMakeLists.txt +++ b/tests/auto/qml/debugger/qqmldebugprocess/qqmldebugprocessprocess/CMakeLists.txt @@ -4,7 +4,7 @@ ## qqmldebugprocessprocess Binary: ##################################################################### -qt_add_executable(qqmldebugprocessprocess +qt_internal_add_executable(qqmldebugprocessprocess OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../qqmldebugprocess" # special case begin # Remove INSTALL_DIRECTORY which starts with diff --git a/tests/auto/qml/debugger/qqmldebugservice/CMakeLists.txt b/tests/auto/qml/debugger/qqmldebugservice/CMakeLists.txt index 93ad4c76a7..7434dc4286 100644 --- a/tests/auto/qml/debugger/qqmldebugservice/CMakeLists.txt +++ b/tests/auto/qml/debugger/qqmldebugservice/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qqmldebugservice +qt_internal_add_test(tst_qqmldebugservice SOURCES ../../../shared/util.cpp ../../../shared/util.h ../shared/debugutil.cpp ../shared/debugutil_p.h @@ -37,12 +37,12 @@ qt_add_test(tst_qqmldebugservice ## Scopes: ##################################################################### -qt_extend_target(tst_qqmldebugservice CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qqmldebugservice CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qqmldebugservice CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qqmldebugservice CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/qml/debugger/qqmldebugtranslationservice/CMakeLists.txt b/tests/auto/qml/debugger/qqmldebugtranslationservice/CMakeLists.txt index 7264d7cbe5..e02ef7150c 100644 --- a/tests/auto/qml/debugger/qqmldebugtranslationservice/CMakeLists.txt +++ b/tests/auto/qml/debugger/qqmldebugtranslationservice/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qdebugtranslationservice +qt_internal_add_test(tst_qdebugtranslationservice SOURCES ../../../shared/util.cpp ../../../shared/util.h ../shared/debugutil.cpp ../shared/debugutil_p.h @@ -34,12 +34,12 @@ qt_add_test(tst_qdebugtranslationservice ## Scopes: ##################################################################### -qt_extend_target(tst_qdebugtranslationservice CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qdebugtranslationservice CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qdebugtranslationservice CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qdebugtranslationservice CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/qml/debugger/qqmlenginecontrol/CMakeLists.txt b/tests/auto/qml/debugger/qqmlenginecontrol/CMakeLists.txt index a998af77cf..63eda146ea 100644 --- a/tests/auto/qml/debugger/qqmlenginecontrol/CMakeLists.txt +++ b/tests/auto/qml/debugger/qqmlenginecontrol/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qqmlenginecontrol +qt_internal_add_test(tst_qqmlenginecontrol SOURCES ../../../shared/util.cpp ../../../shared/util.h ../shared/debugutil.cpp ../shared/debugutil_p.h @@ -33,12 +33,12 @@ qt_add_test(tst_qqmlenginecontrol ## Scopes: ##################################################################### -qt_extend_target(tst_qqmlenginecontrol CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qqmlenginecontrol CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qqmlenginecontrol CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qqmlenginecontrol CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/qml/debugger/qqmlenginedebuginspectorintegrationtest/CMakeLists.txt b/tests/auto/qml/debugger/qqmlenginedebuginspectorintegrationtest/CMakeLists.txt index f3fb518bfe..e2553e1abc 100644 --- a/tests/auto/qml/debugger/qqmlenginedebuginspectorintegrationtest/CMakeLists.txt +++ b/tests/auto/qml/debugger/qqmlenginedebuginspectorintegrationtest/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qqmlenginedebuginspectorintegration +qt_internal_add_test(tst_qqmlenginedebuginspectorintegration SOURCES ../../../shared/util.cpp ../../../shared/util.h ../shared/debugutil.cpp ../shared/debugutil_p.h @@ -30,12 +30,12 @@ qt_add_test(tst_qqmlenginedebuginspectorintegration ## Scopes: ##################################################################### -qt_extend_target(tst_qqmlenginedebuginspectorintegration CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qqmlenginedebuginspectorintegration CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qqmlenginedebuginspectorintegration CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qqmlenginedebuginspectorintegration CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/qml/debugger/qqmlenginedebugservice/CMakeLists.txt b/tests/auto/qml/debugger/qqmlenginedebugservice/CMakeLists.txt index fa7f15939e..4c3b449cb4 100644 --- a/tests/auto/qml/debugger/qqmlenginedebugservice/CMakeLists.txt +++ b/tests/auto/qml/debugger/qqmlenginedebugservice/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qqmlenginedebugservice Test: ##################################################################### -qt_add_test(tst_qqmlenginedebugservice +qt_internal_add_test(tst_qqmlenginedebugservice SOURCES ../../../shared/util.cpp ../../../shared/util.h ../shared/debugutil.cpp ../shared/debugutil_p.h @@ -25,12 +25,12 @@ qt_add_test(tst_qqmlenginedebugservice ## Scopes: ##################################################################### -qt_extend_target(tst_qqmlenginedebugservice CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qqmlenginedebugservice CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qqmlenginedebugservice CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qqmlenginedebugservice CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/qml/debugger/qqmlinspector/CMakeLists.txt b/tests/auto/qml/debugger/qqmlinspector/CMakeLists.txt index 4ddb1d436d..3303c7d110 100644 --- a/tests/auto/qml/debugger/qqmlinspector/CMakeLists.txt +++ b/tests/auto/qml/debugger/qqmlinspector/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qqmlinspector +qt_internal_add_test(tst_qqmlinspector SOURCES ../../../shared/util.cpp ../../../shared/util.h ../shared/debugutil.cpp ../shared/debugutil_p.h @@ -30,12 +30,12 @@ qt_add_test(tst_qqmlinspector ## Scopes: ##################################################################### -qt_extend_target(tst_qqmlinspector CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qqmlinspector CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qqmlinspector CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qqmlinspector CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/qml/debugger/qqmlnativeconnector/CMakeLists.txt b/tests/auto/qml/debugger/qqmlnativeconnector/CMakeLists.txt index bbff6a73c5..02ec4dcdea 100644 --- a/tests/auto/qml/debugger/qqmlnativeconnector/CMakeLists.txt +++ b/tests/auto/qml/debugger/qqmlnativeconnector/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qqmlnativeconnector Test: ##################################################################### -qt_add_test(tst_qqmlnativeconnector +qt_internal_add_test(tst_qqmlnativeconnector SOURCES tst_qqmlnativeconnector.cpp DEFINES diff --git a/tests/auto/qml/debugger/qqmlpreview/CMakeLists.txt b/tests/auto/qml/debugger/qqmlpreview/CMakeLists.txt index 6a509748ba..38a3b9a00c 100644 --- a/tests/auto/qml/debugger/qqmlpreview/CMakeLists.txt +++ b/tests/auto/qml/debugger/qqmlpreview/CMakeLists.txt @@ -13,7 +13,7 @@ list(APPEND test_data "data/broken.qml") list(APPEND test_data "data/zoom.qml") list(APPEND test_data "data/i18n/qml_fr_FR.qm") -qt_add_test(tst_qqmlpreview +qt_internal_add_test(tst_qqmlpreview SOURCES ../../../../../src/plugins/qmltooling/qmldbg_preview/qqmlpreviewblacklist.cpp ../../../../../src/plugins/qmltooling/qmldbg_preview/qqmlpreviewblacklist.h ../../../shared/util.cpp ../../../shared/util.h @@ -34,12 +34,12 @@ qt_add_test(tst_qqmlpreview ## Scopes: ##################################################################### -qt_extend_target(tst_qqmlpreview CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qqmlpreview CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qqmlpreview CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qqmlpreview CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/qml/debugger/qqmlprofilerservice/CMakeLists.txt b/tests/auto/qml/debugger/qqmlprofilerservice/CMakeLists.txt index 2395c84e7d..394e4aa08d 100644 --- a/tests/auto/qml/debugger/qqmlprofilerservice/CMakeLists.txt +++ b/tests/auto/qml/debugger/qqmlprofilerservice/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qqmlprofilerservice +qt_internal_add_test(tst_qqmlprofilerservice SOURCES ../../../shared/util.cpp ../../../shared/util.h ../shared/debugutil.cpp ../shared/debugutil_p.h @@ -32,12 +32,12 @@ qt_add_test(tst_qqmlprofilerservice ## Scopes: ##################################################################### -qt_extend_target(tst_qqmlprofilerservice CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qqmlprofilerservice CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qqmlprofilerservice CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qqmlprofilerservice CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/qml/debugger/qv4debugger/CMakeLists.txt b/tests/auto/qml/debugger/qv4debugger/CMakeLists.txt index 8d8aeb396b..f106208737 100644 --- a/tests/auto/qml/debugger/qv4debugger/CMakeLists.txt +++ b/tests/auto/qml/debugger/qv4debugger/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qv4debugger Test: ##################################################################### -qt_add_test(tst_qv4debugger +qt_internal_add_test(tst_qv4debugger SOURCES ../../../../../src/plugins/qmltooling/qmldbg_debugger/qv4datacollector.cpp ../../../../../src/plugins/qmltooling/qmldbg_debugger/qv4datacollector.h ../../../../../src/plugins/qmltooling/qmldbg_debugger/qv4debugger.cpp ../../../../../src/plugins/qmltooling/qmldbg_debugger/qv4debugger.h diff --git a/tests/auto/qml/ecmascripttests/CMakeLists.txt b/tests/auto/qml/ecmascripttests/CMakeLists.txt index 4b22007c7b..040e5d08c6 100644 --- a/tests/auto/qml/ecmascripttests/CMakeLists.txt +++ b/tests/auto/qml/ecmascripttests/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_ecmascripttests Test: ##################################################################### -qt_add_test(tst_ecmascripttests +qt_internal_add_test(tst_ecmascripttests SOURCES qjstest/test262runner.cpp qjstest/test262runner.h tst_ecmascripttests.cpp diff --git a/tests/auto/qml/ecmascripttests/qjstest/CMakeLists.txt b/tests/auto/qml/ecmascripttests/qjstest/CMakeLists.txt index 5c3581a7e9..4ffaf6c02f 100644 --- a/tests/auto/qml/ecmascripttests/qjstest/CMakeLists.txt +++ b/tests/auto/qml/ecmascripttests/qjstest/CMakeLists.txt @@ -5,7 +5,7 @@ ##################################################################### qt_get_tool_target_name(target_name qjstest) -qt_add_tool(${target_name} +qt_internal_add_tool(${target_name} TARGET_DESCRIPTION "Javascript test runner" SOURCES main.cpp diff --git a/tests/auto/qml/parserstress/CMakeLists.txt b/tests/auto/qml/parserstress/CMakeLists.txt index e18c6fd8fe..2d2f3df4c3 100644 --- a/tests/auto/qml/parserstress/CMakeLists.txt +++ b/tests/auto/qml/parserstress/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob tests/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_parserstress +qt_internal_add_test(tst_parserstress SOURCES tst_parserstress.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/qml/qjsengine/.prev_CMakeLists.txt b/tests/auto/qml/qjsengine/.prev_CMakeLists.txt index aaff27ee03..8ea882795b 100644 --- a/tests/auto/qml/qjsengine/.prev_CMakeLists.txt +++ b/tests/auto/qml/qjsengine/.prev_CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob script/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qjsengine +qt_internal_add_test(tst_qjsengine SOURCES tst_qjsengine.cpp PUBLIC_LIBRARIES @@ -30,7 +30,7 @@ set(qjsengine_resource_files "translations/translatable_la.qm" ) -qt_add_resource(tst_qjsengine "qjsengine" +qt_internal_add_resource(tst_qjsengine "qjsengine" PREFIX "/" FILES @@ -43,7 +43,7 @@ set(qmake_immediate_resource_files "testmodule.mjs" ) -qt_add_resource(tst_qjsengine "qmake_immediate" +qt_internal_add_resource(tst_qjsengine "qmake_immediate" PREFIX "/" FILES diff --git a/tests/auto/qml/qjsengine/CMakeLists.txt b/tests/auto/qml/qjsengine/CMakeLists.txt index 3fc68ba163..83e13826bf 100644 --- a/tests/auto/qml/qjsengine/CMakeLists.txt +++ b/tests/auto/qml/qjsengine/CMakeLists.txt @@ -17,7 +17,7 @@ if(NOT TARGET Threads::Threads) endif() # special case end -qt_add_test(tst_qjsengine +qt_internal_add_test(tst_qjsengine SOURCES tst_qjsengine.cpp PUBLIC_LIBRARIES @@ -39,7 +39,7 @@ set(qjsengine_resource_files "translations/translatable_la.qm" ) -qt_add_resource(tst_qjsengine "qjsengine" +qt_internal_add_resource(tst_qjsengine "qjsengine" PREFIX "/" FILES @@ -52,7 +52,7 @@ set(qmake_immediate_resource_files "testmodule.mjs" ) -qt_add_resource(tst_qjsengine "qmake_immediate" +qt_internal_add_resource(tst_qjsengine "qmake_immediate" PREFIX "/" FILES diff --git a/tests/auto/qml/qjsonbinding/CMakeLists.txt b/tests/auto/qml/qjsonbinding/CMakeLists.txt index d4c3ef3dac..1704e4e790 100644 --- a/tests/auto/qml/qjsonbinding/CMakeLists.txt +++ b/tests/auto/qml/qjsonbinding/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qjsonbinding +qt_internal_add_test(tst_qjsonbinding SOURCES ../../shared/util.cpp ../../shared/util.h tst_qjsonbinding.cpp @@ -26,12 +26,12 @@ qt_add_test(tst_qjsonbinding ## Scopes: ##################################################################### -qt_extend_target(tst_qjsonbinding CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qjsonbinding CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qjsonbinding CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qjsonbinding CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/qml/qjsvalue/.prev_CMakeLists.txt b/tests/auto/qml/qjsvalue/.prev_CMakeLists.txt index 74789968d3..72bd0c6d8d 100644 --- a/tests/auto/qml/qjsvalue/.prev_CMakeLists.txt +++ b/tests/auto/qml/qjsvalue/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qjsvalue Test: ##################################################################### -qt_add_test(tst_qjsvalue +qt_internal_add_test(tst_qjsvalue SOURCES tst_qjsvalue.cpp tst_qjsvalue.h PUBLIC_LIBRARIES diff --git a/tests/auto/qml/qjsvalue/CMakeLists.txt b/tests/auto/qml/qjsvalue/CMakeLists.txt index 06b43709d9..bb00f3221a 100644 --- a/tests/auto/qml/qjsvalue/CMakeLists.txt +++ b/tests/auto/qml/qjsvalue/CMakeLists.txt @@ -11,7 +11,7 @@ if(NOT TARGET Threads::Threads) endif() # special case end -qt_add_test(tst_qjsvalue +qt_internal_add_test(tst_qjsvalue SOURCES tst_qjsvalue.cpp tst_qjsvalue.h PUBLIC_LIBRARIES diff --git a/tests/auto/qml/qjsvalueiterator/CMakeLists.txt b/tests/auto/qml/qjsvalueiterator/CMakeLists.txt index 48edd77265..5bf20d63c2 100644 --- a/tests/auto/qml/qjsvalueiterator/CMakeLists.txt +++ b/tests/auto/qml/qjsvalueiterator/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qjsvalueiterator Test: ##################################################################### -qt_add_test(tst_qjsvalueiterator +qt_internal_add_test(tst_qjsvalueiterator SOURCES tst_qjsvalueiterator.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/qml/qmlcachegen/CMakeLists.txt b/tests/auto/qml/qmlcachegen/CMakeLists.txt index 0571d2d3e1..06a5fb9b9c 100644 --- a/tests/auto/qml/qmlcachegen/CMakeLists.txt +++ b/tests/auto/qml/qmlcachegen/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qmlcachegen +qt_internal_add_test(tst_qmlcachegen SOURCES ../../shared/util.cpp ../../shared/util.h tst_qmlcachegen.cpp @@ -29,7 +29,7 @@ set(qmake_workerscripts_test_resource_files "data/worker.qml" ) -qt_add_resource(tst_qmlcachegen "qmake_workerscripts_test" +qt_internal_add_resource(tst_qmlcachegen "qmake_workerscripts_test" PREFIX "/workerscripts" FILES @@ -50,7 +50,7 @@ set(trickypaths_resource_files "data/versionStyleSuffix-1.2-more.qml" ) -qt_add_resource(tst_qmlcachegen "trickypaths" +qt_internal_add_resource(tst_qmlcachegen "trickypaths" PREFIX "/directory with spaces" FILES @@ -63,7 +63,7 @@ set(retain_resource_files "Retain.qml" ) -qt_add_resource(tst_qmlcachegen "retain" +qt_internal_add_resource(tst_qmlcachegen "retain" PREFIX "/" BASE @@ -79,7 +79,7 @@ set(skip_resource_files "SkipQmlCacheGen.qml" ) -qt_add_resource(tst_qmlcachegen "skip" +qt_internal_add_resource(tst_qmlcachegen "skip" PREFIX "/not/" BASE @@ -101,7 +101,7 @@ set(qmake_immediate_resource_files "data/versionchecks.qml" ) -qt_add_resource(tst_qmlcachegen "qmake_immediate" +qt_internal_add_resource(tst_qmlcachegen "qmake_immediate" PREFIX "/" FILES @@ -121,7 +121,7 @@ if(UNIX) "data/umlaut.qml" ) - qt_add_resource(tst_qmlcachegen "trickypaths_umlaut" + qt_internal_add_resource(tst_qmlcachegen "trickypaths_umlaut" PREFIX "/" FILES @@ -129,12 +129,12 @@ if(UNIX) ) endif() -qt_extend_target(tst_qmlcachegen CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qmlcachegen CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qmlcachegen CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qmlcachegen CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/qml/qmldiskcache/.prev_CMakeLists.txt b/tests/auto/qml/qmldiskcache/.prev_CMakeLists.txt index 86bcca1bba..6fbc6bf058 100644 --- a/tests/auto/qml/qmldiskcache/.prev_CMakeLists.txt +++ b/tests/auto/qml/qmldiskcache/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qmldiskcache Test: ##################################################################### -qt_add_test(tst_qmldiskcache +qt_internal_add_test(tst_qmldiskcache SOURCES tst_qmldiskcache.cpp PUBLIC_LIBRARIES @@ -20,7 +20,7 @@ set(qmake_immediate_resource_files "test.qml" ) -qt_add_resource(tst_qmldiskcache "qmake_immediate" +qt_internal_add_resource(tst_qmldiskcache "qmake_immediate" PREFIX "/" FILES diff --git a/tests/auto/qml/qmldiskcache/CMakeLists.txt b/tests/auto/qml/qmldiskcache/CMakeLists.txt index b4ff957331..c45f7d6d5c 100644 --- a/tests/auto/qml/qmldiskcache/CMakeLists.txt +++ b/tests/auto/qml/qmldiskcache/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qmldiskcache Test: ##################################################################### -qt_add_test(tst_qmldiskcache +qt_internal_add_test(tst_qmldiskcache SOURCES tst_qmldiskcache.cpp PUBLIC_LIBRARIES @@ -31,7 +31,7 @@ set(qmake_immediate_resource_files "test.qml" ) -qt_add_resource(tst_qmldiskcache "qmake_immediate" +qt_internal_add_resource(tst_qmldiskcache "qmake_immediate" PREFIX "/" FILES diff --git a/tests/auto/qml/qmlformat/CMakeLists.txt b/tests/auto/qml/qmlformat/CMakeLists.txt index 14a8acb5d9..01f4fa2837 100644 --- a/tests/auto/qml/qmlformat/CMakeLists.txt +++ b/tests/auto/qml/qmlformat/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qmlformat +qt_internal_add_test(tst_qmlformat SOURCES ../../shared/util.cpp ../../shared/util.h tst_qmlformat.cpp @@ -26,12 +26,12 @@ qt_add_test(tst_qmlformat ## Scopes: ##################################################################### -qt_extend_target(tst_qmlformat CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qmlformat CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qmlformat CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qmlformat CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/qml/qmlimportscanner/CMakeLists.txt b/tests/auto/qml/qmlimportscanner/CMakeLists.txt index 58c6620ff0..66231beccb 100644 --- a/tests/auto/qml/qmlimportscanner/CMakeLists.txt +++ b/tests/auto/qml/qmlimportscanner/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qmlimportscanner +qt_internal_add_test(tst_qmlimportscanner SOURCES ../../shared/util.cpp ../../shared/util.h tst_qmlimportscanner.cpp @@ -24,12 +24,12 @@ qt_add_test(tst_qmlimportscanner ## Scopes: ##################################################################### -qt_extend_target(tst_qmlimportscanner CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qmlimportscanner CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qmlimportscanner CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qmlimportscanner CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/qml/qmllint/CMakeLists.txt b/tests/auto/qml/qmllint/CMakeLists.txt index a66507f625..2518740101 100644 --- a/tests/auto/qml/qmllint/CMakeLists.txt +++ b/tests/auto/qml/qmllint/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qmllint +qt_internal_add_test(tst_qmllint SOURCES ../../shared/util.cpp ../../shared/util.h tst_qmllint.cpp @@ -24,12 +24,12 @@ qt_add_test(tst_qmllint ## Scopes: ##################################################################### -qt_extend_target(tst_qmllint CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qmllint CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qmllint CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qmllint CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/qml/qmlplugindump/CMakeLists.txt b/tests/auto/qml/qmlplugindump/CMakeLists.txt index 9ef606bae0..1bf13a2c02 100644 --- a/tests/auto/qml/qmlplugindump/CMakeLists.txt +++ b/tests/auto/qml/qmlplugindump/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qmlplugindump Test: ##################################################################### -qt_add_test(tst_qmlplugindump +qt_internal_add_test(tst_qmlplugindump SOURCES ../../shared/util.cpp ../../shared/util.h tst_qmlplugindump.cpp @@ -20,12 +20,12 @@ qt_add_test(tst_qmlplugindump ## Scopes: ##################################################################### -qt_extend_target(tst_qmlplugindump CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qmlplugindump CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qmlplugindump CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qmlplugindump CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/qml/qmlplugindump/data/dumper/Dummy/.prev_CMakeLists.txt b/tests/auto/qml/qmlplugindump/data/dumper/Dummy/.prev_CMakeLists.txt index e8f6a9f7b7..c2881170b0 100644 --- a/tests/auto/qml/qmlplugindump/data/dumper/Dummy/.prev_CMakeLists.txt +++ b/tests/auto/qml/qmlplugindump/data/dumper/Dummy/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## Dummy Generic Library: ##################################################################### -qt_add_cmake_library(Dummy +qt_internal_add_cmake_library(Dummy MODULE SOURCES dummy.cpp dummy.h diff --git a/tests/auto/qml/qmlplugindump/data/dumper/Dummy/CMakeLists.txt b/tests/auto/qml/qmlplugindump/data/dumper/Dummy/CMakeLists.txt index 933b3f152e..5cb08a8570 100644 --- a/tests/auto/qml/qmlplugindump/data/dumper/Dummy/CMakeLists.txt +++ b/tests/auto/qml/qmlplugindump/data/dumper/Dummy/CMakeLists.txt @@ -4,7 +4,7 @@ ## Dummy Generic Library: ##################################################################### -qt_add_cmake_library(Dummy +qt_internal_add_cmake_library(Dummy MODULE OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case SOURCES diff --git a/tests/auto/qml/qmlplugindump/data/dumper/ExtendedType/.prev_CMakeLists.txt b/tests/auto/qml/qmlplugindump/data/dumper/ExtendedType/.prev_CMakeLists.txt index 993c3e19e6..3030d4b428 100644 --- a/tests/auto/qml/qmlplugindump/data/dumper/ExtendedType/.prev_CMakeLists.txt +++ b/tests/auto/qml/qmlplugindump/data/dumper/ExtendedType/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## ExtendedType Generic Library: ##################################################################### -qt_add_cmake_library(ExtendedType +qt_internal_add_cmake_library(ExtendedType MODULE SOURCES plugin.cpp plugin.h diff --git a/tests/auto/qml/qmlplugindump/data/dumper/ExtendedType/CMakeLists.txt b/tests/auto/qml/qmlplugindump/data/dumper/ExtendedType/CMakeLists.txt index 9e934eff60..fae7a5f990 100644 --- a/tests/auto/qml/qmlplugindump/data/dumper/ExtendedType/CMakeLists.txt +++ b/tests/auto/qml/qmlplugindump/data/dumper/ExtendedType/CMakeLists.txt @@ -4,7 +4,7 @@ ## ExtendedType Generic Library: ##################################################################### -qt_add_cmake_library(ExtendedType +qt_internal_add_cmake_library(ExtendedType MODULE OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case SOURCES diff --git a/tests/auto/qml/qmlplugindump/data/dumper/Imports/.prev_CMakeLists.txt b/tests/auto/qml/qmlplugindump/data/dumper/Imports/.prev_CMakeLists.txt index ae80ac867a..dbec5d422e 100644 --- a/tests/auto/qml/qmlplugindump/data/dumper/Imports/.prev_CMakeLists.txt +++ b/tests/auto/qml/qmlplugindump/data/dumper/Imports/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## Imports Generic Library: ##################################################################### -qt_add_cmake_library(Imports +qt_internal_add_cmake_library(Imports MODULE SOURCES imports.cpp imports.h diff --git a/tests/auto/qml/qmlplugindump/data/dumper/Imports/CMakeLists.txt b/tests/auto/qml/qmlplugindump/data/dumper/Imports/CMakeLists.txt index cf9871b42e..6b1dcdaf7c 100644 --- a/tests/auto/qml/qmlplugindump/data/dumper/Imports/CMakeLists.txt +++ b/tests/auto/qml/qmlplugindump/data/dumper/Imports/CMakeLists.txt @@ -4,7 +4,7 @@ ## Imports Generic Library: ##################################################################### -qt_add_cmake_library(Imports +qt_internal_add_cmake_library(Imports MODULE OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case SOURCES diff --git a/tests/auto/qml/qmlplugindump/data/dumper/Versions/.prev_CMakeLists.txt b/tests/auto/qml/qmlplugindump/data/dumper/Versions/.prev_CMakeLists.txt index 2edf46a96a..13f18fc789 100644 --- a/tests/auto/qml/qmlplugindump/data/dumper/Versions/.prev_CMakeLists.txt +++ b/tests/auto/qml/qmlplugindump/data/dumper/Versions/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## Versions Generic Library: ##################################################################### -qt_add_cmake_library(Versions +qt_internal_add_cmake_library(Versions MODULE SOURCES versions.cpp versions.h diff --git a/tests/auto/qml/qmlplugindump/data/dumper/Versions/CMakeLists.txt b/tests/auto/qml/qmlplugindump/data/dumper/Versions/CMakeLists.txt index 950ffda821..3f499afa71 100644 --- a/tests/auto/qml/qmlplugindump/data/dumper/Versions/CMakeLists.txt +++ b/tests/auto/qml/qmlplugindump/data/dumper/Versions/CMakeLists.txt @@ -4,7 +4,7 @@ ## Versions Generic Library: ##################################################################### -qt_add_cmake_library(Versions +qt_internal_add_cmake_library(Versions MODULE OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case SOURCES diff --git a/tests/auto/qml/qmltyperegistrar/.prev_CMakeLists.txt b/tests/auto/qml/qmltyperegistrar/.prev_CMakeLists.txt index 65272b0c7f..9ee509cebb 100644 --- a/tests/auto/qml/qmltyperegistrar/.prev_CMakeLists.txt +++ b/tests/auto/qml/qmltyperegistrar/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qmltyperegistrar Test: ##################################################################### -qt_add_test(tst_qmltyperegistrar +qt_internal_add_test(tst_qmltyperegistrar SOURCES hppheader.hpp noextheader diff --git a/tests/auto/qml/qmltyperegistrar/CMakeLists.txt b/tests/auto/qml/qmltyperegistrar/CMakeLists.txt index 4af6313c65..d581589f4d 100644 --- a/tests/auto/qml/qmltyperegistrar/CMakeLists.txt +++ b/tests/auto/qml/qmltyperegistrar/CMakeLists.txt @@ -5,7 +5,7 @@ ##################################################################### qt_manual_moc(moc_files OUTPUT_MOC_JSON_FILES json_list noextheader) # special case -qt_add_test(tst_qmltyperegistrar +qt_internal_add_test(tst_qmltyperegistrar SOURCES hppheader.hpp # noextheader special case diff --git a/tests/auto/qml/qmltyperegistrar/foreign/.prev_CMakeLists.txt b/tests/auto/qml/qmltyperegistrar/foreign/.prev_CMakeLists.txt index 4933b9271e..0dcbd16e43 100644 --- a/tests/auto/qml/qmltyperegistrar/foreign/.prev_CMakeLists.txt +++ b/tests/auto/qml/qmltyperegistrar/foreign/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## foreign Generic Library: ##################################################################### -qt_add_cmake_library(foreign +qt_internal_add_cmake_library(foreign STATIC SOURCES foreign.cpp foreign.h diff --git a/tests/auto/qml/qmltyperegistrar/foreign/CMakeLists.txt b/tests/auto/qml/qmltyperegistrar/foreign/CMakeLists.txt index cc85c404c5..dc969c2468 100644 --- a/tests/auto/qml/qmltyperegistrar/foreign/CMakeLists.txt +++ b/tests/auto/qml/qmltyperegistrar/foreign/CMakeLists.txt @@ -4,7 +4,7 @@ ## foreign Generic Library: ##################################################################### -qt_add_cmake_library(foreign +qt_internal_add_cmake_library(foreign STATIC SOURCES foreign.cpp foreign.h diff --git a/tests/auto/qml/qqmlapplicationengine/CMakeLists.txt b/tests/auto/qml/qqmlapplicationengine/CMakeLists.txt index 695651f90e..ea88b6c8e3 100644 --- a/tests/auto/qml/qqmlapplicationengine/CMakeLists.txt +++ b/tests/auto/qml/qqmlapplicationengine/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qqmlapplicationengine +qt_internal_add_test(tst_qqmlapplicationengine SOURCES ../../shared/util.cpp ../../shared/util.h tst_qqmlapplicationengine.cpp @@ -30,7 +30,7 @@ set(tst_qqmlapplicationengine_resource_files "data/loadTranslation.qml" ) -qt_add_resource(tst_qqmlapplicationengine "tst_qqmlapplicationengine" +qt_internal_add_resource(tst_qqmlapplicationengine "tst_qqmlapplicationengine" PREFIX "/" FILES @@ -44,12 +44,12 @@ qt_add_resource(tst_qqmlapplicationengine "tst_qqmlapplicationengine" ## Scopes: ##################################################################### -qt_extend_target(tst_qqmlapplicationengine CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qqmlapplicationengine CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qqmlapplicationengine CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qqmlapplicationengine CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/qml/qqmlapplicationengine/testapp/CMakeLists.txt b/tests/auto/qml/qqmlapplicationengine/testapp/CMakeLists.txt index b97251f0b8..f1b2b43506 100644 --- a/tests/auto/qml/qqmlapplicationengine/testapp/CMakeLists.txt +++ b/tests/auto/qml/qqmlapplicationengine/testapp/CMakeLists.txt @@ -4,7 +4,7 @@ ## testapp Binary: ##################################################################### -qt_add_executable(testapp +qt_internal_add_executable(testapp OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" SOURCES main.cpp @@ -21,7 +21,7 @@ set(main_resource_files "immediateQuit.qml" ) -qt_add_resource(testapp "main" +qt_internal_add_resource(testapp "main" PREFIX "/" FILES diff --git a/tests/auto/qml/qqmlbinding/CMakeLists.txt b/tests/auto/qml/qqmlbinding/CMakeLists.txt index f885560bbe..c95d3e6f29 100644 --- a/tests/auto/qml/qqmlbinding/CMakeLists.txt +++ b/tests/auto/qml/qqmlbinding/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qqmlbinding +qt_internal_add_test(tst_qqmlbinding SOURCES ../../shared/util.cpp ../../shared/util.h tst_qqmlbinding.cpp @@ -28,12 +28,12 @@ qt_add_test(tst_qqmlbinding ## Scopes: ##################################################################### -qt_extend_target(tst_qqmlbinding CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qqmlbinding CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qqmlbinding CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qqmlbinding CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/qml/qqmlchangeset/CMakeLists.txt b/tests/auto/qml/qqmlchangeset/CMakeLists.txt index fafffa2a68..da06b85fad 100644 --- a/tests/auto/qml/qqmlchangeset/CMakeLists.txt +++ b/tests/auto/qml/qqmlchangeset/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qqmlhangeset Test: ##################################################################### -qt_add_test(tst_qqmlhangeset +qt_internal_add_test(tst_qqmlhangeset SOURCES tst_qqmlchangeset.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/qml/qqmlcomponent/CMakeLists.txt b/tests/auto/qml/qqmlcomponent/CMakeLists.txt index e773e58cd2..c7dd50e8d6 100644 --- a/tests/auto/qml/qqmlcomponent/CMakeLists.txt +++ b/tests/auto/qml/qqmlcomponent/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qqmlcomponent +qt_internal_add_test(tst_qqmlcomponent SOURCES ../../shared/testhttpserver.cpp ../../shared/testhttpserver.h ../../shared/util.cpp ../../shared/util.h @@ -32,7 +32,7 @@ set(qmake_immediate_resource_files "data/QtObjectComponent.qml" ) -qt_add_resource(tst_qqmlcomponent "qmake_immediate" +qt_internal_add_resource(tst_qqmlcomponent "qmake_immediate" PREFIX "/" FILES @@ -43,12 +43,12 @@ qt_add_resource(tst_qqmlcomponent "qmake_immediate" ## Scopes: ##################################################################### -qt_extend_target(tst_qqmlcomponent CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qqmlcomponent CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qqmlcomponent CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qqmlcomponent CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/qml/qqmlconnections/CMakeLists.txt b/tests/auto/qml/qqmlconnections/CMakeLists.txt index 8f6b9ce87f..fef16f58f8 100644 --- a/tests/auto/qml/qqmlconnections/CMakeLists.txt +++ b/tests/auto/qml/qqmlconnections/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qqmlconnections +qt_internal_add_test(tst_qqmlconnections SOURCES ../../shared/util.cpp ../../shared/util.h tst_qqmlconnections.cpp @@ -28,12 +28,12 @@ qt_add_test(tst_qqmlconnections ## Scopes: ##################################################################### -qt_extend_target(tst_qqmlconnections CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qqmlconnections CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qqmlconnections CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qqmlconnections CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/qml/qqmlconsole/CMakeLists.txt b/tests/auto/qml/qqmlconsole/CMakeLists.txt index f22fcbc4da..5e98ed2f31 100644 --- a/tests/auto/qml/qqmlconsole/CMakeLists.txt +++ b/tests/auto/qml/qqmlconsole/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qqmlconsole +qt_internal_add_test(tst_qqmlconsole SOURCES ../../shared/util.cpp ../../shared/util.h tst_qqmlconsole.cpp @@ -26,12 +26,12 @@ qt_add_test(tst_qqmlconsole ## Scopes: ##################################################################### -qt_extend_target(tst_qqmlconsole CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qqmlconsole CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qqmlconsole CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qqmlconsole CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/qml/qqmlcontext/CMakeLists.txt b/tests/auto/qml/qqmlcontext/CMakeLists.txt index 08982b837b..ce07e8c785 100644 --- a/tests/auto/qml/qqmlcontext/CMakeLists.txt +++ b/tests/auto/qml/qqmlcontext/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qqmlcontext +qt_internal_add_test(tst_qqmlcontext SOURCES ../../shared/util.cpp ../../shared/util.h tst_qqmlcontext.cpp @@ -27,12 +27,12 @@ qt_add_test(tst_qqmlcontext ## Scopes: ##################################################################### -qt_extend_target(tst_qqmlcontext CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qqmlcontext CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qqmlcontext CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qqmlcontext CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/qml/qqmlcpputils/CMakeLists.txt b/tests/auto/qml/qqmlcpputils/CMakeLists.txt index ad6febe94f..c508a1f7e7 100644 --- a/tests/auto/qml/qqmlcpputils/CMakeLists.txt +++ b/tests/auto/qml/qqmlcpputils/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qqmlcpputils Test: ##################################################################### -qt_add_test(tst_qqmlcpputils +qt_internal_add_test(tst_qqmlcpputils SOURCES tst_qqmlcpputils.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/qml/qqmldelegatemodel/CMakeLists.txt b/tests/auto/qml/qqmldelegatemodel/CMakeLists.txt index f29187d29e..ef31fa3db3 100644 --- a/tests/auto/qml/qqmldelegatemodel/CMakeLists.txt +++ b/tests/auto/qml/qqmldelegatemodel/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qqmldelegatemodel +qt_internal_add_test(tst_qqmldelegatemodel SOURCES ../../shared/util.cpp ../../shared/util.h tst_qqmldelegatemodel.cpp @@ -31,12 +31,12 @@ qt_add_test(tst_qqmldelegatemodel ## Scopes: ##################################################################### -qt_extend_target(tst_qqmldelegatemodel CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qqmldelegatemodel CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qqmldelegatemodel CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qqmldelegatemodel CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/qml/qqmldirparser/CMakeLists.txt b/tests/auto/qml/qqmldirparser/CMakeLists.txt index 36f010d682..255cc75c6a 100644 --- a/tests/auto/qml/qqmldirparser/CMakeLists.txt +++ b/tests/auto/qml/qqmldirparser/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qqmldirparser +qt_internal_add_test(tst_qqmldirparser SOURCES ../../shared/util.cpp ../../shared/util.h tst_qqmldirparser.cpp @@ -26,12 +26,12 @@ qt_add_test(tst_qqmldirparser ## Scopes: ##################################################################### -qt_extend_target(tst_qqmldirparser CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qqmldirparser CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qqmldirparser CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qqmldirparser CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/qml/qqmlecmascript/.prev_CMakeLists.txt b/tests/auto/qml/qqmlecmascript/.prev_CMakeLists.txt index a30688cfaa..26b7f2437d 100644 --- a/tests/auto/qml/qqmlecmascript/.prev_CMakeLists.txt +++ b/tests/auto/qml/qqmlecmascript/.prev_CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qqmlecmascript +qt_internal_add_test(tst_qqmlecmascript SOURCES ../../shared/testhttpserver.cpp ../../shared/testhttpserver.h ../../shared/util.cpp ../../shared/util.h @@ -35,7 +35,7 @@ set(qqmlecmascript_resource_files "data/js/include3.js" ) -qt_add_resource(tst_qqmlecmascript "qqmlecmascript" +qt_internal_add_resource(tst_qqmlecmascript "qqmlecmascript" PREFIX "/" FILES @@ -46,17 +46,17 @@ qt_add_resource(tst_qqmlecmascript "qqmlecmascript" ## Scopes: ##################################################################### -qt_extend_target(tst_qqmlecmascript CONDITION TARGET Qt::Widgets +qt_internal_extend_target(tst_qqmlecmascript CONDITION TARGET Qt::Widgets PUBLIC_LIBRARIES Qt::Widgets ) -qt_extend_target(tst_qqmlecmascript CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qqmlecmascript CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qqmlecmascript CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qqmlecmascript CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/qml/qqmlecmascript/CMakeLists.txt b/tests/auto/qml/qqmlecmascript/CMakeLists.txt index bf74b8ccba..5c5bd528ed 100644 --- a/tests/auto/qml/qqmlecmascript/CMakeLists.txt +++ b/tests/auto/qml/qqmlecmascript/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qqmlecmascript +qt_internal_add_test(tst_qqmlecmascript SOURCES ../../shared/testhttpserver.cpp ../../shared/testhttpserver.h ../../shared/util.cpp ../../shared/util.h @@ -42,7 +42,7 @@ set_source_files_properties( QT_SKIP_QUICKCOMPILER 1) # special case end -qt_add_resource(tst_qqmlecmascript "qqmlecmascript" +qt_internal_add_resource(tst_qqmlecmascript "qqmlecmascript" PREFIX "/" FILES @@ -53,17 +53,17 @@ qt_add_resource(tst_qqmlecmascript "qqmlecmascript" ## Scopes: ##################################################################### -qt_extend_target(tst_qqmlecmascript CONDITION TARGET Qt::Widgets +qt_internal_extend_target(tst_qqmlecmascript CONDITION TARGET Qt::Widgets PUBLIC_LIBRARIES Qt::Widgets ) -qt_extend_target(tst_qqmlecmascript CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qqmlecmascript CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qqmlecmascript CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qqmlecmascript CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/qml/qqmlengine/CMakeLists.txt b/tests/auto/qml/qqmlengine/CMakeLists.txt index f692a1a3a5..88037fb009 100644 --- a/tests/auto/qml/qqmlengine/CMakeLists.txt +++ b/tests/auto/qml/qqmlengine/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qqmlengine +qt_internal_add_test(tst_qqmlengine SOURCES ../../shared/util.cpp ../../shared/util.h tst_qqmlengine.cpp @@ -31,7 +31,7 @@ set(qmake_immediate_resource_files "data/qrcurls.qml" ) -qt_add_resource(tst_qqmlengine "qmake_immediate" +qt_internal_add_resource(tst_qqmlengine "qmake_immediate" PREFIX "/" FILES @@ -42,17 +42,17 @@ qt_add_resource(tst_qqmlengine "qmake_immediate" ## Scopes: ##################################################################### -qt_extend_target(tst_qqmlengine CONDITION boot2qt +qt_internal_extend_target(tst_qqmlengine CONDITION boot2qt DEFINES SKIP_GCCORRUPTION_TEST ) -qt_extend_target(tst_qqmlengine CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qqmlengine CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qqmlengine CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qqmlengine CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/qml/qqmlenginecleanup/CMakeLists.txt b/tests/auto/qml/qqmlenginecleanup/CMakeLists.txt index 62647409c1..f8637755b7 100644 --- a/tests/auto/qml/qqmlenginecleanup/CMakeLists.txt +++ b/tests/auto/qml/qqmlenginecleanup/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qqmlenginecleanup Test: ##################################################################### -qt_add_test(tst_qqmlenginecleanup +qt_internal_add_test(tst_qqmlenginecleanup SOURCES ../../shared/util.cpp ../../shared/util.h tst_qqmlenginecleanup.cpp @@ -18,12 +18,12 @@ qt_add_test(tst_qqmlenginecleanup ## Scopes: ##################################################################### -qt_extend_target(tst_qqmlenginecleanup CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qqmlenginecleanup CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qqmlenginecleanup CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qqmlenginecleanup CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/qml/qqmlenginecleanup/CustomModuleImport/.prev_CMakeLists.txt b/tests/auto/qml/qqmlenginecleanup/CustomModuleImport/.prev_CMakeLists.txt index f16ce3e6c3..b68b65aac4 100644 --- a/tests/auto/qml/qqmlenginecleanup/CustomModuleImport/.prev_CMakeLists.txt +++ b/tests/auto/qml/qqmlenginecleanup/CustomModuleImport/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## CustomModule Generic Library: ##################################################################### -qt_add_cmake_library(CustomModule +qt_internal_add_cmake_library(CustomModule OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../CustomModule" SOURCES moduleplugin.cpp @@ -20,7 +20,7 @@ set(moduleplugin_resource_files "ModuleType.qml" ) -qt_add_resource(CustomModule "moduleplugin" +qt_internal_add_resource(CustomModule "moduleplugin" PREFIX "/" FILES diff --git a/tests/auto/qml/qqmlenginecleanup/CustomModuleImport/CMakeLists.txt b/tests/auto/qml/qqmlenginecleanup/CustomModuleImport/CMakeLists.txt index f98f97cf81..e53d8307e4 100644 --- a/tests/auto/qml/qqmlenginecleanup/CustomModuleImport/CMakeLists.txt +++ b/tests/auto/qml/qqmlenginecleanup/CustomModuleImport/CMakeLists.txt @@ -4,7 +4,7 @@ ## CustomModule Generic Library: ##################################################################### -qt_add_cmake_library(CustomModule +qt_internal_add_cmake_library(CustomModule OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../CustomModule" SOURCES moduleplugin.cpp @@ -20,7 +20,7 @@ set(moduleplugin_resource_files "ModuleType.qml" ) -qt_add_resource(CustomModule "moduleplugin" +qt_internal_add_resource(CustomModule "moduleplugin" PREFIX "/" FILES diff --git a/tests/auto/qml/qqmlerror/CMakeLists.txt b/tests/auto/qml/qqmlerror/CMakeLists.txt index c4d218fb8e..7bb8715b01 100644 --- a/tests/auto/qml/qqmlerror/CMakeLists.txt +++ b/tests/auto/qml/qqmlerror/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qqmlerror +qt_internal_add_test(tst_qqmlerror SOURCES ../../shared/util.cpp ../../shared/util.h tst_qqmlerror.cpp @@ -27,12 +27,12 @@ qt_add_test(tst_qqmlerror ## Scopes: ##################################################################### -qt_extend_target(tst_qqmlerror CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qqmlerror CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qqmlerror CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qqmlerror CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/qml/qqmlexpression/CMakeLists.txt b/tests/auto/qml/qqmlexpression/CMakeLists.txt index 55f85089bf..cc5e69d4bc 100644 --- a/tests/auto/qml/qqmlexpression/CMakeLists.txt +++ b/tests/auto/qml/qqmlexpression/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qqmlexpression +qt_internal_add_test(tst_qqmlexpression SOURCES ../../shared/util.cpp ../../shared/util.h tst_qqmlexpression.cpp @@ -27,12 +27,12 @@ qt_add_test(tst_qqmlexpression ## Scopes: ##################################################################### -qt_extend_target(tst_qqmlexpression CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qqmlexpression CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qqmlexpression CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qqmlexpression CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/qml/qqmlextensionplugin/CMakeLists.txt b/tests/auto/qml/qqmlextensionplugin/CMakeLists.txt index d0716ed8ff..16d884f66b 100644 --- a/tests/auto/qml/qqmlextensionplugin/CMakeLists.txt +++ b/tests/auto/qml/qqmlextensionplugin/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qqmlextensionplugin Test: ##################################################################### -qt_add_test(tst_qqmlextensionplugin +qt_internal_add_test(tst_qqmlextensionplugin SOURCES tst_qqmlextensionplugin.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/qml/qqmlfile/CMakeLists.txt b/tests/auto/qml/qqmlfile/CMakeLists.txt index 2a0fa63bb8..3de9d5884c 100644 --- a/tests/auto/qml/qqmlfile/CMakeLists.txt +++ b/tests/auto/qml/qqmlfile/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qqmlfile Test: ##################################################################### -qt_add_test(tst_qqmlfile +qt_internal_add_test(tst_qqmlfile SOURCES tst_qqmlfile.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/qml/qqmlfileselector/CMakeLists.txt b/tests/auto/qml/qqmlfileselector/CMakeLists.txt index 34e80921cb..61707f79c7 100644 --- a/tests/auto/qml/qqmlfileselector/CMakeLists.txt +++ b/tests/auto/qml/qqmlfileselector/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qqmlfileselector +qt_internal_add_test(tst_qqmlfileselector SOURCES ../../shared/util.cpp ../../shared/util.h tst_qqmlfileselector.cpp @@ -27,12 +27,12 @@ qt_add_test(tst_qqmlfileselector ## Scopes: ##################################################################### -qt_extend_target(tst_qqmlfileselector CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qqmlfileselector CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qqmlfileselector CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qqmlfileselector CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/qml/qqmlglobal/CMakeLists.txt b/tests/auto/qml/qqmlglobal/CMakeLists.txt index 50ced86ee4..ef7884993e 100644 --- a/tests/auto/qml/qqmlglobal/CMakeLists.txt +++ b/tests/auto/qml/qqmlglobal/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qqmlglobal Test: ##################################################################### -qt_add_test(tst_qqmlglobal +qt_internal_add_test(tst_qqmlglobal SOURCES tst_qqmlglobal.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/qml/qqmlimport/CMakeLists.txt b/tests/auto/qml/qqmlimport/CMakeLists.txt index 175543232f..dba34c1a0b 100644 --- a/tests/auto/qml/qqmlimport/CMakeLists.txt +++ b/tests/auto/qml/qqmlimport/CMakeLists.txt @@ -22,7 +22,7 @@ file(GLOB_RECURSE test_data_glob FormFromQmlDir/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qqmlimport +qt_internal_add_test(tst_qqmlimport SOURCES ../../shared/util.cpp ../../shared/util.h tst_qqmlimport.cpp @@ -39,12 +39,12 @@ qt_add_test(tst_qqmlimport ## Scopes: ##################################################################### -qt_extend_target(tst_qqmlimport CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qqmlimport CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qqmlimport CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qqmlimport CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/qml/qqmlincubator/CMakeLists.txt b/tests/auto/qml/qqmlincubator/CMakeLists.txt index 36879eee87..34f794b7d9 100644 --- a/tests/auto/qml/qqmlincubator/CMakeLists.txt +++ b/tests/auto/qml/qqmlincubator/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qqmlincubator +qt_internal_add_test(tst_qqmlincubator SOURCES ../../shared/util.cpp ../../shared/util.h testtypes.cpp testtypes.h @@ -29,12 +29,12 @@ qt_add_test(tst_qqmlincubator ## Scopes: ##################################################################### -qt_extend_target(tst_qqmlincubator CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qqmlincubator CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qqmlincubator CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qqmlincubator CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/qml/qqmlinfo/CMakeLists.txt b/tests/auto/qml/qqmlinfo/CMakeLists.txt index 821228245b..4d234e8ce0 100644 --- a/tests/auto/qml/qqmlinfo/CMakeLists.txt +++ b/tests/auto/qml/qqmlinfo/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qqmlinfo +qt_internal_add_test(tst_qqmlinfo SOURCES ../../shared/util.cpp ../../shared/util.h attached.cpp attached.h @@ -32,12 +32,12 @@ qt_add_test(tst_qqmlinfo ## Scopes: ##################################################################### -qt_extend_target(tst_qqmlinfo CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qqmlinfo CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qqmlinfo CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qqmlinfo CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/qml/qqmlinstantiator/CMakeLists.txt b/tests/auto/qml/qqmlinstantiator/CMakeLists.txt index 36c496cbf3..b7d967ca9f 100644 --- a/tests/auto/qml/qqmlinstantiator/CMakeLists.txt +++ b/tests/auto/qml/qqmlinstantiator/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qqmlinstantiator +qt_internal_add_test(tst_qqmlinstantiator SOURCES ../../shared/util.cpp ../../shared/util.h stringmodel.h @@ -29,12 +29,12 @@ qt_add_test(tst_qqmlinstantiator ## Scopes: ##################################################################### -qt_extend_target(tst_qqmlinstantiator CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qqmlinstantiator CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qqmlinstantiator CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qqmlinstantiator CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/qml/qqmlitemmodels/CMakeLists.txt b/tests/auto/qml/qqmlitemmodels/CMakeLists.txt index e531ac95c4..5246638739 100644 --- a/tests/auto/qml/qqmlitemmodels/CMakeLists.txt +++ b/tests/auto/qml/qqmlitemmodels/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qqmlitemmodels +qt_internal_add_test(tst_qqmlitemmodels SOURCES ../../shared/util.cpp ../../shared/util.h qtestmodel.h @@ -30,12 +30,12 @@ qt_add_test(tst_qqmlitemmodels ## Scopes: ##################################################################### -qt_extend_target(tst_qqmlitemmodels CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qqmlitemmodels CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qqmlitemmodels CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qqmlitemmodels CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/qml/qqmllanguage/CMakeLists.txt b/tests/auto/qml/qqmllanguage/CMakeLists.txt index d428621600..e7fa05d23e 100644 --- a/tests/auto/qml/qqmllanguage/CMakeLists.txt +++ b/tests/auto/qml/qqmllanguage/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qqmllanguage +qt_internal_add_test(tst_qqmllanguage SOURCES ../../shared/testhttpserver.cpp ../../shared/testhttpserver.h ../../shared/util.cpp ../../shared/util.h @@ -44,7 +44,7 @@ if(ANDROID) "data/I18nType30.qml" ) - qt_add_resource(tst_qqmllanguage "qqmllanguage" + qt_internal_add_resource(tst_qqmllanguage "qqmllanguage" PREFIX "/" FILES @@ -52,12 +52,12 @@ if(ANDROID) ) endif() -qt_extend_target(tst_qqmllanguage CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qqmllanguage CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qqmllanguage CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qqmllanguage CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/qml/qqmllistcompositor/CMakeLists.txt b/tests/auto/qml/qqmllistcompositor/CMakeLists.txt index 940a41f5cd..2780075f09 100644 --- a/tests/auto/qml/qqmllistcompositor/CMakeLists.txt +++ b/tests/auto/qml/qqmllistcompositor/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qqmllistcompositor Test: ##################################################################### -qt_add_test(tst_qqmllistcompositor +qt_internal_add_test(tst_qqmllistcompositor SOURCES tst_qqmllistcompositor.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/qml/qqmllistmodel/CMakeLists.txt b/tests/auto/qml/qqmllistmodel/CMakeLists.txt index b83e2b3cf1..d583dc3b0e 100644 --- a/tests/auto/qml/qqmllistmodel/CMakeLists.txt +++ b/tests/auto/qml/qqmllistmodel/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qqmllistmodel +qt_internal_add_test(tst_qqmllistmodel SOURCES ../../shared/util.cpp ../../shared/util.h tst_qqmllistmodel.cpp @@ -29,12 +29,12 @@ qt_add_test(tst_qqmllistmodel ## Scopes: ##################################################################### -qt_extend_target(tst_qqmllistmodel CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qqmllistmodel CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qqmllistmodel CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qqmllistmodel CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/qml/qqmllistmodelworkerscript/CMakeLists.txt b/tests/auto/qml/qqmllistmodelworkerscript/CMakeLists.txt index 436f38a13b..66c7c3a557 100644 --- a/tests/auto/qml/qqmllistmodelworkerscript/CMakeLists.txt +++ b/tests/auto/qml/qqmllistmodelworkerscript/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qqmllistmodelworkerscript +qt_internal_add_test(tst_qqmllistmodelworkerscript SOURCES ../../shared/util.cpp ../../shared/util.h tst_qqmllistmodelworkerscript.cpp @@ -29,12 +29,12 @@ qt_add_test(tst_qqmllistmodelworkerscript ## Scopes: ##################################################################### -qt_extend_target(tst_qqmllistmodelworkerscript CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qqmllistmodelworkerscript CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qqmllistmodelworkerscript CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qqmllistmodelworkerscript CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/qml/qqmllistreference/CMakeLists.txt b/tests/auto/qml/qqmllistreference/CMakeLists.txt index cb2d91826c..15fa87b0b7 100644 --- a/tests/auto/qml/qqmllistreference/CMakeLists.txt +++ b/tests/auto/qml/qqmllistreference/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qqmllistreference +qt_internal_add_test(tst_qqmllistreference SOURCES ../../shared/util.cpp ../../shared/util.h tst_qqmllistreference.cpp @@ -28,12 +28,12 @@ qt_add_test(tst_qqmllistreference ## Scopes: ##################################################################### -qt_extend_target(tst_qqmllistreference CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qqmllistreference CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qqmllistreference CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qqmllistreference CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/qml/qqmllocale/CMakeLists.txt b/tests/auto/qml/qqmllocale/CMakeLists.txt index 408f4a5c19..4022cb8cc4 100644 --- a/tests/auto/qml/qqmllocale/CMakeLists.txt +++ b/tests/auto/qml/qqmllocale/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qqmllocale +qt_internal_add_test(tst_qqmllocale SOURCES ../../shared/util.cpp ../../shared/util.h tst_qqmllocale.cpp @@ -26,12 +26,12 @@ qt_add_test(tst_qqmllocale ## Scopes: ##################################################################### -qt_extend_target(tst_qqmllocale CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qqmllocale CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qqmllocale CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qqmllocale CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/qml/qqmlmetaobject/CMakeLists.txt b/tests/auto/qml/qqmlmetaobject/CMakeLists.txt index 20e8fff759..c7ec398a5d 100644 --- a/tests/auto/qml/qqmlmetaobject/CMakeLists.txt +++ b/tests/auto/qml/qqmlmetaobject/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qqmlmetaobject +qt_internal_add_test(tst_qqmlmetaobject SOURCES ../../shared/util.cpp ../../shared/util.h tst_qqmlmetaobject.cpp @@ -26,12 +26,12 @@ qt_add_test(tst_qqmlmetaobject ## Scopes: ##################################################################### -qt_extend_target(tst_qqmlmetaobject CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qqmlmetaobject CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qqmlmetaobject CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qqmlmetaobject CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/qml/qqmlmetatype/CMakeLists.txt b/tests/auto/qml/qqmlmetatype/CMakeLists.txt index 66f2a6586e..55eebaa651 100644 --- a/tests/auto/qml/qqmlmetatype/CMakeLists.txt +++ b/tests/auto/qml/qqmlmetatype/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qqmlmetatype +qt_internal_add_test(tst_qqmlmetatype SOURCES ../../shared/util.cpp ../../shared/util.h tst_qqmlmetatype.cpp @@ -29,7 +29,7 @@ set(qmake_qmlfiles_resource_files "data/CompositeType.qml" ) -qt_add_resource(tst_qqmlmetatype "qmake_qmlfiles" +qt_internal_add_resource(tst_qqmlmetatype "qmake_qmlfiles" PREFIX "/tstqqmlmetatype" FILES @@ -41,7 +41,7 @@ set(qmake_qmldirresource_resource_files "data/enumsInRecursiveImport.qml" ) -qt_add_resource(tst_qqmlmetatype "qmake_qmldirresource" +qt_internal_add_resource(tst_qqmlmetatype "qmake_qmldirresource" PREFIX "/" FILES @@ -52,12 +52,12 @@ qt_add_resource(tst_qqmlmetatype "qmake_qmldirresource" ## Scopes: ##################################################################### -qt_extend_target(tst_qqmlmetatype CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qqmlmetatype CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qqmlmetatype CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qqmlmetatype CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/qml/qqmlmoduleplugin/.prev_CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/.prev_CMakeLists.txt index 6b240a9291..fdaa0e2eda 100644 --- a/tests/auto/qml/qqmlmoduleplugin/.prev_CMakeLists.txt +++ b/tests/auto/qml/qqmlmoduleplugin/.prev_CMakeLists.txt @@ -18,7 +18,7 @@ file(GLOB_RECURSE test_data_glob ${CMAKE_CURRENT_BINARY_DIR}/imports/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qqmlmoduleplugin +qt_internal_add_test(tst_qqmlmoduleplugin SOURCES ../../shared/testhttpserver.cpp ../../shared/testhttpserver.h ../../shared/util.cpp ../../shared/util.h @@ -39,7 +39,7 @@ set(qmake_waitingPlugin_resource_files "moduleWithWaitingPlugin" ) -qt_add_resource(tst_qqmlmoduleplugin "qmake_waitingPlugin" +qt_internal_add_resource(tst_qqmlmoduleplugin "qmake_waitingPlugin" PREFIX "/qt-project.org/imports/" FILES @@ -49,7 +49,7 @@ set(qmake_staticPlugin_resource_files "moduleWithStaticPlugin" ) -qt_add_resource(tst_qqmlmoduleplugin "qmake_staticPlugin" +qt_internal_add_resource(tst_qqmlmoduleplugin "qmake_staticPlugin" PREFIX "/qt-project.org/imports/" FILES @@ -60,12 +60,12 @@ qt_add_resource(tst_qqmlmoduleplugin "qmake_staticPlugin" ## Scopes: ##################################################################### -qt_extend_target(tst_qqmlmoduleplugin CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qqmlmoduleplugin CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qqmlmoduleplugin CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qqmlmoduleplugin CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/qml/qqmlmoduleplugin/CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/CMakeLists.txt index 2fcce3d7c9..58a52919ea 100644 --- a/tests/auto/qml/qqmlmoduleplugin/CMakeLists.txt +++ b/tests/auto/qml/qqmlmoduleplugin/CMakeLists.txt @@ -18,7 +18,7 @@ file(GLOB_RECURSE test_data_glob ${CMAKE_CURRENT_BINARY_DIR}/imports/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qqmlmoduleplugin +qt_internal_add_test(tst_qqmlmoduleplugin SOURCES ../../shared/testhttpserver.cpp ../../shared/testhttpserver.h ../../shared/util.cpp ../../shared/util.h @@ -39,7 +39,7 @@ set(qmake_waitingPlugin_resource_files "moduleWithWaitingPlugin" ) -qt_add_resource(tst_qqmlmoduleplugin "qmake_waitingPlugin" +qt_internal_add_resource(tst_qqmlmoduleplugin "qmake_waitingPlugin" PREFIX "/qt-project.org/imports/" FILES @@ -49,7 +49,7 @@ set(qmake_staticPlugin_resource_files "moduleWithStaticPlugin" ) -qt_add_resource(tst_qqmlmoduleplugin "qmake_staticPlugin" +qt_internal_add_resource(tst_qqmlmoduleplugin "qmake_staticPlugin" PREFIX "/qt-project.org/imports/" FILES @@ -65,11 +65,11 @@ qt_add_resource(tst_qqmlmoduleplugin "qmake_staticPlugin" # waitingPlugin.prefix = "/qt-project.org/imports/" # special case begin -add_qt_resource(tst_qqmlmoduleplugin waitingPlugin +qt_internal_add_resource(tst_qqmlmoduleplugin waitingPlugin PREFIX /qt-project.org/imports FILES moduleWithWaitingPlugin/qmldir ) -add_qt_resource(tst_qqmlmoduleplugin staticPlugin +qt_internal_add_resource(tst_qqmlmoduleplugin staticPlugin PREFIX /qt-project.org/imports FILES moduleWithStaticPlugin/qmldir ) @@ -78,12 +78,12 @@ add_qt_resource(tst_qqmlmoduleplugin staticPlugin ## Scopes: ##################################################################### -qt_extend_target(tst_qqmlmoduleplugin CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qqmlmoduleplugin CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qqmlmoduleplugin CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qqmlmoduleplugin CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/qml/qqmlmoduleplugin/invalidFirstCommandModule/.prev_CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/invalidFirstCommandModule/.prev_CMakeLists.txt index d337235cd8..874c639f2b 100644 --- a/tests/auto/qml/qqmlmoduleplugin/invalidFirstCommandModule/.prev_CMakeLists.txt +++ b/tests/auto/qml/qqmlmoduleplugin/invalidFirstCommandModule/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## invalidFirstCommandModule Generic Library: ##################################################################### -qt_add_cmake_library(invalidFirstCommandModule +qt_internal_add_cmake_library(invalidFirstCommandModule MODULE OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/InvalidFirstCommandModule" SOURCES diff --git a/tests/auto/qml/qqmlmoduleplugin/invalidFirstCommandModule/CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/invalidFirstCommandModule/CMakeLists.txt index c580c9d517..d40bc750fd 100644 --- a/tests/auto/qml/qqmlmoduleplugin/invalidFirstCommandModule/CMakeLists.txt +++ b/tests/auto/qml/qqmlmoduleplugin/invalidFirstCommandModule/CMakeLists.txt @@ -4,7 +4,7 @@ ## invalidFirstCommandModule Generic Library: ##################################################################### -qt_add_cmake_library(invalidFirstCommandModule +qt_internal_add_cmake_library(invalidFirstCommandModule MODULE OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/InvalidFirstCommandModule" SOURCES diff --git a/tests/auto/qml/qqmlmoduleplugin/invalidNamespaceModule/.prev_CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/invalidNamespaceModule/.prev_CMakeLists.txt index 9c762abc48..f32cbc8184 100644 --- a/tests/auto/qml/qqmlmoduleplugin/invalidNamespaceModule/.prev_CMakeLists.txt +++ b/tests/auto/qml/qqmlmoduleplugin/invalidNamespaceModule/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## invalidNamespaceModule Generic Library: ##################################################################### -qt_add_cmake_library(invalidNamespaceModule +qt_internal_add_cmake_library(invalidNamespaceModule MODULE OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/InvalidNamespaceModule" SOURCES diff --git a/tests/auto/qml/qqmlmoduleplugin/invalidNamespaceModule/CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/invalidNamespaceModule/CMakeLists.txt index a223ecffbf..4b65f8eff4 100644 --- a/tests/auto/qml/qqmlmoduleplugin/invalidNamespaceModule/CMakeLists.txt +++ b/tests/auto/qml/qqmlmoduleplugin/invalidNamespaceModule/CMakeLists.txt @@ -4,7 +4,7 @@ ## invalidNamespaceModule Generic Library: ##################################################################### -qt_add_cmake_library(invalidNamespaceModule +qt_internal_add_cmake_library(invalidNamespaceModule MODULE OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/InvalidNamespaceModule" SOURCES diff --git a/tests/auto/qml/qqmlmoduleplugin/moduleWithQmlSingleton/.prev_CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/moduleWithQmlSingleton/.prev_CMakeLists.txt index f420295e84..e773de357a 100644 --- a/tests/auto/qml/qqmlmoduleplugin/moduleWithQmlSingleton/.prev_CMakeLists.txt +++ b/tests/auto/qml/qqmlmoduleplugin/moduleWithQmlSingleton/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## moduleWithQmlSingleton Generic Library: ##################################################################### -qt_add_cmake_library(moduleWithQmlSingleton +qt_internal_add_cmake_library(moduleWithQmlSingleton MODULE OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/ModuleWithQmlSingleton" SOURCES diff --git a/tests/auto/qml/qqmlmoduleplugin/moduleWithQmlSingleton/CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/moduleWithQmlSingleton/CMakeLists.txt index e0f8f3043a..d96bff4a57 100644 --- a/tests/auto/qml/qqmlmoduleplugin/moduleWithQmlSingleton/CMakeLists.txt +++ b/tests/auto/qml/qqmlmoduleplugin/moduleWithQmlSingleton/CMakeLists.txt @@ -4,7 +4,7 @@ ## moduleWithQmlSingleton Generic Library: ##################################################################### -qt_add_cmake_library(moduleWithQmlSingleton +qt_internal_add_cmake_library(moduleWithQmlSingleton MODULE OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/ModuleWithQmlSingleton" SOURCES diff --git a/tests/auto/qml/qqmlmoduleplugin/nestedPlugin/.prev_CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/nestedPlugin/.prev_CMakeLists.txt index 8a5bfaab59..03094effc4 100644 --- a/tests/auto/qml/qqmlmoduleplugin/nestedPlugin/.prev_CMakeLists.txt +++ b/tests/auto/qml/qqmlmoduleplugin/nestedPlugin/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## nestedPlugin Generic Library: ##################################################################### -qt_add_cmake_library(nestedPlugin +qt_internal_add_cmake_library(nestedPlugin OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/AutoTestQmlNestedPluginType" SOURCES nestedPlugin.cpp diff --git a/tests/auto/qml/qqmlmoduleplugin/nestedPlugin/CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/nestedPlugin/CMakeLists.txt index ce87292240..4fe48abcfd 100644 --- a/tests/auto/qml/qqmlmoduleplugin/nestedPlugin/CMakeLists.txt +++ b/tests/auto/qml/qqmlmoduleplugin/nestedPlugin/CMakeLists.txt @@ -4,7 +4,7 @@ ## nestedPlugin Generic Library: ##################################################################### -qt_add_cmake_library(nestedPlugin +qt_internal_add_cmake_library(nestedPlugin MODULE # special case OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/AutoTestQmlNestedPluginType" SOURCES diff --git a/tests/auto/qml/qqmlmoduleplugin/nonstrictModule/.prev_CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/nonstrictModule/.prev_CMakeLists.txt index fd9a4a9038..24487bf4d5 100644 --- a/tests/auto/qml/qqmlmoduleplugin/nonstrictModule/.prev_CMakeLists.txt +++ b/tests/auto/qml/qqmlmoduleplugin/nonstrictModule/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## nonstrictModule Generic Library: ##################################################################### -qt_add_cmake_library(nonstrictModule +qt_internal_add_cmake_library(nonstrictModule MODULE OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/NonstrictModule" SOURCES diff --git a/tests/auto/qml/qqmlmoduleplugin/nonstrictModule/CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/nonstrictModule/CMakeLists.txt index c871907e01..3abece32e1 100644 --- a/tests/auto/qml/qqmlmoduleplugin/nonstrictModule/CMakeLists.txt +++ b/tests/auto/qml/qqmlmoduleplugin/nonstrictModule/CMakeLists.txt @@ -4,7 +4,7 @@ ## nonstrictModule Generic Library: ##################################################################### -qt_add_cmake_library(nonstrictModule +qt_internal_add_cmake_library(nonstrictModule MODULE OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/NonstrictModule" SOURCES diff --git a/tests/auto/qml/qqmlmoduleplugin/optionalPlugin/.prev_CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/optionalPlugin/.prev_CMakeLists.txt index 375ade482a..cba807561e 100644 --- a/tests/auto/qml/qqmlmoduleplugin/optionalPlugin/.prev_CMakeLists.txt +++ b/tests/auto/qml/qqmlmoduleplugin/optionalPlugin/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## optionalPlugin Generic Library: ##################################################################### -qt_add_cmake_library(optionalPlugin +qt_internal_add_cmake_library(optionalPlugin MODULE OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/QtQuick/Shapes" SOURCES diff --git a/tests/auto/qml/qqmlmoduleplugin/optionalPlugin/CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/optionalPlugin/CMakeLists.txt index 49b2bce8b7..8a73cfc824 100644 --- a/tests/auto/qml/qqmlmoduleplugin/optionalPlugin/CMakeLists.txt +++ b/tests/auto/qml/qqmlmoduleplugin/optionalPlugin/CMakeLists.txt @@ -4,7 +4,7 @@ ## optionalPlugin Generic Library: ##################################################################### -qt_add_cmake_library(optionalPlugin +qt_internal_add_cmake_library(optionalPlugin MODULE OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/QtQuick/Shapes" SOURCES diff --git a/tests/auto/qml/qqmlmoduleplugin/plugin.2.1/.prev_CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/plugin.2.1/.prev_CMakeLists.txt index 8bb52a6323..6bc535d7ac 100644 --- a/tests/auto/qml/qqmlmoduleplugin/plugin.2.1/.prev_CMakeLists.txt +++ b/tests/auto/qml/qqmlmoduleplugin/plugin.2.1/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## plugin.2.1 Generic Library: ##################################################################### -qt_add_cmake_library(plugin.2.1 +qt_internal_add_cmake_library(plugin.2.1 MODULE OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/AutoTestQmlPluginType.2.1" SOURCES diff --git a/tests/auto/qml/qqmlmoduleplugin/plugin.2.1/CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/plugin.2.1/CMakeLists.txt index 9d1f1c1ca8..2511795326 100644 --- a/tests/auto/qml/qqmlmoduleplugin/plugin.2.1/CMakeLists.txt +++ b/tests/auto/qml/qqmlmoduleplugin/plugin.2.1/CMakeLists.txt @@ -4,7 +4,7 @@ ## plugin.2.1 Generic Library: ##################################################################### -qt_add_cmake_library(plugin.2.1 +qt_internal_add_cmake_library(plugin.2.1 MODULE OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/AutoTestQmlPluginType.2.1" SOURCES diff --git a/tests/auto/qml/qqmlmoduleplugin/plugin.2.1/childplugin/.prev_CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/plugin.2.1/childplugin/.prev_CMakeLists.txt index d945c031cb..e58ad65a99 100644 --- a/tests/auto/qml/qqmlmoduleplugin/plugin.2.1/childplugin/.prev_CMakeLists.txt +++ b/tests/auto/qml/qqmlmoduleplugin/plugin.2.1/childplugin/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## childplugin Generic Library: ##################################################################### -qt_add_cmake_library(childplugin +qt_internal_add_cmake_library(childplugin OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../../imports/org/qtproject/AutoTestQmlPluginType.2.1/ChildPlugin" SOURCES childplugin.cpp diff --git a/tests/auto/qml/qqmlmoduleplugin/plugin.2.1/childplugin/CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/plugin.2.1/childplugin/CMakeLists.txt index d68158d95f..dd75406df6 100644 --- a/tests/auto/qml/qqmlmoduleplugin/plugin.2.1/childplugin/CMakeLists.txt +++ b/tests/auto/qml/qqmlmoduleplugin/plugin.2.1/childplugin/CMakeLists.txt @@ -4,7 +4,7 @@ ## childplugin Generic Library: ##################################################################### -qt_add_cmake_library(childplugin.2.1 # special case +qt_internal_add_cmake_library(childplugin.2.1 # special case MODULE # special case OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../../imports/org/qtproject/AutoTestQmlPluginType.2.1/ChildPlugin" SOURCES diff --git a/tests/auto/qml/qqmlmoduleplugin/plugin.2.2/.prev_CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/plugin.2.2/.prev_CMakeLists.txt index b4af645c81..f0920e6242 100644 --- a/tests/auto/qml/qqmlmoduleplugin/plugin.2.2/.prev_CMakeLists.txt +++ b/tests/auto/qml/qqmlmoduleplugin/plugin.2.2/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## plugin.2.2 Generic Library: ##################################################################### -qt_add_cmake_library(plugin.2.2 +qt_internal_add_cmake_library(plugin.2.2 MODULE OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/AutoTestQmlPluginType.2.2" SOURCES diff --git a/tests/auto/qml/qqmlmoduleplugin/plugin.2.2/CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/plugin.2.2/CMakeLists.txt index e2b36e8f09..d301ed48a6 100644 --- a/tests/auto/qml/qqmlmoduleplugin/plugin.2.2/CMakeLists.txt +++ b/tests/auto/qml/qqmlmoduleplugin/plugin.2.2/CMakeLists.txt @@ -4,7 +4,7 @@ ## plugin.2.2 Generic Library: ##################################################################### -qt_add_cmake_library(plugin.2.2 +qt_internal_add_cmake_library(plugin.2.2 MODULE OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/AutoTestQmlPluginType.2.2" SOURCES diff --git a/tests/auto/qml/qqmlmoduleplugin/plugin.2/.prev_CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/plugin.2/.prev_CMakeLists.txt index 1cbd74d97a..3d13df1e68 100644 --- a/tests/auto/qml/qqmlmoduleplugin/plugin.2/.prev_CMakeLists.txt +++ b/tests/auto/qml/qqmlmoduleplugin/plugin.2/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## plugin.2 Generic Library: ##################################################################### -qt_add_cmake_library(plugin.2 +qt_internal_add_cmake_library(plugin.2 MODULE OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/AutoTestQmlPluginType.2" SOURCES diff --git a/tests/auto/qml/qqmlmoduleplugin/plugin.2/CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/plugin.2/CMakeLists.txt index 0a546866de..f740919f33 100644 --- a/tests/auto/qml/qqmlmoduleplugin/plugin.2/CMakeLists.txt +++ b/tests/auto/qml/qqmlmoduleplugin/plugin.2/CMakeLists.txt @@ -4,7 +4,7 @@ ## plugin.2 Generic Library: ##################################################################### -qt_add_cmake_library(plugin.2 +qt_internal_add_cmake_library(plugin.2 MODULE OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/AutoTestQmlPluginType.2" SOURCES diff --git a/tests/auto/qml/qqmlmoduleplugin/plugin.2/childplugin/.prev_CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/plugin.2/childplugin/.prev_CMakeLists.txt index 036b2237a5..2993a0e429 100644 --- a/tests/auto/qml/qqmlmoduleplugin/plugin.2/childplugin/.prev_CMakeLists.txt +++ b/tests/auto/qml/qqmlmoduleplugin/plugin.2/childplugin/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## childplugin Generic Library: ##################################################################### -qt_add_cmake_library(childplugin +qt_internal_add_cmake_library(childplugin OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../../imports/org/qtproject/AutoTestQmlPluginType.2/ChildPlugin" SOURCES childplugin.cpp diff --git a/tests/auto/qml/qqmlmoduleplugin/plugin.2/childplugin/CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/plugin.2/childplugin/CMakeLists.txt index d7675ba6f1..140f2d4bed 100644 --- a/tests/auto/qml/qqmlmoduleplugin/plugin.2/childplugin/CMakeLists.txt +++ b/tests/auto/qml/qqmlmoduleplugin/plugin.2/childplugin/CMakeLists.txt @@ -4,7 +4,7 @@ ## childplugin Generic Library: ##################################################################### -qt_add_cmake_library(childplugin.2 # special case +qt_internal_add_cmake_library(childplugin.2 # special case MODULE # special case OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../../imports/org/qtproject/AutoTestQmlPluginType.2/ChildPlugin" SOURCES diff --git a/tests/auto/qml/qqmlmoduleplugin/plugin/.prev_CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/plugin/.prev_CMakeLists.txt index 4de3788caa..e295d5a8ea 100644 --- a/tests/auto/qml/qqmlmoduleplugin/plugin/.prev_CMakeLists.txt +++ b/tests/auto/qml/qqmlmoduleplugin/plugin/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## plugin Generic Library: ##################################################################### -qt_add_cmake_library(plugin +qt_internal_add_cmake_library(plugin MODULE OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/AutoTestQmlPluginType" SOURCES diff --git a/tests/auto/qml/qqmlmoduleplugin/plugin/CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/plugin/CMakeLists.txt index 50e30ecf09..7537a70028 100644 --- a/tests/auto/qml/qqmlmoduleplugin/plugin/CMakeLists.txt +++ b/tests/auto/qml/qqmlmoduleplugin/plugin/CMakeLists.txt @@ -4,7 +4,7 @@ ## plugin Generic Library: ##################################################################### -qt_add_cmake_library(plugin +qt_internal_add_cmake_library(plugin MODULE OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/AutoTestQmlPluginType" SOURCES diff --git a/tests/auto/qml/qqmlmoduleplugin/plugin/childplugin/.prev_CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/plugin/childplugin/.prev_CMakeLists.txt index e137159431..a79d00a016 100644 --- a/tests/auto/qml/qqmlmoduleplugin/plugin/childplugin/.prev_CMakeLists.txt +++ b/tests/auto/qml/qqmlmoduleplugin/plugin/childplugin/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## childplugin Generic Library: ##################################################################### -qt_add_cmake_library(childplugin +qt_internal_add_cmake_library(childplugin OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../../imports/org/qtproject/AutoTestQmlPluginType/ChildPlugin" SOURCES childplugin.cpp diff --git a/tests/auto/qml/qqmlmoduleplugin/plugin/childplugin/CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/plugin/childplugin/CMakeLists.txt index 962471f304..ddd9794339 100644 --- a/tests/auto/qml/qqmlmoduleplugin/plugin/childplugin/CMakeLists.txt +++ b/tests/auto/qml/qqmlmoduleplugin/plugin/childplugin/CMakeLists.txt @@ -4,7 +4,7 @@ ## childplugin Generic Library: ##################################################################### -qt_add_cmake_library(childplugin +qt_internal_add_cmake_library(childplugin MODULE # special case OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../../imports/org/qtproject/AutoTestQmlPluginType/ChildPlugin" SOURCES diff --git a/tests/auto/qml/qqmlmoduleplugin/pluginMixed/.prev_CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/pluginMixed/.prev_CMakeLists.txt index 0d27da3434..be502cd3c7 100644 --- a/tests/auto/qml/qqmlmoduleplugin/pluginMixed/.prev_CMakeLists.txt +++ b/tests/auto/qml/qqmlmoduleplugin/pluginMixed/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## pluginMixed Generic Library: ##################################################################### -qt_add_cmake_library(pluginMixed +qt_internal_add_cmake_library(pluginMixed MODULE OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/AutoTestQmlMixedPluginType" SOURCES diff --git a/tests/auto/qml/qqmlmoduleplugin/pluginMixed/CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/pluginMixed/CMakeLists.txt index 967868a674..3638d93cd4 100644 --- a/tests/auto/qml/qqmlmoduleplugin/pluginMixed/CMakeLists.txt +++ b/tests/auto/qml/qqmlmoduleplugin/pluginMixed/CMakeLists.txt @@ -4,7 +4,7 @@ ## pluginMixed Generic Library: ##################################################################### -qt_add_cmake_library(pluginMixed +qt_internal_add_cmake_library(pluginMixed MODULE OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/AutoTestQmlMixedPluginType" SOURCES diff --git a/tests/auto/qml/qqmlmoduleplugin/pluginVersion/.prev_CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/pluginVersion/.prev_CMakeLists.txt index 278d100ed9..4a98877528 100644 --- a/tests/auto/qml/qqmlmoduleplugin/pluginVersion/.prev_CMakeLists.txt +++ b/tests/auto/qml/qqmlmoduleplugin/pluginVersion/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## pluginVersion Generic Library: ##################################################################### -qt_add_cmake_library(pluginVersion +qt_internal_add_cmake_library(pluginVersion MODULE OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/AutoTestQmlVersionPluginType" SOURCES diff --git a/tests/auto/qml/qqmlmoduleplugin/pluginVersion/CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/pluginVersion/CMakeLists.txt index 7e58ea3b18..e3be81a837 100644 --- a/tests/auto/qml/qqmlmoduleplugin/pluginVersion/CMakeLists.txt +++ b/tests/auto/qml/qqmlmoduleplugin/pluginVersion/CMakeLists.txt @@ -4,7 +4,7 @@ ## pluginVersion Generic Library: ##################################################################### -qt_add_cmake_library(pluginVersion +qt_internal_add_cmake_library(pluginVersion MODULE OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/AutoTestQmlVersionPluginType" SOURCES diff --git a/tests/auto/qml/qqmlmoduleplugin/pluginWithQmlFile/.prev_CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/pluginWithQmlFile/.prev_CMakeLists.txt index 7db53592e1..f37b45d5a0 100644 --- a/tests/auto/qml/qqmlmoduleplugin/pluginWithQmlFile/.prev_CMakeLists.txt +++ b/tests/auto/qml/qqmlmoduleplugin/pluginWithQmlFile/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## pluginWithQmlFile Generic Library: ##################################################################### -qt_add_cmake_library(pluginWithQmlFile +qt_internal_add_cmake_library(pluginWithQmlFile MODULE OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/AutoTestPluginWithQmlFile" SOURCES diff --git a/tests/auto/qml/qqmlmoduleplugin/pluginWithQmlFile/CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/pluginWithQmlFile/CMakeLists.txt index ad21516b1c..dc0a1142ba 100644 --- a/tests/auto/qml/qqmlmoduleplugin/pluginWithQmlFile/CMakeLists.txt +++ b/tests/auto/qml/qqmlmoduleplugin/pluginWithQmlFile/CMakeLists.txt @@ -4,7 +4,7 @@ ## pluginWithQmlFile Generic Library: ##################################################################### -qt_add_cmake_library(pluginWithQmlFile +qt_internal_add_cmake_library(pluginWithQmlFile MODULE OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/AutoTestPluginWithQmlFile" SOURCES diff --git a/tests/auto/qml/qqmlmoduleplugin/pluginWrongCase/.prev_CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/pluginWrongCase/.prev_CMakeLists.txt index 93a10a2169..1eb7e6a784 100644 --- a/tests/auto/qml/qqmlmoduleplugin/pluginWrongCase/.prev_CMakeLists.txt +++ b/tests/auto/qml/qqmlmoduleplugin/pluginWrongCase/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## Plugin Generic Library: ##################################################################### -qt_add_cmake_library(Plugin +qt_internal_add_cmake_library(Plugin MODULE OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/WrongCase" SOURCES diff --git a/tests/auto/qml/qqmlmoduleplugin/pluginWrongCase/CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/pluginWrongCase/CMakeLists.txt index 7938f93465..351d2a4c5e 100644 --- a/tests/auto/qml/qqmlmoduleplugin/pluginWrongCase/CMakeLists.txt +++ b/tests/auto/qml/qqmlmoduleplugin/pluginWrongCase/CMakeLists.txt @@ -4,7 +4,7 @@ ## Plugin Generic Library: ##################################################################### -qt_add_cmake_library(Plugin +qt_internal_add_cmake_library(Plugin MODULE OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/WrongCase" SOURCES diff --git a/tests/auto/qml/qqmlmoduleplugin/preemptedStrictModule/.prev_CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/preemptedStrictModule/.prev_CMakeLists.txt index 1e803e65af..10bd25cda3 100644 --- a/tests/auto/qml/qqmlmoduleplugin/preemptedStrictModule/.prev_CMakeLists.txt +++ b/tests/auto/qml/qqmlmoduleplugin/preemptedStrictModule/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## preemptedStrictModule Generic Library: ##################################################################### -qt_add_cmake_library(preemptedStrictModule +qt_internal_add_cmake_library(preemptedStrictModule MODULE OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/PreemptedStrictModule" SOURCES diff --git a/tests/auto/qml/qqmlmoduleplugin/preemptedStrictModule/CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/preemptedStrictModule/CMakeLists.txt index 2c13ea8aa6..ef278f139f 100644 --- a/tests/auto/qml/qqmlmoduleplugin/preemptedStrictModule/CMakeLists.txt +++ b/tests/auto/qml/qqmlmoduleplugin/preemptedStrictModule/CMakeLists.txt @@ -4,7 +4,7 @@ ## preemptedStrictModule Generic Library: ##################################################################### -qt_add_cmake_library(preemptedStrictModule +qt_internal_add_cmake_library(preemptedStrictModule MODULE OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/PreemptedStrictModule" SOURCES diff --git a/tests/auto/qml/qqmlmoduleplugin/preemptiveModule/.prev_CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/preemptiveModule/.prev_CMakeLists.txt index 3addc1aacb..ae55a4a81f 100644 --- a/tests/auto/qml/qqmlmoduleplugin/preemptiveModule/.prev_CMakeLists.txt +++ b/tests/auto/qml/qqmlmoduleplugin/preemptiveModule/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## preemptiveModule Generic Library: ##################################################################### -qt_add_cmake_library(preemptiveModule +qt_internal_add_cmake_library(preemptiveModule MODULE OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/PreemptiveModule" SOURCES diff --git a/tests/auto/qml/qqmlmoduleplugin/preemptiveModule/CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/preemptiveModule/CMakeLists.txt index d473bff09c..1d91354aaa 100644 --- a/tests/auto/qml/qqmlmoduleplugin/preemptiveModule/CMakeLists.txt +++ b/tests/auto/qml/qqmlmoduleplugin/preemptiveModule/CMakeLists.txt @@ -4,7 +4,7 @@ ## preemptiveModule Generic Library: ##################################################################### -qt_add_cmake_library(preemptiveModule +qt_internal_add_cmake_library(preemptiveModule MODULE OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/PreemptiveModule" SOURCES diff --git a/tests/auto/qml/qqmlmoduleplugin/protectedModule/.prev_CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/protectedModule/.prev_CMakeLists.txt index 5ff2840aef..3ee6865ded 100644 --- a/tests/auto/qml/qqmlmoduleplugin/protectedModule/.prev_CMakeLists.txt +++ b/tests/auto/qml/qqmlmoduleplugin/protectedModule/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## protectedModule Generic Library: ##################################################################### -qt_add_cmake_library(protectedModule +qt_internal_add_cmake_library(protectedModule MODULE OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/ProtectedModule" SOURCES diff --git a/tests/auto/qml/qqmlmoduleplugin/protectedModule/CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/protectedModule/CMakeLists.txt index 24da9a078e..bb5b270a30 100644 --- a/tests/auto/qml/qqmlmoduleplugin/protectedModule/CMakeLists.txt +++ b/tests/auto/qml/qqmlmoduleplugin/protectedModule/CMakeLists.txt @@ -4,7 +4,7 @@ ## protectedModule Generic Library: ##################################################################### -qt_add_cmake_library(protectedModule +qt_internal_add_cmake_library(protectedModule MODULE OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/ProtectedModule" SOURCES diff --git a/tests/auto/qml/qqmlmoduleplugin/strictModule.2/.prev_CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/strictModule.2/.prev_CMakeLists.txt index d832421c8f..c8d51ce4ea 100644 --- a/tests/auto/qml/qqmlmoduleplugin/strictModule.2/.prev_CMakeLists.txt +++ b/tests/auto/qml/qqmlmoduleplugin/strictModule.2/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## strictModule.2 Generic Library: ##################################################################### -qt_add_cmake_library(strictModule.2 +qt_internal_add_cmake_library(strictModule.2 MODULE OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/StrictModule.2" SOURCES diff --git a/tests/auto/qml/qqmlmoduleplugin/strictModule.2/CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/strictModule.2/CMakeLists.txt index 9b69cf90ca..1e976b06c8 100644 --- a/tests/auto/qml/qqmlmoduleplugin/strictModule.2/CMakeLists.txt +++ b/tests/auto/qml/qqmlmoduleplugin/strictModule.2/CMakeLists.txt @@ -4,7 +4,7 @@ ## strictModule.2 Generic Library: ##################################################################### -qt_add_cmake_library(strictModule.2 +qt_internal_add_cmake_library(strictModule.2 MODULE OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/StrictModule.2" SOURCES diff --git a/tests/auto/qml/qqmlmoduleplugin/strictModule/.prev_CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/strictModule/.prev_CMakeLists.txt index f8bb888bd9..ff1f47e336 100644 --- a/tests/auto/qml/qqmlmoduleplugin/strictModule/.prev_CMakeLists.txt +++ b/tests/auto/qml/qqmlmoduleplugin/strictModule/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## strictModule Generic Library: ##################################################################### -qt_add_cmake_library(strictModule +qt_internal_add_cmake_library(strictModule MODULE OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/StrictModule" SOURCES diff --git a/tests/auto/qml/qqmlmoduleplugin/strictModule/CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/strictModule/CMakeLists.txt index d3013fef73..341e147ebe 100644 --- a/tests/auto/qml/qqmlmoduleplugin/strictModule/CMakeLists.txt +++ b/tests/auto/qml/qqmlmoduleplugin/strictModule/CMakeLists.txt @@ -4,7 +4,7 @@ ## strictModule Generic Library: ##################################################################### -qt_add_cmake_library(strictModule +qt_internal_add_cmake_library(strictModule MODULE OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/StrictModule" SOURCES diff --git a/tests/auto/qml/qqmlnotifier/CMakeLists.txt b/tests/auto/qml/qqmlnotifier/CMakeLists.txt index 75c4893e26..5cc0495393 100644 --- a/tests/auto/qml/qqmlnotifier/CMakeLists.txt +++ b/tests/auto/qml/qqmlnotifier/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qqmlnotifier +qt_internal_add_test(tst_qqmlnotifier SOURCES ../../shared/util.cpp ../../shared/util.h tst_qqmlnotifier.cpp @@ -25,12 +25,12 @@ qt_add_test(tst_qqmlnotifier ## Scopes: ##################################################################### -qt_extend_target(tst_qqmlnotifier CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qqmlnotifier CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qqmlnotifier CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qqmlnotifier CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/qml/qqmlobjectmodel/CMakeLists.txt b/tests/auto/qml/qqmlobjectmodel/CMakeLists.txt index 347a68a8de..b16bd99b2b 100644 --- a/tests/auto/qml/qqmlobjectmodel/CMakeLists.txt +++ b/tests/auto/qml/qqmlobjectmodel/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qqmlobjectmodel Test: ##################################################################### -qt_add_test(tst_qqmlobjectmodel +qt_internal_add_test(tst_qqmlobjectmodel SOURCES tst_qqmlobjectmodel.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/qml/qqmlopenmetaobject/CMakeLists.txt b/tests/auto/qml/qqmlopenmetaobject/CMakeLists.txt index 361ea61ae9..3e223a21fd 100644 --- a/tests/auto/qml/qqmlopenmetaobject/CMakeLists.txt +++ b/tests/auto/qml/qqmlopenmetaobject/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qqmlopenmetaobject Test: ##################################################################### -qt_add_test(tst_qqmlopenmetaobject +qt_internal_add_test(tst_qqmlopenmetaobject SOURCES tst_qqmlopenmetaobject.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/qml/qqmlparser/CMakeLists.txt b/tests/auto/qml/qqmlparser/CMakeLists.txt index 6fc6135e5f..c322e29e94 100644 --- a/tests/auto/qml/qqmlparser/CMakeLists.txt +++ b/tests/auto/qml/qqmlparser/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qqmlparser +qt_internal_add_test(tst_qqmlparser SOURCES ../../shared/qqmljsastdumper.cpp ../../shared/qqmljsastdumper.h ../../shared/util.cpp ../../shared/util.h @@ -28,17 +28,17 @@ qt_add_test(tst_qqmlparser ## Scopes: ##################################################################### -qt_extend_target(tst_qqmlparser CONDITION CMAKE_CROSSCOMPILING +qt_internal_extend_target(tst_qqmlparser CONDITION CMAKE_CROSSCOMPILING DEFINES QTEST_CROSS_COMPILED ) -qt_extend_target(tst_qqmlparser CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qqmlparser CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qqmlparser CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qqmlparser CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/qml/qqmlpromise/CMakeLists.txt b/tests/auto/qml/qqmlpromise/CMakeLists.txt index 591ad850db..e972ab08fb 100644 --- a/tests/auto/qml/qqmlpromise/CMakeLists.txt +++ b/tests/auto/qml/qqmlpromise/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qqmlpromise +qt_internal_add_test(tst_qqmlpromise SOURCES ../../shared/util.cpp ../../shared/util.h tst_qqmlpromise.cpp @@ -33,12 +33,12 @@ qt_add_test(tst_qqmlpromise ## Scopes: ##################################################################### -qt_extend_target(tst_qqmlpromise CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qqmlpromise CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qqmlpromise CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qqmlpromise CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/qml/qqmlproperty/CMakeLists.txt b/tests/auto/qml/qqmlproperty/CMakeLists.txt index 8e28a0bfd2..2dabf0f948 100644 --- a/tests/auto/qml/qqmlproperty/CMakeLists.txt +++ b/tests/auto/qml/qqmlproperty/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qqmlproperty +qt_internal_add_test(tst_qqmlproperty SOURCES ../../shared/util.cpp ../../shared/util.h interfaces.h @@ -32,12 +32,12 @@ qt_add_test(tst_qqmlproperty ## Scopes: ##################################################################### -qt_extend_target(tst_qqmlproperty CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qqmlproperty CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qqmlproperty CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qqmlproperty CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/qml/qqmlpropertycache/CMakeLists.txt b/tests/auto/qml/qqmlpropertycache/CMakeLists.txt index 7c84ef687a..55f8c7b76b 100644 --- a/tests/auto/qml/qqmlpropertycache/CMakeLists.txt +++ b/tests/auto/qml/qqmlpropertycache/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qqmlpropertycache +qt_internal_add_test(tst_qqmlpropertycache SOURCES ../../shared/util.cpp ../../shared/util.h tst_qqmlpropertycache.cpp @@ -27,12 +27,12 @@ qt_add_test(tst_qqmlpropertycache ## Scopes: ##################################################################### -qt_extend_target(tst_qqmlpropertycache CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qqmlpropertycache CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qqmlpropertycache CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qqmlpropertycache CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/qml/qqmlpropertymap/CMakeLists.txt b/tests/auto/qml/qqmlpropertymap/CMakeLists.txt index 7d5bce3056..3092aa4eb2 100644 --- a/tests/auto/qml/qqmlpropertymap/CMakeLists.txt +++ b/tests/auto/qml/qqmlpropertymap/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qqmlpropertymap +qt_internal_add_test(tst_qqmlpropertymap SOURCES ../../shared/util.cpp ../../shared/util.h tst_qqmlpropertymap.cpp @@ -28,12 +28,12 @@ qt_add_test(tst_qqmlpropertymap ## Scopes: ##################################################################### -qt_extend_target(tst_qqmlpropertymap CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qqmlpropertymap CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qqmlpropertymap CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qqmlpropertymap CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/qml/qqmlqt/CMakeLists.txt b/tests/auto/qml/qqmlqt/CMakeLists.txt index 085c7e0f75..1c965d5c5a 100644 --- a/tests/auto/qml/qqmlqt/CMakeLists.txt +++ b/tests/auto/qml/qqmlqt/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qqmlqt +qt_internal_add_test(tst_qqmlqt SOURCES ../../shared/util.cpp ../../shared/util.h tst_qqmlqt.cpp @@ -28,12 +28,12 @@ qt_add_test(tst_qqmlqt ## Scopes: ##################################################################### -qt_extend_target(tst_qqmlqt CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qqmlqt CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qqmlqt CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qqmlqt CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/qml/qqmlsettings/CMakeLists.txt b/tests/auto/qml/qqmlsettings/CMakeLists.txt index 40bc827555..01d35824da 100644 --- a/tests/auto/qml/qqmlsettings/CMakeLists.txt +++ b/tests/auto/qml/qqmlsettings/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qqmlsettings +qt_internal_add_test(tst_qqmlsettings SOURCES ../../shared/util.cpp ../../shared/util.h tst_qqmlsettings.cpp @@ -25,12 +25,12 @@ qt_add_test(tst_qqmlsettings ## Scopes: ##################################################################### -qt_extend_target(tst_qqmlsettings CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qqmlsettings CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qqmlsettings CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qqmlsettings CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/qml/qqmlsqldatabase/CMakeLists.txt b/tests/auto/qml/qqmlsqldatabase/CMakeLists.txt index bc4a88653b..b9762b2eb6 100644 --- a/tests/auto/qml/qqmlsqldatabase/CMakeLists.txt +++ b/tests/auto/qml/qqmlsqldatabase/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qqmlsqldatabase +qt_internal_add_test(tst_qqmlsqldatabase SOURCES ../../shared/util.cpp ../../shared/util.h tst_qqmlsqldatabase.cpp @@ -29,12 +29,12 @@ qt_add_test(tst_qqmlsqldatabase ## Scopes: ##################################################################### -qt_extend_target(tst_qqmlsqldatabase CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qqmlsqldatabase CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qqmlsqldatabase CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qqmlsqldatabase CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/qml/qqmltablemodel/CMakeLists.txt b/tests/auto/qml/qqmltablemodel/CMakeLists.txt index ee33bb4517..75da1fc93f 100644 --- a/tests/auto/qml/qqmltablemodel/CMakeLists.txt +++ b/tests/auto/qml/qqmltablemodel/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qqmltablemodel +qt_internal_add_test(tst_qqmltablemodel SOURCES ../../shared/util.cpp ../../shared/util.h tst_qqmltablemodel.cpp @@ -28,12 +28,12 @@ qt_add_test(tst_qqmltablemodel ## Scopes: ##################################################################### -qt_extend_target(tst_qqmltablemodel CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qqmltablemodel CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qqmltablemodel CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qqmltablemodel CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/qml/qqmltimer/CMakeLists.txt b/tests/auto/qml/qqmltimer/CMakeLists.txt index aeb299c914..0f80a2dc79 100644 --- a/tests/auto/qml/qqmltimer/CMakeLists.txt +++ b/tests/auto/qml/qqmltimer/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qqmltimer Test: ##################################################################### -qt_add_test(tst_qqmltimer +qt_internal_add_test(tst_qqmltimer SOURCES tst_qqmltimer.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/qml/qqmltranslation/.prev_CMakeLists.txt b/tests/auto/qml/qqmltranslation/.prev_CMakeLists.txt index 576f836cf9..73b327f814 100644 --- a/tests/auto/qml/qqmltranslation/.prev_CMakeLists.txt +++ b/tests/auto/qml/qqmltranslation/.prev_CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qqmltranslation +qt_internal_add_test(tst_qqmltranslation SOURCES ../../shared/util.cpp ../../shared/util.h tst_qqmltranslation.cpp @@ -31,7 +31,7 @@ set(translation_resource_files "translation.qml" ) -qt_add_resource(tst_qqmltranslation "translation" +qt_internal_add_resource(tst_qqmltranslation "translation" PREFIX "/" BASE @@ -44,12 +44,12 @@ qt_add_resource(tst_qqmltranslation "translation" ## Scopes: ##################################################################### -qt_extend_target(tst_qqmltranslation CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qqmltranslation CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qqmltranslation CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qqmltranslation CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/qml/qqmltranslation/CMakeLists.txt b/tests/auto/qml/qqmltranslation/CMakeLists.txt index 8b665dd1b5..6e67a2ecfb 100644 --- a/tests/auto/qml/qqmltranslation/CMakeLists.txt +++ b/tests/auto/qml/qqmltranslation/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qqmltranslation +qt_internal_add_test(tst_qqmltranslation SOURCES ../../shared/util.cpp ../../shared/util.h tst_qqmltranslation.cpp @@ -45,7 +45,7 @@ set_source_files_properties( ) # special case end -qt_add_resource(tst_qqmltranslation "translation" +qt_internal_add_resource(tst_qqmltranslation "translation" PREFIX "/" BASE @@ -58,12 +58,12 @@ qt_add_resource(tst_qqmltranslation "translation" ## Scopes: ##################################################################### -qt_extend_target(tst_qqmltranslation CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qqmltranslation CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qqmltranslation CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qqmltranslation CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/qml/qqmltypeloader/CMakeLists.txt b/tests/auto/qml/qqmltypeloader/CMakeLists.txt index a28d7592e3..13a7e49b17 100644 --- a/tests/auto/qml/qqmltypeloader/CMakeLists.txt +++ b/tests/auto/qml/qqmltypeloader/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qqmltypeloader +qt_internal_add_test(tst_qqmltypeloader SOURCES ../../shared/testhttpserver.cpp ../../shared/testhttpserver.h ../../shared/util.cpp ../../shared/util.h @@ -32,12 +32,12 @@ qt_add_test(tst_qqmltypeloader ## Scopes: ##################################################################### -qt_extend_target(tst_qqmltypeloader CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qqmltypeloader CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qqmltypeloader CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qqmltypeloader CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/qml/qqmltypeloader/SlowImport/.prev_CMakeLists.txt b/tests/auto/qml/qqmltypeloader/SlowImport/.prev_CMakeLists.txt index 7dd4bb659c..7e6324636b 100644 --- a/tests/auto/qml/qqmltypeloader/SlowImport/.prev_CMakeLists.txt +++ b/tests/auto/qml/qqmltypeloader/SlowImport/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## Slow Generic Library: ##################################################################### -qt_add_cmake_library(Slow +qt_internal_add_cmake_library(Slow OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../Slow" SOURCES plugin.cpp plugin.h diff --git a/tests/auto/qml/qqmltypeloader/SlowImport/CMakeLists.txt b/tests/auto/qml/qqmltypeloader/SlowImport/CMakeLists.txt index c377016682..18043652cd 100644 --- a/tests/auto/qml/qqmltypeloader/SlowImport/CMakeLists.txt +++ b/tests/auto/qml/qqmltypeloader/SlowImport/CMakeLists.txt @@ -4,7 +4,7 @@ ## Slow Generic Library: ##################################################################### -qt_add_cmake_library(Slow +qt_internal_add_cmake_library(Slow OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../Slow" SOURCES plugin.cpp plugin.h diff --git a/tests/auto/qml/qqmlvaluetypeproviders/CMakeLists.txt b/tests/auto/qml/qqmlvaluetypeproviders/CMakeLists.txt index 6af68cb1ce..697f501153 100644 --- a/tests/auto/qml/qqmlvaluetypeproviders/CMakeLists.txt +++ b/tests/auto/qml/qqmlvaluetypeproviders/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qqmlvaluetypeproviders +qt_internal_add_test(tst_qqmlvaluetypeproviders SOURCES ../../shared/util.cpp ../../shared/util.h testtypes.cpp testtypes.h @@ -29,12 +29,12 @@ qt_add_test(tst_qqmlvaluetypeproviders ## Scopes: ##################################################################### -qt_extend_target(tst_qqmlvaluetypeproviders CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qqmlvaluetypeproviders CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qqmlvaluetypeproviders CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qqmlvaluetypeproviders CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/qml/qqmlvaluetypes/CMakeLists.txt b/tests/auto/qml/qqmlvaluetypes/CMakeLists.txt index 0fc8045f38..fc76a3ff12 100644 --- a/tests/auto/qml/qqmlvaluetypes/CMakeLists.txt +++ b/tests/auto/qml/qqmlvaluetypes/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qqmlvaluetypes +qt_internal_add_test(tst_qqmlvaluetypes SOURCES ../../shared/util.cpp ../../shared/util.h testtypes.cpp testtypes.h @@ -32,12 +32,12 @@ qt_add_test(tst_qqmlvaluetypes ## Scopes: ##################################################################### -qt_extend_target(tst_qqmlvaluetypes CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qqmlvaluetypes CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qqmlvaluetypes CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qqmlvaluetypes CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/qml/qqmlxmlhttprequest/CMakeLists.txt b/tests/auto/qml/qqmlxmlhttprequest/CMakeLists.txt index 233a3aac62..4f428fe3a1 100644 --- a/tests/auto/qml/qqmlxmlhttprequest/CMakeLists.txt +++ b/tests/auto/qml/qqmlxmlhttprequest/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qqmlxmlhttprequest +qt_internal_add_test(tst_qqmlxmlhttprequest SOURCES ../../shared/testhttpserver.cpp ../../shared/testhttpserver.h ../../shared/util.cpp ../../shared/util.h @@ -29,12 +29,12 @@ qt_add_test(tst_qqmlxmlhttprequest ## Scopes: ##################################################################### -qt_extend_target(tst_qqmlxmlhttprequest CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qqmlxmlhttprequest CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qqmlxmlhttprequest CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qqmlxmlhttprequest CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/qml/qquickfolderlistmodel/.prev_CMakeLists.txt b/tests/auto/qml/qquickfolderlistmodel/.prev_CMakeLists.txt index b222e3db6d..313787cb31 100644 --- a/tests/auto/qml/qquickfolderlistmodel/.prev_CMakeLists.txt +++ b/tests/auto/qml/qquickfolderlistmodel/.prev_CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qquickfolderlistmodel +qt_internal_add_test(tst_qquickfolderlistmodel SOURCES ../../shared/util.cpp ../../shared/util.h tst_qquickfolderlistmodel.cpp @@ -29,7 +29,7 @@ set(introspect_resource_files "txtdir/hello.txt" ) -qt_add_resource(tst_qquickfolderlistmodel "introspect" +qt_internal_add_resource(tst_qquickfolderlistmodel "introspect" PREFIX "/myprefix/subdir" BASE @@ -42,12 +42,12 @@ qt_add_resource(tst_qquickfolderlistmodel "introspect" ## Scopes: ##################################################################### -qt_extend_target(tst_qquickfolderlistmodel CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquickfolderlistmodel CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickfolderlistmodel CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquickfolderlistmodel CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/qml/qquickfolderlistmodel/CMakeLists.txt b/tests/auto/qml/qquickfolderlistmodel/CMakeLists.txt index 326f8245e9..9c44abd939 100644 --- a/tests/auto/qml/qquickfolderlistmodel/CMakeLists.txt +++ b/tests/auto/qml/qquickfolderlistmodel/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qquickfolderlistmodel +qt_internal_add_test(tst_qquickfolderlistmodel SOURCES ../../shared/util.cpp ../../shared/util.h tst_qquickfolderlistmodel.cpp @@ -32,7 +32,7 @@ set(introspect_resource_files "txtdir/hello.txt" ) -qt_add_resource(tst_qquickfolderlistmodel "introspect" +qt_internal_add_resource(tst_qquickfolderlistmodel "introspect" PREFIX "/myprefix/subdir" BASE @@ -45,12 +45,12 @@ qt_add_resource(tst_qquickfolderlistmodel "introspect" ## Scopes: ##################################################################### -qt_extend_target(tst_qquickfolderlistmodel CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquickfolderlistmodel CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickfolderlistmodel CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquickfolderlistmodel CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/qml/qquickworkerscript/CMakeLists.txt b/tests/auto/qml/qquickworkerscript/CMakeLists.txt index de9e45d662..52a2380ff4 100644 --- a/tests/auto/qml/qquickworkerscript/CMakeLists.txt +++ b/tests/auto/qml/qquickworkerscript/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qquickworkerscript +qt_internal_add_test(tst_qquickworkerscript SOURCES ../../shared/util.cpp ../../shared/util.h tst_qquickworkerscript.cpp @@ -28,12 +28,12 @@ qt_add_test(tst_qquickworkerscript ## Scopes: ##################################################################### -qt_extend_target(tst_qquickworkerscript CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquickworkerscript CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickworkerscript CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquickworkerscript CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/qml/qrcqml/CMakeLists.txt b/tests/auto/qml/qrcqml/CMakeLists.txt index 88e910ba05..52624e38d3 100644 --- a/tests/auto/qml/qrcqml/CMakeLists.txt +++ b/tests/auto/qml/qrcqml/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qrcqml Test: ##################################################################### -qt_add_test(tst_qrcqml +qt_internal_add_test(tst_qrcqml SOURCES tst_qrcqml.cpp PUBLIC_LIBRARIES @@ -31,7 +31,7 @@ set(qrcqml_resource_files "data/main2.qml" ) -qt_add_resource(tst_qrcqml "qrcqml" +qt_internal_add_resource(tst_qrcqml "qrcqml" PREFIX "/" FILES @@ -48,7 +48,7 @@ set(qrcqml1_resource_files "data/main3.qml" ) -qt_add_resource(tst_qrcqml "qrcqml1" +qt_internal_add_resource(tst_qrcqml "qrcqml1" PREFIX "/search" FILES @@ -61,7 +61,7 @@ set(qrcqml2_resource_files "data/SubDir.qml" ) -qt_add_resource(tst_qrcqml "qrcqml2" +qt_internal_add_resource(tst_qrcqml "qrcqml2" PREFIX "/search/data" FILES @@ -78,7 +78,7 @@ set(qrcqml3_resource_files "data/imports/QrcImport/qmldir" ) -qt_add_resource(tst_qrcqml "qrcqml3" +qt_internal_add_resource(tst_qrcqml "qrcqml3" PREFIX "/imports" FILES diff --git a/tests/auto/qml/qtqmlmodules/CMakeLists.txt b/tests/auto/qml/qtqmlmodules/CMakeLists.txt index b42cb964b8..9637588a8b 100644 --- a/tests/auto/qml/qtqmlmodules/CMakeLists.txt +++ b/tests/auto/qml/qtqmlmodules/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qtqmlmodules +qt_internal_add_test(tst_qtqmlmodules SOURCES ../../shared/util.cpp ../../shared/util.h tst_qtqmlmodules.cpp @@ -27,12 +27,12 @@ qt_add_test(tst_qtqmlmodules ## Scopes: ##################################################################### -qt_extend_target(tst_qtqmlmodules CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qtqmlmodules CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qtqmlmodules CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qtqmlmodules CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/qml/qv4assembler/CMakeLists.txt b/tests/auto/qml/qv4assembler/CMakeLists.txt index b54dd67816..1f73fd3495 100644 --- a/tests/auto/qml/qv4assembler/CMakeLists.txt +++ b/tests/auto/qml/qv4assembler/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qv4assembler +qt_internal_add_test(tst_qv4assembler SOURCES ../../shared/util.cpp ../../shared/util.h tst_qv4assembler.cpp @@ -25,12 +25,12 @@ qt_add_test(tst_qv4assembler ## Scopes: ##################################################################### -qt_extend_target(tst_qv4assembler CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qv4assembler CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qv4assembler CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qv4assembler CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/qml/qv4identifiertable/CMakeLists.txt b/tests/auto/qml/qv4identifiertable/CMakeLists.txt index 8606bb0d3a..0a21c81ef1 100644 --- a/tests/auto/qml/qv4identifiertable/CMakeLists.txt +++ b/tests/auto/qml/qv4identifiertable/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qv4identifiertable Test: ##################################################################### -qt_add_test(tst_qv4identifiertable +qt_internal_add_test(tst_qv4identifiertable SOURCES tst_qv4identifiertable.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/qml/qv4mm/CMakeLists.txt b/tests/auto/qml/qv4mm/CMakeLists.txt index b319f36792..f5667c2b5d 100644 --- a/tests/auto/qml/qv4mm/CMakeLists.txt +++ b/tests/auto/qml/qv4mm/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qv4mm +qt_internal_add_test(tst_qv4mm SOURCES ../../shared/util.cpp ../../shared/util.h tst_qv4mm.cpp @@ -26,12 +26,12 @@ qt_add_test(tst_qv4mm ## Scopes: ##################################################################### -qt_extend_target(tst_qv4mm CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qv4mm CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qv4mm CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qv4mm CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/qml/qv4regexp/CMakeLists.txt b/tests/auto/qml/qv4regexp/CMakeLists.txt index bba8314256..709ea7aa7f 100644 --- a/tests/auto/qml/qv4regexp/CMakeLists.txt +++ b/tests/auto/qml/qv4regexp/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qv4regexp Test: ##################################################################### -qt_add_test(tst_qv4regexp +qt_internal_add_test(tst_qv4regexp SOURCES tst_qv4regexp.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/qml/qwidgetsinqml/CMakeLists.txt b/tests/auto/qml/qwidgetsinqml/CMakeLists.txt index 2596f05930..56e0181e89 100644 --- a/tests/auto/qml/qwidgetsinqml/CMakeLists.txt +++ b/tests/auto/qml/qwidgetsinqml/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qwidgetsinqml Test: ##################################################################### -qt_add_test(tst_qwidgetsinqml +qt_internal_add_test(tst_qwidgetsinqml SOURCES tst_qwidgetsinqml.cpp DEFINES diff --git a/tests/auto/qml/v4misc/CMakeLists.txt b/tests/auto/qml/v4misc/CMakeLists.txt index 65a2d26139..1e0435b939 100644 --- a/tests/auto/qml/v4misc/CMakeLists.txt +++ b/tests/auto/qml/v4misc/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_v4misc Test: ##################################################################### -qt_add_test(tst_v4misc +qt_internal_add_test(tst_v4misc SOURCES tst_v4misc.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/qmldevtools/compile/CMakeLists.txt b/tests/auto/qmldevtools/compile/CMakeLists.txt index d569135990..6c58dbb63f 100644 --- a/tests/auto/qmldevtools/compile/CMakeLists.txt +++ b/tests/auto/qmldevtools/compile/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_compile Binary: ##################################################################### -qt_add_executable(tst_compile +qt_internal_add_executable(tst_compile GUI SOURCES tst_compile.cpp @@ -19,12 +19,12 @@ qt_add_executable(tst_compile ## Scopes: ##################################################################### -qt_extend_target(tst_compile CONDITION force_bootstrap +qt_internal_extend_target(tst_compile CONDITION force_bootstrap PUBLIC_LIBRARIES Qt::BootstrapPrivate ) -qt_extend_target(tst_compile CONDITION NOT force_bootstrap +qt_internal_extend_target(tst_compile CONDITION NOT force_bootstrap PUBLIC_LIBRARIES Qt::Core ) diff --git a/tests/auto/qmltest-blacklist/shortcut/CMakeLists.txt b/tests/auto/qmltest-blacklist/shortcut/CMakeLists.txt index 0d2623d0d6..4dd53ed5b3 100644 --- a/tests/auto/qmltest-blacklist/shortcut/CMakeLists.txt +++ b/tests/auto/qmltest-blacklist/shortcut/CMakeLists.txt @@ -4,7 +4,7 @@ ## shortcut Test: ##################################################################### -qt_add_test(shortcut +qt_internal_add_test(shortcut GUI QMLTEST PUBLIC_LIBRARIES diff --git a/tests/auto/qmltest/animatedimage/CMakeLists.txt b/tests/auto/qmltest/animatedimage/CMakeLists.txt index d30d87316d..63eb9c29c6 100644 --- a/tests/auto/qmltest/animatedimage/CMakeLists.txt +++ b/tests/auto/qmltest/animatedimage/CMakeLists.txt @@ -4,7 +4,7 @@ ## animatedimage Test: ##################################################################### -qt_add_test(animatedimage +qt_internal_add_test(animatedimage GUI QMLTEST PUBLIC_LIBRARIES diff --git a/tests/auto/qmltest/animations/CMakeLists.txt b/tests/auto/qmltest/animations/CMakeLists.txt index d41f46ba1d..6e5d524772 100644 --- a/tests/auto/qmltest/animations/CMakeLists.txt +++ b/tests/auto/qmltest/animations/CMakeLists.txt @@ -4,7 +4,7 @@ ## animations Test: ##################################################################### -qt_add_test(animations +qt_internal_add_test(animations GUI QMLTEST PUBLIC_LIBRARIES diff --git a/tests/auto/qmltest/borderimage/CMakeLists.txt b/tests/auto/qmltest/borderimage/CMakeLists.txt index 08e23089b1..1931727f07 100644 --- a/tests/auto/qmltest/borderimage/CMakeLists.txt +++ b/tests/auto/qmltest/borderimage/CMakeLists.txt @@ -4,7 +4,7 @@ ## borderimage Test: ##################################################################### -qt_add_test(borderimage +qt_internal_add_test(borderimage GUI QMLTEST PUBLIC_LIBRARIES diff --git a/tests/auto/qmltest/buttonclick/CMakeLists.txt b/tests/auto/qmltest/buttonclick/CMakeLists.txt index 014372220c..2f669c8bee 100644 --- a/tests/auto/qmltest/buttonclick/CMakeLists.txt +++ b/tests/auto/qmltest/buttonclick/CMakeLists.txt @@ -4,7 +4,7 @@ ## buttonclick Test: ##################################################################### -qt_add_test(buttonclick +qt_internal_add_test(buttonclick GUI QMLTEST PUBLIC_LIBRARIES diff --git a/tests/auto/qmltest/createbenchmark/CMakeLists.txt b/tests/auto/qmltest/createbenchmark/CMakeLists.txt index 429f454b62..6fa52a8f34 100644 --- a/tests/auto/qmltest/createbenchmark/CMakeLists.txt +++ b/tests/auto/qmltest/createbenchmark/CMakeLists.txt @@ -4,7 +4,7 @@ ## createbenchmark Test: ##################################################################### -qt_add_test(createbenchmark +qt_internal_add_test(createbenchmark GUI QMLTEST PUBLIC_LIBRARIES diff --git a/tests/auto/qmltest/events/CMakeLists.txt b/tests/auto/qmltest/events/CMakeLists.txt index 1382529616..43ad908928 100644 --- a/tests/auto/qmltest/events/CMakeLists.txt +++ b/tests/auto/qmltest/events/CMakeLists.txt @@ -4,7 +4,7 @@ ## events Test: ##################################################################### -qt_add_test(events +qt_internal_add_test(events GUI QMLTEST PUBLIC_LIBRARIES diff --git a/tests/auto/qmltest/fontloader/CMakeLists.txt b/tests/auto/qmltest/fontloader/CMakeLists.txt index 7230785db7..49f24b4f36 100644 --- a/tests/auto/qmltest/fontloader/CMakeLists.txt +++ b/tests/auto/qmltest/fontloader/CMakeLists.txt @@ -4,7 +4,7 @@ ## fontloader Test: ##################################################################### -qt_add_test(fontloader +qt_internal_add_test(fontloader GUI QMLTEST PUBLIC_LIBRARIES diff --git a/tests/auto/qmltest/gradient/CMakeLists.txt b/tests/auto/qmltest/gradient/CMakeLists.txt index c5341f4290..bb0322a300 100644 --- a/tests/auto/qmltest/gradient/CMakeLists.txt +++ b/tests/auto/qmltest/gradient/CMakeLists.txt @@ -4,7 +4,7 @@ ## gradient Test: ##################################################################### -qt_add_test(gradient +qt_internal_add_test(gradient GUI QMLTEST PUBLIC_LIBRARIES diff --git a/tests/auto/qmltest/image/CMakeLists.txt b/tests/auto/qmltest/image/CMakeLists.txt index 5d81076031..b0397ec282 100644 --- a/tests/auto/qmltest/image/CMakeLists.txt +++ b/tests/auto/qmltest/image/CMakeLists.txt @@ -4,7 +4,7 @@ ## image Test: ##################################################################### -qt_add_test(image +qt_internal_add_test(image GUI QMLTEST PUBLIC_LIBRARIES diff --git a/tests/auto/qmltest/itemgrabber/CMakeLists.txt b/tests/auto/qmltest/itemgrabber/CMakeLists.txt index 5570f31f49..0ab16d28bc 100644 --- a/tests/auto/qmltest/itemgrabber/CMakeLists.txt +++ b/tests/auto/qmltest/itemgrabber/CMakeLists.txt @@ -4,7 +4,7 @@ ## itemgrabber Test: ##################################################################### -qt_add_test(itemgrabber +qt_internal_add_test(itemgrabber GUI QMLTEST PUBLIC_LIBRARIES diff --git a/tests/auto/qmltest/layout/CMakeLists.txt b/tests/auto/qmltest/layout/CMakeLists.txt index e237397be4..6d85104790 100644 --- a/tests/auto/qmltest/layout/CMakeLists.txt +++ b/tests/auto/qmltest/layout/CMakeLists.txt @@ -4,7 +4,7 @@ ## layout Test: ##################################################################### -qt_add_test(layout +qt_internal_add_test(layout GUI QMLTEST PUBLIC_LIBRARIES diff --git a/tests/auto/qmltest/listmodel/CMakeLists.txt b/tests/auto/qmltest/listmodel/CMakeLists.txt index 29a60be7ae..b47252363e 100644 --- a/tests/auto/qmltest/listmodel/CMakeLists.txt +++ b/tests/auto/qmltest/listmodel/CMakeLists.txt @@ -4,7 +4,7 @@ ## listmodel Test: ##################################################################### -qt_add_test(listmodel +qt_internal_add_test(listmodel GUI QMLTEST PUBLIC_LIBRARIES diff --git a/tests/auto/qmltest/listview/CMakeLists.txt b/tests/auto/qmltest/listview/CMakeLists.txt index 1eed3177d8..16d328f561 100644 --- a/tests/auto/qmltest/listview/CMakeLists.txt +++ b/tests/auto/qmltest/listview/CMakeLists.txt @@ -4,7 +4,7 @@ ## listview Test: ##################################################################### -qt_add_test(listview +qt_internal_add_test(listview GUI QMLTEST PUBLIC_LIBRARIES diff --git a/tests/auto/qmltest/objectmodel/CMakeLists.txt b/tests/auto/qmltest/objectmodel/CMakeLists.txt index ece17f4ac7..da0caae7e1 100644 --- a/tests/auto/qmltest/objectmodel/CMakeLists.txt +++ b/tests/auto/qmltest/objectmodel/CMakeLists.txt @@ -4,7 +4,7 @@ ## objectmodel Test: ##################################################################### -qt_add_test(objectmodel +qt_internal_add_test(objectmodel GUI QMLTEST PUBLIC_LIBRARIES diff --git a/tests/auto/qmltest/pathview/CMakeLists.txt b/tests/auto/qmltest/pathview/CMakeLists.txt index 6f19715ba4..d69ade7aa8 100644 --- a/tests/auto/qmltest/pathview/CMakeLists.txt +++ b/tests/auto/qmltest/pathview/CMakeLists.txt @@ -4,7 +4,7 @@ ## pathview Test: ##################################################################### -qt_add_test(pathview +qt_internal_add_test(pathview GUI QMLTEST PUBLIC_LIBRARIES diff --git a/tests/auto/qmltest/pixel/CMakeLists.txt b/tests/auto/qmltest/pixel/CMakeLists.txt index 64ccfc207d..8ba8a1b2d3 100644 --- a/tests/auto/qmltest/pixel/CMakeLists.txt +++ b/tests/auto/qmltest/pixel/CMakeLists.txt @@ -4,7 +4,7 @@ ## pixel Test: ##################################################################### -qt_add_test(pixel +qt_internal_add_test(pixel GUI QMLTEST PUBLIC_LIBRARIES diff --git a/tests/auto/qmltest/positioners/CMakeLists.txt b/tests/auto/qmltest/positioners/CMakeLists.txt index 909558211a..7352a73351 100644 --- a/tests/auto/qmltest/positioners/CMakeLists.txt +++ b/tests/auto/qmltest/positioners/CMakeLists.txt @@ -4,7 +4,7 @@ ## positioners Test: ##################################################################### -qt_add_test(positioners +qt_internal_add_test(positioners GUI QMLTEST PUBLIC_LIBRARIES diff --git a/tests/auto/qmltest/qqmlbinding/CMakeLists.txt b/tests/auto/qmltest/qqmlbinding/CMakeLists.txt index a0731d6142..3bfd4d4324 100644 --- a/tests/auto/qmltest/qqmlbinding/CMakeLists.txt +++ b/tests/auto/qmltest/qqmlbinding/CMakeLists.txt @@ -4,7 +4,7 @@ ## qqmlbinding Test: ##################################################################### -qt_add_test(qqmlbinding +qt_internal_add_test(qqmlbinding GUI QMLTEST PUBLIC_LIBRARIES diff --git a/tests/auto/qmltest/qtbug46798/CMakeLists.txt b/tests/auto/qmltest/qtbug46798/CMakeLists.txt index a7367a1d87..000931def6 100644 --- a/tests/auto/qmltest/qtbug46798/CMakeLists.txt +++ b/tests/auto/qmltest/qtbug46798/CMakeLists.txt @@ -4,7 +4,7 @@ ## qtbug46798 Test: ##################################################################### -qt_add_test(qtbug46798 +qt_internal_add_test(qtbug46798 GUI QMLTEST PUBLIC_LIBRARIES diff --git a/tests/auto/qmltest/rectangle/CMakeLists.txt b/tests/auto/qmltest/rectangle/CMakeLists.txt index 8bab0dd585..c57ecc1fe3 100644 --- a/tests/auto/qmltest/rectangle/CMakeLists.txt +++ b/tests/auto/qmltest/rectangle/CMakeLists.txt @@ -4,7 +4,7 @@ ## rectangle Test: ##################################################################### -qt_add_test(rectangle +qt_internal_add_test(rectangle GUI QMLTEST PUBLIC_LIBRARIES diff --git a/tests/auto/qmltest/selftests/CMakeLists.txt b/tests/auto/qmltest/selftests/CMakeLists.txt index f37053982c..d07ee10a08 100644 --- a/tests/auto/qmltest/selftests/CMakeLists.txt +++ b/tests/auto/qmltest/selftests/CMakeLists.txt @@ -4,7 +4,7 @@ ## selftests Test: ##################################################################### -qt_add_test(selftests +qt_internal_add_test(selftests GUI QMLTEST PUBLIC_LIBRARIES diff --git a/tests/auto/qmltest/shadersource/CMakeLists.txt b/tests/auto/qmltest/shadersource/CMakeLists.txt index 169dfd6719..96cd3d7ad1 100644 --- a/tests/auto/qmltest/shadersource/CMakeLists.txt +++ b/tests/auto/qmltest/shadersource/CMakeLists.txt @@ -4,7 +4,7 @@ ## shadersource Test: ##################################################################### -qt_add_test(shadersource +qt_internal_add_test(shadersource GUI QMLTEST PUBLIC_LIBRARIES diff --git a/tests/auto/qmltest/stability/CMakeLists.txt b/tests/auto/qmltest/stability/CMakeLists.txt index 1f0d780403..df18c84e50 100644 --- a/tests/auto/qmltest/stability/CMakeLists.txt +++ b/tests/auto/qmltest/stability/CMakeLists.txt @@ -4,7 +4,7 @@ ## stability Test: ##################################################################### -qt_add_test(stability +qt_internal_add_test(stability GUI QMLTEST PUBLIC_LIBRARIES diff --git a/tests/auto/qmltest/text/CMakeLists.txt b/tests/auto/qmltest/text/CMakeLists.txt index 8c25292dbd..2012b6c88b 100644 --- a/tests/auto/qmltest/text/CMakeLists.txt +++ b/tests/auto/qmltest/text/CMakeLists.txt @@ -4,7 +4,7 @@ ## text Test: ##################################################################### -qt_add_test(text +qt_internal_add_test(text GUI QMLTEST PUBLIC_LIBRARIES diff --git a/tests/auto/qmltest/textedit/CMakeLists.txt b/tests/auto/qmltest/textedit/CMakeLists.txt index 7f257c6123..a20af24e87 100644 --- a/tests/auto/qmltest/textedit/CMakeLists.txt +++ b/tests/auto/qmltest/textedit/CMakeLists.txt @@ -4,7 +4,7 @@ ## textedit Test: ##################################################################### -qt_add_test(textedit +qt_internal_add_test(textedit GUI QMLTEST PUBLIC_LIBRARIES diff --git a/tests/auto/qmltest/textinput/CMakeLists.txt b/tests/auto/qmltest/textinput/CMakeLists.txt index 07df991c58..54bd3fe7b1 100644 --- a/tests/auto/qmltest/textinput/CMakeLists.txt +++ b/tests/auto/qmltest/textinput/CMakeLists.txt @@ -4,7 +4,7 @@ ## textinput Test: ##################################################################### -qt_add_test(textinput +qt_internal_add_test(textinput GUI QMLTEST PUBLIC_LIBRARIES diff --git a/tests/auto/qmltest/window/CMakeLists.txt b/tests/auto/qmltest/window/CMakeLists.txt index 584b182713..08bd5766d8 100644 --- a/tests/auto/qmltest/window/CMakeLists.txt +++ b/tests/auto/qmltest/window/CMakeLists.txt @@ -4,7 +4,7 @@ ## window Test: ##################################################################### -qt_add_test(window +qt_internal_add_test(window GUI QMLTEST PUBLIC_LIBRARIES diff --git a/tests/auto/quick/drawingmodes/CMakeLists.txt b/tests/auto/quick/drawingmodes/CMakeLists.txt index e225df5424..f7bf15f49f 100644 --- a/tests/auto/quick/drawingmodes/CMakeLists.txt +++ b/tests/auto/quick/drawingmodes/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_drawingmodes +qt_internal_add_test(tst_drawingmodes SOURCES ../../shared/util.cpp ../../shared/util.h tst_drawingmodes.cpp @@ -31,12 +31,12 @@ qt_add_test(tst_drawingmodes ## Scopes: ##################################################################### -qt_extend_target(tst_drawingmodes CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_drawingmodes CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_drawingmodes CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_drawingmodes CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/quick/examples/CMakeLists.txt b/tests/auto/quick/examples/CMakeLists.txt index 74efa0ad40..5bcaa3f93a 100644 --- a/tests/auto/quick/examples/CMakeLists.txt +++ b/tests/auto/quick/examples/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_examples Test: ##################################################################### -qt_add_test(tst_examples +qt_internal_add_test(tst_examples SOURCES tst_examples.cpp DEFINES diff --git a/tests/auto/quick/geometry/CMakeLists.txt b/tests/auto/quick/geometry/CMakeLists.txt index 5a791a8a9e..1c729527fe 100644 --- a/tests/auto/quick/geometry/CMakeLists.txt +++ b/tests/auto/quick/geometry/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_geometry Test: ##################################################################### -qt_add_test(tst_geometry +qt_internal_add_test(tst_geometry SOURCES tst_geometry.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/quick/nodes/CMakeLists.txt b/tests/auto/quick/nodes/CMakeLists.txt index 825442479f..9b85a9fb7b 100644 --- a/tests/auto/quick/nodes/CMakeLists.txt +++ b/tests/auto/quick/nodes/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_nodestest Test: ##################################################################### -qt_add_test(tst_nodestest +qt_internal_add_test(tst_nodestest SOURCES tst_nodestest.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/quick/nokeywords/CMakeLists.txt b/tests/auto/quick/nokeywords/CMakeLists.txt index bdf29817c0..682ab8aa9c 100644 --- a/tests/auto/quick/nokeywords/CMakeLists.txt +++ b/tests/auto/quick/nokeywords/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_nokeywords Test: ##################################################################### -qt_add_test(tst_nokeywords +qt_internal_add_test(tst_nokeywords SOURCES tst_nokeywords.cpp PUBLIC_LIBRARIES @@ -19,7 +19,7 @@ qt_add_test(tst_nokeywords ## Scopes: ##################################################################### -qt_extend_target(tst_nokeywords CONDITION QT_FEATURE_opengl +qt_internal_extend_target(tst_nokeywords CONDITION QT_FEATURE_opengl LIBRARIES Qt::OpenGLPrivate ) diff --git a/tests/auto/quick/pointerhandlers/flickableinterop/CMakeLists.txt b/tests/auto/quick/pointerhandlers/flickableinterop/CMakeLists.txt index 0d6cc7b58b..f67f9a0a59 100644 --- a/tests/auto/quick/pointerhandlers/flickableinterop/CMakeLists.txt +++ b/tests/auto/quick/pointerhandlers/flickableinterop/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_flickableinterop +qt_internal_add_test(tst_flickableinterop SOURCES ../../../shared/util.cpp ../../../shared/util.h ../../shared/geometrytestutil.cpp ../../shared/geometrytestutil.h @@ -36,12 +36,12 @@ qt_add_test(tst_flickableinterop ## Scopes: ##################################################################### -qt_extend_target(tst_flickableinterop CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_flickableinterop CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_flickableinterop CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_flickableinterop CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/quick/pointerhandlers/mousearea_interop/CMakeLists.txt b/tests/auto/quick/pointerhandlers/mousearea_interop/CMakeLists.txt index 5783c2dc60..f799de97b8 100644 --- a/tests/auto/quick/pointerhandlers/mousearea_interop/CMakeLists.txt +++ b/tests/auto/quick/pointerhandlers/mousearea_interop/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_mousearea_interop +qt_internal_add_test(tst_mousearea_interop SOURCES ../../../shared/util.cpp ../../../shared/util.h ../../shared/geometrytestutil.cpp ../../shared/geometrytestutil.h @@ -36,12 +36,12 @@ qt_add_test(tst_mousearea_interop ## Scopes: ##################################################################### -qt_extend_target(tst_mousearea_interop CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_mousearea_interop CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_mousearea_interop CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_mousearea_interop CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/quick/pointerhandlers/multipointtoucharea_interop/CMakeLists.txt b/tests/auto/quick/pointerhandlers/multipointtoucharea_interop/CMakeLists.txt index 8868ccdbbc..4aac9440f9 100644 --- a/tests/auto/quick/pointerhandlers/multipointtoucharea_interop/CMakeLists.txt +++ b/tests/auto/quick/pointerhandlers/multipointtoucharea_interop/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_multipointtoucharea_interop +qt_internal_add_test(tst_multipointtoucharea_interop SOURCES ../../../shared/util.cpp ../../../shared/util.h ../../shared/geometrytestutil.cpp ../../shared/geometrytestutil.h @@ -36,12 +36,12 @@ qt_add_test(tst_multipointtoucharea_interop ## Scopes: ##################################################################### -qt_extend_target(tst_multipointtoucharea_interop CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_multipointtoucharea_interop CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_multipointtoucharea_interop CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_multipointtoucharea_interop CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/quick/pointerhandlers/qquickdraghandler/CMakeLists.txt b/tests/auto/quick/pointerhandlers/qquickdraghandler/CMakeLists.txt index 825260f53d..85c664f8ca 100644 --- a/tests/auto/quick/pointerhandlers/qquickdraghandler/CMakeLists.txt +++ b/tests/auto/quick/pointerhandlers/qquickdraghandler/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qquickdraghandler +qt_internal_add_test(tst_qquickdraghandler SOURCES ../../../shared/util.cpp ../../../shared/util.h ../../shared/geometrytestutil.cpp ../../shared/geometrytestutil.h @@ -36,12 +36,12 @@ qt_add_test(tst_qquickdraghandler ## Scopes: ##################################################################### -qt_extend_target(tst_qquickdraghandler CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquickdraghandler CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickdraghandler CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquickdraghandler CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/quick/pointerhandlers/qquickhoverhandler/CMakeLists.txt b/tests/auto/quick/pointerhandlers/qquickhoverhandler/CMakeLists.txt index 7ff86c7c6e..654bf1c366 100644 --- a/tests/auto/quick/pointerhandlers/qquickhoverhandler/CMakeLists.txt +++ b/tests/auto/quick/pointerhandlers/qquickhoverhandler/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qquickhoverhandler +qt_internal_add_test(tst_qquickhoverhandler SOURCES ../../../shared/util.cpp ../../../shared/util.h ../../shared/geometrytestutil.cpp ../../shared/geometrytestutil.h @@ -36,12 +36,12 @@ qt_add_test(tst_qquickhoverhandler ## Scopes: ##################################################################### -qt_extend_target(tst_qquickhoverhandler CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquickhoverhandler CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickhoverhandler CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquickhoverhandler CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/quick/pointerhandlers/qquickpinchhandler/CMakeLists.txt b/tests/auto/quick/pointerhandlers/qquickpinchhandler/CMakeLists.txt index 110948c4ee..09550b143d 100644 --- a/tests/auto/quick/pointerhandlers/qquickpinchhandler/CMakeLists.txt +++ b/tests/auto/quick/pointerhandlers/qquickpinchhandler/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qquickpinchhandler +qt_internal_add_test(tst_qquickpinchhandler SOURCES ../../../shared/util.cpp ../../../shared/util.h ../../shared/geometrytestutil.cpp ../../shared/geometrytestutil.h @@ -36,12 +36,12 @@ qt_add_test(tst_qquickpinchhandler ## Scopes: ##################################################################### -qt_extend_target(tst_qquickpinchhandler CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquickpinchhandler CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickpinchhandler CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquickpinchhandler CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/quick/pointerhandlers/qquickpointerhandler/CMakeLists.txt b/tests/auto/quick/pointerhandlers/qquickpointerhandler/CMakeLists.txt index 7da285b4ce..9dc541a845 100644 --- a/tests/auto/quick/pointerhandlers/qquickpointerhandler/CMakeLists.txt +++ b/tests/auto/quick/pointerhandlers/qquickpointerhandler/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qquickpointerhandler +qt_internal_add_test(tst_qquickpointerhandler SOURCES ../../../shared/util.cpp ../../../shared/util.h ../../shared/geometrytestutil.cpp ../../shared/geometrytestutil.h @@ -33,12 +33,12 @@ qt_add_test(tst_qquickpointerhandler ## Scopes: ##################################################################### -qt_extend_target(tst_qquickpointerhandler CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquickpointerhandler CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickpointerhandler CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquickpointerhandler CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/quick/pointerhandlers/qquickpointhandler/CMakeLists.txt b/tests/auto/quick/pointerhandlers/qquickpointhandler/CMakeLists.txt index 51312f1db3..507bc7549b 100644 --- a/tests/auto/quick/pointerhandlers/qquickpointhandler/CMakeLists.txt +++ b/tests/auto/quick/pointerhandlers/qquickpointhandler/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qquickpointhandler +qt_internal_add_test(tst_qquickpointhandler SOURCES ../../../shared/util.cpp ../../../shared/util.h ../../shared/geometrytestutil.cpp ../../shared/geometrytestutil.h @@ -36,12 +36,12 @@ qt_add_test(tst_qquickpointhandler ## Scopes: ##################################################################### -qt_extend_target(tst_qquickpointhandler CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquickpointhandler CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickpointhandler CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquickpointhandler CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/quick/pointerhandlers/qquicktaphandler/CMakeLists.txt b/tests/auto/quick/pointerhandlers/qquicktaphandler/CMakeLists.txt index 97c8106931..babe276519 100644 --- a/tests/auto/quick/pointerhandlers/qquicktaphandler/CMakeLists.txt +++ b/tests/auto/quick/pointerhandlers/qquicktaphandler/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qquicktaphandler +qt_internal_add_test(tst_qquicktaphandler SOURCES ../../../shared/util.cpp ../../../shared/util.h ../../shared/geometrytestutil.cpp ../../shared/geometrytestutil.h @@ -33,12 +33,12 @@ qt_add_test(tst_qquicktaphandler ## Scopes: ##################################################################### -qt_extend_target(tst_qquicktaphandler CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquicktaphandler CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquicktaphandler CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquicktaphandler CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/quick/pointerhandlers/qquickwheelhandler/CMakeLists.txt b/tests/auto/quick/pointerhandlers/qquickwheelhandler/CMakeLists.txt index 32d7ce9398..588fd8f2e2 100644 --- a/tests/auto/quick/pointerhandlers/qquickwheelhandler/CMakeLists.txt +++ b/tests/auto/quick/pointerhandlers/qquickwheelhandler/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qquickwheelhandler +qt_internal_add_test(tst_qquickwheelhandler SOURCES ../../../shared/util.cpp ../../../shared/util.h ../../shared/geometrytestutil.cpp ../../shared/geometrytestutil.h @@ -36,12 +36,12 @@ qt_add_test(tst_qquickwheelhandler ## Scopes: ##################################################################### -qt_extend_target(tst_qquickwheelhandler CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquickwheelhandler CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickwheelhandler CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquickwheelhandler CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/quick/propertyrequirements/CMakeLists.txt b/tests/auto/quick/propertyrequirements/CMakeLists.txt index 2a37646920..6b689502ea 100644 --- a/tests/auto/quick/propertyrequirements/CMakeLists.txt +++ b/tests/auto/quick/propertyrequirements/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_propertyrequirements Test: ##################################################################### -qt_add_test(tst_propertyrequirements +qt_internal_add_test(tst_propertyrequirements SOURCES tst_propertyrequirements.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/quick/qquickaccessible/CMakeLists.txt b/tests/auto/quick/qquickaccessible/CMakeLists.txt index e6a34e0d3f..8d0fcbe406 100644 --- a/tests/auto/quick/qquickaccessible/CMakeLists.txt +++ b/tests/auto/quick/qquickaccessible/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qquickaccessible +qt_internal_add_test(tst_qquickaccessible SOURCES ../../shared/util.cpp ../../shared/util.h tst_qquickaccessible.cpp @@ -32,12 +32,12 @@ qt_add_test(tst_qquickaccessible ## Scopes: ##################################################################### -qt_extend_target(tst_qquickaccessible CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquickaccessible CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickaccessible CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquickaccessible CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/quick/qquickanchors/CMakeLists.txt b/tests/auto/quick/qquickanchors/CMakeLists.txt index 04065b9057..08a4298145 100644 --- a/tests/auto/quick/qquickanchors/CMakeLists.txt +++ b/tests/auto/quick/qquickanchors/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qquickanchors +qt_internal_add_test(tst_qquickanchors SOURCES ../../shared/util.cpp ../../shared/util.h ../shared/geometrytestutil.cpp ../shared/geometrytestutil.h @@ -33,12 +33,12 @@ qt_add_test(tst_qquickanchors ## Scopes: ##################################################################### -qt_extend_target(tst_qquickanchors CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquickanchors CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickanchors CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquickanchors CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/quick/qquickanimatedimage/CMakeLists.txt b/tests/auto/quick/qquickanimatedimage/CMakeLists.txt index ea18c9b5a5..e7a026a36f 100644 --- a/tests/auto/quick/qquickanimatedimage/CMakeLists.txt +++ b/tests/auto/quick/qquickanimatedimage/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qquickanimatedimage +qt_internal_add_test(tst_qquickanimatedimage SOURCES ../../shared/testhttpserver.cpp ../../shared/testhttpserver.h ../../shared/util.cpp ../../shared/util.h @@ -30,12 +30,12 @@ qt_add_test(tst_qquickanimatedimage ## Scopes: ##################################################################### -qt_extend_target(tst_qquickanimatedimage CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquickanimatedimage CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickanimatedimage CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquickanimatedimage CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/quick/qquickanimatedsprite/CMakeLists.txt b/tests/auto/quick/qquickanimatedsprite/CMakeLists.txt index 3165a91673..9e20d712e6 100644 --- a/tests/auto/quick/qquickanimatedsprite/CMakeLists.txt +++ b/tests/auto/quick/qquickanimatedsprite/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qquickanimatedsprite +qt_internal_add_test(tst_qquickanimatedsprite SOURCES ../../shared/util.cpp ../../shared/util.h tst_qquickanimatedsprite.cpp @@ -33,12 +33,12 @@ qt_add_test(tst_qquickanimatedsprite ## Scopes: ##################################################################### -qt_extend_target(tst_qquickanimatedsprite CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquickanimatedsprite CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickanimatedsprite CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquickanimatedsprite CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/quick/qquickanimationcontroller/CMakeLists.txt b/tests/auto/quick/qquickanimationcontroller/CMakeLists.txt index f958f9272e..ffe59c805e 100644 --- a/tests/auto/quick/qquickanimationcontroller/CMakeLists.txt +++ b/tests/auto/quick/qquickanimationcontroller/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qquickanimationcontroller +qt_internal_add_test(tst_qquickanimationcontroller GUI QMLTEST SOURCES diff --git a/tests/auto/quick/qquickanimations/CMakeLists.txt b/tests/auto/quick/qquickanimations/CMakeLists.txt index 822650e91e..63a1236eb9 100644 --- a/tests/auto/quick/qquickanimations/CMakeLists.txt +++ b/tests/auto/quick/qquickanimations/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qquickanimations +qt_internal_add_test(tst_qquickanimations SOURCES ../../shared/util.cpp ../../shared/util.h tst_qquickanimations.cpp @@ -34,12 +34,12 @@ qt_add_test(tst_qquickanimations ## Scopes: ##################################################################### -qt_extend_target(tst_qquickanimations CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquickanimations CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickanimations CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquickanimations CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/quick/qquickanimators/CMakeLists.txt b/tests/auto/quick/qquickanimators/CMakeLists.txt index e0a9fa9029..db1c18e03c 100644 --- a/tests/auto/quick/qquickanimators/CMakeLists.txt +++ b/tests/auto/quick/qquickanimators/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qquickanimators Test: ##################################################################### -qt_add_test(tst_qquickanimators +qt_internal_add_test(tst_qquickanimators SOURCES tst_qquickanimators.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/quick/qquickapplication/CMakeLists.txt b/tests/auto/quick/qquickapplication/CMakeLists.txt index b26bb64b09..53582b4548 100644 --- a/tests/auto/quick/qquickapplication/CMakeLists.txt +++ b/tests/auto/quick/qquickapplication/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qquickapplication +qt_internal_add_test(tst_qquickapplication SOURCES ../../shared/util.cpp ../../shared/util.h tst_qquickapplication.cpp @@ -33,12 +33,12 @@ qt_add_test(tst_qquickapplication ## Scopes: ##################################################################### -qt_extend_target(tst_qquickapplication CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquickapplication CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickapplication CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquickapplication CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/quick/qquickbehaviors/CMakeLists.txt b/tests/auto/quick/qquickbehaviors/CMakeLists.txt index f305fb030f..330df778b6 100644 --- a/tests/auto/quick/qquickbehaviors/CMakeLists.txt +++ b/tests/auto/quick/qquickbehaviors/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qquickbehaviors +qt_internal_add_test(tst_qquickbehaviors SOURCES ../../shared/util.cpp ../../shared/util.h tst_qquickbehaviors.cpp @@ -31,12 +31,12 @@ qt_add_test(tst_qquickbehaviors ## Scopes: ##################################################################### -qt_extend_target(tst_qquickbehaviors CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquickbehaviors CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickbehaviors CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquickbehaviors CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/quick/qquickborderimage/CMakeLists.txt b/tests/auto/quick/qquickborderimage/CMakeLists.txt index 9bcb99befa..7316588123 100644 --- a/tests/auto/quick/qquickborderimage/CMakeLists.txt +++ b/tests/auto/quick/qquickborderimage/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qquickborderimage +qt_internal_add_test(tst_qquickborderimage SOURCES ../../shared/testhttpserver.cpp ../../shared/testhttpserver.h ../../shared/util.cpp ../../shared/util.h @@ -35,12 +35,12 @@ qt_add_test(tst_qquickborderimage ## Scopes: ##################################################################### -qt_extend_target(tst_qquickborderimage CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquickborderimage CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickborderimage CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquickborderimage CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/quick/qquickboundaryrule/CMakeLists.txt b/tests/auto/quick/qquickboundaryrule/CMakeLists.txt index 5fc6d1c2f0..96395c9956 100644 --- a/tests/auto/quick/qquickboundaryrule/CMakeLists.txt +++ b/tests/auto/quick/qquickboundaryrule/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qquickboundaryrule +qt_internal_add_test(tst_qquickboundaryrule SOURCES ../../shared/util.cpp ../../shared/util.h ../shared/geometrytestutil.cpp ../shared/geometrytestutil.h @@ -34,12 +34,12 @@ qt_add_test(tst_qquickboundaryrule ## Scopes: ##################################################################### -qt_extend_target(tst_qquickboundaryrule CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquickboundaryrule CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickboundaryrule CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquickboundaryrule CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/quick/qquickcanvasitem/CMakeLists.txt b/tests/auto/quick/qquickcanvasitem/CMakeLists.txt index 0c935891b4..bd9b7a7265 100644 --- a/tests/auto/quick/qquickcanvasitem/CMakeLists.txt +++ b/tests/auto/quick/qquickcanvasitem/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qquickcanvasitem +qt_internal_add_test(tst_qquickcanvasitem GUI QMLTEST SOURCES @@ -30,7 +30,7 @@ qt_add_test(tst_qquickcanvasitem ## Scopes: ##################################################################### -qt_extend_target(tst_qquickcanvasitem CONDITION EXISTS _ss_[QT_INSTALL_PLUGINS]/imageformats +qt_internal_extend_target(tst_qquickcanvasitem CONDITION EXISTS _ss_[QT_INSTALL_PLUGINS]/imageformats DEFINES HAS_IMAGE_FORMATS ) diff --git a/tests/auto/quick/qquickcolorgroup/CMakeLists.txt b/tests/auto/quick/qquickcolorgroup/CMakeLists.txt index c873b87934..9fde27b06f 100644 --- a/tests/auto/quick/qquickcolorgroup/CMakeLists.txt +++ b/tests/auto/quick/qquickcolorgroup/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qquickcolorgroup Test: ##################################################################### -qt_add_test(tst_qquickcolorgroup +qt_internal_add_test(tst_qquickcolorgroup SOURCES tst_qquickcolorgroup.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/quick/qquickdesignersupport/CMakeLists.txt b/tests/auto/quick/qquickdesignersupport/CMakeLists.txt index 4ce3896d23..88c050f55c 100644 --- a/tests/auto/quick/qquickdesignersupport/CMakeLists.txt +++ b/tests/auto/quick/qquickdesignersupport/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qquickdesignersupport +qt_internal_add_test(tst_qquickdesignersupport SOURCES ../../shared/util.cpp ../../shared/util.h ../shared/geometrytestutil.cpp ../shared/geometrytestutil.h @@ -36,12 +36,12 @@ qt_add_test(tst_qquickdesignersupport ## Scopes: ##################################################################### -qt_extend_target(tst_qquickdesignersupport CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquickdesignersupport CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickdesignersupport CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquickdesignersupport CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/quick/qquickdrag/CMakeLists.txt b/tests/auto/quick/qquickdrag/CMakeLists.txt index 046072e769..16da0943e9 100644 --- a/tests/auto/quick/qquickdrag/CMakeLists.txt +++ b/tests/auto/quick/qquickdrag/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qquickdrag Test: ##################################################################### -qt_add_test(tst_qquickdrag +qt_internal_add_test(tst_qquickdrag SOURCES tst_qquickdrag.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/quick/qquickdroparea/CMakeLists.txt b/tests/auto/quick/qquickdroparea/CMakeLists.txt index 2e64905df5..d66bf23714 100644 --- a/tests/auto/quick/qquickdroparea/CMakeLists.txt +++ b/tests/auto/quick/qquickdroparea/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qquickdroparea +qt_internal_add_test(tst_qquickdroparea SOURCES ../../shared/util.cpp ../../shared/util.h ../shared/geometrytestutil.cpp ../shared/geometrytestutil.h @@ -37,12 +37,12 @@ qt_add_test(tst_qquickdroparea ## Scopes: ##################################################################### -qt_extend_target(tst_qquickdroparea CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquickdroparea CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickdroparea CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquickdroparea CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/quick/qquickdynamicpropertyanimation/CMakeLists.txt b/tests/auto/quick/qquickdynamicpropertyanimation/CMakeLists.txt index e843088036..78395e4661 100644 --- a/tests/auto/quick/qquickdynamicpropertyanimation/CMakeLists.txt +++ b/tests/auto/quick/qquickdynamicpropertyanimation/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qquickdynamicpropertyanimation +qt_internal_add_test(tst_qquickdynamicpropertyanimation SOURCES ../../shared/util.cpp ../../shared/util.h tst_qquickdynamicpropertyanimation.cpp @@ -26,12 +26,12 @@ qt_add_test(tst_qquickdynamicpropertyanimation ## Scopes: ##################################################################### -qt_extend_target(tst_qquickdynamicpropertyanimation CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquickdynamicpropertyanimation CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickdynamicpropertyanimation CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquickdynamicpropertyanimation CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/quick/qquickflickable/CMakeLists.txt b/tests/auto/quick/qquickflickable/CMakeLists.txt index 579f5bcfd7..7c8e802daf 100644 --- a/tests/auto/quick/qquickflickable/CMakeLists.txt +++ b/tests/auto/quick/qquickflickable/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qquickflickable +qt_internal_add_test(tst_qquickflickable SOURCES ../../shared/util.cpp ../../shared/util.h ../shared/geometrytestutil.cpp ../shared/geometrytestutil.h @@ -33,12 +33,12 @@ qt_add_test(tst_qquickflickable ## Scopes: ##################################################################### -qt_extend_target(tst_qquickflickable CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquickflickable CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickflickable CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquickflickable CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/quick/qquickflipable/CMakeLists.txt b/tests/auto/quick/qquickflipable/CMakeLists.txt index e30d57a4ba..95231d7ad9 100644 --- a/tests/auto/quick/qquickflipable/CMakeLists.txt +++ b/tests/auto/quick/qquickflipable/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qquickflipable +qt_internal_add_test(tst_qquickflipable SOURCES ../../shared/util.cpp ../../shared/util.h tst_qquickflipable.cpp @@ -28,12 +28,12 @@ qt_add_test(tst_qquickflipable ## Scopes: ##################################################################### -qt_extend_target(tst_qquickflipable CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquickflipable CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickflipable CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquickflipable CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/quick/qquickfocusscope/CMakeLists.txt b/tests/auto/quick/qquickfocusscope/CMakeLists.txt index f106e8bde2..dac0f78281 100644 --- a/tests/auto/quick/qquickfocusscope/CMakeLists.txt +++ b/tests/auto/quick/qquickfocusscope/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qquickfocusscope +qt_internal_add_test(tst_qquickfocusscope SOURCES ../../shared/util.cpp ../../shared/util.h ../shared/geometrytestutil.cpp ../shared/geometrytestutil.h @@ -33,12 +33,12 @@ qt_add_test(tst_qquickfocusscope ## Scopes: ##################################################################### -qt_extend_target(tst_qquickfocusscope CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquickfocusscope CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickfocusscope CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquickfocusscope CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/quick/qquickfontloader/CMakeLists.txt b/tests/auto/quick/qquickfontloader/CMakeLists.txt index d244c0a2e7..bfaa048bca 100644 --- a/tests/auto/quick/qquickfontloader/CMakeLists.txt +++ b/tests/auto/quick/qquickfontloader/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qquickfontloader +qt_internal_add_test(tst_qquickfontloader SOURCES ../../shared/testhttpserver.cpp ../../shared/testhttpserver.h ../../shared/util.cpp ../../shared/util.h @@ -30,12 +30,12 @@ qt_add_test(tst_qquickfontloader ## Scopes: ##################################################################### -qt_extend_target(tst_qquickfontloader CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquickfontloader CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickfontloader CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquickfontloader CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/quick/qquickfontloader_static/CMakeLists.txt b/tests/auto/quick/qquickfontloader_static/CMakeLists.txt index ce25511fca..efdf13c95d 100644 --- a/tests/auto/quick/qquickfontloader_static/CMakeLists.txt +++ b/tests/auto/quick/qquickfontloader_static/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qquickfontloader_static +qt_internal_add_test(tst_qquickfontloader_static SOURCES ../../shared/util.cpp ../../shared/util.h tst_qquickfontloader_static.cpp @@ -31,12 +31,12 @@ qt_add_test(tst_qquickfontloader_static ## Scopes: ##################################################################### -qt_extend_target(tst_qquickfontloader_static CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquickfontloader_static CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickfontloader_static CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquickfontloader_static CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/quick/qquickfontmetrics/CMakeLists.txt b/tests/auto/quick/qquickfontmetrics/CMakeLists.txt index 7509c6dd86..785248fb99 100644 --- a/tests/auto/quick/qquickfontmetrics/CMakeLists.txt +++ b/tests/auto/quick/qquickfontmetrics/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_quickfontmetrics Test: ##################################################################### -qt_add_test(tst_quickfontmetrics +qt_internal_add_test(tst_quickfontmetrics SOURCES tst_quickfontmetrics.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/quick/qquickframebufferobject/CMakeLists.txt b/tests/auto/quick/qquickframebufferobject/CMakeLists.txt index ba720e1d26..9f242842e6 100644 --- a/tests/auto/quick/qquickframebufferobject/CMakeLists.txt +++ b/tests/auto/quick/qquickframebufferobject/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qquickframebufferobject +qt_internal_add_test(tst_qquickframebufferobject SOURCES ../../shared/util.cpp ../../shared/util.h tst_qquickframebufferobject.cpp @@ -28,12 +28,12 @@ qt_add_test(tst_qquickframebufferobject ## Scopes: ##################################################################### -qt_extend_target(tst_qquickframebufferobject CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquickframebufferobject CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickframebufferobject CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquickframebufferobject CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/quick/qquickgraphicsinfo/CMakeLists.txt b/tests/auto/quick/qquickgraphicsinfo/CMakeLists.txt index a85a526ca4..5a45d8aabd 100644 --- a/tests/auto/quick/qquickgraphicsinfo/CMakeLists.txt +++ b/tests/auto/quick/qquickgraphicsinfo/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qquickgraphicsinfo +qt_internal_add_test(tst_qquickgraphicsinfo SOURCES ../../shared/util.cpp ../../shared/util.h tst_qquickgraphicsinfo.cpp @@ -28,12 +28,12 @@ qt_add_test(tst_qquickgraphicsinfo ## Scopes: ##################################################################### -qt_extend_target(tst_qquickgraphicsinfo CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquickgraphicsinfo CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickgraphicsinfo CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquickgraphicsinfo CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/quick/qquickgridview/CMakeLists.txt b/tests/auto/quick/qquickgridview/CMakeLists.txt index de7cfe581c..07dd48c0a8 100644 --- a/tests/auto/quick/qquickgridview/CMakeLists.txt +++ b/tests/auto/quick/qquickgridview/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qquickgridview +qt_internal_add_test(tst_qquickgridview SOURCES ../../shared/util.cpp ../../shared/util.h ../shared/geometrytestutil.cpp ../shared/geometrytestutil.h @@ -38,12 +38,12 @@ qt_add_test(tst_qquickgridview ## Scopes: ##################################################################### -qt_extend_target(tst_qquickgridview CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquickgridview CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickgridview CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquickgridview CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/quick/qquickimage/CMakeLists.txt b/tests/auto/quick/qquickimage/CMakeLists.txt index 4aeed8b2f2..b7e5479639 100644 --- a/tests/auto/quick/qquickimage/CMakeLists.txt +++ b/tests/auto/quick/qquickimage/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qquickimage +qt_internal_add_test(tst_qquickimage SOURCES ../../shared/testhttpserver.cpp ../../shared/testhttpserver.h ../../shared/util.cpp ../../shared/util.h @@ -35,12 +35,12 @@ qt_add_test(tst_qquickimage ## Scopes: ##################################################################### -qt_extend_target(tst_qquickimage CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquickimage CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickimage CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquickimage CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/quick/qquickimageprovider/CMakeLists.txt b/tests/auto/quick/qquickimageprovider/CMakeLists.txt index 7771df4237..a336e28048 100644 --- a/tests/auto/quick/qquickimageprovider/CMakeLists.txt +++ b/tests/auto/quick/qquickimageprovider/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qquickimageprovider Test: ##################################################################### -qt_add_test(tst_qquickimageprovider +qt_internal_add_test(tst_qquickimageprovider SOURCES tst_qquickimageprovider.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/quick/qquickitem/CMakeLists.txt b/tests/auto/quick/qquickitem/CMakeLists.txt index 00882afa3a..cbc91f8f50 100644 --- a/tests/auto/quick/qquickitem/CMakeLists.txt +++ b/tests/auto/quick/qquickitem/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qquickitem +qt_internal_add_test(tst_qquickitem SOURCES ../../shared/util.cpp ../../shared/util.h ../shared/geometrytestutil.cpp ../shared/geometrytestutil.h @@ -33,19 +33,19 @@ qt_add_test(tst_qquickitem ## Scopes: ##################################################################### -qt_extend_target(tst_qquickitem CONDITION TARGET Qt::Widgets +qt_internal_extend_target(tst_qquickitem CONDITION TARGET Qt::Widgets DEFINES TEST_QTBUG_60123 PUBLIC_LIBRARIES Qt::Widgets ) -qt_extend_target(tst_qquickitem CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquickitem CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickitem CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquickitem CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/quick/qquickitem2/CMakeLists.txt b/tests/auto/quick/qquickitem2/CMakeLists.txt index 5d8bb99dee..f60d1b2d55 100644 --- a/tests/auto/quick/qquickitem2/CMakeLists.txt +++ b/tests/auto/quick/qquickitem2/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qquickitem2 +qt_internal_add_test(tst_qquickitem2 SOURCES ../../shared/util.cpp ../../shared/util.h tst_qquickitem.cpp @@ -28,12 +28,12 @@ qt_add_test(tst_qquickitem2 ## Scopes: ##################################################################### -qt_extend_target(tst_qquickitem2 CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquickitem2 CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickitem2 CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquickitem2 CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/quick/qquickitemlayer/CMakeLists.txt b/tests/auto/quick/qquickitemlayer/CMakeLists.txt index d81ae9ecc2..37103b0c31 100644 --- a/tests/auto/quick/qquickitemlayer/CMakeLists.txt +++ b/tests/auto/quick/qquickitemlayer/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qquickitemlayer +qt_internal_add_test(tst_qquickitemlayer SOURCES ../../shared/util.cpp ../../shared/util.h tst_qquickitemlayer.cpp @@ -31,12 +31,12 @@ qt_add_test(tst_qquickitemlayer ## Scopes: ##################################################################### -qt_extend_target(tst_qquickitemlayer CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquickitemlayer CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickitemlayer CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquickitemlayer CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/quick/qquicklayouts/CMakeLists.txt b/tests/auto/quick/qquicklayouts/CMakeLists.txt index f750a4f1c5..520d247394 100644 --- a/tests/auto/quick/qquicklayouts/CMakeLists.txt +++ b/tests/auto/quick/qquicklayouts/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qquicklayouts +qt_internal_add_test(tst_qquicklayouts GUI QMLTEST SOURCES diff --git a/tests/auto/quick/qquicklistview/CMakeLists.txt b/tests/auto/quick/qquicklistview/CMakeLists.txt index 9244fb6cee..761d515eaf 100644 --- a/tests/auto/quick/qquicklistview/CMakeLists.txt +++ b/tests/auto/quick/qquicklistview/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qquicklistview +qt_internal_add_test(tst_qquicklistview SOURCES ../../shared/util.cpp ../../shared/util.h ../shared/geometrytestutil.cpp ../shared/geometrytestutil.h @@ -43,12 +43,12 @@ qt_add_test(tst_qquicklistview ## Scopes: ##################################################################### -qt_extend_target(tst_qquicklistview CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquicklistview CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquicklistview CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquicklistview CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/quick/qquickloader/CMakeLists.txt b/tests/auto/quick/qquickloader/CMakeLists.txt index 114598bd3f..785d5348a6 100644 --- a/tests/auto/quick/qquickloader/CMakeLists.txt +++ b/tests/auto/quick/qquickloader/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qquickloader +qt_internal_add_test(tst_qquickloader SOURCES ../../shared/testhttpserver.cpp ../../shared/testhttpserver.h ../../shared/util.cpp ../../shared/util.h @@ -35,12 +35,12 @@ qt_add_test(tst_qquickloader ## Scopes: ##################################################################### -qt_extend_target(tst_qquickloader CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquickloader CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickloader CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquickloader CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/quick/qquickmousearea/CMakeLists.txt b/tests/auto/quick/qquickmousearea/CMakeLists.txt index 969bb745f3..7061c92384 100644 --- a/tests/auto/quick/qquickmousearea/CMakeLists.txt +++ b/tests/auto/quick/qquickmousearea/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qquickmousearea +qt_internal_add_test(tst_qquickmousearea SOURCES ../../shared/testhttpserver.cpp ../../shared/testhttpserver.h ../../shared/util.cpp ../../shared/util.h @@ -38,12 +38,12 @@ qt_add_test(tst_qquickmousearea ## Scopes: ##################################################################### -qt_extend_target(tst_qquickmousearea CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquickmousearea CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickmousearea CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquickmousearea CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/quick/qquickmultipointtoucharea/CMakeLists.txt b/tests/auto/quick/qquickmultipointtoucharea/CMakeLists.txt index dff7c77ceb..1902b3fefa 100644 --- a/tests/auto/quick/qquickmultipointtoucharea/CMakeLists.txt +++ b/tests/auto/quick/qquickmultipointtoucharea/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qquickmultipointtoucharea +qt_internal_add_test(tst_qquickmultipointtoucharea SOURCES ../../shared/util.cpp ../../shared/util.h ../shared/geometrytestutil.cpp ../shared/geometrytestutil.h @@ -33,12 +33,12 @@ qt_add_test(tst_qquickmultipointtoucharea ## Scopes: ##################################################################### -qt_extend_target(tst_qquickmultipointtoucharea CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquickmultipointtoucharea CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickmultipointtoucharea CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquickmultipointtoucharea CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/quick/qquickpainteditem/CMakeLists.txt b/tests/auto/quick/qquickpainteditem/CMakeLists.txt index c07fff8ef1..9649ffc032 100644 --- a/tests/auto/quick/qquickpainteditem/CMakeLists.txt +++ b/tests/auto/quick/qquickpainteditem/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qquickpainteditem Test: ##################################################################### -qt_add_test(tst_qquickpainteditem +qt_internal_add_test(tst_qquickpainteditem SOURCES tst_qquickpainteditem.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/quick/qquickpalette/CMakeLists.txt b/tests/auto/quick/qquickpalette/CMakeLists.txt index 70bf19305c..a68873d5dc 100644 --- a/tests/auto/quick/qquickpalette/CMakeLists.txt +++ b/tests/auto/quick/qquickpalette/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qquickpalette Test: ##################################################################### -qt_add_test(tst_qquickpalette +qt_internal_add_test(tst_qquickpalette SOURCES tst_qquickpalette.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/quick/qquickpath/CMakeLists.txt b/tests/auto/quick/qquickpath/CMakeLists.txt index fa41ef74e1..c616519987 100644 --- a/tests/auto/quick/qquickpath/CMakeLists.txt +++ b/tests/auto/quick/qquickpath/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qquickpath +qt_internal_add_test(tst_qquickpath SOURCES ../../shared/util.cpp ../../shared/util.h tst_qquickpath.cpp @@ -31,12 +31,12 @@ qt_add_test(tst_qquickpath ## Scopes: ##################################################################### -qt_extend_target(tst_qquickpath CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquickpath CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickpath CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquickpath CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/quick/qquickpathview/CMakeLists.txt b/tests/auto/quick/qquickpathview/CMakeLists.txt index c3df8ff6a6..2f3bd53500 100644 --- a/tests/auto/quick/qquickpathview/CMakeLists.txt +++ b/tests/auto/quick/qquickpathview/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qquickpathview +qt_internal_add_test(tst_qquickpathview SOURCES ../../shared/util.cpp ../../shared/util.h ../shared/geometrytestutil.cpp ../shared/geometrytestutil.h @@ -35,17 +35,17 @@ qt_add_test(tst_qquickpathview ## Scopes: ##################################################################### -qt_extend_target(tst_qquickpathview CONDITION TARGET Qt::Widgets +qt_internal_extend_target(tst_qquickpathview CONDITION TARGET Qt::Widgets PUBLIC_LIBRARIES Qt::Widgets ) -qt_extend_target(tst_qquickpathview CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquickpathview CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickpathview CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquickpathview CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/quick/qquickpincharea/CMakeLists.txt b/tests/auto/quick/qquickpincharea/CMakeLists.txt index d9394bad9e..4f417366a1 100644 --- a/tests/auto/quick/qquickpincharea/CMakeLists.txt +++ b/tests/auto/quick/qquickpincharea/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qquickpincharea +qt_internal_add_test(tst_qquickpincharea SOURCES ../../shared/util.cpp ../../shared/util.h ../shared/geometrytestutil.cpp ../shared/geometrytestutil.h @@ -33,12 +33,12 @@ qt_add_test(tst_qquickpincharea ## Scopes: ##################################################################### -qt_extend_target(tst_qquickpincharea CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquickpincharea CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickpincharea CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquickpincharea CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/quick/qquickpixmapcache/CMakeLists.txt b/tests/auto/quick/qquickpixmapcache/CMakeLists.txt index cb2debfe6d..e50a6eb6a8 100644 --- a/tests/auto/quick/qquickpixmapcache/CMakeLists.txt +++ b/tests/auto/quick/qquickpixmapcache/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qquickpixmapcache +qt_internal_add_test(tst_qquickpixmapcache SOURCES ../../shared/testhttpserver.cpp ../../shared/testhttpserver.h ../../shared/util.cpp ../../shared/util.h @@ -31,12 +31,12 @@ qt_add_test(tst_qquickpixmapcache ## Scopes: ##################################################################### -qt_extend_target(tst_qquickpixmapcache CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquickpixmapcache CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickpixmapcache CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquickpixmapcache CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/quick/qquickpositioners/CMakeLists.txt b/tests/auto/quick/qquickpositioners/CMakeLists.txt index 040f045598..e72958c6cd 100644 --- a/tests/auto/quick/qquickpositioners/CMakeLists.txt +++ b/tests/auto/quick/qquickpositioners/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qquickpositioners +qt_internal_add_test(tst_qquickpositioners SOURCES ../../shared/util.cpp ../../shared/util.h ../shared/geometrytestutil.cpp ../shared/geometrytestutil.h @@ -34,12 +34,12 @@ qt_add_test(tst_qquickpositioners ## Scopes: ##################################################################### -qt_extend_target(tst_qquickpositioners CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquickpositioners CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickpositioners CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquickpositioners CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/quick/qquickrectangle/CMakeLists.txt b/tests/auto/quick/qquickrectangle/CMakeLists.txt index 4a563432b6..5ccb12a3f7 100644 --- a/tests/auto/quick/qquickrectangle/CMakeLists.txt +++ b/tests/auto/quick/qquickrectangle/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qquickrectangle +qt_internal_add_test(tst_qquickrectangle SOURCES ../../shared/util.cpp ../../shared/util.h ../shared/geometrytestutil.cpp ../shared/geometrytestutil.h @@ -33,12 +33,12 @@ qt_add_test(tst_qquickrectangle ## Scopes: ##################################################################### -qt_extend_target(tst_qquickrectangle CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquickrectangle CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickrectangle CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquickrectangle CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/quick/qquickrendercontrol/CMakeLists.txt b/tests/auto/quick/qquickrendercontrol/CMakeLists.txt index df20449a90..46cfc1513c 100644 --- a/tests/auto/quick/qquickrendercontrol/CMakeLists.txt +++ b/tests/auto/quick/qquickrendercontrol/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qquickrendercontrol Test: ##################################################################### -qt_add_test(tst_qquickrendercontrol +qt_internal_add_test(tst_qquickrendercontrol SOURCES ../../shared/util.cpp ../../shared/util.h tst_qquickrendercontrol.cpp @@ -24,12 +24,12 @@ qt_add_test(tst_qquickrendercontrol ## Scopes: ##################################################################### -qt_extend_target(tst_qquickrendercontrol CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquickrendercontrol CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickrendercontrol CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquickrendercontrol CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/quick/qquickrepeater/CMakeLists.txt b/tests/auto/quick/qquickrepeater/CMakeLists.txt index 950608e0b7..3e7fda53c0 100644 --- a/tests/auto/quick/qquickrepeater/CMakeLists.txt +++ b/tests/auto/quick/qquickrepeater/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qquickrepeater +qt_internal_add_test(tst_qquickrepeater SOURCES ../../shared/util.cpp ../../shared/util.h ../shared/geometrytestutil.cpp ../shared/geometrytestutil.h @@ -34,12 +34,12 @@ qt_add_test(tst_qquickrepeater ## Scopes: ##################################################################### -qt_extend_target(tst_qquickrepeater CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquickrepeater CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickrepeater CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquickrepeater CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/quick/qquickscreen/CMakeLists.txt b/tests/auto/quick/qquickscreen/CMakeLists.txt index 4838fd8321..65c5538be3 100644 --- a/tests/auto/quick/qquickscreen/CMakeLists.txt +++ b/tests/auto/quick/qquickscreen/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qquickscreen Test: ##################################################################### -qt_add_test(tst_qquickscreen +qt_internal_add_test(tst_qquickscreen SOURCES ../../shared/util.cpp ../../shared/util.h tst_qquickscreen.cpp @@ -21,12 +21,12 @@ qt_add_test(tst_qquickscreen ## Scopes: ##################################################################### -qt_extend_target(tst_qquickscreen CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquickscreen CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickscreen CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquickscreen CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/quick/qquickshadereffect/CMakeLists.txt b/tests/auto/quick/qquickshadereffect/CMakeLists.txt index 5d36b7cba2..92a1baa227 100644 --- a/tests/auto/quick/qquickshadereffect/CMakeLists.txt +++ b/tests/auto/quick/qquickshadereffect/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qquickshadereffect Test: ##################################################################### -qt_add_test(tst_qquickshadereffect +qt_internal_add_test(tst_qquickshadereffect SOURCES ../../shared/util.cpp ../../shared/util.h tst_qquickshadereffect.cpp @@ -34,7 +34,7 @@ set(resources_resource_files "data/twoImagesOneShaderEffect.qml" ) -qt_add_resource(tst_qquickshadereffect "resources" +qt_internal_add_resource(tst_qquickshadereffect "resources" PREFIX "/" FILES @@ -45,12 +45,12 @@ qt_add_resource(tst_qquickshadereffect "resources" ## Scopes: ##################################################################### -qt_extend_target(tst_qquickshadereffect CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquickshadereffect CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickshadereffect CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquickshadereffect CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/quick/qquickshape/CMakeLists.txt b/tests/auto/quick/qquickshape/CMakeLists.txt index 96e48c29e5..325d812ed2 100644 --- a/tests/auto/quick/qquickshape/CMakeLists.txt +++ b/tests/auto/quick/qquickshape/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qquickshape +qt_internal_add_test(tst_qquickshape SOURCES ../../shared/util.cpp ../../shared/util.h ../shared/geometrytestutil.cpp ../shared/geometrytestutil.h @@ -37,17 +37,17 @@ qt_add_test(tst_qquickshape ## Scopes: ##################################################################### -qt_extend_target(tst_qquickshape CONDITION TARGET Qt::Widgets +qt_internal_extend_target(tst_qquickshape CONDITION TARGET Qt::Widgets PUBLIC_LIBRARIES Qt::Widgets ) -qt_extend_target(tst_qquickshape CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquickshape CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickshape CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquickshape CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/quick/qquickshortcut/CMakeLists.txt b/tests/auto/quick/qquickshortcut/CMakeLists.txt index c3986d263d..dda488abff 100644 --- a/tests/auto/quick/qquickshortcut/CMakeLists.txt +++ b/tests/auto/quick/qquickshortcut/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qquickshortcut +qt_internal_add_test(tst_qquickshortcut SOURCES ../../shared/util.cpp ../../shared/util.h tst_qquickshortcut.cpp @@ -26,17 +26,17 @@ qt_add_test(tst_qquickshortcut ## Scopes: ##################################################################### -qt_extend_target(tst_qquickshortcut CONDITION TARGET Qt::Widgets +qt_internal_extend_target(tst_qquickshortcut CONDITION TARGET Qt::Widgets PUBLIC_LIBRARIES Qt::QuickWidgets ) -qt_extend_target(tst_qquickshortcut CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquickshortcut CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickshortcut CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquickshortcut CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/quick/qquicksmoothedanimation/CMakeLists.txt b/tests/auto/quick/qquicksmoothedanimation/CMakeLists.txt index 31841f2740..f487e786ab 100644 --- a/tests/auto/quick/qquicksmoothedanimation/CMakeLists.txt +++ b/tests/auto/quick/qquicksmoothedanimation/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qquicksmoothedanimation +qt_internal_add_test(tst_qquicksmoothedanimation SOURCES ../../shared/util.cpp ../../shared/util.h tst_qquicksmoothedanimation.cpp @@ -28,12 +28,12 @@ qt_add_test(tst_qquicksmoothedanimation ## Scopes: ##################################################################### -qt_extend_target(tst_qquicksmoothedanimation CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquicksmoothedanimation CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquicksmoothedanimation CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquicksmoothedanimation CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/quick/qquickspringanimation/CMakeLists.txt b/tests/auto/quick/qquickspringanimation/CMakeLists.txt index 4831c67c10..b90f76cdf6 100644 --- a/tests/auto/quick/qquickspringanimation/CMakeLists.txt +++ b/tests/auto/quick/qquickspringanimation/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qquickspringanimation +qt_internal_add_test(tst_qquickspringanimation SOURCES ../../shared/util.cpp ../../shared/util.h tst_qquickspringanimation.cpp @@ -28,12 +28,12 @@ qt_add_test(tst_qquickspringanimation ## Scopes: ##################################################################### -qt_extend_target(tst_qquickspringanimation CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquickspringanimation CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickspringanimation CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquickspringanimation CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/quick/qquickspritesequence/CMakeLists.txt b/tests/auto/quick/qquickspritesequence/CMakeLists.txt index 6887b1ee79..3955536260 100644 --- a/tests/auto/quick/qquickspritesequence/CMakeLists.txt +++ b/tests/auto/quick/qquickspritesequence/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qquickspritesequence +qt_internal_add_test(tst_qquickspritesequence SOURCES ../../shared/util.cpp ../../shared/util.h tst_qquickspritesequence.cpp @@ -29,12 +29,12 @@ qt_add_test(tst_qquickspritesequence ## Scopes: ##################################################################### -qt_extend_target(tst_qquickspritesequence CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquickspritesequence CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickspritesequence CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquickspritesequence CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/quick/qquickstates/CMakeLists.txt b/tests/auto/quick/qquickstates/CMakeLists.txt index 78a68c0f15..00b259e763 100644 --- a/tests/auto/quick/qquickstates/CMakeLists.txt +++ b/tests/auto/quick/qquickstates/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qquickstates +qt_internal_add_test(tst_qquickstates SOURCES ../../shared/util.cpp ../../shared/util.h tst_qquickstates.cpp @@ -28,12 +28,12 @@ qt_add_test(tst_qquickstates ## Scopes: ##################################################################### -qt_extend_target(tst_qquickstates CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquickstates CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickstates CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquickstates CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/quick/qquickstyledtext/CMakeLists.txt b/tests/auto/quick/qquickstyledtext/CMakeLists.txt index bc73e9178c..a22a4157d7 100644 --- a/tests/auto/quick/qquickstyledtext/CMakeLists.txt +++ b/tests/auto/quick/qquickstyledtext/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qquickstyledtext Test: ##################################################################### -qt_add_test(tst_qquickstyledtext +qt_internal_add_test(tst_qquickstyledtext SOURCES tst_qquickstyledtext.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/quick/qquicksystempalette/CMakeLists.txt b/tests/auto/quick/qquicksystempalette/CMakeLists.txt index 57efc14e65..5951dc1d07 100644 --- a/tests/auto/quick/qquicksystempalette/CMakeLists.txt +++ b/tests/auto/quick/qquicksystempalette/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qquicksystempalette Test: ##################################################################### -qt_add_test(tst_qquicksystempalette +qt_internal_add_test(tst_qquicksystempalette SOURCES tst_qquicksystempalette.cpp PUBLIC_LIBRARIES @@ -18,7 +18,7 @@ qt_add_test(tst_qquicksystempalette ## Scopes: ##################################################################### -qt_extend_target(tst_qquicksystempalette CONDITION TARGET Qt::Widgets +qt_internal_extend_target(tst_qquicksystempalette CONDITION TARGET Qt::Widgets PUBLIC_LIBRARIES Qt::Widgets ) diff --git a/tests/auto/quick/qquicktableview/CMakeLists.txt b/tests/auto/quick/qquicktableview/CMakeLists.txt index 70456af1d6..04842aaae2 100644 --- a/tests/auto/quick/qquicktableview/CMakeLists.txt +++ b/tests/auto/quick/qquicktableview/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qquicktableview +qt_internal_add_test(tst_qquicktableview SOURCES ../../shared/util.cpp ../../shared/util.h ../shared/geometrytestutil.cpp ../shared/geometrytestutil.h @@ -39,12 +39,12 @@ qt_add_test(tst_qquicktableview ## Scopes: ##################################################################### -qt_extend_target(tst_qquicktableview CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquicktableview CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquicktableview CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquicktableview CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/quick/qquicktext/CMakeLists.txt b/tests/auto/quick/qquicktext/CMakeLists.txt index 7b1edd910f..569347e287 100644 --- a/tests/auto/quick/qquicktext/CMakeLists.txt +++ b/tests/auto/quick/qquicktext/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qquicktext +qt_internal_add_test(tst_qquicktext SOURCES ../../shared/testhttpserver.cpp ../../shared/testhttpserver.h ../../shared/util.cpp ../../shared/util.h @@ -31,12 +31,12 @@ qt_add_test(tst_qquicktext ## Scopes: ##################################################################### -qt_extend_target(tst_qquicktext CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquicktext CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquicktext CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquicktext CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/quick/qquicktextdocument/CMakeLists.txt b/tests/auto/quick/qquicktextdocument/CMakeLists.txt index 7d2f750549..c2e52317fe 100644 --- a/tests/auto/quick/qquicktextdocument/CMakeLists.txt +++ b/tests/auto/quick/qquicktextdocument/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qquicktextdocument +qt_internal_add_test(tst_qquicktextdocument SOURCES ../../shared/util.cpp ../../shared/util.h tst_qquicktextdocument.cpp @@ -28,12 +28,12 @@ qt_add_test(tst_qquicktextdocument ## Scopes: ##################################################################### -qt_extend_target(tst_qquicktextdocument CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquicktextdocument CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquicktextdocument CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquicktextdocument CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/quick/qquicktextedit/CMakeLists.txt b/tests/auto/quick/qquicktextedit/CMakeLists.txt index 4a4cc3811e..57a955877b 100644 --- a/tests/auto/quick/qquicktextedit/CMakeLists.txt +++ b/tests/auto/quick/qquicktextedit/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qquicktextedit +qt_internal_add_test(tst_qquicktextedit SOURCES ../../shared/testhttpserver.cpp ../../shared/testhttpserver.h ../../shared/util.cpp ../../shared/util.h @@ -35,17 +35,17 @@ qt_add_test(tst_qquicktextedit ## Scopes: ##################################################################### -qt_extend_target(tst_qquicktextedit CONDITION MACOS +qt_internal_extend_target(tst_qquicktextedit CONDITION MACOS PUBLIC_LIBRARIES ${FWAppKit} ) -qt_extend_target(tst_qquicktextedit CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquicktextedit CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquicktextedit CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquicktextedit CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/quick/qquicktextinput/CMakeLists.txt b/tests/auto/quick/qquicktextinput/CMakeLists.txt index dff1a6f555..6e8d855a58 100644 --- a/tests/auto/quick/qquicktextinput/CMakeLists.txt +++ b/tests/auto/quick/qquicktextinput/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qquicktextinput +qt_internal_add_test(tst_qquicktextinput SOURCES ../../shared/testhttpserver.cpp ../../shared/testhttpserver.h ../../shared/util.cpp ../../shared/util.h @@ -29,17 +29,17 @@ qt_add_test(tst_qquicktextinput ## Scopes: ##################################################################### -qt_extend_target(tst_qquicktextinput CONDITION MACOS +qt_internal_extend_target(tst_qquicktextinput CONDITION MACOS PUBLIC_LIBRARIES ${FWAppKit} ) -qt_extend_target(tst_qquicktextinput CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquicktextinput CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquicktextinput CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquicktextinput CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/quick/qquicktextmetrics/CMakeLists.txt b/tests/auto/quick/qquicktextmetrics/CMakeLists.txt index 74e5c2bf7e..510baafaca 100644 --- a/tests/auto/quick/qquicktextmetrics/CMakeLists.txt +++ b/tests/auto/quick/qquicktextmetrics/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qquicktextmetrics Test: ##################################################################### -qt_add_test(tst_qquicktextmetrics +qt_internal_add_test(tst_qquicktextmetrics SOURCES tst_qquicktextmetrics.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/quick/qquicktimeline/CMakeLists.txt b/tests/auto/quick/qquicktimeline/CMakeLists.txt index 1d31d0b4b9..2ce3b2f8c4 100644 --- a/tests/auto/quick/qquicktimeline/CMakeLists.txt +++ b/tests/auto/quick/qquicktimeline/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qquicktimeline Test: ##################################################################### -qt_add_test(tst_qquicktimeline +qt_internal_add_test(tst_qquicktimeline SOURCES tst_qquicktimeline.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/quick/qquickview/CMakeLists.txt b/tests/auto/quick/qquickview/CMakeLists.txt index ce0f0fad68..16babb106a 100644 --- a/tests/auto/quick/qquickview/CMakeLists.txt +++ b/tests/auto/quick/qquickview/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qquickview +qt_internal_add_test(tst_qquickview SOURCES ../../shared/util.cpp ../../shared/util.h ../shared/geometrytestutil.cpp ../shared/geometrytestutil.h @@ -33,12 +33,12 @@ qt_add_test(tst_qquickview ## Scopes: ##################################################################### -qt_extend_target(tst_qquickview CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquickview CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickview CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquickview CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/quick/qquickvisualdatamodel/CMakeLists.txt b/tests/auto/quick/qquickvisualdatamodel/CMakeLists.txt index 81e9fe3601..8222fd001f 100644 --- a/tests/auto/quick/qquickvisualdatamodel/CMakeLists.txt +++ b/tests/auto/quick/qquickvisualdatamodel/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qquickvisualdatamodel +qt_internal_add_test(tst_qquickvisualdatamodel SOURCES ../../shared/util.cpp ../../shared/util.h ../shared/geometrytestutil.cpp ../shared/geometrytestutil.h @@ -34,17 +34,17 @@ qt_add_test(tst_qquickvisualdatamodel ## Scopes: ##################################################################### -qt_extend_target(tst_qquickvisualdatamodel CONDITION TARGET Qt::Widgets +qt_internal_extend_target(tst_qquickvisualdatamodel CONDITION TARGET Qt::Widgets PUBLIC_LIBRARIES Qt::Widgets ) -qt_extend_target(tst_qquickvisualdatamodel CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquickvisualdatamodel CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickvisualdatamodel CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquickvisualdatamodel CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/quick/qquickwindow/CMakeLists.txt b/tests/auto/quick/qquickwindow/CMakeLists.txt index 5d9f91280e..4b353cb277 100644 --- a/tests/auto/quick/qquickwindow/CMakeLists.txt +++ b/tests/auto/quick/qquickwindow/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qquickwindow +qt_internal_add_test(tst_qquickwindow SOURCES ../../shared/util.cpp ../../shared/util.h ../shared/geometrytestutil.cpp ../shared/geometrytestutil.h @@ -36,12 +36,12 @@ qt_add_test(tst_qquickwindow ## Scopes: ##################################################################### -qt_extend_target(tst_qquickwindow CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquickwindow CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickwindow CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquickwindow CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/quick/rendernode/CMakeLists.txt b/tests/auto/quick/rendernode/CMakeLists.txt index 970934b3fb..037ff85843 100644 --- a/tests/auto/quick/rendernode/CMakeLists.txt +++ b/tests/auto/quick/rendernode/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_rendernode +qt_internal_add_test(tst_rendernode SOURCES ../../shared/util.cpp ../../shared/util.h tst_rendernode.cpp @@ -31,12 +31,12 @@ qt_add_test(tst_rendernode ## Scopes: ##################################################################### -qt_extend_target(tst_rendernode CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_rendernode CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_rendernode CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_rendernode CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/quick/scenegraph/CMakeLists.txt b/tests/auto/quick/scenegraph/CMakeLists.txt index 3e7fa6fe88..046629ba04 100644 --- a/tests/auto/quick/scenegraph/CMakeLists.txt +++ b/tests/auto/quick/scenegraph/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_scenegraph Test: ##################################################################### -qt_add_test(tst_scenegraph +qt_internal_add_test(tst_scenegraph SOURCES ../../shared/util.cpp ../../shared/util.h ../shared/geometrytestutil.cpp ../shared/geometrytestutil.h @@ -29,12 +29,12 @@ qt_add_test(tst_scenegraph ## Scopes: ##################################################################### -qt_extend_target(tst_scenegraph CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_scenegraph CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_scenegraph CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_scenegraph CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/quick/sharedimage/CMakeLists.txt b/tests/auto/quick/sharedimage/CMakeLists.txt index 17d2bec634..c69b150c97 100644 --- a/tests/auto/quick/sharedimage/CMakeLists.txt +++ b/tests/auto/quick/sharedimage/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_sharedimage +qt_internal_add_test(tst_sharedimage SOURCES tst_sharedimage.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/quick/touchmouse/CMakeLists.txt b/tests/auto/quick/touchmouse/CMakeLists.txt index a07596018e..703f4f7578 100644 --- a/tests/auto/quick/touchmouse/CMakeLists.txt +++ b/tests/auto/quick/touchmouse/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_touchmouse +qt_internal_add_test(tst_touchmouse SOURCES ../../shared/util.cpp ../../shared/util.h ../shared/geometrytestutil.cpp ../shared/geometrytestutil.h @@ -33,12 +33,12 @@ qt_add_test(tst_touchmouse ## Scopes: ##################################################################### -qt_extend_target(tst_touchmouse CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_touchmouse CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_touchmouse CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_touchmouse CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/quicktest/polish-qml/CMakeLists.txt b/tests/auto/quicktest/polish-qml/CMakeLists.txt index 56038660d9..ff09b1e82e 100644 --- a/tests/auto/quicktest/polish-qml/CMakeLists.txt +++ b/tests/auto/quicktest/polish-qml/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob ${CMAKE_CURRENT_SOURCE_DIR}/data/*.qml) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_polish-qml +qt_internal_add_test(tst_polish-qml QMLTEST SOURCES ../../shared/util.cpp ../../shared/util.h @@ -27,12 +27,12 @@ qt_add_test(tst_polish-qml ## Scopes: ##################################################################### -qt_extend_target(tst_polish-qml CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_polish-qml CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_polish-qml CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_polish-qml CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/quicktest/polish/CMakeLists.txt b/tests/auto/quicktest/polish/CMakeLists.txt index 9c5104400c..d980935c88 100644 --- a/tests/auto/quicktest/polish/CMakeLists.txt +++ b/tests/auto/quicktest/polish/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob ${CMAKE_CURRENT_SOURCE_DIR}/data/*.qml) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_polish +qt_internal_add_test(tst_polish QMLTEST SOURCES ../../shared/util.cpp ../../shared/util.h @@ -27,12 +27,12 @@ qt_add_test(tst_polish ## Scopes: ##################################################################### -qt_extend_target(tst_polish CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_polish CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_polish CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_polish CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/quicktest/quicktestmainwithsetup/CMakeLists.txt b/tests/auto/quicktest/quicktestmainwithsetup/CMakeLists.txt index 252c1011af..9d627dbe43 100644 --- a/tests/auto/quicktest/quicktestmainwithsetup/CMakeLists.txt +++ b/tests/auto/quicktest/quicktestmainwithsetup/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob ${CMAKE_CURRENT_SOURCE_DIR}/data/*.qml) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_quicktestmainwithsetup +qt_internal_add_test(tst_quicktestmainwithsetup QMLTEST SOURCES ../../shared/util.cpp ../../shared/util.h @@ -26,12 +26,12 @@ qt_add_test(tst_quicktestmainwithsetup ## Scopes: ##################################################################### -qt_extend_target(tst_quicktestmainwithsetup CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_quicktestmainwithsetup CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_quicktestmainwithsetup CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_quicktestmainwithsetup CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/quicktest/signalspy/CMakeLists.txt b/tests/auto/quicktest/signalspy/CMakeLists.txt index 8d9d864ec1..cda19b605a 100644 --- a/tests/auto/quicktest/signalspy/CMakeLists.txt +++ b/tests/auto/quicktest/signalspy/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_signalspy Test: ##################################################################### -qt_add_test(tst_signalspy +qt_internal_add_test(tst_signalspy SOURCES ../../shared/util.cpp ../../shared/util.h mypropertymap.cpp mypropertymap.h @@ -19,12 +19,12 @@ qt_add_test(tst_signalspy ## Scopes: ##################################################################### -qt_extend_target(tst_signalspy CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_signalspy CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_signalspy CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_signalspy CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/quicktest/testfiltering/quicktestmain/CMakeLists.txt b/tests/auto/quicktest/testfiltering/quicktestmain/CMakeLists.txt index 9baedbab97..298033084a 100644 --- a/tests/auto/quicktest/testfiltering/quicktestmain/CMakeLists.txt +++ b/tests/auto/quicktest/testfiltering/quicktestmain/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob ${CMAKE_CURRENT_SOURCE_DIR}/*.qml) list(APPEND test_data ${test_data_glob}) -qt_add_test(quicktestmain +qt_internal_add_test(quicktestmain GUI QMLTEST OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" diff --git a/tests/auto/quicktest/testfiltering/test/.prev_CMakeLists.txt b/tests/auto/quicktest/testfiltering/test/.prev_CMakeLists.txt index f00249bfc4..07c019829a 100644 --- a/tests/auto/quicktest/testfiltering/test/.prev_CMakeLists.txt +++ b/tests/auto/quicktest/testfiltering/test/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_testfiltering Test: ##################################################################### -qt_add_test(tst_testfiltering +qt_internal_add_test(tst_testfiltering OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../" SOURCES ../tst_testfiltering.cpp diff --git a/tests/auto/quicktest/testfiltering/test/CMakeLists.txt b/tests/auto/quicktest/testfiltering/test/CMakeLists.txt index b53bfec73b..448bf1bf60 100644 --- a/tests/auto/quicktest/testfiltering/test/CMakeLists.txt +++ b/tests/auto/quicktest/testfiltering/test/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_testfiltering Test: ##################################################################### -qt_add_test(tst_testfiltering +qt_internal_add_test(tst_testfiltering OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../" WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../" # special case SOURCES diff --git a/tests/auto/quickwidgets/qquickwidget/CMakeLists.txt b/tests/auto/quickwidgets/qquickwidget/CMakeLists.txt index f8908592e6..9018d5544d 100644 --- a/tests/auto/quickwidgets/qquickwidget/CMakeLists.txt +++ b/tests/auto/quickwidgets/qquickwidget/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qquickwidget +qt_internal_add_test(tst_qquickwidget SOURCES ../../shared/util.cpp ../../shared/util.h tst_qquickwidget.cpp @@ -34,12 +34,12 @@ qt_add_test(tst_qquickwidget ## Scopes: ##################################################################### -qt_extend_target(tst_qquickwidget CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquickwidget CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickwidget CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquickwidget CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/toolsupport/CMakeLists.txt b/tests/auto/toolsupport/CMakeLists.txt index 65eff5e92e..d80aee6d9b 100644 --- a/tests/auto/toolsupport/CMakeLists.txt +++ b/tests/auto/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/benchmarks/particles/affectors/CMakeLists.txt b/tests/benchmarks/particles/affectors/CMakeLists.txt index 7910d4256d..685df3ae79 100644 --- a/tests/benchmarks/particles/affectors/CMakeLists.txt +++ b/tests/benchmarks/particles/affectors/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_affectors Binary: ##################################################################### -qt_add_benchmark(tst_affectors +qt_internal_add_benchmark(tst_affectors SOURCES tst_affectors.cpp DEFINES diff --git a/tests/benchmarks/particles/emission/CMakeLists.txt b/tests/benchmarks/particles/emission/CMakeLists.txt index 831b42e7a9..3d053a766e 100644 --- a/tests/benchmarks/particles/emission/CMakeLists.txt +++ b/tests/benchmarks/particles/emission/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_emission Binary: ##################################################################### -qt_add_benchmark(tst_emission +qt_internal_add_benchmark(tst_emission SOURCES tst_emission.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/qml/animation/CMakeLists.txt b/tests/benchmarks/qml/animation/CMakeLists.txt index a3e2b5a46d..8c11b2c865 100644 --- a/tests/benchmarks/qml/animation/CMakeLists.txt +++ b/tests/benchmarks/qml/animation/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_animation Binary: ##################################################################### -qt_add_benchmark(tst_animation +qt_internal_add_benchmark(tst_animation SOURCES tst_animation.cpp DEFINES diff --git a/tests/benchmarks/qml/binding/CMakeLists.txt b/tests/benchmarks/qml/binding/CMakeLists.txt index 60ebf582de..d72f3ac0a9 100644 --- a/tests/benchmarks/qml/binding/CMakeLists.txt +++ b/tests/benchmarks/qml/binding/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_binding Binary: ##################################################################### -qt_add_benchmark(tst_binding +qt_internal_add_benchmark(tst_binding SOURCES testtypes.cpp testtypes.h tst_binding.cpp diff --git a/tests/benchmarks/qml/compilation/CMakeLists.txt b/tests/benchmarks/qml/compilation/CMakeLists.txt index a43c62863b..581e8ba337 100644 --- a/tests/benchmarks/qml/compilation/CMakeLists.txt +++ b/tests/benchmarks/qml/compilation/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_compilation Binary: ##################################################################### -qt_add_benchmark(tst_compilation +qt_internal_add_benchmark(tst_compilation SOURCES tst_compilation.cpp DEFINES diff --git a/tests/benchmarks/qml/creation/CMakeLists.txt b/tests/benchmarks/qml/creation/CMakeLists.txt index 2210f0a24a..1ff40f9e5e 100644 --- a/tests/benchmarks/qml/creation/CMakeLists.txt +++ b/tests/benchmarks/qml/creation/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_creation Binary: ##################################################################### -qt_add_benchmark(tst_creation +qt_internal_add_benchmark(tst_creation SOURCES tst_creation.cpp DEFINES diff --git a/tests/benchmarks/qml/holistic/CMakeLists.txt b/tests/benchmarks/qml/holistic/CMakeLists.txt index 746254cbea..680a317a8e 100644 --- a/tests/benchmarks/qml/holistic/CMakeLists.txt +++ b/tests/benchmarks/qml/holistic/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_holistic Binary: ##################################################################### -qt_add_benchmark(tst_holistic +qt_internal_add_benchmark(tst_holistic SOURCES testtypes.cpp testtypes.h tst_holistic.cpp diff --git a/tests/benchmarks/qml/javascript/CMakeLists.txt b/tests/benchmarks/qml/javascript/CMakeLists.txt index 837d46df05..57e981d461 100644 --- a/tests/benchmarks/qml/javascript/CMakeLists.txt +++ b/tests/benchmarks/qml/javascript/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_javascript Binary: ##################################################################### -qt_add_benchmark(tst_javascript +qt_internal_add_benchmark(tst_javascript SOURCES testtypes.cpp testtypes.h tst_javascript.cpp diff --git a/tests/benchmarks/qml/js/qjsengine/CMakeLists.txt b/tests/benchmarks/qml/js/qjsengine/CMakeLists.txt index 577514e2ce..72f6d805a4 100644 --- a/tests/benchmarks/qml/js/qjsengine/CMakeLists.txt +++ b/tests/benchmarks/qml/js/qjsengine/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qjsengine Binary: ##################################################################### -qt_add_benchmark(tst_bench_qjsengine +qt_internal_add_benchmark(tst_bench_qjsengine SOURCES tst_qjsengine.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/qml/js/qjsvalue/CMakeLists.txt b/tests/benchmarks/qml/js/qjsvalue/CMakeLists.txt index 8c56fa1820..93ea32187f 100644 --- a/tests/benchmarks/qml/js/qjsvalue/CMakeLists.txt +++ b/tests/benchmarks/qml/js/qjsvalue/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qjsvalue Binary: ##################################################################### -qt_add_benchmark(tst_bench_qjsvalue +qt_internal_add_benchmark(tst_bench_qjsvalue SOURCES tst_qjsvalue.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/qml/js/qjsvalueiterator/CMakeLists.txt b/tests/benchmarks/qml/js/qjsvalueiterator/CMakeLists.txt index 99e19d45a4..06aa88d539 100644 --- a/tests/benchmarks/qml/js/qjsvalueiterator/CMakeLists.txt +++ b/tests/benchmarks/qml/js/qjsvalueiterator/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qjsvalueiterator Binary: ##################################################################### -qt_add_benchmark(tst_bench_qjsvalueiterator +qt_internal_add_benchmark(tst_bench_qjsvalueiterator SOURCES tst_qjsvalueiterator.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/qml/librarymetrics_performance/CMakeLists.txt b/tests/benchmarks/qml/librarymetrics_performance/CMakeLists.txt index e70db585a8..290badc123 100644 --- a/tests/benchmarks/qml/librarymetrics_performance/CMakeLists.txt +++ b/tests/benchmarks/qml/librarymetrics_performance/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_librarymetrics_performance Binary: ##################################################################### -qt_add_benchmark(tst_librarymetrics_performance +qt_internal_add_benchmark(tst_librarymetrics_performance SOURCES tst_librarymetrics_performance.cpp PUBLIC_LIBRARIES @@ -20,7 +20,7 @@ set(qmake_immediate_resource_files "data" ) -qt_add_resource(tst_librarymetrics_performance "qmake_immediate" +qt_internal_add_resource(tst_librarymetrics_performance "qmake_immediate" PREFIX "/" FILES diff --git a/tests/benchmarks/qml/painting/CMakeLists.txt b/tests/benchmarks/qml/painting/CMakeLists.txt index a54bf6c22e..e9b0a69ff9 100644 --- a/tests/benchmarks/qml/painting/CMakeLists.txt +++ b/tests/benchmarks/qml/painting/CMakeLists.txt @@ -4,7 +4,7 @@ ## painting Binary: ##################################################################### -qt_add_benchmark(painting +qt_internal_add_benchmark(painting SOURCES paintbenchmark.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/qml/qqmlchangeset/CMakeLists.txt b/tests/benchmarks/qml/qqmlchangeset/CMakeLists.txt index 06a41df546..2d6461eefd 100644 --- a/tests/benchmarks/qml/qqmlchangeset/CMakeLists.txt +++ b/tests/benchmarks/qml/qqmlchangeset/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qqmlchangeset Binary: ##################################################################### -qt_add_benchmark(tst_qqmlchangeset +qt_internal_add_benchmark(tst_qqmlchangeset SOURCES tst_qqmlchangeset.cpp DEFINES diff --git a/tests/benchmarks/qml/qqmlcomponent/.prev_CMakeLists.txt b/tests/benchmarks/qml/qqmlcomponent/.prev_CMakeLists.txt index d219c447d7..8d5788aa51 100644 --- a/tests/benchmarks/qml/qqmlcomponent/.prev_CMakeLists.txt +++ b/tests/benchmarks/qml/qqmlcomponent/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qqmlcomponent Binary: ##################################################################### -qt_add_benchmark(tst_qqmlcomponent +qt_internal_add_benchmark(tst_qqmlcomponent SOURCES testtypes.cpp testtypes.h tst_qqmlcomponent.cpp diff --git a/tests/benchmarks/qml/qqmlcomponent/CMakeLists.txt b/tests/benchmarks/qml/qqmlcomponent/CMakeLists.txt index faa9dac56f..74754c44ba 100644 --- a/tests/benchmarks/qml/qqmlcomponent/CMakeLists.txt +++ b/tests/benchmarks/qml/qqmlcomponent/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qqmlcomponent Binary: ##################################################################### -qt_add_benchmark(tst_qqmlcomponent_benchmark # special case avoid collision with auto test +qt_internal_add_benchmark(tst_qqmlcomponent_benchmark # special case avoid collision with auto test GUI SOURCES testtypes.cpp testtypes.h diff --git a/tests/benchmarks/qml/qqmlmetaproperty/CMakeLists.txt b/tests/benchmarks/qml/qqmlmetaproperty/CMakeLists.txt index e0a7db012a..2b1b8ae26a 100644 --- a/tests/benchmarks/qml/qqmlmetaproperty/CMakeLists.txt +++ b/tests/benchmarks/qml/qqmlmetaproperty/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qqmlmetaproperty Binary: ##################################################################### -qt_add_benchmark(tst_qqmlmetaproperty +qt_internal_add_benchmark(tst_qqmlmetaproperty SOURCES tst_qqmlmetaproperty.cpp DEFINES diff --git a/tests/benchmarks/qml/qquickwindow/.prev_CMakeLists.txt b/tests/benchmarks/qml/qquickwindow/.prev_CMakeLists.txt index a4895d8202..efcc65c10f 100644 --- a/tests/benchmarks/qml/qquickwindow/.prev_CMakeLists.txt +++ b/tests/benchmarks/qml/qquickwindow/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qquickwindow Binary: ##################################################################### -qt_add_benchmark(tst_qquickwindow +qt_internal_add_benchmark(tst_qquickwindow SOURCES tst_qquickwindow.cpp DEFINES diff --git a/tests/benchmarks/qml/qquickwindow/CMakeLists.txt b/tests/benchmarks/qml/qquickwindow/CMakeLists.txt index ea21ca7497..17e457d638 100644 --- a/tests/benchmarks/qml/qquickwindow/CMakeLists.txt +++ b/tests/benchmarks/qml/qquickwindow/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qquickwindow Binary: ##################################################################### -qt_add_benchmark(tst_qquickwindow_bench # special case +qt_internal_add_benchmark(tst_qquickwindow_bench # special case SOURCES tst_qquickwindow.cpp DEFINES diff --git a/tests/benchmarks/qml/script/CMakeLists.txt b/tests/benchmarks/qml/script/CMakeLists.txt index 76362dc0d9..45fac4f9e6 100644 --- a/tests/benchmarks/qml/script/CMakeLists.txt +++ b/tests/benchmarks/qml/script/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_script Binary: ##################################################################### -qt_add_benchmark(tst_script +qt_internal_add_benchmark(tst_script SOURCES tst_script.cpp DEFINES diff --git a/tests/benchmarks/qml/typeimports/CMakeLists.txt b/tests/benchmarks/qml/typeimports/CMakeLists.txt index 93f1f7c73b..01e89ce4c6 100644 --- a/tests/benchmarks/qml/typeimports/CMakeLists.txt +++ b/tests/benchmarks/qml/typeimports/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_typeimports Binary: ##################################################################### -qt_add_benchmark(tst_typeimports +qt_internal_add_benchmark(tst_typeimports SOURCES tst_typeimports.cpp DEFINES diff --git a/tests/benchmarks/quick/colorresolving/CMakeLists.txt b/tests/benchmarks/quick/colorresolving/CMakeLists.txt index 74b3cc4267..f121fffa7e 100644 --- a/tests/benchmarks/quick/colorresolving/CMakeLists.txt +++ b/tests/benchmarks/quick/colorresolving/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob ${CMAKE_CURRENT_SOURCE_DIR}/data/tst_*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_colorresolving +qt_internal_add_test(tst_colorresolving GUI QMLTEST SOURCES diff --git a/tests/benchmarks/quick/events/CMakeLists.txt b/tests/benchmarks/quick/events/CMakeLists.txt index 253b1d9c4e..29ee7bc803 100644 --- a/tests/benchmarks/quick/events/CMakeLists.txt +++ b/tests/benchmarks/quick/events/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qevents Binary: ##################################################################### -qt_add_benchmark(tst_qevents +qt_internal_add_benchmark(tst_qevents SOURCES ../../../auto/quick/shared/geometrytestutil.cpp ../../../auto/quick/shared/geometrytestutil.h ../../../auto/quick/shared/viewtestutil.cpp ../../../auto/quick/shared/viewtestutil.h @@ -32,12 +32,12 @@ qt_add_benchmark(tst_qevents ## Scopes: ##################################################################### -qt_extend_target(tst_qevents CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qevents CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qevents CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qevents CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/libfuzzer/qml/jsapi/evaluate/CMakeLists.txt b/tests/libfuzzer/qml/jsapi/evaluate/CMakeLists.txt index 2a41d5ed66..9ac10e584d 100644 --- a/tests/libfuzzer/qml/jsapi/evaluate/CMakeLists.txt +++ b/tests/libfuzzer/qml/jsapi/evaluate/CMakeLists.txt @@ -4,7 +4,7 @@ ## evaluate Binary: ##################################################################### -qt_add_executable(evaluate +qt_internal_add_executable(evaluate SOURCES main.cpp PUBLIC_LIBRARIES @@ -17,12 +17,12 @@ qt_add_executable(evaluate ## Scopes: ##################################################################### -qt_extend_target(evaluate CONDITION FUZZ_ENGINE_ISEMPTY +qt_internal_extend_target(evaluate CONDITION FUZZ_ENGINE_ISEMPTY LINK_OPTIONS "-fsanitize=fuzzer" ) -qt_extend_target(evaluate CONDITION NOT FUZZ_ENGINE_ISEMPTY +qt_internal_extend_target(evaluate CONDITION NOT FUZZ_ENGINE_ISEMPTY PUBLIC_LIBRARIES $ENV{LIB_FUZZING_ENGINE} ) diff --git a/tests/manual/highdpi/CMakeLists.txt b/tests/manual/highdpi/CMakeLists.txt index 4ae749c660..971e432d1d 100644 --- a/tests/manual/highdpi/CMakeLists.txt +++ b/tests/manual/highdpi/CMakeLists.txt @@ -4,7 +4,7 @@ ## qmlimageproviderplugin Generic Library: ##################################################################### -qt_add_cmake_library(qmlimageproviderplugin +qt_internal_add_cmake_library(qmlimageproviderplugin MODULE INSTALL_DIRECTORY "${INSTALL_EXAMPLESDIR}/quick/imageprovider/ImageProvider" OUTPUT_DIRECTORY "ImageProvider" diff --git a/tests/manual/httpserver/CMakeLists.txt b/tests/manual/httpserver/CMakeLists.txt index 105799e59e..2717465c82 100644 --- a/tests/manual/httpserver/CMakeLists.txt +++ b/tests/manual/httpserver/CMakeLists.txt @@ -4,7 +4,7 @@ ## httpserver Binary: ##################################################################### -qt_add_manual_test(httpserver +qt_internal_add_manual_test(httpserver SOURCES ../../auto/shared/testhttpserver.cpp ../../auto/shared/testhttpserver.h main.cpp diff --git a/tests/manual/mousearea/CMakeLists.txt b/tests/manual/mousearea/CMakeLists.txt index f3b0003ea3..8b1a56018b 100644 --- a/tests/manual/mousearea/CMakeLists.txt +++ b/tests/manual/mousearea/CMakeLists.txt @@ -4,7 +4,7 @@ ## mousearea Binary: ##################################################################### -qt_add_manual_test(mousearea +qt_internal_add_manual_test(mousearea GUI SOURCES main.cpp @@ -20,7 +20,7 @@ set(qml_resource_files "plainMouseArea.qml" ) -qt_add_resource(mousearea "qml" +qt_internal_add_resource(mousearea "qml" PREFIX "/" FILES @@ -73,7 +73,7 @@ set(quick_shared_resource_files "images/slider_handle.png" ) -qt_add_resource(mousearea "quick_shared" +qt_internal_add_resource(mousearea "quick_shared" PREFIX "/quick/shared" BASE diff --git a/tests/manual/nodetypes/CMakeLists.txt b/tests/manual/nodetypes/CMakeLists.txt deleted file mode 100644 index cdb64701b8..0000000000 --- a/tests/manual/nodetypes/CMakeLists.txt +++ /dev/null @@ -1,47 +0,0 @@ -# Generated from nodetypes.pro. - -##################################################################### -## nodetypes Binary: -##################################################################### - -qt_add_manual_test(nodetypes - GUI - SOURCES - nodetypes.cpp - PUBLIC_LIBRARIES - Qt::Gui - Qt::Qml - Qt::Quick -) - -# Resources: -set(nodetypes_resource_files - "Animators.qml" - "Effects.qml" - "Images.qml" - "Layers.qml" - "LotsOfImages.qml" - "LotsOfRects.qml" - "Painter.qml" - "Rects.qml" - "Text.qml" - "face-smile.png" - "main.qml" - "ps_shadow1.cso" - "ps_shadow2.cso" - "ps_wobble.cso" - "qt.png" - "shadow.png" - "vs_wobble.cso" -) - -qt_add_resource(nodetypes "nodetypes" - PREFIX - "/" - FILES - ${nodetypes_resource_files} -) - - -#### Keys ignored in scope 1:.:.:nodetypes.pro:<TRUE>: -# OTHER_FILES = "main.qml" "Rects.qml" "LotsOfRects.qml" "Images.qml" "LotsOfImages.qml" "Text.qml" "Animators.qml" "Layers.qml" "Effects.qml" "Painter.qml" "wobble.hlsl" "shadow1.hlsl" "shadow2.hlsl" diff --git a/tests/manual/nodetypes_ng/CMakeLists.txt b/tests/manual/nodetypes_ng/CMakeLists.txt index 5687cb2768..b01cbe0282 100644 --- a/tests/manual/nodetypes_ng/CMakeLists.txt +++ b/tests/manual/nodetypes_ng/CMakeLists.txt @@ -4,7 +4,7 @@ ## nodetypes_ng Binary: ##################################################################### -qt_add_manual_test(nodetypes_ng +qt_internal_add_manual_test(nodetypes_ng GUI SOURCES nodetypes_ng.cpp @@ -52,7 +52,7 @@ set(nodetypes_ng_resource_files "wobble_legacy_gl.vert" ) -qt_add_resource(nodetypes_ng "nodetypes_ng" +qt_internal_add_resource(nodetypes_ng "nodetypes_ng" PREFIX "/" FILES diff --git a/tests/manual/pointer/CMakeLists.txt b/tests/manual/pointer/CMakeLists.txt index e58fc7f29f..6bdb0f9e78 100644 --- a/tests/manual/pointer/CMakeLists.txt +++ b/tests/manual/pointer/CMakeLists.txt @@ -4,7 +4,7 @@ ## pointer Binary: ##################################################################### -qt_add_manual_test(pointer +qt_internal_add_manual_test(pointer GUI SOURCES inputinspector.cpp inputinspector.h @@ -69,7 +69,7 @@ set(qml_resource_files "tapHandler.qml" ) -qt_add_resource(pointer "qml" +qt_internal_add_resource(pointer "qml" PREFIX "/" FILES @@ -122,7 +122,7 @@ set(quick_shared_resource_files "images/slider_handle.png" ) -qt_add_resource(pointer "quick_shared" +qt_internal_add_resource(pointer "quick_shared" PREFIX "/quick/shared" BASE diff --git a/tests/manual/qmltypememory/CMakeLists.txt b/tests/manual/qmltypememory/CMakeLists.txt index ae3a10e944..621c18dd8b 100644 --- a/tests/manual/qmltypememory/CMakeLists.txt +++ b/tests/manual/qmltypememory/CMakeLists.txt @@ -4,7 +4,7 @@ ## qmltypememory Binary: ##################################################################### -qt_add_manual_test(qmltypememory +qt_internal_add_manual_test(qmltypememory GUI SOURCES main.cpp diff --git a/tests/manual/qmltypememory/TestPlugin/CMakeLists.txt b/tests/manual/qmltypememory/TestPlugin/CMakeLists.txt index d05139d0ea..25f03ad908 100644 --- a/tests/manual/qmltypememory/TestPlugin/CMakeLists.txt +++ b/tests/manual/qmltypememory/TestPlugin/CMakeLists.txt @@ -4,7 +4,7 @@ ## testplugin Generic Library: ##################################################################### -qt_add_cmake_library(testplugin +qt_internal_add_cmake_library(testplugin MODULE SOURCES plugin.cpp diff --git a/tests/manual/quickwidgetviewer/CMakeLists.txt b/tests/manual/quickwidgetviewer/CMakeLists.txt index 00245e4942..a48a731e23 100644 --- a/tests/manual/quickwidgetviewer/CMakeLists.txt +++ b/tests/manual/quickwidgetviewer/CMakeLists.txt @@ -4,7 +4,7 @@ ## quickwidgetviewer Binary: ##################################################################### -qt_add_manual_test(quickwidgetviewer +qt_internal_add_manual_test(quickwidgetviewer SOURCES main.cpp PUBLIC_LIBRARIES diff --git a/tests/manual/scalablepath/CMakeLists.txt b/tests/manual/scalablepath/CMakeLists.txt index 738c6ebb45..203099699d 100644 --- a/tests/manual/scalablepath/CMakeLists.txt +++ b/tests/manual/scalablepath/CMakeLists.txt @@ -4,7 +4,7 @@ ## scalablepath Binary: ##################################################################### -qt_add_manual_test(scalablepath +qt_internal_add_manual_test(scalablepath GUI SOURCES main.cpp @@ -20,7 +20,7 @@ set(qml_resource_files "main.qml" ) -qt_add_resource(scalablepath "qml" +qt_internal_add_resource(scalablepath "qml" PREFIX "/" FILES diff --git a/tests/manual/scenegraph_lancelot/scenegrabber/.prev_CMakeLists.txt b/tests/manual/scenegraph_lancelot/scenegrabber/.prev_CMakeLists.txt index 573b2e57c1..cb122bfa76 100644 --- a/tests/manual/scenegraph_lancelot/scenegrabber/.prev_CMakeLists.txt +++ b/tests/manual/scenegraph_lancelot/scenegrabber/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## qmlscenegrabber Binary: ##################################################################### -qt_add_manual_test(qmlscenegrabber +qt_internal_add_manual_test(qmlscenegrabber OUTPUT_DIRECTORY ".." SOURCES main.cpp @@ -153,7 +153,7 @@ set(shared_resource_files "shaders/wave.vert" ) -qt_add_resource(qmlscenegrabber "shared" +qt_internal_add_resource(qmlscenegrabber "shared" PREFIX "/" BASE diff --git a/tests/manual/scenegraph_lancelot/scenegrabber/CMakeLists.txt b/tests/manual/scenegraph_lancelot/scenegrabber/CMakeLists.txt index b5c71ee67e..abf5f648dd 100644 --- a/tests/manual/scenegraph_lancelot/scenegrabber/CMakeLists.txt +++ b/tests/manual/scenegraph_lancelot/scenegrabber/CMakeLists.txt @@ -4,7 +4,7 @@ ## qmlscenegrabber Binary: ##################################################################### -qt_add_manual_test(qmlscenegrabber +qt_internal_add_manual_test(qmlscenegrabber OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/.." # special case SOURCES main.cpp @@ -153,7 +153,7 @@ set(shared_resource_files "shaders/wave.vert" ) -qt_add_resource(qmlscenegrabber "shared" +qt_internal_add_resource(qmlscenegrabber "shared" PREFIX "/" BASE diff --git a/tests/manual/scenegraph_lancelot/scenegraph/.prev_CMakeLists.txt b/tests/manual/scenegraph_lancelot/scenegraph/.prev_CMakeLists.txt index 86f5c102a9..666bc986d5 100644 --- a/tests/manual/scenegraph_lancelot/scenegraph/.prev_CMakeLists.txt +++ b/tests/manual/scenegraph_lancelot/scenegraph/.prev_CMakeLists.txt @@ -7,7 +7,7 @@ # Collect test data list(APPEND test_data "../data") -qt_add_test(tst_scenegraph +qt_internal_add_test(tst_scenegraph OUTPUT_DIRECTORY ".." SOURCES ../../../../../qtbase/tests/baselineserver/shared/baselineprotocol.cpp ../../../../../qtbase/tests/baselineserver/shared/baselineprotocol.h diff --git a/tests/manual/scenegraph_lancelot/scenegraph/CMakeLists.txt b/tests/manual/scenegraph_lancelot/scenegraph/CMakeLists.txt index 407fd9976c..268eae6d58 100644 --- a/tests/manual/scenegraph_lancelot/scenegraph/CMakeLists.txt +++ b/tests/manual/scenegraph_lancelot/scenegraph/CMakeLists.txt @@ -7,7 +7,7 @@ # Collect test data list(APPEND test_data "../data") -qt_add_test(tst_scenegraph +qt_internal_add_test(tst_scenegraph OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/.." # special case SOURCES ../../../../../qtbase/tests/baselineserver/shared/baselineprotocol.cpp ../../../../../qtbase/tests/baselineserver/shared/baselineprotocol.h diff --git a/tests/manual/shapestest/CMakeLists.txt b/tests/manual/shapestest/CMakeLists.txt index 6fd93cdc11..793a798cb8 100644 --- a/tests/manual/shapestest/CMakeLists.txt +++ b/tests/manual/shapestest/CMakeLists.txt @@ -4,7 +4,7 @@ ## shapestest Binary: ##################################################################### -qt_add_manual_test(shapestest +qt_internal_add_manual_test(shapestest GUI SOURCES main.cpp @@ -19,7 +19,7 @@ set(shapestest_resource_files "shapestest.qml" ) -qt_add_resource(shapestest "shapestest" +qt_internal_add_resource(shapestest "shapestest" PREFIX "/shapestest" FILES diff --git a/tests/manual/tableview/abstracttablemodel/CMakeLists.txt b/tests/manual/tableview/abstracttablemodel/CMakeLists.txt index 2aa3d5b797..32d3af34bd 100644 --- a/tests/manual/tableview/abstracttablemodel/CMakeLists.txt +++ b/tests/manual/tableview/abstracttablemodel/CMakeLists.txt @@ -4,7 +4,7 @@ ## tableview_abstracttablemodel Binary: ##################################################################### -qt_add_manual_test(tableview_abstracttablemodel +qt_internal_add_manual_test(tableview_abstracttablemodel GUI SOURCES main.cpp @@ -20,7 +20,7 @@ set(qmake_immediate_resource_files "main.qml" ) -qt_add_resource(tableview_abstracttablemodel "qmake_immediate" +qt_internal_add_resource(tableview_abstracttablemodel "qmake_immediate" PREFIX "/" FILES diff --git a/tests/manual/tableview/listmodel/CMakeLists.txt b/tests/manual/tableview/listmodel/CMakeLists.txt index 9e4b8871cc..ce39476237 100644 --- a/tests/manual/tableview/listmodel/CMakeLists.txt +++ b/tests/manual/tableview/listmodel/CMakeLists.txt @@ -4,7 +4,7 @@ ## tableview_listmodel Binary: ##################################################################### -qt_add_manual_test(tableview_listmodel +qt_internal_add_manual_test(tableview_listmodel GUI SOURCES main.cpp @@ -19,7 +19,7 @@ set(qmake_immediate_resource_files "main.qml" ) -qt_add_resource(tableview_listmodel "qmake_immediate" +qt_internal_add_resource(tableview_listmodel "qmake_immediate" PREFIX "/" FILES diff --git a/tests/manual/tableview/storagemodel/CMakeLists.txt b/tests/manual/tableview/storagemodel/CMakeLists.txt index 747d5f5b40..397db3e1f7 100644 --- a/tests/manual/tableview/storagemodel/CMakeLists.txt +++ b/tests/manual/tableview/storagemodel/CMakeLists.txt @@ -4,7 +4,7 @@ ## tableview_storage Binary: ##################################################################### -qt_add_manual_test(tableview_storage +qt_internal_add_manual_test(tableview_storage GUI SOURCES main.cpp @@ -20,7 +20,7 @@ set(qmake_immediate_resource_files "main.qml" ) -qt_add_resource(tableview_storage "qmake_immediate" +qt_internal_add_resource(tableview_storage "qmake_immediate" PREFIX "/" FILES diff --git a/tests/manual/tableview/tablemodel/form/CMakeLists.txt b/tests/manual/tableview/tablemodel/form/CMakeLists.txt index 4a4a7e28fe..00bea7bddc 100644 --- a/tests/manual/tableview/tablemodel/form/CMakeLists.txt +++ b/tests/manual/tableview/tablemodel/form/CMakeLists.txt @@ -4,7 +4,7 @@ ## form Binary: ##################################################################### -qt_add_manual_test(form +qt_internal_add_manual_test(form GUI SOURCES main.cpp @@ -20,7 +20,7 @@ set(qmake_immediate_resource_files "main.qml" ) -qt_add_resource(form "qmake_immediate" +qt_internal_add_resource(form "qmake_immediate" PREFIX "/" FILES diff --git a/tests/manual/tableview/tablemodel/json/CMakeLists.txt b/tests/manual/tableview/tablemodel/json/CMakeLists.txt index 4251d08269..86d177d08c 100644 --- a/tests/manual/tableview/tablemodel/json/CMakeLists.txt +++ b/tests/manual/tableview/tablemodel/json/CMakeLists.txt @@ -4,7 +4,7 @@ ## json Binary: ##################################################################### -qt_add_manual_test(json +qt_internal_add_manual_test(json GUI SOURCES main.cpp @@ -20,7 +20,7 @@ set(qmake_immediate_resource_files "main.qml" ) -qt_add_resource(json "qmake_immediate" +qt_internal_add_resource(json "qmake_immediate" PREFIX "/" FILES diff --git a/tests/manual/text/CMakeLists.txt b/tests/manual/text/CMakeLists.txt index 09c6d780e7..78c07f6ca8 100644 --- a/tests/manual/text/CMakeLists.txt +++ b/tests/manual/text/CMakeLists.txt @@ -4,7 +4,7 @@ ## text Binary: ##################################################################### -qt_add_manual_test(text +qt_internal_add_manual_test(text GUI SOURCES main.cpp @@ -21,7 +21,7 @@ set(qml_resource_files "textInputPropertiesAndSignals.qml" ) -qt_add_resource(text "qml" +qt_internal_add_resource(text "qml" PREFIX "/" FILES @@ -74,7 +74,7 @@ set(quick_shared_resource_files "images/slider_handle.png" ) -qt_add_resource(text "quick_shared" +qt_internal_add_resource(text "quick_shared" PREFIX "/quick/shared" BASE diff --git a/tests/manual/touch/CMakeLists.txt b/tests/manual/touch/CMakeLists.txt index 261bab2d49..28e26e30c3 100644 --- a/tests/manual/touch/CMakeLists.txt +++ b/tests/manual/touch/CMakeLists.txt @@ -4,7 +4,7 @@ ## touch Binary: ##################################################################### -qt_add_manual_test(touch +qt_internal_add_manual_test(touch GUI SOURCES main.cpp @@ -21,7 +21,7 @@ set(qml_resource_files "mpta-crosshairs.qml" ) -qt_add_resource(touch "qml" +qt_internal_add_resource(touch "qml" PREFIX "/" FILES @@ -74,7 +74,7 @@ set(quick_shared_resource_files "images/slider_handle.png" ) -qt_add_resource(touch "quick_shared" +qt_internal_add_resource(touch "quick_shared" PREFIX "/quick/shared" BASE diff --git a/tests/manual/v4/auto/executableallocator/CMakeLists.txt b/tests/manual/v4/auto/executableallocator/CMakeLists.txt index 7001a270b6..14a4e9c7f3 100644 --- a/tests/manual/v4/auto/executableallocator/CMakeLists.txt +++ b/tests/manual/v4/auto/executableallocator/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_executableallocator Binary: ##################################################################### -qt_add_manual_test(tst_executableallocator +qt_internal_add_manual_test(tst_executableallocator SOURCES tst_executableallocator.cpp PUBLIC_LIBRARIES diff --git a/tools/qml/.prev_CMakeLists.txt b/tools/qml/.prev_CMakeLists.txt index 52f1082f02..7a278d970e 100644 --- a/tools/qml/.prev_CMakeLists.txt +++ b/tools/qml/.prev_CMakeLists.txt @@ -5,7 +5,7 @@ ##################################################################### qt_get_tool_target_name(target_name qml) -qt_add_tool(${target_name} +qt_internal_add_tool(${target_name} TARGET_DESCRIPTION "QML Runtime" SOURCES conf.h @@ -24,7 +24,7 @@ set(qml_resource_files "resources/qml-64.png" ) -qt_add_resource(${target_name} "qml" +qt_internal_add_resource(${target_name} "qml" PREFIX "/qt-project.org/QmlRuntime" FILES @@ -41,12 +41,12 @@ qt_add_resource(${target_name} "qml" ## Scopes: ##################################################################### -qt_extend_target(${target_name} CONDITION TARGET Qt::Gui +qt_internal_extend_target(${target_name} CONDITION TARGET Qt::Gui PUBLIC_LIBRARIES Qt::Gui ) -qt_extend_target(${target_name} CONDITION TARGET Qt::Widgets +qt_internal_extend_target(${target_name} CONDITION TARGET Qt::Widgets PUBLIC_LIBRARIES Qt::Widgets ) @@ -59,7 +59,7 @@ qt_extend_target(${target_name} CONDITION TARGET Qt::Widgets # OTHER_FILES = "resources/Info.plist" # QMAKE_INFO_PLIST = "resources/Info.plist" -qt_extend_target(${target_name} CONDITION QT_FEATURE_qml_debug +qt_internal_extend_target(${target_name} CONDITION QT_FEATURE_qml_debug DEFINES QT_QML_DEBUG_NO_WARNING ) diff --git a/tools/qml/CMakeLists.txt b/tools/qml/CMakeLists.txt index a069731aac..7c545ecb75 100644 --- a/tools/qml/CMakeLists.txt +++ b/tools/qml/CMakeLists.txt @@ -5,7 +5,7 @@ ##################################################################### qt_get_tool_target_name(target_name qml) -qt_add_tool(${target_name} +qt_internal_add_tool(${target_name} TARGET_DESCRIPTION "QML Runtime" TOOLS_TARGET Qml # special case SOURCES @@ -41,7 +41,7 @@ set(qml_resource_files "resources/qml-64.png" ) -qt_add_resource(${target_name} "qml" +qt_internal_add_resource(${target_name} "qml" PREFIX "/qt-project.org/QmlRuntime" FILES @@ -58,12 +58,12 @@ qt_add_resource(${target_name} "qml" ## Scopes: ##################################################################### -qt_extend_target(${target_name} CONDITION TARGET Qt::Gui +qt_internal_extend_target(${target_name} CONDITION TARGET Qt::Gui PUBLIC_LIBRARIES Qt::Gui ) -qt_extend_target(${target_name} CONDITION TARGET Qt::Widgets +qt_internal_extend_target(${target_name} CONDITION TARGET Qt::Widgets PUBLIC_LIBRARIES Qt::Widgets ) @@ -76,7 +76,7 @@ qt_extend_target(${target_name} CONDITION TARGET Qt::Widgets # OTHER_FILES = "resources/Info.plist" # QMAKE_INFO_PLIST = "resources/Info.plist" -qt_extend_target(${target_name} CONDITION QT_FEATURE_qml_debug +qt_internal_extend_target(${target_name} CONDITION QT_FEATURE_qml_debug DEFINES QT_QML_DEBUG_NO_WARNING ) diff --git a/tools/qmlcachegen/.prev_CMakeLists.txt b/tools/qmlcachegen/.prev_CMakeLists.txt index 06b03d8e96..78e63898ac 100644 --- a/tools/qmlcachegen/.prev_CMakeLists.txt +++ b/tools/qmlcachegen/.prev_CMakeLists.txt @@ -5,7 +5,7 @@ ##################################################################### qt_get_tool_target_name(target_name qmlcachegen) -qt_add_tool(${target_name} +qt_internal_add_tool(${target_name} TARGET_DESCRIPTION "QML Cache Generator" SOURCES generateloader.cpp diff --git a/tools/qmlcachegen/CMakeLists.txt b/tools/qmlcachegen/CMakeLists.txt index a509166dee..9903406fab 100644 --- a/tools/qmlcachegen/CMakeLists.txt +++ b/tools/qmlcachegen/CMakeLists.txt @@ -5,7 +5,7 @@ ##################################################################### qt_get_tool_target_name(target_name qmlcachegen) -qt_add_tool(${target_name} +qt_internal_add_tool(${target_name} TARGET_DESCRIPTION "QML Cache Generator" TOOLS_TARGET Qml # special case SOURCES diff --git a/tools/qmleasing/CMakeLists.txt b/tools/qmleasing/CMakeLists.txt index e93995326b..7257b7cf6e 100644 --- a/tools/qmleasing/CMakeLists.txt +++ b/tools/qmleasing/CMakeLists.txt @@ -28,7 +28,7 @@ set(resources_resource_files "preview.qml" ) -qt_add_resource(qmleasing "resources" +qt_internal_add_resource(qmleasing "resources" PREFIX "/" FILES diff --git a/tools/qmlformat/.prev_CMakeLists.txt b/tools/qmlformat/.prev_CMakeLists.txt index e99eca96e1..618e1bbfaa 100644 --- a/tools/qmlformat/.prev_CMakeLists.txt +++ b/tools/qmlformat/.prev_CMakeLists.txt @@ -5,7 +5,7 @@ ##################################################################### qt_get_tool_target_name(target_name qmlformat) -qt_add_tool(${target_name} +qt_internal_add_tool(${target_name} TARGET_DESCRIPTION "QML Formatter" SOURCES commentastvisitor.cpp commentastvisitor.h diff --git a/tools/qmlformat/CMakeLists.txt b/tools/qmlformat/CMakeLists.txt index 73d106a1c1..e492a3ec56 100644 --- a/tools/qmlformat/CMakeLists.txt +++ b/tools/qmlformat/CMakeLists.txt @@ -5,7 +5,7 @@ ##################################################################### qt_get_tool_target_name(target_name qmlformat) -qt_add_tool(${target_name} +qt_internal_add_tool(${target_name} TARGET_DESCRIPTION "QML Formatter" TOOLS_TARGET Qml # special case SOURCES diff --git a/tools/qmlimportscanner/.prev_CMakeLists.txt b/tools/qmlimportscanner/.prev_CMakeLists.txt index 4be5ad8f06..7d56f6b75a 100644 --- a/tools/qmlimportscanner/.prev_CMakeLists.txt +++ b/tools/qmlimportscanner/.prev_CMakeLists.txt @@ -5,7 +5,7 @@ ##################################################################### qt_get_tool_target_name(target_name qmlimportscanner) -qt_add_tool(${target_name} +qt_internal_add_tool(${target_name} TARGET_DESCRIPTION "QML Import Scanner" SOURCES main.cpp diff --git a/tools/qmlimportscanner/CMakeLists.txt b/tools/qmlimportscanner/CMakeLists.txt index 8bb3dd9908..61e927b6fe 100644 --- a/tools/qmlimportscanner/CMakeLists.txt +++ b/tools/qmlimportscanner/CMakeLists.txt @@ -5,7 +5,7 @@ ##################################################################### qt_get_tool_target_name(target_name qmlimportscanner) -qt_add_tool(${target_name} +qt_internal_add_tool(${target_name} TARGET_DESCRIPTION "QML Import Scanner" TOOLS_TARGET Qml # special case SOURCES diff --git a/tools/qmljs/.prev_CMakeLists.txt b/tools/qmljs/.prev_CMakeLists.txt index 621f54a18b..86d0a31552 100644 --- a/tools/qmljs/.prev_CMakeLists.txt +++ b/tools/qmljs/.prev_CMakeLists.txt @@ -5,7 +5,7 @@ ##################################################################### qt_get_tool_target_name(target_name qmljs) -qt_add_tool(${target_name} +qt_internal_add_tool(${target_name} TARGET_DESCRIPTION "QML JavaScript Tool" SOURCES qmljs.cpp @@ -45,42 +45,42 @@ qt_add_tool(${target_name} ## Scopes: ##################################################################### -qt_extend_target(${target_name} CONDITION WIN32 +qt_internal_extend_target(${target_name} CONDITION WIN32 DEFINES NOMINMAX ) -qt_extend_target(${target_name} CONDITION disassembler AND ((TEST_architecture_arch STREQUAL "i386") OR (TEST_architecture_arch STREQUAL "x86_64")) +qt_internal_extend_target(${target_name} CONDITION disassembler AND ((TEST_architecture_arch STREQUAL "i386") OR (TEST_architecture_arch STREQUAL "x86_64")) DEFINES WTF_USE_UDIS86=1 ) -qt_extend_target(${target_name} CONDITION (TEST_architecture_arch STREQUAL "arm") AND disassembler +qt_internal_extend_target(${target_name} CONDITION (TEST_architecture_arch STREQUAL "arm") AND disassembler DEFINES WTF_USE_ARMV7_DISASSEMBLER=1 ) -qt_extend_target(${target_name} CONDITION (TEST_architecture_arch STREQUAL "arm64") AND disassembler +qt_internal_extend_target(${target_name} CONDITION (TEST_architecture_arch STREQUAL "arm64") AND disassembler DEFINES WTF_USE_ARM64_DISASSEMBLER=1 ) -qt_extend_target(${target_name} CONDITION (TEST_architecture_arch STREQUAL "mips") AND disassembler +qt_internal_extend_target(${target_name} CONDITION (TEST_architecture_arch STREQUAL "mips") AND disassembler DEFINES WTF_USE_MIPS32_DISASSEMBLER=1 ) -qt_extend_target(${target_name} CONDITION NOT disassembler +qt_internal_extend_target(${target_name} CONDITION NOT disassembler DEFINES WTF_USE_UDIS86=0 ) -qt_extend_target(${target_name} CONDITION CMAKE_BUILD_TYPE STREQUAL Release +qt_internal_extend_target(${target_name} CONDITION CMAKE_BUILD_TYPE STREQUAL Release DEFINES NDEBUG ) -qt_extend_target(${target_name} CONDITION GCC AND QT_COMPILER_VERSION_MAJOR STRGREATER 6 AND NOT CLANG AND NOT ICC +qt_internal_extend_target(${target_name} CONDITION GCC AND QT_COMPILER_VERSION_MAJOR STRGREATER 6 AND NOT CLANG AND NOT ICC COMPILE_OPTIONS -Wno-expansion-to-defined ) diff --git a/tools/qmljs/CMakeLists.txt b/tools/qmljs/CMakeLists.txt index e4e2cf1b7a..147ddf008c 100644 --- a/tools/qmljs/CMakeLists.txt +++ b/tools/qmljs/CMakeLists.txt @@ -5,7 +5,7 @@ ##################################################################### qt_get_tool_target_name(target_name qmljs) -qt_add_tool(${target_name} +qt_internal_add_tool(${target_name} TARGET_DESCRIPTION "QML JavaScript Tool" TOOLS_TARGET Qml # special case SOURCES @@ -46,42 +46,42 @@ qt_add_tool(${target_name} ## Scopes: ##################################################################### -qt_extend_target(${target_name} CONDITION WIN32 +qt_internal_extend_target(${target_name} CONDITION WIN32 DEFINES NOMINMAX ) -qt_extend_target(${target_name} CONDITION disassembler AND ((TEST_architecture_arch STREQUAL "i386") OR (TEST_architecture_arch STREQUAL "x86_64")) +qt_internal_extend_target(${target_name} CONDITION disassembler AND ((TEST_architecture_arch STREQUAL "i386") OR (TEST_architecture_arch STREQUAL "x86_64")) DEFINES WTF_USE_UDIS86=1 ) -qt_extend_target(${target_name} CONDITION (TEST_architecture_arch STREQUAL "arm") AND disassembler +qt_internal_extend_target(${target_name} CONDITION (TEST_architecture_arch STREQUAL "arm") AND disassembler DEFINES WTF_USE_ARMV7_DISASSEMBLER=1 ) -qt_extend_target(${target_name} CONDITION (TEST_architecture_arch STREQUAL "arm64") AND disassembler +qt_internal_extend_target(${target_name} CONDITION (TEST_architecture_arch STREQUAL "arm64") AND disassembler DEFINES WTF_USE_ARM64_DISASSEMBLER=1 ) -qt_extend_target(${target_name} CONDITION (TEST_architecture_arch STREQUAL "mips") AND disassembler +qt_internal_extend_target(${target_name} CONDITION (TEST_architecture_arch STREQUAL "mips") AND disassembler DEFINES WTF_USE_MIPS32_DISASSEMBLER=1 ) -qt_extend_target(${target_name} CONDITION NOT disassembler +qt_internal_extend_target(${target_name} CONDITION NOT disassembler DEFINES WTF_USE_UDIS86=0 ) -qt_extend_target(${target_name} CONDITION CMAKE_BUILD_TYPE STREQUAL Release +qt_internal_extend_target(${target_name} CONDITION CMAKE_BUILD_TYPE STREQUAL Release DEFINES NDEBUG ) -qt_extend_target(${target_name} CONDITION GCC AND QT_COMPILER_VERSION_MAJOR STRGREATER 6 AND NOT CLANG AND NOT ICC +qt_internal_extend_target(${target_name} CONDITION GCC AND QT_COMPILER_VERSION_MAJOR STRGREATER 6 AND NOT CLANG AND NOT ICC COMPILE_OPTIONS -Wno-expansion-to-defined ) diff --git a/tools/qmllint/.prev_CMakeLists.txt b/tools/qmllint/.prev_CMakeLists.txt index 923371c587..3b5a152f4b 100644 --- a/tools/qmllint/.prev_CMakeLists.txt +++ b/tools/qmllint/.prev_CMakeLists.txt @@ -5,7 +5,7 @@ ##################################################################### qt_get_tool_target_name(target_name qmllint) -qt_add_tool(${target_name} +qt_internal_add_tool(${target_name} TARGET_DESCRIPTION "QML Syntax Verifier" SOURCES checkidentifiers.cpp checkidentifiers.h diff --git a/tools/qmllint/CMakeLists.txt b/tools/qmllint/CMakeLists.txt index 9230d8117b..a133af3cb7 100644 --- a/tools/qmllint/CMakeLists.txt +++ b/tools/qmllint/CMakeLists.txt @@ -5,7 +5,7 @@ ##################################################################### qt_get_tool_target_name(target_name qmllint) -qt_add_tool(${target_name} +qt_internal_add_tool(${target_name} TARGET_DESCRIPTION "QML Syntax Verifier" TOOLS_TARGET Qml # special case SOURCES diff --git a/tools/qmlplugindump/.prev_CMakeLists.txt b/tools/qmlplugindump/.prev_CMakeLists.txt index 997f0ca446..c4747ea3ab 100644 --- a/tools/qmlplugindump/.prev_CMakeLists.txt +++ b/tools/qmlplugindump/.prev_CMakeLists.txt @@ -5,7 +5,7 @@ ##################################################################### qt_get_tool_target_name(target_name qmlplugindump) -qt_add_tool(${target_name} +qt_internal_add_tool(${target_name} TARGET_DESCRIPTION "QML Plugin Metadata Dumper" SOURCES ../../src/qmlcompiler/qqmljsstreamwriter.cpp ../../src/qmlcompiler/qqmljsstreamwriter_p.h @@ -28,12 +28,12 @@ qt_add_tool(${target_name} ## Scopes: ##################################################################### -qt_extend_target(${target_name} CONDITION TARGET Qt::Widgets +qt_internal_extend_target(${target_name} CONDITION TARGET Qt::Widgets PUBLIC_LIBRARIES Qt::Widgets ) -qt_extend_target(${target_name} CONDITION MACOS +qt_internal_extend_target(${target_name} CONDITION MACOS LINK_OPTIONS "-Wl,-sectcreate,__TEXT,__info_plist,$$shell_quote$$PWD/Info.plist" ) diff --git a/tools/qmlplugindump/CMakeLists.txt b/tools/qmlplugindump/CMakeLists.txt index 111f7dda24..c36d743611 100644 --- a/tools/qmlplugindump/CMakeLists.txt +++ b/tools/qmlplugindump/CMakeLists.txt @@ -5,7 +5,7 @@ ##################################################################### qt_get_tool_target_name(target_name qmlplugindump) -qt_add_tool(${target_name} +qt_internal_add_tool(${target_name} TARGET_DESCRIPTION "QML Plugin Metadata Dumper" TOOLS_TARGET Qml # special case SOURCES @@ -29,12 +29,12 @@ qt_add_tool(${target_name} ## Scopes: ##################################################################### -qt_extend_target(${target_name} CONDITION TARGET Qt::Widgets +qt_internal_extend_target(${target_name} CONDITION TARGET Qt::Widgets PUBLIC_LIBRARIES Qt::Widgets ) -qt_extend_target(${target_name} CONDITION MACOS +qt_internal_extend_target(${target_name} CONDITION MACOS LINK_OPTIONS "-Wl,-sectcreate,__TEXT,__info_plist,${CMAKE_CURRENT_SOURCE_DIR}/Info.plist" # special case ) diff --git a/tools/qmlpreview/.prev_CMakeLists.txt b/tools/qmlpreview/.prev_CMakeLists.txt index e8cfaa528a..61efd03729 100644 --- a/tools/qmlpreview/.prev_CMakeLists.txt +++ b/tools/qmlpreview/.prev_CMakeLists.txt @@ -5,7 +5,7 @@ ##################################################################### qt_get_tool_target_name(target_name qmlpreview) -qt_add_tool(${target_name} +qt_internal_add_tool(${target_name} TARGET_DESCRIPTION "QML Preview" SOURCES main.cpp diff --git a/tools/qmlpreview/CMakeLists.txt b/tools/qmlpreview/CMakeLists.txt index 3df5a921cf..4c347a404e 100644 --- a/tools/qmlpreview/CMakeLists.txt +++ b/tools/qmlpreview/CMakeLists.txt @@ -5,7 +5,7 @@ ##################################################################### qt_get_tool_target_name(target_name qmlpreview) -qt_add_tool(${target_name} +qt_internal_add_tool(${target_name} TARGET_DESCRIPTION "QML Preview" TOOLS_TARGET Qml # special case SOURCES diff --git a/tools/qmlprofiler/.prev_CMakeLists.txt b/tools/qmlprofiler/.prev_CMakeLists.txt index 27121615bd..51418f62dc 100644 --- a/tools/qmlprofiler/.prev_CMakeLists.txt +++ b/tools/qmlprofiler/.prev_CMakeLists.txt @@ -5,7 +5,7 @@ ##################################################################### qt_get_tool_target_name(target_name qmlprofiler) -qt_add_tool(${target_name} +qt_internal_add_tool(${target_name} TARGET_DESCRIPTION "QML Profiler" SOURCES commandlistener.cpp commandlistener.h diff --git a/tools/qmlprofiler/CMakeLists.txt b/tools/qmlprofiler/CMakeLists.txt index 77943aa397..c2e5c111ae 100644 --- a/tools/qmlprofiler/CMakeLists.txt +++ b/tools/qmlprofiler/CMakeLists.txt @@ -5,7 +5,7 @@ ##################################################################### qt_get_tool_target_name(target_name qmlprofiler) -qt_add_tool(${target_name} +qt_internal_add_tool(${target_name} TARGET_DESCRIPTION "QML Profiler" TOOLS_TARGET Qml # special case SOURCES diff --git a/tools/qmlscene/.prev_CMakeLists.txt b/tools/qmlscene/.prev_CMakeLists.txt index c1f7a78dd3..5c29546d60 100644 --- a/tools/qmlscene/.prev_CMakeLists.txt +++ b/tools/qmlscene/.prev_CMakeLists.txt @@ -5,7 +5,7 @@ ##################################################################### qt_get_tool_target_name(target_name qmlscene) -qt_add_tool(${target_name} +qt_internal_add_tool(${target_name} TARGET_DESCRIPTION "QML Scene Viewer" SOURCES main.cpp @@ -26,12 +26,12 @@ qt_add_tool(${target_name} ## Scopes: ##################################################################### -qt_extend_target(${target_name} CONDITION TARGET Qt::Widgets +qt_internal_extend_target(${target_name} CONDITION TARGET Qt::Widgets PUBLIC_LIBRARIES Qt::Widgets ) -qt_extend_target(${target_name} CONDITION QT_FEATURE_qml_debug +qt_internal_extend_target(${target_name} CONDITION QT_FEATURE_qml_debug DEFINES QT_QML_DEBUG_NO_WARNING ) diff --git a/tools/qmlscene/CMakeLists.txt b/tools/qmlscene/CMakeLists.txt index 7e385653c1..4566a60441 100644 --- a/tools/qmlscene/CMakeLists.txt +++ b/tools/qmlscene/CMakeLists.txt @@ -5,7 +5,7 @@ ##################################################################### qt_get_tool_target_name(target_name qmlscene) -qt_add_tool(${target_name} +qt_internal_add_tool(${target_name} TARGET_DESCRIPTION "QML Scene Viewer" TOOLS_TARGET Qml # special case SOURCES @@ -27,12 +27,12 @@ qt_add_tool(${target_name} ## Scopes: ##################################################################### -qt_extend_target(${target_name} CONDITION TARGET Qt::Widgets +qt_internal_extend_target(${target_name} CONDITION TARGET Qt::Widgets PUBLIC_LIBRARIES Qt::Widgets ) -qt_extend_target(${target_name} CONDITION QT_FEATURE_qml_debug +qt_internal_extend_target(${target_name} CONDITION QT_FEATURE_qml_debug DEFINES QT_QML_DEBUG_NO_WARNING ) diff --git a/tools/qmltestrunner/.prev_CMakeLists.txt b/tools/qmltestrunner/.prev_CMakeLists.txt index 4744ad5c80..9d55cb5075 100644 --- a/tools/qmltestrunner/.prev_CMakeLists.txt +++ b/tools/qmltestrunner/.prev_CMakeLists.txt @@ -5,7 +5,7 @@ ##################################################################### qt_get_tool_target_name(target_name qmltestrunner) -qt_add_tool(${target_name} +qt_internal_add_tool(${target_name} TARGET_DESCRIPTION "QML Test Runner" SOURCES main.cpp diff --git a/tools/qmltestrunner/CMakeLists.txt b/tools/qmltestrunner/CMakeLists.txt index 370c1054a6..ebdec60bb5 100644 --- a/tools/qmltestrunner/CMakeLists.txt +++ b/tools/qmltestrunner/CMakeLists.txt @@ -5,7 +5,7 @@ ##################################################################### qt_get_tool_target_name(target_name qmltestrunner) -qt_add_tool(${target_name} +qt_internal_add_tool(${target_name} TARGET_DESCRIPTION "QML Test Runner" TOOLS_TARGET Qml # special case SOURCES diff --git a/tools/qmltime/CMakeLists.txt b/tools/qmltime/CMakeLists.txt index 40161d1c1a..95794e8135 100644 --- a/tools/qmltime/CMakeLists.txt +++ b/tools/qmltime/CMakeLists.txt @@ -4,7 +4,7 @@ ## qmltime Binary: ##################################################################### -qt_add_executable(qmltime +qt_internal_add_executable(qmltime GUI SOURCES qmltime.cpp qmltime.h |