diff options
| author | Mike Krus <mike.krus@kdab.com> | 2020-10-07 10:20:57 +0100 |
|---|---|---|
| committer | Mike Krus <mike.krus@kdab.com> | 2020-10-07 16:00:04 +0100 |
| commit | bcad723d9c657ab16acd7ae0d31d3b2de512afd4 (patch) | |
| tree | 5ed4b7a3a48fb131576dc9f70c61f95a54045f87 | |
| parent | 676685f3e1bfe0b93e4d64a0a308f0d24aa41858 (diff) | |
Use internal CMake API
Task-number: QTBUG-86815
Change-Id: I7a8755571c8977be1f16b2287e5a8055e9016ee5
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
363 files changed, 574 insertions, 574 deletions
diff --git a/examples/qt3d/simple-qml/CMakeLists.txt b/examples/qt3d/simple-qml/CMakeLists.txt index 9fcc6b8cd..90ebefdd0 100644 --- a/examples/qt3d/simple-qml/CMakeLists.txt +++ b/examples/qt3d/simple-qml/CMakeLists.txt @@ -38,7 +38,7 @@ set(simple-qml_resource_files "main.qml" ) -qt_add_resource(simple-qml "simple-qml" +qt6_add_resources(simple-qml "simple-qml" PREFIX "/" FILES diff --git a/src/3rdparty/assimp/assimp.cmake b/src/3rdparty/assimp/assimp.cmake index b35b9ffc6..b8b8da137 100644 --- a/src/3rdparty/assimp/assimp.cmake +++ b/src/3rdparty/assimp/assimp.cmake @@ -9,12 +9,12 @@ endif() function(qt3d_extend_target_for_assimp target) set(assimpDir ${PROJECT_SOURCE_DIR}/src/3rdparty/assimp) - qt_extend_target(${target} CONDITION QT_FEATURE_system_assimp AND (NOT CMAKE_CROSSCOMPILING OR NOT host_build) + qt_internal_extend_target(${target} CONDITION QT_FEATURE_system_assimp AND (NOT CMAKE_CROSSCOMPILING OR NOT host_build) LIBRARIES WrapAssimp::WrapAssimp ) - qt_extend_target(${target} CONDITION NOT QT_FEATURE_system_assimp OR (CMAKE_CROSSCOMPILING AND host_build) + qt_internal_extend_target(${target} CONDITION NOT QT_FEATURE_system_assimp OR (CMAKE_CROSSCOMPILING AND host_build) SOURCES ${assimpDir}/src/code/3DS/3DSExporter.h ${assimpDir}/src/code/3DS/3DSHelper.h @@ -507,33 +507,33 @@ function(qt3d_extend_target_for_assimp target) ${assimpDir}/unzip ) - qt_extend_target(${target} CONDITION CMAKE_BUILD_TYPE STREQUAL Debug AND (CMAKE_CROSSCOMPILING OR NOT QT_FEATURE_system_assimp) AND (host_build OR NOT QT_FEATURE_system_assimp) + qt_internal_extend_target(${target} CONDITION CMAKE_BUILD_TYPE STREQUAL Debug AND (CMAKE_CROSSCOMPILING OR NOT QT_FEATURE_system_assimp) AND (host_build OR NOT QT_FEATURE_system_assimp) DEFINES _DEBUG ) - qt_extend_target(${target} CONDITION WIN32 AND (CMAKE_CROSSCOMPILING OR NOT QT_FEATURE_system_assimp) AND (host_build OR NOT QT_FEATURE_system_assimp) + qt_internal_extend_target(${target} CONDITION WIN32 AND (CMAKE_CROSSCOMPILING OR NOT QT_FEATURE_system_assimp) AND (host_build OR NOT QT_FEATURE_system_assimp) DEFINES _CRT_SECURE_NO_WARNINGS ) - qt_extend_target(${target} CONDITION QT_FEATURE_system_zlib AND NOT QT_FEATURE_system_assimp AND (NOT CMAKE_CROSSCOMPILING OR NOT host_build) + qt_internal_extend_target(${target} CONDITION QT_FEATURE_system_zlib AND NOT QT_FEATURE_system_assimp AND (NOT CMAKE_CROSSCOMPILING OR NOT host_build) LIBRARIES ZLIB::ZLIB ) - qt_extend_target(${target} CONDITION (CMAKE_CROSSCOMPILING OR NOT QT_FEATURE_system_assimp) AND (CMAKE_CROSSCOMPILING OR NOT QT_FEATURE_system_zlib) AND (host_build OR NOT QT_FEATURE_system_assimp) AND (host_build OR NOT QT_FEATURE_system_zlib) + qt_internal_extend_target(${target} CONDITION (CMAKE_CROSSCOMPILING OR NOT QT_FEATURE_system_assimp) AND (CMAKE_CROSSCOMPILING OR NOT QT_FEATURE_system_zlib) AND (host_build OR NOT QT_FEATURE_system_assimp) AND (host_build OR NOT QT_FEATURE_system_zlib) LIBRARIES Qt::ZlibPrivate ) # special case begin - qt_extend_target(${target} CONDITION ICC AND NOT QT_FEATURE_system_assimp AND (NOT CMAKE_CROSSCOMPILING OR NOT host_build) + qt_internal_extend_target(${target} CONDITION ICC AND NOT QT_FEATURE_system_assimp AND (NOT CMAKE_CROSSCOMPILING OR NOT host_build) COMPILE_OPTIONS "-wd310" "-wd68" "-wd858" ) - qt_extend_target(${target} CONDITION (GCC OR CLANG) AND NOT QT_FEATURE_system_assimp AND (NOT CMAKE_CROSSCOMPILING OR NOT host_build) + qt_internal_extend_target(${target} CONDITION (GCC OR CLANG) AND NOT QT_FEATURE_system_assimp AND (NOT CMAKE_CROSSCOMPILING OR NOT host_build) COMPILE_OPTIONS "-Wno-ignored-qualifiers" "-Wno-unused-parameter" @@ -543,7 +543,7 @@ function(qt3d_extend_target_for_assimp target) "-Wno-reorder" ) - qt_extend_target(${target} CONDITION MSVC AND NOT QT_FEATURE_system_assimp AND (NOT CMAKE_CROSSCOMPILING OR NOT host_build) + qt_internal_extend_target(${target} CONDITION MSVC AND NOT QT_FEATURE_system_assimp AND (NOT CMAKE_CROSSCOMPILING OR NOT host_build) COMPILE_OPTIONS "-wd4100" "-wd4189" @@ -552,13 +552,13 @@ function(qt3d_extend_target_for_assimp target) "-wd4828" ) - qt_extend_target(${target} CONDITION CLANG AND NOT QT_FEATURE_system_assimp AND (NOT CMAKE_CROSSCOMPILING OR NOT host_build) + qt_internal_extend_target(${target} CONDITION CLANG AND NOT QT_FEATURE_system_assimp AND (NOT CMAKE_CROSSCOMPILING OR NOT host_build) COMPILE_OPTIONS "-Wno-unused-private-field" ) # special case end - qt_extend_target(${target} CONDITION MSVC AND (CMAKE_CROSSCOMPILING OR NOT QT_FEATURE_system_assimp) AND (host_build OR NOT QT_FEATURE_system_assimp) + qt_internal_extend_target(${target} CONDITION MSVC AND (CMAKE_CROSSCOMPILING OR NOT QT_FEATURE_system_assimp) AND (host_build OR NOT QT_FEATURE_system_assimp) DEFINES _CRT_SECURE_NO_WARNINGS _SCL_SECURE_NO_WARNINGS diff --git a/src/animation/CMakeLists.txt b/src/animation/CMakeLists.txt index d74d331e0..f4a105e2f 100644 --- a/src/animation/CMakeLists.txt +++ b/src/animation/CMakeLists.txt @@ -4,7 +4,7 @@ ## 3DAnimation Module: ##################################################################### -qt_add_module(3DAnimation +qt_internal_add_module(3DAnimation SOURCES animationlogging.cpp animationlogging_p.h backend/abstractevaluateclipanimatorjob.cpp backend/abstractevaluateclipanimatorjob_p.h diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index 7db3ccf6a..5cfb01fb6 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -4,7 +4,7 @@ ## Qt::3DCore Module: ##################################################################### -qt_add_module(3DCore +qt_internal_add_module(3DCore SOURCES aspect/qcoreaspect.cpp aspect/qcoreaspect.h aspect/qcoreaspect_p.h aspect/qcoresettings.cpp aspect/qcoresettings.h aspect/qcoresettings_p.h @@ -99,7 +99,7 @@ qt_add_module(3DCore Qt::GuiPrivate ) -qt_extend_target(3DCore CONDITION gcov +qt_internal_extend_target(3DCore CONDITION gcov COMPILE_OPTIONS -fprofile-arcs -ftest-coverage @@ -178,7 +178,7 @@ if(QT_FEATURE_qt3d_simd_avx2) ) endif() -qt_extend_target(3DCore +qt_internal_extend_target(3DCore CONDITION NOT QT_FEATURE_qt3d_simd_sse2 AND NOT QT_FEATURE_qt3d_simd_avx2 SOURCES diff --git a/src/extras/CMakeLists.txt b/src/extras/CMakeLists.txt index 6c7a6938f..7368960b6 100644 --- a/src/extras/CMakeLists.txt +++ b/src/extras/CMakeLists.txt @@ -4,7 +4,7 @@ ## Qt::3DExtras Module: ##################################################################### -qt_add_module(3DExtras +qt_internal_add_module(3DExtras SOURCES 3dtext/qextrudedtextgeometry.cpp 3dtext/qextrudedtextgeometry.h 3dtext/qextrudedtextgeometry_p.h 3dtext/qextrudedtextmesh.cpp 3dtext/qextrudedtextmesh.h @@ -145,7 +145,7 @@ set(extras_resource_files "shaders/rhi/unlittexture.vert" ) -qt_add_resource(3DExtras "extras" +qt_internal_add_resource(3DExtras "extras" PREFIX "/" FILES diff --git a/src/input/CMakeLists.txt b/src/input/CMakeLists.txt index ecb8a94e9..5a9d6ef8b 100644 --- a/src/input/CMakeLists.txt +++ b/src/input/CMakeLists.txt @@ -4,7 +4,7 @@ ## Qt::3DInput Module: ##################################################################### -qt_add_module(3DInput +qt_internal_add_module(3DInput PLUGIN_TYPES Qt::3DInputdevices SOURCES backend/abstractactioninput.cpp backend/abstractactioninput_p.h @@ -93,7 +93,7 @@ qt_add_module(3DInput ## Scopes: ##################################################################### -qt_extend_target(3DInput CONDITION TARGET Qt::Gamepad +qt_internal_extend_target(3DInput CONDITION TARGET Qt::Gamepad SOURCES frontend/qgamepadinput.cpp frontend/qgamepadinput_p.h DEFINES diff --git a/src/logic/CMakeLists.txt b/src/logic/CMakeLists.txt index beae98e84..59edd1693 100644 --- a/src/logic/CMakeLists.txt +++ b/src/logic/CMakeLists.txt @@ -4,7 +4,7 @@ ## 3DLogic Module: ##################################################################### -qt_add_module(3DLogic +qt_internal_add_module(3DLogic SOURCES callbackjob.cpp callbackjob_p.h executor.cpp executor_p.h @@ -38,7 +38,7 @@ qt_add_module(3DLogic ## Scopes: ##################################################################### -qt_extend_target(3DLogic CONDITION gcov +qt_internal_extend_target(3DLogic CONDITION gcov COMPILE_OPTIONS -fprofile-arcs -ftest-coverage diff --git a/src/plugins/renderers/dummy/CMakeLists.txt b/src/plugins/renderers/dummy/CMakeLists.txt index 2e0fea2af..86681e137 100644 --- a/src/plugins/renderers/dummy/CMakeLists.txt +++ b/src/plugins/renderers/dummy/CMakeLists.txt @@ -4,7 +4,7 @@ ## dummy Binary: ##################################################################### -qt_add_executable(dummy +qt_internal_add_executable(dummy GUI PUBLIC_LIBRARIES Qt::Gui diff --git a/src/plugins/renderers/opengl/CMakeLists.txt b/src/plugins/renderers/opengl/CMakeLists.txt index 478f7b9d0..242dfb5bb 100644 --- a/src/plugins/renderers/opengl/CMakeLists.txt +++ b/src/plugins/renderers/opengl/CMakeLists.txt @@ -71,7 +71,7 @@ if(QT_FEATURE_private_tests) QT_NO_FOREACH ) - qt_extend_target(OpenGLRendererLib CONDITION NOT INTEGRITY + qt_internal_extend_target(OpenGLRendererLib CONDITION NOT INTEGRITY SOURCES debug/imguirenderer.cpp debug/imguirenderer_p.h ${PROJECT_SOURCE_DIR}/src/3rdparty/imgui/imgui.cpp @@ -118,7 +118,7 @@ qt_internal_add_plugin(OpenGLRendererPlugin Qt::OpenGLPrivate ) -qt_extend_target(OpenGLRendererPlugin CONDITION NOT INTEGRITY +qt_internal_extend_target(OpenGLRendererPlugin CONDITION NOT INTEGRITY SOURCES debug/imguirenderer.cpp debug/imguirenderer_p.h ${PROJECT_SOURCE_DIR}/src/3rdparty/imgui/imgui.cpp @@ -132,7 +132,7 @@ qt_extend_target(OpenGLRendererPlugin CONDITION NOT INTEGRITY ## Scopes: ##################################################################### -qt_extend_target(OpenGLRendererPlugin CONDITION gcov +qt_internal_extend_target(OpenGLRendererPlugin CONDITION gcov COMPILE_OPTIONS -fprofile-arcs -ftest-coverage diff --git a/src/plugins/renderers/rhi/CMakeLists.txt b/src/plugins/renderers/rhi/CMakeLists.txt index 4ee31a20f..270294ab4 100644 --- a/src/plugins/renderers/rhi/CMakeLists.txt +++ b/src/plugins/renderers/rhi/CMakeLists.txt @@ -98,7 +98,7 @@ qt_internal_add_plugin(RhiRendererPlugin ## Scopes: ##################################################################### -qt_extend_target(RhiRendererPlugin CONDITION gcov +qt_internal_extend_target(RhiRendererPlugin CONDITION gcov COMPILE_OPTIONS -fprofile-arcs -ftest-coverage diff --git a/src/quick3d/imports/animation/CMakeLists.txt b/src/quick3d/imports/animation/CMakeLists.txt index 17de3b0f7..e68005171 100644 --- a/src/quick3d/imports/animation/CMakeLists.txt +++ b/src/quick3d/imports/animation/CMakeLists.txt @@ -4,7 +4,7 @@ ## quick3danimationplugin Plugin: ##################################################################### -qt_add_qml_module(quick3danimationplugin +qt_internal_add_qml_module(quick3danimationplugin URI "Qt3D.Animation" VERSION "2.${CMAKE_PROJECT_VERSION_MINOR}" CLASSNAME Qt3DQuick3DAnimationPlugin diff --git a/src/quick3d/imports/core/CMakeLists.txt b/src/quick3d/imports/core/CMakeLists.txt index 147668e9b..0843a436c 100644 --- a/src/quick3d/imports/core/CMakeLists.txt +++ b/src/quick3d/imports/core/CMakeLists.txt @@ -4,7 +4,7 @@ ## quick3dcoreplugin Plugin: ##################################################################### -qt_add_qml_module(quick3dcoreplugin +qt_internal_add_qml_module(quick3dcoreplugin URI "Qt3D.Core" VERSION "2.${CMAKE_PROJECT_VERSION_MINOR}" CLASSNAME Qt3DQuick3DCorePlugin diff --git a/src/quick3d/imports/extras/CMakeLists.txt b/src/quick3d/imports/extras/CMakeLists.txt index a18244aca..79f849f64 100644 --- a/src/quick3d/imports/extras/CMakeLists.txt +++ b/src/quick3d/imports/extras/CMakeLists.txt @@ -4,7 +4,7 @@ ## quick3dextrasplugin Plugin: ##################################################################### -qt_add_qml_module(quick3dextrasplugin +qt_internal_add_qml_module(quick3dextrasplugin URI "Qt3D.Extras" VERSION "2.${CMAKE_PROJECT_VERSION_MINOR}" CLASSNAME Qt3DQuick3DExtrasPlugin diff --git a/src/quick3d/imports/input/CMakeLists.txt b/src/quick3d/imports/input/CMakeLists.txt index 564667403..257472022 100644 --- a/src/quick3d/imports/input/CMakeLists.txt +++ b/src/quick3d/imports/input/CMakeLists.txt @@ -4,7 +4,7 @@ ## quick3dinputplugin Plugin: ##################################################################### -qt_add_qml_module(quick3dinputplugin +qt_internal_add_qml_module(quick3dinputplugin URI "Qt3D.Input" VERSION "2.${CMAKE_PROJECT_VERSION_MINOR}" CLASSNAME Qt3DQuick3DInputPlugin @@ -31,7 +31,7 @@ qt_add_qml_module(quick3dinputplugin ## Scopes: ##################################################################### -qt_extend_target(quick3dinputplugin CONDITION TARGET Qt::Gamepad +qt_internal_extend_target(quick3dinputplugin CONDITION TARGET Qt::Gamepad DEFINES HAVE_QGAMEPAD ) diff --git a/src/quick3d/imports/logic/CMakeLists.txt b/src/quick3d/imports/logic/CMakeLists.txt index be22f48f1..9cf595ab9 100644 --- a/src/quick3d/imports/logic/CMakeLists.txt +++ b/src/quick3d/imports/logic/CMakeLists.txt @@ -4,7 +4,7 @@ ## quick3dlogicplugin Plugin: ##################################################################### -qt_add_qml_module(quick3dlogicplugin +qt_internal_add_qml_module(quick3dlogicplugin URI "Qt3D.Logic" VERSION "2.${CMAKE_PROJECT_VERSION_MINOR}" CLASSNAME Qt3DQuick3DLogicPlugin diff --git a/src/quick3d/imports/render/CMakeLists.txt b/src/quick3d/imports/render/CMakeLists.txt index 34b688e41..fc9a5ee23 100644 --- a/src/quick3d/imports/render/CMakeLists.txt +++ b/src/quick3d/imports/render/CMakeLists.txt @@ -4,7 +4,7 @@ ## quick3drenderplugin: ##################################################################### -qt_add_qml_module(quick3drenderplugin +qt_internal_add_qml_module(quick3drenderplugin URI "Qt3D.Render" VERSION "2.${CMAKE_PROJECT_VERSION_MINOR}" CLASSNAME Qt3DQuick3DRenderPlugin diff --git a/src/quick3d/imports/scene2d/CMakeLists.txt b/src/quick3d/imports/scene2d/CMakeLists.txt index 3e6731c0f..e5fa0682e 100644 --- a/src/quick3d/imports/scene2d/CMakeLists.txt +++ b/src/quick3d/imports/scene2d/CMakeLists.txt @@ -4,7 +4,7 @@ ## qtquickscene2dplugin Plugin: ##################################################################### -qt_add_qml_module(qtquickscene2dplugin +qt_internal_add_qml_module(qtquickscene2dplugin URI "QtQuick.Scene2D" VERSION "2.${CMAKE_PROJECT_VERSION_MINOR}" CLASSNAME QtQuickScene2DPlugin diff --git a/src/quick3d/imports/scene3d/CMakeLists.txt b/src/quick3d/imports/scene3d/CMakeLists.txt index 0c31d662c..e6297dec8 100644 --- a/src/quick3d/imports/scene3d/CMakeLists.txt +++ b/src/quick3d/imports/scene3d/CMakeLists.txt @@ -4,7 +4,7 @@ ## qtquickscene3dplugin Plugin: ##################################################################### -qt_add_qml_module(qtquickscene3dplugin +qt_internal_add_qml_module(qtquickscene3dplugin URI "QtQuick.Scene3D" VERSION "2.${CMAKE_PROJECT_VERSION_MINOR}" CLASSNAME QtQuickScene3DPlugin @@ -37,17 +37,17 @@ qt_add_qml_module(qtquickscene3dplugin ## Scopes: ##################################################################### -qt_extend_target(qtquickscene3dplugin CONDITION QT_FEATURE_qt3d_input +qt_internal_extend_target(qtquickscene3dplugin CONDITION QT_FEATURE_qt3d_input PUBLIC_LIBRARIES Qt::3DInput ) -qt_extend_target(qtquickscene3dplugin CONDITION QT_FEATURE_qt3d_logic +qt_internal_extend_target(qtquickscene3dplugin CONDITION QT_FEATURE_qt3d_logic PUBLIC_LIBRARIES Qt::3DLogic ) -qt_extend_target(qtquickscene3dplugin CONDITION QT_FEATURE_qt3d_animation +qt_internal_extend_target(qtquickscene3dplugin CONDITION QT_FEATURE_qt3d_animation PUBLIC_LIBRARIES Qt::3DAnimation ) @@ -58,7 +58,7 @@ set(shader_resource_files "shaders/scene3dmaterial.frag.qsb" ) -qt_add_resource(qtquickscene3dplugin "scene3d" +qt_internal_add_resource(qtquickscene3dplugin "scene3d" PREFIX "/" FILES diff --git a/src/quick3d/quick3d/CMakeLists.txt b/src/quick3d/quick3d/CMakeLists.txt index a8dc96233..ccb9271fd 100644 --- a/src/quick3d/quick3d/CMakeLists.txt +++ b/src/quick3d/quick3d/CMakeLists.txt @@ -4,7 +4,7 @@ ## Qt::3DQuick Module: ##################################################################### -qt_add_module(3DQuick +qt_internal_add_module(3DQuick SOURCES items/quick3dbuffer.cpp items/quick3dbuffer_p.h items/quick3dentity.cpp items/quick3dentity_p.h @@ -46,7 +46,7 @@ qt_add_module(3DQuick ## Scopes: ##################################################################### -qt_extend_target(3DQuick CONDITION gcov +qt_internal_extend_target(3DQuick CONDITION gcov COMPILE_OPTIONS -fprofile-arcs -ftest-coverage diff --git a/src/quick3d/quick3danimation/CMakeLists.txt b/src/quick3d/quick3danimation/CMakeLists.txt index ee8d41e99..3f17462fc 100644 --- a/src/quick3d/quick3danimation/CMakeLists.txt +++ b/src/quick3d/quick3danimation/CMakeLists.txt @@ -4,7 +4,7 @@ ## Qt::3DQuickAnimation Module: ##################################################################### -qt_add_module(3DQuickAnimation +qt_internal_add_module(3DQuickAnimation SOURCES items/quick3danimationcontroller.cpp items/quick3danimationcontroller_p.h items/quick3danimationgroup.cpp items/quick3danimationgroup_p.h @@ -42,7 +42,7 @@ qt_add_module(3DQuickAnimation ## Scopes: ##################################################################### -qt_extend_target(3DQuickAnimation CONDITION gcov +qt_internal_extend_target(3DQuickAnimation CONDITION gcov COMPILE_OPTIONS -fprofile-arcs -ftest-coverage diff --git a/src/quick3d/quick3dextras/CMakeLists.txt b/src/quick3d/quick3dextras/CMakeLists.txt index 475878ccc..0312127dc 100644 --- a/src/quick3d/quick3dextras/CMakeLists.txt +++ b/src/quick3d/quick3dextras/CMakeLists.txt @@ -4,7 +4,7 @@ ## Qt::3DQuickExtras Module: ##################################################################### -qt_add_module(3DQuickExtras +qt_internal_add_module(3DQuickExtras SOURCES items/quick3dlevelofdetailloader.cpp items/quick3dlevelofdetailloader_p.h items/quick3dlevelofdetailloader_p_p.h @@ -42,7 +42,7 @@ qt_add_module(3DQuickExtras ## Scopes: ##################################################################### -qt_extend_target(3DQuickExtras CONDITION gcov +qt_internal_extend_target(3DQuickExtras CONDITION gcov COMPILE_OPTIONS -fprofile-arcs -ftest-coverage diff --git a/src/quick3d/quick3dinput/CMakeLists.txt b/src/quick3d/quick3dinput/CMakeLists.txt index 6537b80b7..2c03d2409 100644 --- a/src/quick3d/quick3dinput/CMakeLists.txt +++ b/src/quick3d/quick3dinput/CMakeLists.txt @@ -4,7 +4,7 @@ ## Qt::3DQuickInput Module: ##################################################################### -qt_add_module(3DQuickInput +qt_internal_add_module(3DQuickInput SOURCES items/quick3daction.cpp items/quick3daction_p.h items/quick3daxis.cpp items/quick3daxis_p.h @@ -40,7 +40,7 @@ qt_add_module(3DQuickInput ## Scopes: ##################################################################### -qt_extend_target(3DQuickInput CONDITION gcov +qt_internal_extend_target(3DQuickInput CONDITION gcov COMPILE_OPTIONS -fprofile-arcs -ftest-coverage diff --git a/src/quick3d/quick3drender/CMakeLists.txt b/src/quick3d/quick3drender/CMakeLists.txt index f38f282cc..5c8685fad 100644 --- a/src/quick3d/quick3drender/CMakeLists.txt +++ b/src/quick3d/quick3drender/CMakeLists.txt @@ -4,7 +4,7 @@ ## Qt::3DQuickRender Module: ##################################################################### -qt_add_module(3DQuickRender +qt_internal_add_module(3DQuickRender SOURCES items/quick3deffect.cpp items/quick3deffect_p.h items/quick3dlayerfilter.cpp items/quick3dlayerfilter_p.h @@ -55,7 +55,7 @@ qt_add_module(3DQuickRender ## Scopes: ##################################################################### -qt_extend_target(3DQuickRender CONDITION gcov +qt_internal_extend_target(3DQuickRender CONDITION gcov COMPILE_OPTIONS -fprofile-arcs -ftest-coverage diff --git a/src/quick3d/quick3dscene2d/CMakeLists.txt b/src/quick3d/quick3dscene2d/CMakeLists.txt index 978824897..42046a7e7 100644 --- a/src/quick3d/quick3dscene2d/CMakeLists.txt +++ b/src/quick3d/quick3dscene2d/CMakeLists.txt @@ -4,7 +4,7 @@ ## Qt::3DQuickScene2D Module: ##################################################################### -qt_add_module(3DQuickScene2D +qt_internal_add_module(3DQuickScene2D SOURCES items/qscene2d.cpp items/qscene2d.h items/qscene2d_p.h items/qt3dquick3dscene2d.cpp items/qt3dquick3dscene2d_p.h @@ -41,7 +41,7 @@ qt_add_module(3DQuickScene2D ## Scopes: ##################################################################### -qt_extend_target(3DQuickScene2D CONDITION gcov +qt_internal_extend_target(3DQuickScene2D CONDITION gcov COMPILE_OPTIONS -fprofile-arcs -ftest-coverage diff --git a/src/render/CMakeLists.txt b/src/render/CMakeLists.txt index 5380659cc..56a63ecd4 100644 --- a/src/render/CMakeLists.txt +++ b/src/render/CMakeLists.txt @@ -4,7 +4,7 @@ ## 3drender Module: ##################################################################### -qt_add_module(3DRender +qt_internal_add_module(3DRender PLUGIN_TYPES sceneparsers geometryloaders renderplugins renderers SOURCES backend/abstractrenderer_p.h @@ -314,7 +314,7 @@ set(materialsystem_resource_files "prototypes/default.json" ) -qt_add_resource(3DRender "materialsystem" +qt_internal_add_resource(3DRender "materialsystem" PREFIX "/" BASE @@ -341,7 +341,7 @@ if(NOT TARGET Threads::Threads) endif() # special case end -qt_extend_target(3DRender CONDITION gcov +qt_internal_extend_target(3DRender CONDITION gcov COMPILE_OPTIONS -fprofile-arcs -ftest-coverage @@ -350,7 +350,7 @@ qt_extend_target(3DRender CONDITION gcov "-ftest-coverage" ) -qt_extend_target(3DRender CONDITION QT_FEATURE_vulkan +qt_internal_extend_target(3DRender CONDITION QT_FEATURE_vulkan SOURCES surfaces/vulkaninstance.cpp surfaces/vulkaninstance_p.h ) diff --git a/tests/auto/animation/additiveclipblend/CMakeLists.txt b/tests/auto/animation/additiveclipblend/CMakeLists.txt index 216cffdb3..628c8e766 100644 --- a/tests/auto/animation/additiveclipblend/CMakeLists.txt +++ b/tests/auto/animation/additiveclipblend/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_additiveclipblend Test: ##################################################################### -qt_add_test(tst_additiveclipblend +qt_internal_add_test(tst_additiveclipblend SOURCES tst_additiveclipblend.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/animation/animationclip/CMakeLists.txt b/tests/auto/animation/animationclip/CMakeLists.txt index 9bdcf0cd5..e772f7ca1 100644 --- a/tests/auto/animation/animationclip/CMakeLists.txt +++ b/tests/auto/animation/animationclip/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_animationclip Test: ##################################################################### -qt_add_test(tst_animationclip +qt_internal_add_test(tst_animationclip SOURCES tst_animationclip.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/animation/animationutils/CMakeLists.txt b/tests/auto/animation/animationutils/CMakeLists.txt index 278b90dcf..0c0cc3b7d 100644 --- a/tests/auto/animation/animationutils/CMakeLists.txt +++ b/tests/auto/animation/animationutils/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_animationutils Test: ##################################################################### -qt_add_test(tst_animationutils +qt_internal_add_test(tst_animationutils SOURCES tst_animationutils.cpp PUBLIC_LIBRARIES @@ -26,7 +26,7 @@ set(animationutils_resource_files "clip6.json" ) -qt_add_resource(tst_animationutils "animationutils" +qt_internal_add_resource(tst_animationutils "animationutils" PREFIX "/" FILES diff --git a/tests/auto/animation/bezierevaluator/CMakeLists.txt b/tests/auto/animation/bezierevaluator/CMakeLists.txt index a979cb95d..6495ff135 100644 --- a/tests/auto/animation/bezierevaluator/CMakeLists.txt +++ b/tests/auto/animation/bezierevaluator/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bezierevaluator Test: ##################################################################### -qt_add_test(tst_bezierevaluator +qt_internal_add_test(tst_bezierevaluator SOURCES tst_bezierevaluator.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/animation/blendedclipanimator/CMakeLists.txt b/tests/auto/animation/blendedclipanimator/CMakeLists.txt index 510cf7ea6..c1c75c80d 100644 --- a/tests/auto/animation/blendedclipanimator/CMakeLists.txt +++ b/tests/auto/animation/blendedclipanimator/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_blendedclipanimator Test: ##################################################################### -qt_add_test(tst_blendedclipanimator +qt_internal_add_test(tst_blendedclipanimator SOURCES tst_blendedclipanimator.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/animation/channelmapper/CMakeLists.txt b/tests/auto/animation/channelmapper/CMakeLists.txt index fb37a7bab..393c0549f 100644 --- a/tests/auto/animation/channelmapper/CMakeLists.txt +++ b/tests/auto/animation/channelmapper/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_channelmapper Test: ##################################################################### -qt_add_test(tst_channelmapper +qt_internal_add_test(tst_channelmapper SOURCES tst_channelmapper.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/animation/channelmapping/CMakeLists.txt b/tests/auto/animation/channelmapping/CMakeLists.txt index 06675af06..ccb165da2 100644 --- a/tests/auto/animation/channelmapping/CMakeLists.txt +++ b/tests/auto/animation/channelmapping/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_channelmapping Test: ##################################################################### -qt_add_test(tst_channelmapping +qt_internal_add_test(tst_channelmapping SOURCES tst_channelmapping.cpp INCLUDE_DIRECTORIES diff --git a/tests/auto/animation/clipanimator/CMakeLists.txt b/tests/auto/animation/clipanimator/CMakeLists.txt index 4c7d9c2c8..068b5915e 100644 --- a/tests/auto/animation/clipanimator/CMakeLists.txt +++ b/tests/auto/animation/clipanimator/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_clipanimator Test: ##################################################################### -qt_add_test(tst_clipanimator +qt_internal_add_test(tst_clipanimator SOURCES tst_clipanimator.cpp INCLUDE_DIRECTORIES @@ -24,7 +24,7 @@ qt_add_test(tst_clipanimator ## Scopes: ##################################################################### -qt_extend_target(tst_clipanimator CONDITION QT_FEATURE_private_tests +qt_internal_extend_target(tst_clipanimator CONDITION QT_FEATURE_private_tests SOURCES ../../core/common/qbackendnodetester.cpp ../../core/common/qbackendnodetester.h ../../core/common/testarbiter.h diff --git a/tests/auto/animation/clipblendnode/CMakeLists.txt b/tests/auto/animation/clipblendnode/CMakeLists.txt index 394a6e484..9dd5c596e 100644 --- a/tests/auto/animation/clipblendnode/CMakeLists.txt +++ b/tests/auto/animation/clipblendnode/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_clipblendnode Test: ##################################################################### -qt_add_test(tst_clipblendnode +qt_internal_add_test(tst_clipblendnode SOURCES tst_clipblendnode.cpp INCLUDE_DIRECTORIES @@ -24,7 +24,7 @@ qt_add_test(tst_clipblendnode ## Scopes: ##################################################################### -qt_extend_target(tst_clipblendnode CONDITION QT_FEATURE_private_tests +qt_internal_extend_target(tst_clipblendnode CONDITION QT_FEATURE_private_tests SOURCES ../../core/common/qbackendnodetester.cpp ../../core/common/qbackendnodetester.h ../../core/common/testarbiter.h diff --git a/tests/auto/animation/clipblendnodemanager/CMakeLists.txt b/tests/auto/animation/clipblendnodemanager/CMakeLists.txt index 0647e66ff..0e5cecb52 100644 --- a/tests/auto/animation/clipblendnodemanager/CMakeLists.txt +++ b/tests/auto/animation/clipblendnodemanager/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_clipblendnodemanager Test: ##################################################################### -qt_add_test(tst_clipblendnodemanager +qt_internal_add_test(tst_clipblendnodemanager SOURCES tst_clipblendnodemanager.cpp INCLUDE_DIRECTORIES @@ -24,7 +24,7 @@ qt_add_test(tst_clipblendnodemanager ## Scopes: ##################################################################### -qt_extend_target(tst_clipblendnodemanager CONDITION QT_FEATURE_private_tests +qt_internal_extend_target(tst_clipblendnodemanager CONDITION QT_FEATURE_private_tests SOURCES ../../core/common/qbackendnodetester.cpp ../../core/common/qbackendnodetester.h ../../core/common/testarbiter.h diff --git a/tests/auto/animation/clipblendnodevisitor/CMakeLists.txt b/tests/auto/animation/clipblendnodevisitor/CMakeLists.txt index 8c8d73c48..b232e07c8 100644 --- a/tests/auto/animation/clipblendnodevisitor/CMakeLists.txt +++ b/tests/auto/animation/clipblendnodevisitor/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_clipblendnodevisitor Test: ##################################################################### -qt_add_test(tst_clipblendnodevisitor +qt_internal_add_test(tst_clipblendnodevisitor SOURCES tst_clipblendnodevisitor.cpp INCLUDE_DIRECTORIES @@ -24,7 +24,7 @@ qt_add_test(tst_clipblendnodevisitor ## Scopes: ##################################################################### -qt_extend_target(tst_clipblendnodevisitor CONDITION QT_FEATURE_private_tests +qt_internal_extend_target(tst_clipblendnodevisitor CONDITION QT_FEATURE_private_tests SOURCES ../../core/common/qbackendnodetester.cpp ../../core/common/qbackendnodetester.h ../../core/common/testarbiter.h diff --git a/tests/auto/animation/clipblendvalue/CMakeLists.txt b/tests/auto/animation/clipblendvalue/CMakeLists.txt index 99f6afd34..629d32b74 100644 --- a/tests/auto/animation/clipblendvalue/CMakeLists.txt +++ b/tests/auto/animation/clipblendvalue/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_clipblendvalue Test: ##################################################################### -qt_add_test(tst_clipblendvalue +qt_internal_add_test(tst_clipblendvalue SOURCES tst_clipblendvalue.cpp INCLUDE_DIRECTORIES @@ -24,7 +24,7 @@ qt_add_test(tst_clipblendvalue ## Scopes: ##################################################################### -qt_extend_target(tst_clipblendvalue CONDITION QT_FEATURE_private_tests +qt_internal_extend_target(tst_clipblendvalue CONDITION QT_FEATURE_private_tests SOURCES ../../core/common/qbackendnodetester.cpp ../../core/common/qbackendnodetester.h ../../core/common/testarbiter.h diff --git a/tests/auto/animation/clock/CMakeLists.txt b/tests/auto/animation/clock/CMakeLists.txt index ca457c32e..18a0b6519 100644 --- a/tests/auto/animation/clock/CMakeLists.txt +++ b/tests/auto/animation/clock/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_clock Test: ##################################################################### -qt_add_test(tst_clock +qt_internal_add_test(tst_clock SOURCES tst_clock.cpp INCLUDE_DIRECTORIES @@ -24,7 +24,7 @@ qt_add_test(tst_clock ## Scopes: ##################################################################### -qt_extend_target(tst_clock CONDITION QT_FEATURE_private_tests +qt_internal_extend_target(tst_clock CONDITION QT_FEATURE_private_tests SOURCES ../../core/common/qbackendnodetester.cpp ../../core/common/qbackendnodetester.h ../../core/common/testarbiter.h diff --git a/tests/auto/animation/fcurve/CMakeLists.txt b/tests/auto/animation/fcurve/CMakeLists.txt index 2c33937d1..63662e11a 100644 --- a/tests/auto/animation/fcurve/CMakeLists.txt +++ b/tests/auto/animation/fcurve/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_fcurve Test: ##################################################################### -qt_add_test(tst_fcurve +qt_internal_add_test(tst_fcurve SOURCES tst_fcurve.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/animation/findrunningclipanimatorsjob/CMakeLists.txt b/tests/auto/animation/findrunningclipanimatorsjob/CMakeLists.txt index eeaafae0e..17d52ceaf 100644 --- a/tests/auto/animation/findrunningclipanimatorsjob/CMakeLists.txt +++ b/tests/auto/animation/findrunningclipanimatorsjob/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_findrunningclipanimatorsjob Test: ##################################################################### -qt_add_test(tst_findrunningclipanimatorsjob +qt_internal_add_test(tst_findrunningclipanimatorsjob SOURCES tst_findrunningclipanimatorsjob.cpp INCLUDE_DIRECTORIES @@ -23,7 +23,7 @@ set(findrunningclipanimatorsjob_resource_files "clip1.json" ) -qt_add_resource(tst_findrunningclipanimatorsjob "findrunningclipanimatorsjob" +qt_internal_add_resource(tst_findrunningclipanimatorsjob "findrunningclipanimatorsjob" PREFIX "/" FILES @@ -37,7 +37,7 @@ qt_add_resource(tst_findrunningclipanimatorsjob "findrunningclipanimatorsjob" ## Scopes: ##################################################################### -qt_extend_target(tst_findrunningclipanimatorsjob CONDITION QT_FEATURE_private_tests +qt_internal_extend_target(tst_findrunningclipanimatorsjob CONDITION QT_FEATURE_private_tests SOURCES ../../core/common/qbackendnodetester.cpp ../../core/common/qbackendnodetester.h ../../core/common/testarbiter.h diff --git a/tests/auto/animation/functionrangefinder/CMakeLists.txt b/tests/auto/animation/functionrangefinder/CMakeLists.txt index 9e035f0df..96f61709c 100644 --- a/tests/auto/animation/functionrangefinder/CMakeLists.txt +++ b/tests/auto/animation/functionrangefinder/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_sandwichfinder Test: ##################################################################### -qt_add_test(tst_sandwichfinder +qt_internal_add_test(tst_sandwichfinder SOURCES tst_functionrangefinder.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/animation/lerpclipblend/CMakeLists.txt b/tests/auto/animation/lerpclipblend/CMakeLists.txt index 430bcd202..5f443e09c 100644 --- a/tests/auto/animation/lerpclipblend/CMakeLists.txt +++ b/tests/auto/animation/lerpclipblend/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_lerpclipblend Test: ##################################################################### -qt_add_test(tst_lerpclipblend +qt_internal_add_test(tst_lerpclipblend SOURCES tst_lerpclipblend.cpp INCLUDE_DIRECTORIES @@ -24,7 +24,7 @@ qt_add_test(tst_lerpclipblend ## Scopes: ##################################################################### -qt_extend_target(tst_lerpclipblend CONDITION QT_FEATURE_private_tests +qt_internal_extend_target(tst_lerpclipblend CONDITION QT_FEATURE_private_tests SOURCES ../../core/common/qbackendnodetester.cpp ../../core/common/qbackendnodetester.h ../../core/common/testarbiter.h diff --git a/tests/auto/animation/qabstractanimation/CMakeLists.txt b/tests/auto/animation/qabstractanimation/CMakeLists.txt index 7e6a4b847..032c74f5d 100644 --- a/tests/auto/animation/qabstractanimation/CMakeLists.txt +++ b/tests/auto/animation/qabstractanimation/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qabstractanimation Test: ##################################################################### -qt_add_test(tst_qabstractanimation +qt_internal_add_test(tst_qabstractanimation SOURCES tst_qabstractanimation.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/animation/qadditiveclipblend/CMakeLists.txt b/tests/auto/animation/qadditiveclipblend/CMakeLists.txt index 1d220c566..507ea1136 100644 --- a/tests/auto/animation/qadditiveclipblend/CMakeLists.txt +++ b/tests/auto/animation/qadditiveclipblend/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qadditiveclipblend Test: ##################################################################### -qt_add_test(tst_qadditiveclipblend +qt_internal_add_test(tst_qadditiveclipblend SOURCES tst_qadditiveclipblend.cpp INCLUDE_DIRECTORIES @@ -24,7 +24,7 @@ qt_add_test(tst_qadditiveclipblend ## Scopes: ##################################################################### -qt_extend_target(tst_qadditiveclipblend CONDITION QT_FEATURE_private_tests +qt_internal_extend_target(tst_qadditiveclipblend CONDITION QT_FEATURE_private_tests SOURCES ../../core/common/qbackendnodetester.cpp ../../core/common/qbackendnodetester.h ../../core/common/testarbiter.h diff --git a/tests/auto/animation/qanimationaspect/CMakeLists.txt b/tests/auto/animation/qanimationaspect/CMakeLists.txt index 2b87cf024..7dd227186 100644 --- a/tests/auto/animation/qanimationaspect/CMakeLists.txt +++ b/tests/auto/animation/qanimationaspect/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qanimationaspect Test: ##################################################################### -qt_add_test(tst_qanimationaspect +qt_internal_add_test(tst_qanimationaspect SOURCES tst_qanimationaspect.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/animation/qanimationcliploader/CMakeLists.txt b/tests/auto/animation/qanimationcliploader/CMakeLists.txt index 8306868dd..d0cac1ef6 100644 --- a/tests/auto/animation/qanimationcliploader/CMakeLists.txt +++ b/tests/auto/animation/qanimationcliploader/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qanimationclip Test: ##################################################################### -qt_add_test(tst_qanimationclip +qt_internal_add_test(tst_qanimationclip SOURCES tst_qanimationcliploader.cpp INCLUDE_DIRECTORIES @@ -24,7 +24,7 @@ qt_add_test(tst_qanimationclip ## Scopes: ##################################################################### -qt_extend_target(tst_qanimationclip CONDITION QT_FEATURE_private_tests +qt_internal_extend_target(tst_qanimationclip CONDITION QT_FEATURE_private_tests SOURCES ../../core/common/qbackendnodetester.cpp ../../core/common/qbackendnodetester.h ../../core/common/testarbiter.h diff --git a/tests/auto/animation/qanimationcontroller/CMakeLists.txt b/tests/auto/animation/qanimationcontroller/CMakeLists.txt index ca1af7566..09c0001c9 100644 --- a/tests/auto/animation/qanimationcontroller/CMakeLists.txt +++ b/tests/auto/animation/qanimationcontroller/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qanimationcontroller Test: ##################################################################### -qt_add_test(tst_qanimationcontroller +qt_internal_add_test(tst_qanimationcontroller SOURCES tst_qanimationcontroller.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/animation/qanimationgroup/CMakeLists.txt b/tests/auto/animation/qanimationgroup/CMakeLists.txt index 5e2bc7483..217e35787 100644 --- a/tests/auto/animation/qanimationgroup/CMakeLists.txt +++ b/tests/auto/animation/qanimationgroup/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qanimationgroup Test: ##################################################################### -qt_add_test(tst_qanimationgroup +qt_internal_add_test(tst_qanimationgroup SOURCES tst_qanimationgroup.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/animation/qblendedclipanimator/CMakeLists.txt b/tests/auto/animation/qblendedclipanimator/CMakeLists.txt index 736123702..cdf98f37a 100644 --- a/tests/auto/animation/qblendedclipanimator/CMakeLists.txt +++ b/tests/auto/animation/qblendedclipanimator/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qblendedclipanimator Test: ##################################################################### -qt_add_test(tst_qblendedclipanimator +qt_internal_add_test(tst_qblendedclipanimator SOURCES tst_qblendedclipanimator.cpp INCLUDE_DIRECTORIES @@ -24,7 +24,7 @@ qt_add_test(tst_qblendedclipanimator ## Scopes: ##################################################################### -qt_extend_target(tst_qblendedclipanimator CONDITION QT_FEATURE_private_tests +qt_internal_extend_target(tst_qblendedclipanimator CONDITION QT_FEATURE_private_tests SOURCES ../../core/common/qbackendnodetester.cpp ../../core/common/qbackendnodetester.h ../../core/common/testarbiter.h diff --git a/tests/auto/animation/qcallbackmapping/CMakeLists.txt b/tests/auto/animation/qcallbackmapping/CMakeLists.txt index db02dc866..f6e37aa5d 100644 --- a/tests/auto/animation/qcallbackmapping/CMakeLists.txt +++ b/tests/auto/animation/qcallbackmapping/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qcallbackmapping Test: ##################################################################### -qt_add_test(tst_qcallbackmapping +qt_internal_add_test(tst_qcallbackmapping SOURCES tst_qcallbackmapping.cpp INCLUDE_DIRECTORIES @@ -24,7 +24,7 @@ qt_add_test(tst_qcallbackmapping ## Scopes: ##################################################################### -qt_extend_target(tst_qcallbackmapping CONDITION QT_FEATURE_private_tests +qt_internal_extend_target(tst_qcallbackmapping CONDITION QT_FEATURE_private_tests SOURCES ../../core/common/qbackendnodetester.cpp ../../core/common/qbackendnodetester.h ../../core/common/testarbiter.h diff --git a/tests/auto/animation/qchannelmapper/CMakeLists.txt b/tests/auto/animation/qchannelmapper/CMakeLists.txt index 222b2d0b0..e9f33cc14 100644 --- a/tests/auto/animation/qchannelmapper/CMakeLists.txt +++ b/tests/auto/animation/qchannelmapper/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qchannelmapper Test: ##################################################################### -qt_add_test(tst_qchannelmapper +qt_internal_add_test(tst_qchannelmapper SOURCES tst_qchannelmapper.cpp INCLUDE_DIRECTORIES @@ -24,7 +24,7 @@ qt_add_test(tst_qchannelmapper ## Scopes: ##################################################################### -qt_extend_target(tst_qchannelmapper CONDITION QT_FEATURE_private_tests +qt_internal_extend_target(tst_qchannelmapper CONDITION QT_FEATURE_private_tests SOURCES ../../core/common/qbackendnodetester.cpp ../../core/common/qbackendnodetester.h ../../core/common/testarbiter.h diff --git a/tests/auto/animation/qchannelmapping/CMakeLists.txt b/tests/auto/animation/qchannelmapping/CMakeLists.txt index cb0293056..7a7a5f509 100644 --- a/tests/auto/animation/qchannelmapping/CMakeLists.txt +++ b/tests/auto/animation/qchannelmapping/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qchannelmapping Test: ##################################################################### -qt_add_test(tst_qchannelmapping +qt_internal_add_test(tst_qchannelmapping SOURCES tst_qchannelmapping.cpp INCLUDE_DIRECTORIES @@ -24,7 +24,7 @@ qt_add_test(tst_qchannelmapping ## Scopes: ##################################################################### -qt_extend_target(tst_qchannelmapping CONDITION QT_FEATURE_private_tests +qt_internal_extend_target(tst_qchannelmapping CONDITION QT_FEATURE_private_tests SOURCES ../../core/common/qbackendnodetester.cpp ../../core/common/qbackendnodetester.h ../../core/common/testarbiter.h diff --git a/tests/auto/animation/qclipanimator/CMakeLists.txt b/tests/auto/animation/qclipanimator/CMakeLists.txt index 14f28f47b..3e5e3977b 100644 --- a/tests/auto/animation/qclipanimator/CMakeLists.txt +++ b/tests/auto/animation/qclipanimator/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qclipanimator Test: ##################################################################### -qt_add_test(tst_qclipanimator +qt_internal_add_test(tst_qclipanimator SOURCES tst_qclipanimator.cpp INCLUDE_DIRECTORIES @@ -24,7 +24,7 @@ qt_add_test(tst_qclipanimator ## Scopes: ##################################################################### -qt_extend_target(tst_qclipanimator CONDITION QT_FEATURE_private_tests +qt_internal_extend_target(tst_qclipanimator CONDITION QT_FEATURE_private_tests SOURCES ../../core/common/qbackendnodetester.cpp ../../core/common/qbackendnodetester.h ../../core/common/testarbiter.h diff --git a/tests/auto/animation/qclipblendvalue/CMakeLists.txt b/tests/auto/animation/qclipblendvalue/CMakeLists.txt index 299d83324..8dd098ff9 100644 --- a/tests/auto/animation/qclipblendvalue/CMakeLists.txt +++ b/tests/auto/animation/qclipblendvalue/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qclipblendvalue Test: ##################################################################### -qt_add_test(tst_qclipblendvalue +qt_internal_add_test(tst_qclipblendvalue SOURCES tst_qclipblendvalue.cpp INCLUDE_DIRECTORIES @@ -24,7 +24,7 @@ qt_add_test(tst_qclipblendvalue ## Scopes: ##################################################################### -qt_extend_target(tst_qclipblendvalue CONDITION QT_FEATURE_private_tests +qt_internal_extend_target(tst_qclipblendvalue CONDITION QT_FEATURE_private_tests SOURCES ../../core/common/qbackendnodetester.cpp ../../core/common/qbackendnodetester.h ../../core/common/testarbiter.h diff --git a/tests/auto/animation/qclock/CMakeLists.txt b/tests/auto/animation/qclock/CMakeLists.txt index 1ed4bcf2f..896cb98c6 100644 --- a/tests/auto/animation/qclock/CMakeLists.txt +++ b/tests/auto/animation/qclock/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qclock Test: ##################################################################### -qt_add_test(tst_qclock +qt_internal_add_test(tst_qclock SOURCES tst_qclock.cpp INCLUDE_DIRECTORIES @@ -24,7 +24,7 @@ qt_add_test(tst_qclock ## Scopes: ##################################################################### -qt_extend_target(tst_qclock CONDITION QT_FEATURE_private_tests +qt_internal_extend_target(tst_qclock CONDITION QT_FEATURE_private_tests SOURCES ../../core/common/qbackendnodetester.cpp ../../core/common/qbackendnodetester.h ../../core/common/testarbiter.h diff --git a/tests/auto/animation/qkeyframeanimation/CMakeLists.txt b/tests/auto/animation/qkeyframeanimation/CMakeLists.txt index a4a39b749..b013fdb3a 100644 --- a/tests/auto/animation/qkeyframeanimation/CMakeLists.txt +++ b/tests/auto/animation/qkeyframeanimation/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qkeyframeanimation Test: ##################################################################### -qt_add_test(tst_qkeyframeanimation +qt_internal_add_test(tst_qkeyframeanimation SOURCES tst_qkeyframeanimation.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/animation/qlerpclipblend/CMakeLists.txt b/tests/auto/animation/qlerpclipblend/CMakeLists.txt index 1fc5a0585..33712ed53 100644 --- a/tests/auto/animation/qlerpclipblend/CMakeLists.txt +++ b/tests/auto/animation/qlerpclipblend/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qlerpclipblend Test: ##################################################################### -qt_add_test(tst_qlerpclipblend +qt_internal_add_test(tst_qlerpclipblend SOURCES tst_qlerpclipblend.cpp INCLUDE_DIRECTORIES @@ -24,7 +24,7 @@ qt_add_test(tst_qlerpclipblend ## Scopes: ##################################################################### -qt_extend_target(tst_qlerpclipblend CONDITION QT_FEATURE_private_tests +qt_internal_extend_target(tst_qlerpclipblend CONDITION QT_FEATURE_private_tests SOURCES ../../core/common/qbackendnodetester.cpp ../../core/common/qbackendnodetester.h ../../core/common/testarbiter.h diff --git a/tests/auto/animation/qmorphinganimation/CMakeLists.txt b/tests/auto/animation/qmorphinganimation/CMakeLists.txt index a970bf6fa..f34594b0d 100644 --- a/tests/auto/animation/qmorphinganimation/CMakeLists.txt +++ b/tests/auto/animation/qmorphinganimation/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qmorphinganimation Test: ##################################################################### -qt_add_test(tst_qmorphinganimation +qt_internal_add_test(tst_qmorphinganimation SOURCES tst_qmorphinganimation.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/animation/qmorphtarget/CMakeLists.txt b/tests/auto/animation/qmorphtarget/CMakeLists.txt index 5881d620b..21afa66f8 100644 --- a/tests/auto/animation/qmorphtarget/CMakeLists.txt +++ b/tests/auto/animation/qmorphtarget/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qmorphtarget Test: ##################################################################### -qt_add_test(tst_qmorphtarget +qt_internal_add_test(tst_qmorphtarget SOURCES tst_qmorphtarget.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/animation/qskeletonmapping/CMakeLists.txt b/tests/auto/animation/qskeletonmapping/CMakeLists.txt index 63f76972e..082fe0dc2 100644 --- a/tests/auto/animation/qskeletonmapping/CMakeLists.txt +++ b/tests/auto/animation/qskeletonmapping/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qskeletonmapping Test: ##################################################################### -qt_add_test(tst_qskeletonmapping +qt_internal_add_test(tst_qskeletonmapping SOURCES tst_qskeletonmapping.cpp INCLUDE_DIRECTORIES @@ -24,7 +24,7 @@ qt_add_test(tst_qskeletonmapping ## Scopes: ##################################################################### -qt_extend_target(tst_qskeletonmapping CONDITION QT_FEATURE_private_tests +qt_internal_extend_target(tst_qskeletonmapping CONDITION QT_FEATURE_private_tests SOURCES ../../core/common/qbackendnodetester.cpp ../../core/common/qbackendnodetester.h ../../core/common/testarbiter.h diff --git a/tests/auto/animation/qvertexblendanimation/CMakeLists.txt b/tests/auto/animation/qvertexblendanimation/CMakeLists.txt index f716d4ed4..b78f6cd84 100644 --- a/tests/auto/animation/qvertexblendanimation/CMakeLists.txt +++ b/tests/auto/animation/qvertexblendanimation/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qvertexblendanimation Test: ##################################################################### -qt_add_test(tst_qvertexblendanimation +qt_internal_add_test(tst_qvertexblendanimation SOURCES tst_qvertexblendanimation.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/animation/skeleton/CMakeLists.txt b/tests/auto/animation/skeleton/CMakeLists.txt index 37bf11619..5788a0e45 100644 --- a/tests/auto/animation/skeleton/CMakeLists.txt +++ b/tests/auto/animation/skeleton/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_skeleton Test: ##################################################################### -qt_add_test(tst_skeleton_anim +qt_internal_add_test(tst_skeleton_anim SOURCES tst_skeleton.cpp INCLUDE_DIRECTORIES @@ -24,7 +24,7 @@ qt_add_test(tst_skeleton_anim ## Scopes: ##################################################################### -qt_extend_target(tst_skeleton_anim CONDITION QT_FEATURE_private_tests +qt_internal_extend_target(tst_skeleton_anim CONDITION QT_FEATURE_private_tests SOURCES ../../core/common/qbackendnodetester.cpp ../../core/common/qbackendnodetester.h ../../core/common/testarbiter.h diff --git a/tests/auto/core/aspectcommanddebugger/CMakeLists.txt b/tests/auto/core/aspectcommanddebugger/CMakeLists.txt index 08ad70bf7..7497ca342 100644 --- a/tests/auto/core/aspectcommanddebugger/CMakeLists.txt +++ b/tests/auto/core/aspectcommanddebugger/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_aspectcommandddebugger Test: ##################################################################### -qt_add_test(tst_aspectcommandddebugger +qt_internal_add_test(tst_aspectcommandddebugger SOURCES tst_aspectcommanddebugger.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/core/common/common.cmake b/tests/auto/core/common/common.cmake index 43857a65f..8b464c957 100644 --- a/tests/auto/core/common/common.cmake +++ b/tests/auto/core/common/common.cmake @@ -3,7 +3,7 @@ function(qt3d_setup_common_test target) target_sources(${target} PRIVATE ${commonDir}/qbackendnodetester.h ${commonDir}/qbackendnodetester.cpp) target_include_directories(${target} PRIVATE ${commonDir}) -# qt_extend_target(${target} CONDITION QT_FEATURE_private_tests +# qt_internal_extend_target(${target} CONDITION QT_FEATURE_private_tests # SOURCES # ${commonDir}/qbackendnodetester.cpp ${commonDir}/qbackendnodetester.h # ${commonDir}/testarbiter.h diff --git a/tests/auto/core/handle/CMakeLists.txt b/tests/auto/core/handle/CMakeLists.txt index 69f45aad9..ce77bd49a 100644 --- a/tests/auto/core/handle/CMakeLists.txt +++ b/tests/auto/core/handle/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_handle Test: ##################################################################### -qt_add_test(tst_handle +qt_internal_add_test(tst_handle SOURCES tst_handle.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/core/matrix4x4_avx2/CMakeLists.txt b/tests/auto/core/matrix4x4_avx2/CMakeLists.txt index 648967283..8fdfd32f7 100644 --- a/tests/auto/core/matrix4x4_avx2/CMakeLists.txt +++ b/tests/auto/core/matrix4x4_avx2/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_matrix4x4_avx2 Test: ##################################################################### -qt_add_test(tst_matrix4x4_avx2 +qt_internal_add_test(tst_matrix4x4_avx2 SOURCES tst_matrix4x4_avx2.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/core/matrix4x4_sse/CMakeLists.txt b/tests/auto/core/matrix4x4_sse/CMakeLists.txt index 8d28bd22c..79e78bae9 100644 --- a/tests/auto/core/matrix4x4_sse/CMakeLists.txt +++ b/tests/auto/core/matrix4x4_sse/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_matrix4x4_sse Test: ##################################################################### -qt_add_test(tst_matrix4x4_sse +qt_internal_add_test(tst_matrix4x4_sse SOURCES tst_matrix4x4_sse.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/core/nodes/CMakeLists.txt b/tests/auto/core/nodes/CMakeLists.txt index 56d375359..e72b54ca4 100644 --- a/tests/auto/core/nodes/CMakeLists.txt +++ b/tests/auto/core/nodes/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_nodes Test: ##################################################################### -qt_add_test(tst_nodes +qt_internal_add_test(tst_nodes SOURCES tst_nodes.cpp INCLUDE_DIRECTORIES @@ -22,7 +22,7 @@ qt_add_test(tst_nodes ## Scopes: ##################################################################### -qt_extend_target(tst_nodes CONDITION QT_FEATURE_private_tests +qt_internal_extend_target(tst_nodes CONDITION QT_FEATURE_private_tests SOURCES ../common/qbackendnodetester.cpp ../common/qbackendnodetester.h ../common/testarbiter.h diff --git a/tests/auto/core/qarmature/CMakeLists.txt b/tests/auto/core/qarmature/CMakeLists.txt index aa1989553..685427e0f 100644 --- a/tests/auto/core/qarmature/CMakeLists.txt +++ b/tests/auto/core/qarmature/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qarmature Test: ##################################################################### -qt_add_test(tst_qarmature +qt_internal_add_test(tst_qarmature SOURCES tst_qarmature.cpp INCLUDE_DIRECTORIES @@ -22,7 +22,7 @@ qt_add_test(tst_qarmature ## Scopes: ##################################################################### -qt_extend_target(tst_qarmature CONDITION QT_FEATURE_private_tests +qt_internal_extend_target(tst_qarmature CONDITION QT_FEATURE_private_tests SOURCES ../common/qbackendnodetester.cpp ../common/qbackendnodetester.h ../common/testarbiter.h diff --git a/tests/auto/core/qaspectengine/CMakeLists.txt b/tests/auto/core/qaspectengine/CMakeLists.txt index 3ca3a576a..150f98968 100644 --- a/tests/auto/core/qaspectengine/CMakeLists.txt +++ b/tests/auto/core/qaspectengine/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qaspectengine Test: ##################################################################### -qt_add_test(tst_qaspectengine +qt_internal_add_test(tst_qaspectengine SOURCES tst_qaspectengine.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/core/qaspectfactory/CMakeLists.txt b/tests/auto/core/qaspectfactory/CMakeLists.txt index b85033cb1..ef961833d 100644 --- a/tests/auto/core/qaspectfactory/CMakeLists.txt +++ b/tests/auto/core/qaspectfactory/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qaspectfactory Test: ##################################################################### -qt_add_test(tst_qaspectfactory +qt_internal_add_test(tst_qaspectfactory SOURCES tst_qaspectfactory.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/core/qaspectjob/CMakeLists.txt b/tests/auto/core/qaspectjob/CMakeLists.txt index 5ea02f88e..1e905d423 100644 --- a/tests/auto/core/qaspectjob/CMakeLists.txt +++ b/tests/auto/core/qaspectjob/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qaspectjob Test: ##################################################################### -qt_add_test(tst_qaspectjob +qt_internal_add_test(tst_qaspectjob SOURCES tst_qaspectjob.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/core/qchangearbiter/CMakeLists.txt b/tests/auto/core/qchangearbiter/CMakeLists.txt index ba4569dd2..23b0a2220 100644 --- a/tests/auto/core/qchangearbiter/CMakeLists.txt +++ b/tests/auto/core/qchangearbiter/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qchangearbiter Test: ##################################################################### -qt_add_test(tst_qchangearbiter +qt_internal_add_test(tst_qchangearbiter SOURCES tst_qchangearbiter.cpp INCLUDE_DIRECTORIES @@ -22,7 +22,7 @@ qt_add_test(tst_qchangearbiter ## Scopes: ##################################################################### -qt_extend_target(tst_qchangearbiter CONDITION QT_FEATURE_private_tests +qt_internal_extend_target(tst_qchangearbiter CONDITION QT_FEATURE_private_tests SOURCES ../common/qbackendnodetester.cpp ../common/qbackendnodetester.h ../common/testarbiter.h diff --git a/tests/auto/core/qentity/CMakeLists.txt b/tests/auto/core/qentity/CMakeLists.txt index e3a3c39b3..46135ce72 100644 --- a/tests/auto/core/qentity/CMakeLists.txt +++ b/tests/auto/core/qentity/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qentity Test: ##################################################################### -qt_add_test(tst_qentity +qt_internal_add_test(tst_qentity SOURCES tst_qentity.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/core/qjoint/CMakeLists.txt b/tests/auto/core/qjoint/CMakeLists.txt index c3b3b7195..555e757e7 100644 --- a/tests/auto/core/qjoint/CMakeLists.txt +++ b/tests/auto/core/qjoint/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qjoint Test: ##################################################################### -qt_add_test(tst_qjoint +qt_internal_add_test(tst_qjoint SOURCES tst_qjoint.cpp INCLUDE_DIRECTORIES @@ -22,7 +22,7 @@ qt_add_test(tst_qjoint ## Scopes: ##################################################################### -qt_extend_target(tst_qjoint CONDITION QT_FEATURE_private_tests +qt_internal_extend_target(tst_qjoint CONDITION QT_FEATURE_private_tests SOURCES ../common/qbackendnodetester.cpp ../common/qbackendnodetester.h ../common/testarbiter.h diff --git a/tests/auto/core/qresourcemanager/CMakeLists.txt b/tests/auto/core/qresourcemanager/CMakeLists.txt index 9fbc1c622..7b33269bf 100644 --- a/tests/auto/core/qresourcemanager/CMakeLists.txt +++ b/tests/auto/core/qresourcemanager/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qresourcemanager Test: ##################################################################### -qt_add_test(tst_qresourcemanager +qt_internal_add_test(tst_qresourcemanager SOURCES tst_qresourcemanager.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/core/qscene/CMakeLists.txt b/tests/auto/core/qscene/CMakeLists.txt index 581d5705d..bd0ade3ad 100644 --- a/tests/auto/core/qscene/CMakeLists.txt +++ b/tests/auto/core/qscene/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qscene Test: ##################################################################### -qt_add_test(tst_qscene +qt_internal_add_test(tst_qscene SOURCES tst_qscene.cpp INCLUDE_DIRECTORIES @@ -22,7 +22,7 @@ qt_add_test(tst_qscene ## Scopes: ##################################################################### -qt_extend_target(tst_qscene CONDITION QT_FEATURE_private_tests +qt_internal_extend_target(tst_qscene CONDITION QT_FEATURE_private_tests SOURCES ../common/qbackendnodetester.cpp ../common/qbackendnodetester.h ../common/testarbiter.h diff --git a/tests/auto/core/qscheduler/CMakeLists.txt b/tests/auto/core/qscheduler/CMakeLists.txt index 7447a8026..2d6f81753 100644 --- a/tests/auto/core/qscheduler/CMakeLists.txt +++ b/tests/auto/core/qscheduler/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qscheduler Test: ##################################################################### -qt_add_test(tst_qscheduler +qt_internal_add_test(tst_qscheduler SOURCES tst_qscheduler.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/core/qservicelocator/CMakeLists.txt b/tests/auto/core/qservicelocator/CMakeLists.txt index 71d48d335..0c903dd95 100644 --- a/tests/auto/core/qservicelocator/CMakeLists.txt +++ b/tests/auto/core/qservicelocator/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qservicelocator Test: ##################################################################### -qt_add_test(tst_qservicelocator +qt_internal_add_test(tst_qservicelocator SOURCES tst_qservicelocator.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/core/qskeleton/CMakeLists.txt b/tests/auto/core/qskeleton/CMakeLists.txt index 941c91c6c..b4d92d9b9 100644 --- a/tests/auto/core/qskeleton/CMakeLists.txt +++ b/tests/auto/core/qskeleton/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qskeleton Test: ##################################################################### -qt_add_test(tst_qskeleton +qt_internal_add_test(tst_qskeleton SOURCES tst_qskeleton.cpp INCLUDE_DIRECTORIES @@ -22,7 +22,7 @@ qt_add_test(tst_qskeleton ## Scopes: ##################################################################### -qt_extend_target(tst_qskeleton CONDITION QT_FEATURE_private_tests +qt_internal_extend_target(tst_qskeleton CONDITION QT_FEATURE_private_tests SOURCES ../common/qbackendnodetester.cpp ../common/qbackendnodetester.h ../common/testarbiter.h diff --git a/tests/auto/core/qskeletonloader/CMakeLists.txt b/tests/auto/core/qskeletonloader/CMakeLists.txt index e044349c5..d94ec660c 100644 --- a/tests/auto/core/qskeletonloader/CMakeLists.txt +++ b/tests/auto/core/qskeletonloader/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qskeletonloader Test: ##################################################################### -qt_add_test(tst_qskeletonloader +qt_internal_add_test(tst_qskeletonloader SOURCES tst_qskeletonloader.cpp INCLUDE_DIRECTORIES @@ -22,7 +22,7 @@ qt_add_test(tst_qskeletonloader ## Scopes: ##################################################################### -qt_extend_target(tst_qskeletonloader CONDITION QT_FEATURE_private_tests +qt_internal_extend_target(tst_qskeletonloader CONDITION QT_FEATURE_private_tests SOURCES ../common/qbackendnodetester.cpp ../common/qbackendnodetester.h ../common/testarbiter.h diff --git a/tests/auto/core/qtransform/CMakeLists.txt b/tests/auto/core/qtransform/CMakeLists.txt index 7a8d9441e..d78858afb 100644 --- a/tests/auto/core/qtransform/CMakeLists.txt +++ b/tests/auto/core/qtransform/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qtransform Test: ##################################################################### -qt_add_test(tst_qtransform +qt_internal_add_test(tst_qtransform SOURCES tst_qtransform.cpp INCLUDE_DIRECTORIES @@ -22,7 +22,7 @@ qt_add_test(tst_qtransform ## Scopes: ##################################################################### -qt_extend_target(tst_qtransform CONDITION QT_FEATURE_private_tests +qt_internal_extend_target(tst_qtransform CONDITION QT_FEATURE_private_tests SOURCES ../common/qbackendnodetester.cpp ../common/qbackendnodetester.h ../common/testarbiter.h diff --git a/tests/auto/core/threadpooler/CMakeLists.txt b/tests/auto/core/threadpooler/CMakeLists.txt index d09ef8795..7598ce97b 100644 --- a/tests/auto/core/threadpooler/CMakeLists.txt +++ b/tests/auto/core/threadpooler/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_threadpooler Test: ##################################################################### -qt_add_test(tst_threadpooler +qt_internal_add_test(tst_threadpooler SOURCES tst_threadpooler.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/core/vector3d_base/CMakeLists.txt b/tests/auto/core/vector3d_base/CMakeLists.txt index 83bddc490..8f74e3a6f 100644 --- a/tests/auto/core/vector3d_base/CMakeLists.txt +++ b/tests/auto/core/vector3d_base/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_vector3d_base Test: ##################################################################### -qt_add_test(tst_vector3d_base +qt_internal_add_test(tst_vector3d_base SOURCES tst_vector3d_base.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/core/vector3d_sse/CMakeLists.txt b/tests/auto/core/vector3d_sse/CMakeLists.txt index 30818d073..cf4ae3955 100644 --- a/tests/auto/core/vector3d_sse/CMakeLists.txt +++ b/tests/auto/core/vector3d_sse/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_vector3d_sse Test: ##################################################################### -qt_add_test(tst_vector3d_sse +qt_internal_add_test(tst_vector3d_sse SOURCES tst_vector3d_sse.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/core/vector4d_base/CMakeLists.txt b/tests/auto/core/vector4d_base/CMakeLists.txt index 3b514814a..87741ff51 100644 --- a/tests/auto/core/vector4d_base/CMakeLists.txt +++ b/tests/auto/core/vector4d_base/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_vector4d_base Test: ##################################################################### -qt_add_test(tst_vector4d_base +qt_internal_add_test(tst_vector4d_base SOURCES tst_vector4d_base.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/core/vector4d_sse/CMakeLists.txt b/tests/auto/core/vector4d_sse/CMakeLists.txt index 92efad8c3..76a080a76 100644 --- a/tests/auto/core/vector4d_sse/CMakeLists.txt +++ b/tests/auto/core/vector4d_sse/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_vector4d_sse Test: ##################################################################### -qt_add_test(tst_vector4d_sse +qt_internal_add_test(tst_vector4d_sse SOURCES tst_vector4d_sse.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/extras/qcuboidgeometry/CMakeLists.txt b/tests/auto/extras/qcuboidgeometry/CMakeLists.txt index 97ceb833f..e51ec69ed 100644 --- a/tests/auto/extras/qcuboidgeometry/CMakeLists.txt +++ b/tests/auto/extras/qcuboidgeometry/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qcuboidgeometry Test: ##################################################################### -qt_add_test(tst_qcuboidgeometry +qt_internal_add_test(tst_qcuboidgeometry SOURCES ../common/geometrytesthelper.h tst_qcuboidgeometry.cpp diff --git a/tests/auto/extras/qfirstpersoncameracontroller/CMakeLists.txt b/tests/auto/extras/qfirstpersoncameracontroller/CMakeLists.txt index 59c0f5711..4988a0f74 100644 --- a/tests/auto/extras/qfirstpersoncameracontroller/CMakeLists.txt +++ b/tests/auto/extras/qfirstpersoncameracontroller/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qfirstpersoncameracontroller Test: ##################################################################### -qt_add_test(tst_qfirstpersoncameracontroller +qt_internal_add_test(tst_qfirstpersoncameracontroller SOURCES tst_qfirstpersoncameracontroller.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/extras/qforwardrenderer/CMakeLists.txt b/tests/auto/extras/qforwardrenderer/CMakeLists.txt index 4159c6709..3ee28b62c 100644 --- a/tests/auto/extras/qforwardrenderer/CMakeLists.txt +++ b/tests/auto/extras/qforwardrenderer/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qforwardrenderer Test: ##################################################################### -qt_add_test(tst_qforwardrenderer +qt_internal_add_test(tst_qforwardrenderer SOURCES tst_qforwardrenderer.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/extras/qorbitcameracontroller/CMakeLists.txt b/tests/auto/extras/qorbitcameracontroller/CMakeLists.txt index d68541144..07ff57ae6 100644 --- a/tests/auto/extras/qorbitcameracontroller/CMakeLists.txt +++ b/tests/auto/extras/qorbitcameracontroller/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qorbitcameracontroller Test: ##################################################################### -qt_add_test(tst_qorbitcameracontroller +qt_internal_add_test(tst_qorbitcameracontroller SOURCES tst_qorbitcameracontroller.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/extras/qtext2dentity/CMakeLists.txt b/tests/auto/extras/qtext2dentity/CMakeLists.txt index ebc3d628f..a533e5092 100644 --- a/tests/auto/extras/qtext2dentity/CMakeLists.txt +++ b/tests/auto/extras/qtext2dentity/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qtext2dentity Test: ##################################################################### -qt_add_test(tst_qtext2dentity +qt_internal_add_test(tst_qtext2dentity SOURCES tst_qtext2dentity.cpp PUBLIC_LIBRARIES @@ -21,7 +21,7 @@ set(qtext2dentity_resource_files "qtext2dentity.qml" ) -qt_add_resource(tst_qtext2dentity "qtext2dentity" +qt_internal_add_resource(tst_qtext2dentity "qtext2dentity" PREFIX "/" FILES diff --git a/tests/auto/extras/qtorusgeometry/CMakeLists.txt b/tests/auto/extras/qtorusgeometry/CMakeLists.txt index 632f15fb7..3cee2ed5b 100644 --- a/tests/auto/extras/qtorusgeometry/CMakeLists.txt +++ b/tests/auto/extras/qtorusgeometry/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qtorusgeometry Test: ##################################################################### -qt_add_test(tst_qtorusgeometry +qt_internal_add_test(tst_qtorusgeometry SOURCES ../common/geometrytesthelper.h tst_qtorusgeometry.cpp diff --git a/tests/auto/geometryloaders/objgeometryloader/CMakeLists.txt b/tests/auto/geometryloaders/objgeometryloader/CMakeLists.txt index 1b6ecb5e7..6b27892af 100644 --- a/tests/auto/geometryloaders/objgeometryloader/CMakeLists.txt +++ b/tests/auto/geometryloaders/objgeometryloader/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_objgeometryloader Test: ##################################################################### -qt_add_test(tst_objgeometryloader +qt_internal_add_test(tst_objgeometryloader SOURCES tst_objgeometryloader.cpp PUBLIC_LIBRARIES @@ -20,7 +20,7 @@ set(resources_resource_files "invalid_vertex_position.obj" ) -qt_add_resource(tst_objgeometryloader "resources" +qt_internal_add_resource(tst_objgeometryloader "resources" PREFIX "/" FILES diff --git a/tests/auto/global/aspects_startup_shutdown/CMakeLists.txt b/tests/auto/global/aspects_startup_shutdown/CMakeLists.txt index 4f6d20eac..58ae5d5cf 100644 --- a/tests/auto/global/aspects_startup_shutdown/CMakeLists.txt +++ b/tests/auto/global/aspects_startup_shutdown/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_aspects_startup_shutdown Test: ##################################################################### -qt_add_test(tst_aspects_startup_shutdown +qt_internal_add_test(tst_aspects_startup_shutdown SOURCES tst_aspects_startup_shutdown.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/input/abstractaxisinput/CMakeLists.txt b/tests/auto/input/abstractaxisinput/CMakeLists.txt index d578024ff..10dc60834 100644 --- a/tests/auto/input/abstractaxisinput/CMakeLists.txt +++ b/tests/auto/input/abstractaxisinput/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_abstractaxisinput Test: ##################################################################### -qt_add_test(tst_abstractaxisinput +qt_internal_add_test(tst_abstractaxisinput SOURCES ../commons/testdevice.h ../commons/testdeviceproxy.h @@ -27,7 +27,7 @@ qt_add_test(tst_abstractaxisinput ## Scopes: ##################################################################### -qt_extend_target(tst_abstractaxisinput CONDITION QT_FEATURE_private_tests +qt_internal_extend_target(tst_abstractaxisinput CONDITION QT_FEATURE_private_tests SOURCES ../../core/common/qbackendnodetester.cpp ../../core/common/qbackendnodetester.h ../../core/common/testarbiter.h diff --git a/tests/auto/input/action/CMakeLists.txt b/tests/auto/input/action/CMakeLists.txt index 0ac20120d..5519a5659 100644 --- a/tests/auto/input/action/CMakeLists.txt +++ b/tests/auto/input/action/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_action Test: ##################################################################### -qt_add_test(tst_action +qt_internal_add_test(tst_action SOURCES tst_action.cpp INCLUDE_DIRECTORIES @@ -24,7 +24,7 @@ qt_add_test(tst_action ## Scopes: ##################################################################### -qt_extend_target(tst_action CONDITION QT_FEATURE_private_tests +qt_internal_extend_target(tst_action CONDITION QT_FEATURE_private_tests SOURCES ../../core/common/qbackendnodetester.cpp ../../core/common/qbackendnodetester.h ../../core/common/testarbiter.h diff --git a/tests/auto/input/actioninput/CMakeLists.txt b/tests/auto/input/actioninput/CMakeLists.txt index 174269b6f..f9564e2ac 100644 --- a/tests/auto/input/actioninput/CMakeLists.txt +++ b/tests/auto/input/actioninput/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_actioninput Test: ##################################################################### -qt_add_test(tst_actioninput +qt_internal_add_test(tst_actioninput SOURCES ../commons/testdevice.h ../commons/testdeviceproxy.h @@ -27,7 +27,7 @@ qt_add_test(tst_actioninput ## Scopes: ##################################################################### -qt_extend_target(tst_actioninput CONDITION QT_FEATURE_private_tests +qt_internal_extend_target(tst_actioninput CONDITION QT_FEATURE_private_tests SOURCES ../../core/common/qbackendnodetester.cpp ../../core/common/qbackendnodetester.h ../../core/common/testarbiter.h diff --git a/tests/auto/input/analogaxisinput/CMakeLists.txt b/tests/auto/input/analogaxisinput/CMakeLists.txt index 885c0888a..72cbbf68c 100644 --- a/tests/auto/input/analogaxisinput/CMakeLists.txt +++ b/tests/auto/input/analogaxisinput/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_analogaxisinput Test: ##################################################################### -qt_add_test(tst_analogaxisinput +qt_internal_add_test(tst_analogaxisinput SOURCES ../commons/testdevice.h ../commons/testdeviceproxy.h @@ -27,7 +27,7 @@ qt_add_test(tst_analogaxisinput ## Scopes: ##################################################################### -qt_extend_target(tst_analogaxisinput CONDITION QT_FEATURE_private_tests +qt_internal_extend_target(tst_analogaxisinput CONDITION QT_FEATURE_private_tests SOURCES ../../core/common/qbackendnodetester.cpp ../../core/common/qbackendnodetester.h ../../core/common/testarbiter.h diff --git a/tests/auto/input/axis/CMakeLists.txt b/tests/auto/input/axis/CMakeLists.txt index 42ba96de4..71d83a1a4 100644 --- a/tests/auto/input/axis/CMakeLists.txt +++ b/tests/auto/input/axis/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_axis Test: ##################################################################### -qt_add_test(tst_axis +qt_internal_add_test(tst_axis SOURCES tst_axis.cpp INCLUDE_DIRECTORIES @@ -24,7 +24,7 @@ qt_add_test(tst_axis ## Scopes: ##################################################################### -qt_extend_target(tst_axis CONDITION QT_FEATURE_private_tests +qt_internal_extend_target(tst_axis CONDITION QT_FEATURE_private_tests SOURCES ../../core/common/qbackendnodetester.cpp ../../core/common/qbackendnodetester.h ../../core/common/testarbiter.h diff --git a/tests/auto/input/axisaccumulator/CMakeLists.txt b/tests/auto/input/axisaccumulator/CMakeLists.txt index 77f925afc..bacb004d2 100644 --- a/tests/auto/input/axisaccumulator/CMakeLists.txt +++ b/tests/auto/input/axisaccumulator/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_axisaccumulator Test: ##################################################################### -qt_add_test(tst_axisaccumulator +qt_internal_add_test(tst_axisaccumulator SOURCES tst_axisaccumulator.cpp INCLUDE_DIRECTORIES @@ -24,7 +24,7 @@ qt_add_test(tst_axisaccumulator ## Scopes: ##################################################################### -qt_extend_target(tst_axisaccumulator CONDITION QT_FEATURE_private_tests +qt_internal_extend_target(tst_axisaccumulator CONDITION QT_FEATURE_private_tests SOURCES ../../core/common/qbackendnodetester.cpp ../../core/common/qbackendnodetester.h ../../core/common/testarbiter.h diff --git a/tests/auto/input/axisaccumulatorjob/CMakeLists.txt b/tests/auto/input/axisaccumulatorjob/CMakeLists.txt index 4bd484ccc..152a127ce 100644 --- a/tests/auto/input/axisaccumulatorjob/CMakeLists.txt +++ b/tests/auto/input/axisaccumulatorjob/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_axisaccumulatorjob Test: ##################################################################### -qt_add_test(tst_axisaccumulatorjob +qt_internal_add_test(tst_axisaccumulatorjob SOURCES tst_axisaccumulatorjob.cpp INCLUDE_DIRECTORIES @@ -24,7 +24,7 @@ qt_add_test(tst_axisaccumulatorjob ## Scopes: ##################################################################### -qt_extend_target(tst_axisaccumulatorjob CONDITION QT_FEATURE_private_tests +qt_internal_extend_target(tst_axisaccumulatorjob CONDITION QT_FEATURE_private_tests SOURCES ../../core/common/qbackendnodetester.cpp ../../core/common/qbackendnodetester.h ../../core/common/testarbiter.h diff --git a/tests/auto/input/buttonaxisinput/CMakeLists.txt b/tests/auto/input/buttonaxisinput/CMakeLists.txt index cdc527962..3329ff12c 100644 --- a/tests/auto/input/buttonaxisinput/CMakeLists.txt +++ b/tests/auto/input/buttonaxisinput/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_buttonaxisinput Test: ##################################################################### -qt_add_test(tst_buttonaxisinput +qt_internal_add_test(tst_buttonaxisinput SOURCES ../commons/testdevice.h ../commons/testdeviceproxy.h @@ -27,7 +27,7 @@ qt_add_test(tst_buttonaxisinput ## Scopes: ##################################################################### -qt_extend_target(tst_buttonaxisinput CONDITION QT_FEATURE_private_tests +qt_internal_extend_target(tst_buttonaxisinput CONDITION QT_FEATURE_private_tests SOURCES ../../core/common/qbackendnodetester.cpp ../../core/common/qbackendnodetester.h ../../core/common/testarbiter.h diff --git a/tests/auto/input/inputchord/CMakeLists.txt b/tests/auto/input/inputchord/CMakeLists.txt index 88eea1452..49257f421 100644 --- a/tests/auto/input/inputchord/CMakeLists.txt +++ b/tests/auto/input/inputchord/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_inputchord Test: ##################################################################### -qt_add_test(tst_inputchord +qt_internal_add_test(tst_inputchord SOURCES ../commons/testdevice.h ../commons/testdeviceproxy.h @@ -27,7 +27,7 @@ qt_add_test(tst_inputchord ## Scopes: ##################################################################### -qt_extend_target(tst_inputchord CONDITION QT_FEATURE_private_tests +qt_internal_extend_target(tst_inputchord CONDITION QT_FEATURE_private_tests SOURCES ../../core/common/qbackendnodetester.cpp ../../core/common/qbackendnodetester.h ../../core/common/testarbiter.h diff --git a/tests/auto/input/inputsequence/CMakeLists.txt b/tests/auto/input/inputsequence/CMakeLists.txt index 4a06aee45..b0faec313 100644 --- a/tests/auto/input/inputsequence/CMakeLists.txt +++ b/tests/auto/input/inputsequence/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_inputsequence Test: ##################################################################### -qt_add_test(tst_inputsequence +qt_internal_add_test(tst_inputsequence SOURCES ../commons/testdevice.h ../commons/testdeviceproxy.h @@ -27,7 +27,7 @@ qt_add_test(tst_inputsequence ## Scopes: ##################################################################### -qt_extend_target(tst_inputsequence CONDITION QT_FEATURE_private_tests +qt_internal_extend_target(tst_inputsequence CONDITION QT_FEATURE_private_tests SOURCES ../../core/common/qbackendnodetester.cpp ../../core/common/qbackendnodetester.h ../../core/common/testarbiter.h diff --git a/tests/auto/input/keyboardhandler/CMakeLists.txt b/tests/auto/input/keyboardhandler/CMakeLists.txt index ff7917e7b..8726bd533 100644 --- a/tests/auto/input/keyboardhandler/CMakeLists.txt +++ b/tests/auto/input/keyboardhandler/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_keyboardhandler Test: ##################################################################### -qt_add_test(tst_keyboardhandler +qt_internal_add_test(tst_keyboardhandler SOURCES ../commons/testdevice.h ../commons/testdeviceproxy.h @@ -27,7 +27,7 @@ qt_add_test(tst_keyboardhandler ## Scopes: ##################################################################### -qt_extend_target(tst_keyboardhandler CONDITION QT_FEATURE_private_tests +qt_internal_extend_target(tst_keyboardhandler CONDITION QT_FEATURE_private_tests SOURCES ../../core/common/qbackendnodetester.cpp ../../core/common/qbackendnodetester.h ../../core/common/testarbiter.h diff --git a/tests/auto/input/loadproxydevicejob/CMakeLists.txt b/tests/auto/input/loadproxydevicejob/CMakeLists.txt index e212599e8..edb18d443 100644 --- a/tests/auto/input/loadproxydevicejob/CMakeLists.txt +++ b/tests/auto/input/loadproxydevicejob/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_loadproxydevicejob Test: ##################################################################### -qt_add_test(tst_loadproxydevicejob +qt_internal_add_test(tst_loadproxydevicejob SOURCES ../commons/testdevice.h ../commons/testdeviceproxy.h @@ -27,7 +27,7 @@ qt_add_test(tst_loadproxydevicejob ## Scopes: ##################################################################### -qt_extend_target(tst_loadproxydevicejob CONDITION QT_FEATURE_private_tests +qt_internal_extend_target(tst_loadproxydevicejob CONDITION QT_FEATURE_private_tests SOURCES ../../core/common/qbackendnodetester.cpp ../../core/common/qbackendnodetester.h ../../core/common/testarbiter.h diff --git a/tests/auto/input/logicaldevice/CMakeLists.txt b/tests/auto/input/logicaldevice/CMakeLists.txt index 522050aea..e0ad48719 100644 --- a/tests/auto/input/logicaldevice/CMakeLists.txt +++ b/tests/auto/input/logicaldevice/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_logicaldevice Test: ##################################################################### -qt_add_test(tst_logicaldevice +qt_internal_add_test(tst_logicaldevice SOURCES tst_logicaldevice.cpp INCLUDE_DIRECTORIES @@ -24,7 +24,7 @@ qt_add_test(tst_logicaldevice ## Scopes: ##################################################################### -qt_extend_target(tst_logicaldevice CONDITION QT_FEATURE_private_tests +qt_internal_extend_target(tst_logicaldevice CONDITION QT_FEATURE_private_tests SOURCES ../../core/common/qbackendnodetester.cpp ../../core/common/qbackendnodetester.h ../../core/common/testarbiter.h diff --git a/tests/auto/input/mousedevice/CMakeLists.txt b/tests/auto/input/mousedevice/CMakeLists.txt index 7b7cb50e8..696379f1f 100644 --- a/tests/auto/input/mousedevice/CMakeLists.txt +++ b/tests/auto/input/mousedevice/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_mousedevice Test: ##################################################################### -qt_add_test(tst_mousedevice +qt_internal_add_test(tst_mousedevice SOURCES tst_mousedevice.cpp INCLUDE_DIRECTORIES @@ -24,7 +24,7 @@ qt_add_test(tst_mousedevice ## Scopes: ##################################################################### -qt_extend_target(tst_mousedevice CONDITION QT_FEATURE_private_tests +qt_internal_extend_target(tst_mousedevice CONDITION QT_FEATURE_private_tests SOURCES ../../core/common/qbackendnodetester.cpp ../../core/common/qbackendnodetester.h ../../core/common/testarbiter.h diff --git a/tests/auto/input/physicaldeviceproxy/CMakeLists.txt b/tests/auto/input/physicaldeviceproxy/CMakeLists.txt index 286402eda..263e6ef4b 100644 --- a/tests/auto/input/physicaldeviceproxy/CMakeLists.txt +++ b/tests/auto/input/physicaldeviceproxy/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_physicaldeviceproxy Test: ##################################################################### -qt_add_test(tst_physicaldeviceproxy +qt_internal_add_test(tst_physicaldeviceproxy SOURCES ../commons/testdevice.h ../commons/testdeviceproxy.h @@ -27,7 +27,7 @@ qt_add_test(tst_physicaldeviceproxy ## Scopes: ##################################################################### -qt_extend_target(tst_physicaldeviceproxy CONDITION QT_FEATURE_private_tests +qt_internal_extend_target(tst_physicaldeviceproxy CONDITION QT_FEATURE_private_tests SOURCES ../../core/common/qbackendnodetester.cpp ../../core/common/qbackendnodetester.h ../../core/common/testarbiter.h diff --git a/tests/auto/input/qabstractaxisinput/CMakeLists.txt b/tests/auto/input/qabstractaxisinput/CMakeLists.txt index ebb37b24f..28d7f53b2 100644 --- a/tests/auto/input/qabstractaxisinput/CMakeLists.txt +++ b/tests/auto/input/qabstractaxisinput/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qabstractaxisinput Test: ##################################################################### -qt_add_test(tst_qabstractaxisinput +qt_internal_add_test(tst_qabstractaxisinput SOURCES ../commons/testdevice.h ../commons/testdeviceproxy.h @@ -27,7 +27,7 @@ qt_add_test(tst_qabstractaxisinput ## Scopes: ##################################################################### -qt_extend_target(tst_qabstractaxisinput CONDITION QT_FEATURE_private_tests +qt_internal_extend_target(tst_qabstractaxisinput CONDITION QT_FEATURE_private_tests SOURCES ../../core/common/qbackendnodetester.cpp ../../core/common/qbackendnodetester.h ../../core/common/testarbiter.h diff --git a/tests/auto/input/qabstractphysicaldevicebackendnode/CMakeLists.txt b/tests/auto/input/qabstractphysicaldevicebackendnode/CMakeLists.txt index 35dd298f7..2d42dd1f7 100644 --- a/tests/auto/input/qabstractphysicaldevicebackendnode/CMakeLists.txt +++ b/tests/auto/input/qabstractphysicaldevicebackendnode/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qabstractphysicaldevicebackendnode Test: ##################################################################### -qt_add_test(tst_qabstractphysicaldevicebackendnode +qt_internal_add_test(tst_qabstractphysicaldevicebackendnode SOURCES ../commons/testdevice.h ../commons/testdeviceproxy.h @@ -27,7 +27,7 @@ qt_add_test(tst_qabstractphysicaldevicebackendnode ## Scopes: ##################################################################### -qt_extend_target(tst_qabstractphysicaldevicebackendnode CONDITION QT_FEATURE_private_tests +qt_internal_extend_target(tst_qabstractphysicaldevicebackendnode CONDITION QT_FEATURE_private_tests SOURCES ../../core/common/qbackendnodetester.cpp ../../core/common/qbackendnodetester.h ../../core/common/testarbiter.h diff --git a/tests/auto/input/qabstractphysicaldeviceproxy/CMakeLists.txt b/tests/auto/input/qabstractphysicaldeviceproxy/CMakeLists.txt index d300c7b5f..e1d6aac23 100644 --- a/tests/auto/input/qabstractphysicaldeviceproxy/CMakeLists.txt +++ b/tests/auto/input/qabstractphysicaldeviceproxy/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qabstractphysicaldeviceproxy Test: ##################################################################### -qt_add_test(tst_qabstractphysicaldeviceproxy +qt_internal_add_test(tst_qabstractphysicaldeviceproxy SOURCES ../commons/testdevice.h ../commons/testdeviceproxy.h @@ -27,7 +27,7 @@ qt_add_test(tst_qabstractphysicaldeviceproxy ## Scopes: ##################################################################### -qt_extend_target(tst_qabstractphysicaldeviceproxy CONDITION QT_FEATURE_private_tests +qt_internal_extend_target(tst_qabstractphysicaldeviceproxy CONDITION QT_FEATURE_private_tests SOURCES ../../core/common/qbackendnodetester.cpp ../../core/common/qbackendnodetester.h ../../core/common/testarbiter.h diff --git a/tests/auto/input/qaction/CMakeLists.txt b/tests/auto/input/qaction/CMakeLists.txt index 067feb91a..6acfd8fd2 100644 --- a/tests/auto/input/qaction/CMakeLists.txt +++ b/tests/auto/input/qaction/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qaction Test: ##################################################################### -qt_add_test(tst_qaction +qt_internal_add_test(tst_qaction SOURCES ../commons/testdevice.h ../commons/testdeviceproxy.h @@ -27,7 +27,7 @@ qt_add_test(tst_qaction ## Scopes: ##################################################################### -qt_extend_target(tst_qaction CONDITION QT_FEATURE_private_tests +qt_internal_extend_target(tst_qaction CONDITION QT_FEATURE_private_tests SOURCES ../../core/common/qbackendnodetester.cpp ../../core/common/qbackendnodetester.h ../../core/common/testarbiter.h diff --git a/tests/auto/input/qactioninput/CMakeLists.txt b/tests/auto/input/qactioninput/CMakeLists.txt index 48c84c3e2..186b30b49 100644 --- a/tests/auto/input/qactioninput/CMakeLists.txt +++ b/tests/auto/input/qactioninput/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qactioninput Test: ##################################################################### -qt_add_test(tst_qactioninput +qt_internal_add_test(tst_qactioninput SOURCES ../commons/testdevice.h ../commons/testdeviceproxy.h @@ -27,7 +27,7 @@ qt_add_test(tst_qactioninput ## Scopes: ##################################################################### -qt_extend_target(tst_qactioninput CONDITION QT_FEATURE_private_tests +qt_internal_extend_target(tst_qactioninput CONDITION QT_FEATURE_private_tests SOURCES ../../core/common/qbackendnodetester.cpp ../../core/common/qbackendnodetester.h ../../core/common/testarbiter.h diff --git a/tests/auto/input/qanalogaxisinput/CMakeLists.txt b/tests/auto/input/qanalogaxisinput/CMakeLists.txt index 6561c71e0..147ff97c3 100644 --- a/tests/auto/input/qanalogaxisinput/CMakeLists.txt +++ b/tests/auto/input/qanalogaxisinput/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qanalogaxisinput Test: ##################################################################### -qt_add_test(tst_qanalogaxisinput +qt_internal_add_test(tst_qanalogaxisinput SOURCES ../commons/testdevice.h ../commons/testdeviceproxy.h @@ -27,7 +27,7 @@ qt_add_test(tst_qanalogaxisinput ## Scopes: ##################################################################### -qt_extend_target(tst_qanalogaxisinput CONDITION QT_FEATURE_private_tests +qt_internal_extend_target(tst_qanalogaxisinput CONDITION QT_FEATURE_private_tests SOURCES ../../core/common/qbackendnodetester.cpp ../../core/common/qbackendnodetester.h ../../core/common/testarbiter.h diff --git a/tests/auto/input/qaxis/CMakeLists.txt b/tests/auto/input/qaxis/CMakeLists.txt index 6859e514d..f9c77e495 100644 --- a/tests/auto/input/qaxis/CMakeLists.txt +++ b/tests/auto/input/qaxis/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qaxis Test: ##################################################################### -qt_add_test(tst_qaxis +qt_internal_add_test(tst_qaxis SOURCES tst_qaxis.cpp INCLUDE_DIRECTORIES @@ -24,7 +24,7 @@ qt_add_test(tst_qaxis ## Scopes: ##################################################################### -qt_extend_target(tst_qaxis CONDITION QT_FEATURE_private_tests +qt_internal_extend_target(tst_qaxis CONDITION QT_FEATURE_private_tests SOURCES ../../core/common/qbackendnodetester.cpp ../../core/common/qbackendnodetester.h ../../core/common/testarbiter.h diff --git a/tests/auto/input/qaxisaccumulator/CMakeLists.txt b/tests/auto/input/qaxisaccumulator/CMakeLists.txt index 11a9f30de..86337c38e 100644 --- a/tests/auto/input/qaxisaccumulator/CMakeLists.txt +++ b/tests/auto/input/qaxisaccumulator/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qaxisaccumulator Test: ##################################################################### -qt_add_test(tst_qaxisaccumulator +qt_internal_add_test(tst_qaxisaccumulator SOURCES ../commons/testdevice.h ../commons/testdeviceproxy.h @@ -27,7 +27,7 @@ qt_add_test(tst_qaxisaccumulator ## Scopes: ##################################################################### -qt_extend_target(tst_qaxisaccumulator CONDITION QT_FEATURE_private_tests +qt_internal_extend_target(tst_qaxisaccumulator CONDITION QT_FEATURE_private_tests SOURCES ../../core/common/qbackendnodetester.cpp ../../core/common/qbackendnodetester.h ../../core/common/testarbiter.h diff --git a/tests/auto/input/qbuttonaxisinput/CMakeLists.txt b/tests/auto/input/qbuttonaxisinput/CMakeLists.txt index fa95d8afa..36698b66a 100644 --- a/tests/auto/input/qbuttonaxisinput/CMakeLists.txt +++ b/tests/auto/input/qbuttonaxisinput/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qbuttonaxisinput Test: ##################################################################### -qt_add_test(tst_qbuttonaxisinput +qt_internal_add_test(tst_qbuttonaxisinput SOURCES ../commons/testdevice.h ../commons/testdeviceproxy.h @@ -27,7 +27,7 @@ qt_add_test(tst_qbuttonaxisinput ## Scopes: ##################################################################### -qt_extend_target(tst_qbuttonaxisinput CONDITION QT_FEATURE_private_tests +qt_internal_extend_target(tst_qbuttonaxisinput CONDITION QT_FEATURE_private_tests SOURCES ../../core/common/qbackendnodetester.cpp ../../core/common/qbackendnodetester.h ../../core/common/testarbiter.h diff --git a/tests/auto/input/qkeyboardhandler/CMakeLists.txt b/tests/auto/input/qkeyboardhandler/CMakeLists.txt index 76330addd..452292249 100644 --- a/tests/auto/input/qkeyboardhandler/CMakeLists.txt +++ b/tests/auto/input/qkeyboardhandler/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qkeyboardhandler Test: ##################################################################### -qt_add_test(tst_qkeyboardhandler +qt_internal_add_test(tst_qkeyboardhandler SOURCES ../commons/testdevice.h ../commons/testdeviceproxy.h @@ -27,7 +27,7 @@ qt_add_test(tst_qkeyboardhandler ## Scopes: ##################################################################### -qt_extend_target(tst_qkeyboardhandler CONDITION QT_FEATURE_private_tests +qt_internal_extend_target(tst_qkeyboardhandler CONDITION QT_FEATURE_private_tests SOURCES ../../core/common/qbackendnodetester.cpp ../../core/common/qbackendnodetester.h ../../core/common/testarbiter.h diff --git a/tests/auto/input/qlogicaldevice/CMakeLists.txt b/tests/auto/input/qlogicaldevice/CMakeLists.txt index 7eba59e20..f29fdc820 100644 --- a/tests/auto/input/qlogicaldevice/CMakeLists.txt +++ b/tests/auto/input/qlogicaldevice/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qlogicaldevice Test: ##################################################################### -qt_add_test(tst_qlogicaldevice +qt_internal_add_test(tst_qlogicaldevice SOURCES tst_qlogicaldevice.cpp INCLUDE_DIRECTORIES @@ -24,7 +24,7 @@ qt_add_test(tst_qlogicaldevice ## Scopes: ##################################################################### -qt_extend_target(tst_qlogicaldevice CONDITION QT_FEATURE_private_tests +qt_internal_extend_target(tst_qlogicaldevice CONDITION QT_FEATURE_private_tests SOURCES ../../core/common/qbackendnodetester.cpp ../../core/common/qbackendnodetester.h ../../core/common/testarbiter.h diff --git a/tests/auto/input/qmousedevice/CMakeLists.txt b/tests/auto/input/qmousedevice/CMakeLists.txt index 812ffdfdb..62e3247ec 100644 --- a/tests/auto/input/qmousedevice/CMakeLists.txt +++ b/tests/auto/input/qmousedevice/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qmousedevice Test: ##################################################################### -qt_add_test(tst_qmousedevice +qt_internal_add_test(tst_qmousedevice SOURCES ../commons/testdevice.h ../commons/testdeviceproxy.h @@ -27,7 +27,7 @@ qt_add_test(tst_qmousedevice ## Scopes: ##################################################################### -qt_extend_target(tst_qmousedevice CONDITION QT_FEATURE_private_tests +qt_internal_extend_target(tst_qmousedevice CONDITION QT_FEATURE_private_tests SOURCES ../../core/common/qbackendnodetester.cpp ../../core/common/qbackendnodetester.h ../../core/common/testarbiter.h diff --git a/tests/auto/input/qmouseevent/CMakeLists.txt b/tests/auto/input/qmouseevent/CMakeLists.txt index 79f76469b..f0fd99874 100644 --- a/tests/auto/input/qmouseevent/CMakeLists.txt +++ b/tests/auto/input/qmouseevent/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qmouseevent Test: ##################################################################### -qt_add_test(tst_qmouseevent +qt_internal_add_test(tst_qmouseevent SOURCES ../commons/testdevice.h ../commons/testdeviceproxy.h @@ -27,7 +27,7 @@ qt_add_test(tst_qmouseevent ## Scopes: ##################################################################### -qt_extend_target(tst_qmouseevent CONDITION QT_FEATURE_private_tests +qt_internal_extend_target(tst_qmouseevent CONDITION QT_FEATURE_private_tests SOURCES ../../core/common/qbackendnodetester.cpp ../../core/common/qbackendnodetester.h ../../core/common/testarbiter.h diff --git a/tests/auto/input/utils/CMakeLists.txt b/tests/auto/input/utils/CMakeLists.txt index 1c7d2f77d..0ff18ec4d 100644 --- a/tests/auto/input/utils/CMakeLists.txt +++ b/tests/auto/input/utils/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_utils Test: ##################################################################### -qt_add_test(tst_utils +qt_internal_add_test(tst_utils SOURCES ../commons/testdevice.h ../commons/testdeviceproxy.h @@ -27,7 +27,7 @@ qt_add_test(tst_utils ## Scopes: ##################################################################### -qt_extend_target(tst_utils CONDITION QT_FEATURE_private_tests +qt_internal_extend_target(tst_utils CONDITION QT_FEATURE_private_tests SOURCES ../../core/common/qbackendnodetester.cpp ../../core/common/qbackendnodetester.h ../../core/common/testarbiter.h diff --git a/tests/auto/quick3d/3dcore/CMakeLists.txt b/tests/auto/quick3d/3dcore/CMakeLists.txt index adb239788..d82027fff 100644 --- a/tests/auto/quick3d/3dcore/CMakeLists.txt +++ b/tests/auto/quick3d/3dcore/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_import3dcore Test: ##################################################################### -qt_add_test(tst_import3dcore +qt_internal_add_test(tst_import3dcore SOURCES ../../render/qmlscenereader/qmlscenereader.cpp ../../render/qmlscenereader/qmlscenereader.h tst_import3dcore.cpp @@ -26,7 +26,7 @@ set(3dcore_resource_files "3dcore.qml" ) -qt_add_resource(tst_import3dcore "Qt::3DCore" +qt_internal_add_resource(tst_import3dcore "Qt::3DCore" PREFIX "/" FILES diff --git a/tests/auto/quick3d/3dinput/CMakeLists.txt b/tests/auto/quick3d/3dinput/CMakeLists.txt index 52612a899..a78e74a02 100644 --- a/tests/auto/quick3d/3dinput/CMakeLists.txt +++ b/tests/auto/quick3d/3dinput/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_import3dinput Test: ##################################################################### -qt_add_test(tst_import3dinput +qt_internal_add_test(tst_import3dinput SOURCES ../../render/qmlscenereader/qmlscenereader.cpp ../../render/qmlscenereader/qmlscenereader.h tst_import3dinput.cpp @@ -26,7 +26,7 @@ set(3dinput_resource_files "3dinput.qml" ) -qt_add_resource(tst_import3dinput "3dinput" +qt_internal_add_resource(tst_import3dinput "3dinput" PREFIX "/" FILES diff --git a/tests/auto/quick3d/3drender/CMakeLists.txt b/tests/auto/quick3d/3drender/CMakeLists.txt index 68196ca4d..a876800f0 100644 --- a/tests/auto/quick3d/3drender/CMakeLists.txt +++ b/tests/auto/quick3d/3drender/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_import3drender Test: ##################################################################### -qt_add_test(tst_import3drender +qt_internal_add_test(tst_import3drender SOURCES ../../render/qmlscenereader/qmlscenereader.cpp ../../render/qmlscenereader/qmlscenereader.h tst_import3drender.cpp @@ -26,7 +26,7 @@ set( 3drender_resource_files "3drender.qml" ) -qt_add_resource(tst_import3drender "3drender" +qt_internal_add_resource(tst_import3drender "3drender" PREFIX "/" FILES diff --git a/tests/auto/quick3d/dynamicnodecreation/CMakeLists.txt b/tests/auto/quick3d/dynamicnodecreation/CMakeLists.txt index a90760be4..8e5a842ff 100644 --- a/tests/auto/quick3d/dynamicnodecreation/CMakeLists.txt +++ b/tests/auto/quick3d/dynamicnodecreation/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_dynamicnodecreation +qt_internal_add_test(tst_dynamicnodecreation SOURCES ../../shared/util.cpp ../../shared/util.h tst_dynamicnodecreation.cpp diff --git a/tests/auto/quick3d/quick3dbuffer/CMakeLists.txt b/tests/auto/quick3d/quick3dbuffer/CMakeLists.txt index 5c1667ae2..7792acd43 100644 --- a/tests/auto/quick3d/quick3dbuffer/CMakeLists.txt +++ b/tests/auto/quick3d/quick3dbuffer/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_quick3dbuffer Test: ##################################################################### -qt_add_test(tst_quick3dbuffer +qt_internal_add_test(tst_quick3dbuffer SOURCES tst_quick3dbuffer.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/quick3d/quick3dnodeinstantiator/CMakeLists.txt b/tests/auto/quick3d/quick3dnodeinstantiator/CMakeLists.txt index f79d97d2e..195b1da0c 100644 --- a/tests/auto/quick3d/quick3dnodeinstantiator/CMakeLists.txt +++ b/tests/auto/quick3d/quick3dnodeinstantiator/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qnodeinstantiator +qt_internal_add_test(tst_qnodeinstantiator SOURCES ../../shared/util.cpp ../../shared/util.h stringmodel.h diff --git a/tests/auto/render/alignedresourcesmanagers-avx/CMakeLists.txt b/tests/auto/render/alignedresourcesmanagers-avx/CMakeLists.txt index 225d0e36f..015bd6334 100644 --- a/tests/auto/render/alignedresourcesmanagers-avx/CMakeLists.txt +++ b/tests/auto/render/alignedresourcesmanagers-avx/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_alignedresourcesmanagers-avx Test: ##################################################################### -qt_add_test(tst_alignedresourcesmanagers-avx +qt_internal_add_test(tst_alignedresourcesmanagers-avx SOURCES tst_alignedresourcesmanagers-avx.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/render/alignedresourcesmanagers-sse/CMakeLists.txt b/tests/auto/render/alignedresourcesmanagers-sse/CMakeLists.txt index d83d6b6bd..992614ac9 100644 --- a/tests/auto/render/alignedresourcesmanagers-sse/CMakeLists.txt +++ b/tests/auto/render/alignedresourcesmanagers-sse/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_alignedresourcesmanagers-avx Test: ##################################################################### -qt_add_test(tst_alignedresourcesmanagers-avx +qt_internal_add_test(tst_alignedresourcesmanagers-avx SOURCES tst_alignedresourcesmanagers-sse.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/render/armature/CMakeLists.txt b/tests/auto/render/armature/CMakeLists.txt index 82f573201..9c08e4600 100644 --- a/tests/auto/render/armature/CMakeLists.txt +++ b/tests/auto/render/armature/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_armature Test: ##################################################################### -qt_add_test(tst_armature +qt_internal_add_test(tst_armature SOURCES tst_armature.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/render/aspect/CMakeLists.txt b/tests/auto/render/aspect/CMakeLists.txt index b5e544f97..6416904b7 100644 --- a/tests/auto/render/aspect/CMakeLists.txt +++ b/tests/auto/render/aspect/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_aspect Test: ##################################################################### -qt_add_test(tst_aspect +qt_internal_add_test(tst_aspect SOURCES tst_aspect.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/render/attribute/CMakeLists.txt b/tests/auto/render/attribute/CMakeLists.txt index 9e87e0785..b378cabc7 100644 --- a/tests/auto/render/attribute/CMakeLists.txt +++ b/tests/auto/render/attribute/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_attribute Test: ##################################################################### -qt_add_test(tst_attribute +qt_internal_add_test(tst_attribute SOURCES tst_attribute.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/render/blitframebuffer/CMakeLists.txt b/tests/auto/render/blitframebuffer/CMakeLists.txt index d5107481c..ee06267ab 100644 --- a/tests/auto/render/blitframebuffer/CMakeLists.txt +++ b/tests/auto/render/blitframebuffer/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_blitframebuffer Test: ##################################################################### -qt_add_test(tst_blitframebuffer +qt_internal_add_test(tst_blitframebuffer SOURCES ../commons/testrenderer.cpp ../commons/testrenderer.h tst_blitframebuffer.cpp diff --git a/tests/auto/render/boundingsphere/CMakeLists.txt b/tests/auto/render/boundingsphere/CMakeLists.txt index df59b4551..ae6e831a6 100644 --- a/tests/auto/render/boundingsphere/CMakeLists.txt +++ b/tests/auto/render/boundingsphere/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_boundingsphere Test: ##################################################################### -qt_add_test(tst_boundingsphere +qt_internal_add_test(tst_boundingsphere SOURCES ../qmlscenereader/qmlscenereader.cpp ../qmlscenereader/qmlscenereader.h tst_boundingsphere.cpp @@ -31,7 +31,7 @@ set(boundingsphere_resource_files "sphere.qml" ) -qt_add_resource(tst_boundingsphere "boundingsphere" +qt_internal_add_resource(tst_boundingsphere "boundingsphere" PREFIX "/" FILES diff --git a/tests/auto/render/boundingvolumedebug/CMakeLists.txt b/tests/auto/render/boundingvolumedebug/CMakeLists.txt index e6e4c3a98..36ae56012 100644 --- a/tests/auto/render/boundingvolumedebug/CMakeLists.txt +++ b/tests/auto/render/boundingvolumedebug/CMakeLists.txt @@ -4,7 +4,7 @@ ## boundingvolumedebug Test: ##################################################################### -qt_add_test(boundingvolumedebug +qt_internal_add_test(boundingvolumedebug SOURCES ../commons/testrenderer.cpp ../commons/testrenderer.h tst_boundingvolumedebug.cpp @@ -25,7 +25,7 @@ qt_add_test(boundingvolumedebug ## Scopes: ##################################################################### -qt_extend_target(boundingvolumedebug CONDITION useCommonTestAspect +qt_internal_extend_target(boundingvolumedebug CONDITION useCommonTestAspect SOURCES ../commons/testaspect.cpp ../commons/testaspect.h ) diff --git a/tests/auto/render/buffer/CMakeLists.txt b/tests/auto/render/buffer/CMakeLists.txt index 54be229ca..d670aa542 100644 --- a/tests/auto/render/buffer/CMakeLists.txt +++ b/tests/auto/render/buffer/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_buffer Test: ##################################################################### -qt_add_test(tst_buffer +qt_internal_add_test(tst_buffer SOURCES tst_buffer.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/render/computecommand/CMakeLists.txt b/tests/auto/render/computecommand/CMakeLists.txt index 353ac7049..d9cecc64e 100644 --- a/tests/auto/render/computecommand/CMakeLists.txt +++ b/tests/auto/render/computecommand/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_computecommand Test: ##################################################################### -qt_add_test(tst_computecommand +qt_internal_add_test(tst_computecommand SOURCES tst_computecommand.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/render/coordinatereader/CMakeLists.txt b/tests/auto/render/coordinatereader/CMakeLists.txt index a871d2bd3..7a0d75de8 100644 --- a/tests/auto/render/coordinatereader/CMakeLists.txt +++ b/tests/auto/render/coordinatereader/CMakeLists.txt @@ -4,7 +4,7 @@ ## coordinatereader Test: ##################################################################### -qt_add_test(tst_coordinatereader +qt_internal_add_test(tst_coordinatereader SOURCES tst_coordinatereader.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/render/ddstextures/CMakeLists.txt b/tests/auto/render/ddstextures/CMakeLists.txt index cbc1084ac..9e8c7fecd 100644 --- a/tests/auto/render/ddstextures/CMakeLists.txt +++ b/tests/auto/render/ddstextures/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_ddstextures +qt_internal_add_test(tst_ddstextures SOURCES tst_ddstextures.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/render/effect/CMakeLists.txt b/tests/auto/render/effect/CMakeLists.txt index c154021cd..3f8a1338d 100644 --- a/tests/auto/render/effect/CMakeLists.txt +++ b/tests/auto/render/effect/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_effect Test: ##################################################################### -qt_add_test(tst_effect +qt_internal_add_test(tst_effect SOURCES tst_effect.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/render/entity/CMakeLists.txt b/tests/auto/render/entity/CMakeLists.txt index 3df6f6cc8..502190e06 100644 --- a/tests/auto/render/entity/CMakeLists.txt +++ b/tests/auto/render/entity/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_entity Test: ##################################################################### -qt_add_test(tst_entity +qt_internal_add_test(tst_entity SOURCES tst_entity.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/render/filterentitybycomponent/CMakeLists.txt b/tests/auto/render/filterentitybycomponent/CMakeLists.txt index d8661e366..efcbb164f 100644 --- a/tests/auto/render/filterentitybycomponent/CMakeLists.txt +++ b/tests/auto/render/filterentitybycomponent/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_filterentitybycomponent Test: ##################################################################### -qt_add_test(tst_filterentitybycomponent +qt_internal_add_test(tst_filterentitybycomponent SOURCES tst_filterentitybycomponent.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/render/filterkey/CMakeLists.txt b/tests/auto/render/filterkey/CMakeLists.txt index ba3d8836e..bae093c27 100644 --- a/tests/auto/render/filterkey/CMakeLists.txt +++ b/tests/auto/render/filterkey/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_filterkey Test: ##################################################################### -qt_add_test(tst_filterkey +qt_internal_add_test(tst_filterkey SOURCES tst_filterkey.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/render/framegraphnode/CMakeLists.txt b/tests/auto/render/framegraphnode/CMakeLists.txt index 470368647..6e067051b 100644 --- a/tests/auto/render/framegraphnode/CMakeLists.txt +++ b/tests/auto/render/framegraphnode/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_framegraphnode Test: ##################################################################### -qt_add_test(tst_framegraphnode +qt_internal_add_test(tst_framegraphnode SOURCES tst_framegraphnode.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/render/framegraphvisitor/CMakeLists.txt b/tests/auto/render/framegraphvisitor/CMakeLists.txt index 986944f43..26d7ad2e4 100644 --- a/tests/auto/render/framegraphvisitor/CMakeLists.txt +++ b/tests/auto/render/framegraphvisitor/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_framegraphvisitor Test: ##################################################################### -qt_add_test(tst_framegraphvisitor +qt_internal_add_test(tst_framegraphvisitor SOURCES tst_framegraphvisitor.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/render/genericlambdajob/CMakeLists.txt b/tests/auto/render/genericlambdajob/CMakeLists.txt index c15aee9a5..6d7e00902 100644 --- a/tests/auto/render/genericlambdajob/CMakeLists.txt +++ b/tests/auto/render/genericlambdajob/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_genericlambdajob Test: ##################################################################### -qt_add_test(tst_genericlambdajob +qt_internal_add_test(tst_genericlambdajob SOURCES tst_genericlambdajob.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/render/geometry/CMakeLists.txt b/tests/auto/render/geometry/CMakeLists.txt index 7047a7ace..c1e8a81e1 100644 --- a/tests/auto/render/geometry/CMakeLists.txt +++ b/tests/auto/render/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/render/geometryloaders/CMakeLists.txt b/tests/auto/render/geometryloaders/CMakeLists.txt index ac45579bb..1897c27b1 100644 --- a/tests/auto/render/geometryloaders/CMakeLists.txt +++ b/tests/auto/render/geometryloaders/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_geometryloaders Test: ##################################################################### -qt_add_test(tst_geometryloaders +qt_internal_add_test(tst_geometryloaders SOURCES tst_geometryloaders.cpp PUBLIC_LIBRARIES @@ -26,7 +26,7 @@ set(geometryloaders_resource_files "cube_buffer.bin" ) -qt_add_resource(tst_geometryloaders "geometryloaders" +qt_internal_add_resource(tst_geometryloaders "geometryloaders" PREFIX "/" FILES diff --git a/tests/auto/render/geometryrenderer/CMakeLists.txt b/tests/auto/render/geometryrenderer/CMakeLists.txt index 34af7f649..3dae45693 100644 --- a/tests/auto/render/geometryrenderer/CMakeLists.txt +++ b/tests/auto/render/geometryrenderer/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_geometryrenderer Test: ##################################################################### -qt_add_test(tst_geometryrenderer +qt_internal_add_test(tst_geometryrenderer SOURCES tst_geometryrenderer.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/render/gltexture/CMakeLists.txt b/tests/auto/render/gltexture/CMakeLists.txt index 3402c7fe5..967cd08f2 100644 --- a/tests/auto/render/gltexture/CMakeLists.txt +++ b/tests/auto/render/gltexture/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_gltexture Test: ##################################################################### -qt_add_test(tst_gltexture +qt_internal_add_test(tst_gltexture SOURCES tst_gltexture.cpp PUBLIC_LIBRARIES @@ -20,7 +20,7 @@ set(resources_resource_files "image.jpg" ) -qt_add_resource(tst_gltexture "resources" +qt_internal_add_resource(tst_gltexture "resources" PREFIX "/" FILES diff --git a/tests/auto/render/gltfplugins/CMakeLists.txt b/tests/auto/render/gltfplugins/CMakeLists.txt index fbb6fddec..cfd6aa9f8 100644 --- a/tests/auto/render/gltfplugins/CMakeLists.txt +++ b/tests/auto/render/gltfplugins/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_gltfplugins Test: ##################################################################### -qt_add_test(tst_gltfplugins +qt_internal_add_test(tst_gltfplugins SOURCES tst_gltfplugins.cpp PUBLIC_LIBRARIES @@ -28,7 +28,7 @@ set(images_resource_files "qtlogo_with_alpha.png" ) -qt_add_resource(tst_gltfplugins "images" +qt_internal_add_resource(tst_gltfplugins "images" PREFIX "/" FILES diff --git a/tests/auto/render/joint/CMakeLists.txt b/tests/auto/render/joint/CMakeLists.txt index b1185a539..793f6beba 100644 --- a/tests/auto/render/joint/CMakeLists.txt +++ b/tests/auto/render/joint/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_joint Test: ##################################################################### -qt_add_test(tst_joint +qt_internal_add_test(tst_joint SOURCES tst_joint.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/render/ktxtextures/CMakeLists.txt b/tests/auto/render/ktxtextures/CMakeLists.txt index 4a143a364..583b15d1a 100644 --- a/tests/auto/render/ktxtextures/CMakeLists.txt +++ b/tests/auto/render/ktxtextures/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_ktxtextures +qt_internal_add_test(tst_ktxtextures SOURCES tst_ktxtextures.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/render/layerfiltering/CMakeLists.txt b/tests/auto/render/layerfiltering/CMakeLists.txt index 25fbf28a7..e953784d4 100644 --- a/tests/auto/render/layerfiltering/CMakeLists.txt +++ b/tests/auto/render/layerfiltering/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_layerfiltering Test: ##################################################################### -qt_add_test(tst_layerfiltering +qt_internal_add_test(tst_layerfiltering SOURCES tst_layerfiltering.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/render/levelofdetail/CMakeLists.txt b/tests/auto/render/levelofdetail/CMakeLists.txt index a42aceb8e..df4417d40 100644 --- a/tests/auto/render/levelofdetail/CMakeLists.txt +++ b/tests/auto/render/levelofdetail/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_levelofdetail Test: ##################################################################### -qt_add_test(tst_levelofdetail +qt_internal_add_test(tst_levelofdetail SOURCES tst_levelofdetail.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/render/loadscenejob/CMakeLists.txt b/tests/auto/render/loadscenejob/CMakeLists.txt index f881b15c1..892c3a914 100644 --- a/tests/auto/render/loadscenejob/CMakeLists.txt +++ b/tests/auto/render/loadscenejob/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_loadscenejob Test: ##################################################################### -qt_add_test(tst_loadscenejob +qt_internal_add_test(tst_loadscenejob SOURCES tst_loadscenejob.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/render/material/CMakeLists.txt b/tests/auto/render/material/CMakeLists.txt index 7be7e6eb4..f9b093e66 100644 --- a/tests/auto/render/material/CMakeLists.txt +++ b/tests/auto/render/material/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_material Test: ##################################################################### -qt_add_test(tst_material +qt_internal_add_test(tst_material SOURCES tst_material.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/render/memorybarrier/CMakeLists.txt b/tests/auto/render/memorybarrier/CMakeLists.txt index 9efacc9df..bfd6ae219 100644 --- a/tests/auto/render/memorybarrier/CMakeLists.txt +++ b/tests/auto/render/memorybarrier/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_memorybarrier Test: ##################################################################### -qt_add_test(tst_memorybarrier +qt_internal_add_test(tst_memorybarrier SOURCES tst_memorybarrier.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/render/meshfunctors/CMakeLists.txt b/tests/auto/render/meshfunctors/CMakeLists.txt index 78f5b101e..53bf58e0b 100644 --- a/tests/auto/render/meshfunctors/CMakeLists.txt +++ b/tests/auto/render/meshfunctors/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_renderviews Test: ##################################################################### -qt_add_test(tst_meshfunctors +qt_internal_add_test(tst_meshfunctors SOURCES tst_meshfunctors.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/render/objectpicker/CMakeLists.txt b/tests/auto/render/objectpicker/CMakeLists.txt index ef10ba20d..80be6540d 100644 --- a/tests/auto/render/objectpicker/CMakeLists.txt +++ b/tests/auto/render/objectpicker/CMakeLists.txt @@ -4,7 +4,7 @@ ## objectpicker Test: ##################################################################### -qt_add_test(tst_objectpicker +qt_internal_add_test(tst_objectpicker SOURCES tst_objectpicker.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/render/opengl/computecommand/CMakeLists.txt b/tests/auto/render/opengl/computecommand/CMakeLists.txt index c76abf6f1..0bb3494d8 100644 --- a/tests/auto/render/opengl/computecommand/CMakeLists.txt +++ b/tests/auto/render/opengl/computecommand/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_computecommand Test: ##################################################################### -qt_add_test(tst_computecommandgl +qt_internal_add_test(tst_computecommandgl SOURCES tst_computecommand.cpp ) @@ -20,7 +20,7 @@ qt3d_setup_common_render_test(tst_computecommandgl USE_TEST_ASPECT) include(${PROJECT_SOURCE_DIR}/src/plugins/renderers/opengl/opengl.cmake) qt3d_setup_opengl_renderer_target(tst_computecommandgl) -qt_extend_target(tst_computecommandgl CONDITION gcov +qt_internal_extend_target(tst_computecommandgl CONDITION gcov COMPILE_OPTIONS -fprofile-arcs -ftest-coverage diff --git a/tests/auto/render/opengl/filtercompatibletechniquejob/CMakeLists.txt b/tests/auto/render/opengl/filtercompatibletechniquejob/CMakeLists.txt index 1fa9bee37..80db6f729 100644 --- a/tests/auto/render/opengl/filtercompatibletechniquejob/CMakeLists.txt +++ b/tests/auto/render/opengl/filtercompatibletechniquejob/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_filtercompatibletechniquejob Test: ##################################################################### -qt_add_test(tst_filtercompatibletechniquejob +qt_internal_add_test(tst_filtercompatibletechniquejob SOURCES tst_filtercompatibletechniquejob.cpp ) @@ -21,7 +21,7 @@ qt3d_setup_common_test(tst_filtercompatibletechniquejob) include(${PROJECT_SOURCE_DIR}/src/plugins/renderers/opengl/opengl.cmake) qt3d_setup_opengl_renderer_target(tst_filtercompatibletechniquejob) -qt_extend_target(tst_filtercompatibletechniquejob CONDITION gcov +qt_internal_extend_target(tst_filtercompatibletechniquejob CONDITION gcov COMPILE_OPTIONS -fprofile-arcs -ftest-coverage diff --git a/tests/auto/render/opengl/glshadermanager/CMakeLists.txt b/tests/auto/render/opengl/glshadermanager/CMakeLists.txt index 0da95b156..f3c4b4d6c 100644 --- a/tests/auto/render/opengl/glshadermanager/CMakeLists.txt +++ b/tests/auto/render/opengl/glshadermanager/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_glshadermanager Test: ##################################################################### -qt_add_test(tst_glshadermanager +qt_internal_add_test(tst_glshadermanager SOURCES tst_glshadermanager.cpp ) @@ -20,7 +20,7 @@ qt3d_setup_common_render_test(tst_glshadermanager USE_TEST_ASPECT) include(${PROJECT_SOURCE_DIR}/src/plugins/renderers/opengl/opengl.cmake) qt3d_setup_opengl_renderer_target(tst_glshadermanager) -qt_extend_target(tst_glshadermanager CONDITION gcov +qt_internal_extend_target(tst_glshadermanager CONDITION gcov COMPILE_OPTIONS -fprofile-arcs -ftest-coverage diff --git a/tests/auto/render/opengl/graphicshelpergl2/CMakeLists.txt b/tests/auto/render/opengl/graphicshelpergl2/CMakeLists.txt index 427321382..d7b0fdd49 100644 --- a/tests/auto/render/opengl/graphicshelpergl2/CMakeLists.txt +++ b/tests/auto/render/opengl/graphicshelpergl2/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_graphicshelpergl2 Test: ##################################################################### -qt_add_test(tst_graphicshelpergl2 +qt_internal_add_test(tst_graphicshelpergl2 SOURCES tst_graphicshelpergl2.cpp ) @@ -20,7 +20,7 @@ qt3d_setup_common_render_test(tst_graphicshelpergl2 USE_TEST_ASPECT) include(${PROJECT_SOURCE_DIR}/src/plugins/renderers/opengl/opengl.cmake) qt3d_setup_opengl_renderer_target(tst_graphicshelpergl2) -qt_extend_target(tst_graphicshelpergl2 CONDITION gcov +qt_internal_extend_target(tst_graphicshelpergl2 CONDITION gcov COMPILE_OPTIONS -fprofile-arcs -ftest-coverage diff --git a/tests/auto/render/opengl/graphicshelpergl3_2/CMakeLists.txt b/tests/auto/render/opengl/graphicshelpergl3_2/CMakeLists.txt index 93a1e5e60..6898d85d0 100644 --- a/tests/auto/render/opengl/graphicshelpergl3_2/CMakeLists.txt +++ b/tests/auto/render/opengl/graphicshelpergl3_2/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_graphicshelpergl3_2 Test: ##################################################################### -qt_add_test(tst_graphicshelpergl3_2 +qt_internal_add_test(tst_graphicshelpergl3_2 SOURCES tst_graphicshelpergl3_2.cpp ) @@ -20,7 +20,7 @@ qt3d_setup_common_render_test(tst_graphicshelpergl3_2 USE_TEST_ASPECT) include(${PROJECT_SOURCE_DIR}/src/plugins/renderers/opengl/opengl.cmake) qt3d_setup_opengl_renderer_target(tst_graphicshelpergl3_2) -qt_extend_target(tst_graphicshelpergl3_2 CONDITION gcov +qt_internal_extend_target(tst_graphicshelpergl3_2 CONDITION gcov COMPILE_OPTIONS -fprofile-arcs -ftest-coverage diff --git a/tests/auto/render/opengl/graphicshelpergl3_3/CMakeLists.txt b/tests/auto/render/opengl/graphicshelpergl3_3/CMakeLists.txt index 028879f40..3a750b092 100644 --- a/tests/auto/render/opengl/graphicshelpergl3_3/CMakeLists.txt +++ b/tests/auto/render/opengl/graphicshelpergl3_3/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_graphicshelpergl3_3 Test: ##################################################################### -qt_add_test(tst_graphicshelpergl3_3 +qt_internal_add_test(tst_graphicshelpergl3_3 SOURCES tst_graphicshelpergl3_3.cpp ) @@ -20,7 +20,7 @@ qt3d_setup_common_render_test(tst_graphicshelpergl3_3 USE_TEST_ASPECT) include(${PROJECT_SOURCE_DIR}/src/plugins/renderers/opengl/opengl.cmake) qt3d_setup_opengl_renderer_target(tst_graphicshelpergl3_3) -qt_extend_target(tst_graphicshelpergl3_3 CONDITION gcov +qt_internal_extend_target(tst_graphicshelpergl3_3 CONDITION gcov COMPILE_OPTIONS -fprofile-arcs -ftest-coverage diff --git a/tests/auto/render/opengl/graphicshelpergl4/CMakeLists.txt b/tests/auto/render/opengl/graphicshelpergl4/CMakeLists.txt index 4f466f0f2..494b686e8 100644 --- a/tests/auto/render/opengl/graphicshelpergl4/CMakeLists.txt +++ b/tests/auto/render/opengl/graphicshelpergl4/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_graphicshelpergl4 Test: ##################################################################### -qt_add_test(tst_graphicshelpergl4 +qt_internal_add_test(tst_graphicshelpergl4 SOURCES tst_graphicshelpergl4.cpp ) @@ -20,7 +20,7 @@ qt3d_setup_common_render_test(tst_graphicshelpergl4 USE_TEST_ASPECT) include(${PROJECT_SOURCE_DIR}/src/plugins/renderers/opengl/opengl.cmake) qt3d_setup_opengl_renderer_target(tst_graphicshelpergl4) -qt_extend_target(tst_graphicshelpergl4 CONDITION gcov +qt_internal_extend_target(tst_graphicshelpergl4 CONDITION gcov COMPILE_OPTIONS -fprofile-arcs -ftest-coverage diff --git a/tests/auto/render/opengl/materialparametergathererjob/CMakeLists.txt b/tests/auto/render/opengl/materialparametergathererjob/CMakeLists.txt index dfadad96e..ff49b6d42 100644 --- a/tests/auto/render/opengl/materialparametergathererjob/CMakeLists.txt +++ b/tests/auto/render/opengl/materialparametergathererjob/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_materialparametergathererjob Test: ##################################################################### -qt_add_test(tst_materialparametergathererjob +qt_internal_add_test(tst_materialparametergathererjob SOURCES tst_materialparametergathererjob.cpp ) @@ -20,7 +20,7 @@ qt3d_setup_common_render_test(tst_materialparametergathererjob) include(${PROJECT_SOURCE_DIR}/src/plugins/renderers/opengl/opengl.cmake) qt3d_setup_opengl_renderer_target(tst_materialparametergathererjob) -qt_extend_target(tst_materialparametergathererjob CONDITION gcov +qt_internal_extend_target(tst_materialparametergathererjob CONDITION gcov COMPILE_OPTIONS -fprofile-arcs -ftest-coverage diff --git a/tests/auto/render/opengl/qgraphicsutils/CMakeLists.txt b/tests/auto/render/opengl/qgraphicsutils/CMakeLists.txt index 06f00fd5a..c0874f12e 100644 --- a/tests/auto/render/opengl/qgraphicsutils/CMakeLists.txt +++ b/tests/auto/render/opengl/qgraphicsutils/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qgraphicsutils Test: ##################################################################### -qt_add_test(tst_qgraphicsutils +qt_internal_add_test(tst_qgraphicsutils SOURCES tst_qgraphicsutils.cpp ) @@ -20,7 +20,7 @@ qt3d_setup_common_render_test(tst_qgraphicsutils) include(${PROJECT_SOURCE_DIR}/src/plugins/renderers/opengl/opengl.cmake) qt3d_setup_opengl_renderer_target(tst_qgraphicsutils) -qt_extend_target(tst_qgraphicsutils CONDITION gcov +qt_internal_extend_target(tst_qgraphicsutils CONDITION gcov COMPILE_OPTIONS -fprofile-arcs -ftest-coverage diff --git a/tests/auto/render/opengl/renderer/CMakeLists.txt b/tests/auto/render/opengl/renderer/CMakeLists.txt index 9cac82016..209b10fa2 100644 --- a/tests/auto/render/opengl/renderer/CMakeLists.txt +++ b/tests/auto/render/opengl/renderer/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_renderer Test: ##################################################################### -qt_add_test(tst_renderer +qt_internal_add_test(tst_renderer SOURCES tst_renderer.cpp ) @@ -20,7 +20,7 @@ qt3d_setup_common_render_test(tst_renderer USE_TEST_ASPECT) include(${PROJECT_SOURCE_DIR}/src/plugins/renderers/opengl/opengl.cmake) qt3d_setup_opengl_renderer_target(tst_renderer) -qt_extend_target(tst_renderer CONDITION gcov +qt_internal_extend_target(tst_renderer CONDITION gcov COMPILE_OPTIONS -fprofile-arcs -ftest-coverage @@ -29,7 +29,7 @@ qt_extend_target(tst_renderer CONDITION gcov "-ftest-coverage" ) -qt_extend_target(tst_renderer CONDITION useCommonTestAspect +qt_internal_extend_target(tst_renderer CONDITION useCommonTestAspect SOURCES ../../commons/testaspect.cpp ../../commons/testaspect.h ) diff --git a/tests/auto/render/opengl/renderqueue/CMakeLists.txt b/tests/auto/render/opengl/renderqueue/CMakeLists.txt index 940aa1f65..a2c5cb688 100644 --- a/tests/auto/render/opengl/renderqueue/CMakeLists.txt +++ b/tests/auto/render/opengl/renderqueue/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_renderqueue Test: ##################################################################### -qt_add_test(tst_renderqueue +qt_internal_add_test(tst_renderqueue SOURCES tst_renderqueue.cpp ) @@ -20,7 +20,7 @@ qt3d_setup_common_render_test(tst_renderqueue USE_TEST_ASPECT) include(${PROJECT_SOURCE_DIR}/src/plugins/renderers/opengl/opengl.cmake) qt3d_setup_opengl_renderer_target(tst_renderqueue) -qt_extend_target(tst_renderqueue CONDITION gcov +qt_internal_extend_target(tst_renderqueue CONDITION gcov COMPILE_OPTIONS -fprofile-arcs -ftest-coverage diff --git a/tests/auto/render/opengl/renderviewbuilder/CMakeLists.txt b/tests/auto/render/opengl/renderviewbuilder/CMakeLists.txt index 1e47584be..1cfec3785 100644 --- a/tests/auto/render/opengl/renderviewbuilder/CMakeLists.txt +++ b/tests/auto/render/opengl/renderviewbuilder/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_renderviewbuilder Test: ##################################################################### -qt_add_test(tst_renderviewbuilder +qt_internal_add_test(tst_renderviewbuilder SOURCES tst_renderviewbuilder.cpp ) @@ -20,7 +20,7 @@ qt3d_setup_common_render_test(tst_renderviewbuilder) include(${PROJECT_SOURCE_DIR}/src/plugins/renderers/opengl/opengl.cmake) qt3d_setup_opengl_renderer_target(tst_renderviewbuilder) -qt_extend_target(tst_renderviewbuilder CONDITION gcov +qt_internal_extend_target(tst_renderviewbuilder CONDITION gcov COMPILE_OPTIONS -fprofile-arcs -ftest-coverage diff --git a/tests/auto/render/opengl/renderviews/CMakeLists.txt b/tests/auto/render/opengl/renderviews/CMakeLists.txt index 4a675c02e..e3c0b0f58 100644 --- a/tests/auto/render/opengl/renderviews/CMakeLists.txt +++ b/tests/auto/render/opengl/renderviews/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_renderviews Test: ##################################################################### -qt_add_test(tst_renderviews +qt_internal_add_test(tst_renderviews SOURCES tst_renderviews.cpp ) @@ -20,7 +20,7 @@ qt3d_setup_common_render_test(tst_renderviews USE_TEST_ASPECT) include(${PROJECT_SOURCE_DIR}/src/plugins/renderers/opengl/opengl.cmake) qt3d_setup_opengl_renderer_target(tst_renderviews) -qt_extend_target(tst_renderviews CONDITION gcov +qt_internal_extend_target(tst_renderviews CONDITION gcov COMPILE_OPTIONS -fprofile-arcs -ftest-coverage diff --git a/tests/auto/render/opengl/renderviewutils/CMakeLists.txt b/tests/auto/render/opengl/renderviewutils/CMakeLists.txt index 10cb1e0c7..771e49e10 100644 --- a/tests/auto/render/opengl/renderviewutils/CMakeLists.txt +++ b/tests/auto/render/opengl/renderviewutils/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_renderviewutils Test: ##################################################################### -qt_add_test(tst_renderviewutils +qt_internal_add_test(tst_renderviewutils SOURCES tst_renderviewutils.cpp ) @@ -20,7 +20,7 @@ qt3d_setup_common_render_test(tst_renderviewutils USE_TEST_ASPECT) include(${PROJECT_SOURCE_DIR}/src/plugins/renderers/opengl/opengl.cmake) qt3d_setup_opengl_renderer_target(tst_renderviewutils) -qt_extend_target(tst_renderviewutils CONDITION gcov +qt_internal_extend_target(tst_renderviewutils CONDITION gcov COMPILE_OPTIONS -fprofile-arcs -ftest-coverage diff --git a/tests/auto/render/opengl/textures/CMakeLists.txt b/tests/auto/render/opengl/textures/CMakeLists.txt index 59bdc8923..ce74fcfac 100644 --- a/tests/auto/render/opengl/textures/CMakeLists.txt +++ b/tests/auto/render/opengl/textures/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_textures Test: ##################################################################### -qt_add_test(tst_textures +qt_internal_add_test(tst_textures SOURCES tst_textures.cpp ) @@ -20,7 +20,7 @@ qt3d_setup_common_render_test(tst_textures USE_TEST_ASPECT) include(${PROJECT_SOURCE_DIR}/src/plugins/renderers/opengl/opengl.cmake) qt3d_setup_opengl_renderer_target(tst_textures) -qt_extend_target(tst_textures CONDITION gcov +qt_internal_extend_target(tst_textures CONDITION gcov COMPILE_OPTIONS -fprofile-arcs -ftest-coverage diff --git a/tests/auto/render/parameter/CMakeLists.txt b/tests/auto/render/parameter/CMakeLists.txt index e06a8f9de..a3e197e5f 100644 --- a/tests/auto/render/parameter/CMakeLists.txt +++ b/tests/auto/render/parameter/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_parameter Test: ##################################################################### -qt_add_test(tst_parameter +qt_internal_add_test(tst_parameter SOURCES tst_parameter.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/render/pickboundingvolumejob/CMakeLists.txt b/tests/auto/render/pickboundingvolumejob/CMakeLists.txt index 45d143312..53097bc60 100644 --- a/tests/auto/render/pickboundingvolumejob/CMakeLists.txt +++ b/tests/auto/render/pickboundingvolumejob/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_pickboundingvolumejob Test: ##################################################################### -qt_add_test(tst_pickboundingvolumejob +qt_internal_add_test(tst_pickboundingvolumejob SOURCES ../qmlscenereader/qmlscenereader.cpp ../qmlscenereader/qmlscenereader.h tst_pickboundingvolumejob.cpp @@ -41,7 +41,7 @@ set(pickboundingvolumejob_resource_files "testscene_viewports.qml" ) -qt_add_resource(tst_pickboundingvolumejob "pickboundingvolumejob" +qt_internal_add_resource(tst_pickboundingvolumejob "pickboundingvolumejob" PREFIX "/" FILES diff --git a/tests/auto/render/picking/CMakeLists.txt b/tests/auto/render/picking/CMakeLists.txt index cec82aabc..662532c34 100644 --- a/tests/auto/render/picking/CMakeLists.txt +++ b/tests/auto/render/picking/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_picking Test: ##################################################################### -qt_add_test(tst_picking +qt_internal_add_test(tst_picking SOURCES tst_picking.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/render/proximityfilter/CMakeLists.txt b/tests/auto/render/proximityfilter/CMakeLists.txt index 5f09f7e36..5e52d4643 100644 --- a/tests/auto/render/proximityfilter/CMakeLists.txt +++ b/tests/auto/render/proximityfilter/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_proximityfilter Test: ##################################################################### -qt_add_test(tst_proximityfilter +qt_internal_add_test(tst_proximityfilter SOURCES tst_proximityfilter.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/render/proximityfiltering/CMakeLists.txt b/tests/auto/render/proximityfiltering/CMakeLists.txt index 28a57d532..81d2f0a93 100644 --- a/tests/auto/render/proximityfiltering/CMakeLists.txt +++ b/tests/auto/render/proximityfiltering/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_proximityfiltering Test: ##################################################################### -qt_add_test(tst_proximityfiltering +qt_internal_add_test(tst_proximityfiltering SOURCES tst_proximityfiltering.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/render/qabstractlight/CMakeLists.txt b/tests/auto/render/qabstractlight/CMakeLists.txt index 073b28815..46f498dc5 100644 --- a/tests/auto/render/qabstractlight/CMakeLists.txt +++ b/tests/auto/render/qabstractlight/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qabstractlight Test: ##################################################################### -qt_add_test(tst_qabstractlight +qt_internal_add_test(tst_qabstractlight SOURCES tst_qabstractlight.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/render/qabstracttexture/CMakeLists.txt b/tests/auto/render/qabstracttexture/CMakeLists.txt index e2e5f74f8..c6b67b60b 100644 --- a/tests/auto/render/qabstracttexture/CMakeLists.txt +++ b/tests/auto/render/qabstracttexture/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qabstracttexture Test: ##################################################################### -qt_add_test(tst_qabstracttexture +qt_internal_add_test(tst_qabstracttexture SOURCES tst_qabstracttexture.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/render/qabstracttextureimage/CMakeLists.txt b/tests/auto/render/qabstracttextureimage/CMakeLists.txt index ca877629b..99b7fc264 100644 --- a/tests/auto/render/qabstracttextureimage/CMakeLists.txt +++ b/tests/auto/render/qabstracttextureimage/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qabstracttextureimage Test: ##################################################################### -qt_add_test(tst_qabstracttextureimage +qt_internal_add_test(tst_qabstracttextureimage SOURCES tst_qabstracttextureimage.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/render/qattribute/CMakeLists.txt b/tests/auto/render/qattribute/CMakeLists.txt index ba5c654c9..cc12ac7a3 100644 --- a/tests/auto/render/qattribute/CMakeLists.txt +++ b/tests/auto/render/qattribute/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qattribute Test: ##################################################################### -qt_add_test(tst_qattribute +qt_internal_add_test(tst_qattribute SOURCES tst_qattribute.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/render/qblitframebuffer/CMakeLists.txt b/tests/auto/render/qblitframebuffer/CMakeLists.txt index 2ce0fd223..488d7aeb8 100644 --- a/tests/auto/render/qblitframebuffer/CMakeLists.txt +++ b/tests/auto/render/qblitframebuffer/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qblitframebuffer Test: ##################################################################### -qt_add_test(tst_qblitframebuffer +qt_internal_add_test(tst_qblitframebuffer SOURCES tst_qblitframebuffer.cpp INCLUDE_DIRECTORIES @@ -24,7 +24,7 @@ qt_add_test(tst_qblitframebuffer ## Scopes: ##################################################################### -qt_extend_target(tst_qblitframebuffer CONDITION QT_FEATURE_private_tests +qt_internal_extend_target(tst_qblitframebuffer CONDITION QT_FEATURE_private_tests SOURCES ../../core/common/qbackendnodetester.cpp ../../core/common/qbackendnodetester.h ../../core/common/testarbiter.h diff --git a/tests/auto/render/qboundingvolumedebug/CMakeLists.txt b/tests/auto/render/qboundingvolumedebug/CMakeLists.txt index ae53b2635..aff6c3853 100644 --- a/tests/auto/render/qboundingvolumedebug/CMakeLists.txt +++ b/tests/auto/render/qboundingvolumedebug/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qboundingvolumedebug Test: ##################################################################### -qt_add_test(tst_qboundingvolumedebug +qt_internal_add_test(tst_qboundingvolumedebug SOURCES ../commons/testrenderer.cpp ../commons/testrenderer.h tst_qboundingvolumedebug.cpp @@ -25,7 +25,7 @@ qt_add_test(tst_qboundingvolumedebug ## Scopes: ##################################################################### -qt_extend_target(tst_qboundingvolumedebug CONDITION useCommonTestAspect +qt_internal_extend_target(tst_qboundingvolumedebug CONDITION useCommonTestAspect SOURCES ../commons/testaspect.cpp ../commons/testaspect.h ) diff --git a/tests/auto/render/qbuffer/CMakeLists.txt b/tests/auto/render/qbuffer/CMakeLists.txt index 97a843ede..80a3a5fd0 100644 --- a/tests/auto/render/qbuffer/CMakeLists.txt +++ b/tests/auto/render/qbuffer/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qbuffer Test: ##################################################################### -qt_add_test(tst_qbuffer +qt_internal_add_test(tst_qbuffer SOURCES tst_qbuffer.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/render/qcamera/CMakeLists.txt b/tests/auto/render/qcamera/CMakeLists.txt index 03ad8ea60..d9513feb3 100644 --- a/tests/auto/render/qcamera/CMakeLists.txt +++ b/tests/auto/render/qcamera/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qcamera Test: ##################################################################### -qt_add_test(tst_qcamera +qt_internal_add_test(tst_qcamera SOURCES tst_qcamera.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/render/qcameralens/CMakeLists.txt b/tests/auto/render/qcameralens/CMakeLists.txt index e3736c6ab..8fb669bfb 100644 --- a/tests/auto/render/qcameralens/CMakeLists.txt +++ b/tests/auto/render/qcameralens/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qcameralens Test: ##################################################################### -qt_add_test(tst_qcameralens +qt_internal_add_test(tst_qcameralens SOURCES tst_qcameralens.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/render/qcameraselector/CMakeLists.txt b/tests/auto/render/qcameraselector/CMakeLists.txt index d38004080..d62f3f650 100644 --- a/tests/auto/render/qcameraselector/CMakeLists.txt +++ b/tests/auto/render/qcameraselector/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qcameraselector Test: ##################################################################### -qt_add_test(tst_qcameraselector +qt_internal_add_test(tst_qcameraselector SOURCES tst_qcameraselector.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/render/qclearbuffers/CMakeLists.txt b/tests/auto/render/qclearbuffers/CMakeLists.txt index 0c3dc8ba5..19e6b7af7 100644 --- a/tests/auto/render/qclearbuffers/CMakeLists.txt +++ b/tests/auto/render/qclearbuffers/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qclearbuffer Test: ##################################################################### -qt_add_test(tst_qclearbuffer +qt_internal_add_test(tst_qclearbuffer SOURCES tst_qclearbuffers.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/render/qcomputecommand/CMakeLists.txt b/tests/auto/render/qcomputecommand/CMakeLists.txt index 4aacbfd41..262ba4b3e 100644 --- a/tests/auto/render/qcomputecommand/CMakeLists.txt +++ b/tests/auto/render/qcomputecommand/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qcomputecommand Test: ##################################################################### -qt_add_test(tst_qcomputecommand +qt_internal_add_test(tst_qcomputecommand SOURCES tst_qcomputecommand.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/render/qdispatchcompute/CMakeLists.txt b/tests/auto/render/qdispatchcompute/CMakeLists.txt index bb44f72fd..a7a16da4a 100644 --- a/tests/auto/render/qdispatchcompute/CMakeLists.txt +++ b/tests/auto/render/qdispatchcompute/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qdispatchcompute Test: ##################################################################### -qt_add_test(tst_qdispatchcompute +qt_internal_add_test(tst_qdispatchcompute SOURCES tst_qdispatchcompute.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/render/qeffect/CMakeLists.txt b/tests/auto/render/qeffect/CMakeLists.txt index 775d27d4f..efbb84525 100644 --- a/tests/auto/render/qeffect/CMakeLists.txt +++ b/tests/auto/render/qeffect/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qeffect Test: ##################################################################### -qt_add_test(tst_qeffect +qt_internal_add_test(tst_qeffect SOURCES tst_qeffect.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/render/qenvironmentlight/CMakeLists.txt b/tests/auto/render/qenvironmentlight/CMakeLists.txt index 4979e9441..768ce5b6f 100644 --- a/tests/auto/render/qenvironmentlight/CMakeLists.txt +++ b/tests/auto/render/qenvironmentlight/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_environmentlight Test: ##################################################################### -qt_add_test(tst_qenvironmentlight +qt_internal_add_test(tst_qenvironmentlight SOURCES tst_qenvironmentlight.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/render/qfilterkey/CMakeLists.txt b/tests/auto/render/qfilterkey/CMakeLists.txt index 037f5e610..8d762138f 100644 --- a/tests/auto/render/qfilterkey/CMakeLists.txt +++ b/tests/auto/render/qfilterkey/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qfilterkey Test: ##################################################################### -qt_add_test(tst_qfilterkey +qt_internal_add_test(tst_qfilterkey SOURCES tst_qfilterkey.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/render/qframegraphnode/CMakeLists.txt b/tests/auto/render/qframegraphnode/CMakeLists.txt index d4cf11de7..d7847bd53 100644 --- a/tests/auto/render/qframegraphnode/CMakeLists.txt +++ b/tests/auto/render/qframegraphnode/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qframegraphnode Test: ##################################################################### -qt_add_test(tst_qframegraphnode +qt_internal_add_test(tst_qframegraphnode SOURCES tst_qframegraphnode.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/render/qgeometry/CMakeLists.txt b/tests/auto/render/qgeometry/CMakeLists.txt index 367a34a15..47163666d 100644 --- a/tests/auto/render/qgeometry/CMakeLists.txt +++ b/tests/auto/render/qgeometry/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qgeometry Test: ##################################################################### -qt_add_test(tst_qgeometry +qt_internal_add_test(tst_qgeometry SOURCES tst_qgeometry.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/render/qgeometryrenderer/CMakeLists.txt b/tests/auto/render/qgeometryrenderer/CMakeLists.txt index fce74ff18..64337c36a 100644 --- a/tests/auto/render/qgeometryrenderer/CMakeLists.txt +++ b/tests/auto/render/qgeometryrenderer/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qgeometryrenderer Test: ##################################################################### -qt_add_test(tst_qgeometryrenderer +qt_internal_add_test(tst_qgeometryrenderer SOURCES tst_qgeometryrenderer.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/render/qgraphicsapifilter/CMakeLists.txt b/tests/auto/render/qgraphicsapifilter/CMakeLists.txt index 6453b005a..6f3c056ae 100644 --- a/tests/auto/render/qgraphicsapifilter/CMakeLists.txt +++ b/tests/auto/render/qgraphicsapifilter/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qgraphicsapifilter Test: ##################################################################### -qt_add_test(tst_qgraphicsapifilter +qt_internal_add_test(tst_qgraphicsapifilter SOURCES tst_qgraphicsapifilter.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/render/qlayerfilter/CMakeLists.txt b/tests/auto/render/qlayerfilter/CMakeLists.txt index 0083c5fb3..0776acc50 100644 --- a/tests/auto/render/qlayerfilter/CMakeLists.txt +++ b/tests/auto/render/qlayerfilter/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qlayerfilter Test: ##################################################################### -qt_add_test(tst_qlayerfilter +qt_internal_add_test(tst_qlayerfilter SOURCES tst_qlayerfilter.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/render/qlevelofdetail/CMakeLists.txt b/tests/auto/render/qlevelofdetail/CMakeLists.txt index a56e2d985..d376a4805 100644 --- a/tests/auto/render/qlevelofdetail/CMakeLists.txt +++ b/tests/auto/render/qlevelofdetail/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qlevelofdetail Test: ##################################################################### -qt_add_test(tst_qlevelofdetail +qt_internal_add_test(tst_qlevelofdetail SOURCES tst_qlevelofdetail.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/render/qmaterial/CMakeLists.txt b/tests/auto/render/qmaterial/CMakeLists.txt index 77e21f455..109f03a74 100644 --- a/tests/auto/render/qmaterial/CMakeLists.txt +++ b/tests/auto/render/qmaterial/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qmaterial Test: ##################################################################### -qt_add_test(tst_qmaterial +qt_internal_add_test(tst_qmaterial SOURCES tst_qmaterial.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/render/qmemorybarrier/CMakeLists.txt b/tests/auto/render/qmemorybarrier/CMakeLists.txt index 71c0f64e3..4091853c4 100644 --- a/tests/auto/render/qmemorybarrier/CMakeLists.txt +++ b/tests/auto/render/qmemorybarrier/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qmemorybarrier Test: ##################################################################### -qt_add_test(tst_qmemorybarrier +qt_internal_add_test(tst_qmemorybarrier SOURCES tst_qmemorybarrier.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/render/qmesh/CMakeLists.txt b/tests/auto/render/qmesh/CMakeLists.txt index a31fdd31a..11a98192a 100644 --- a/tests/auto/render/qmesh/CMakeLists.txt +++ b/tests/auto/render/qmesh/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qmesh Test: ##################################################################### -qt_add_test(tst_qmesh +qt_internal_add_test(tst_qmesh SOURCES tst_qmesh.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/render/qobjectpicker/CMakeLists.txt b/tests/auto/render/qobjectpicker/CMakeLists.txt index dfce77ca7..4ec7deed1 100644 --- a/tests/auto/render/qobjectpicker/CMakeLists.txt +++ b/tests/auto/render/qobjectpicker/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qobjectpicker Test: ##################################################################### -qt_add_test(tst_qobjectpicker +qt_internal_add_test(tst_qobjectpicker SOURCES tst_qobjectpicker.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/render/qparameter/CMakeLists.txt b/tests/auto/render/qparameter/CMakeLists.txt index 2c1e86dbc..6bfd7ded5 100644 --- a/tests/auto/render/qparameter/CMakeLists.txt +++ b/tests/auto/render/qparameter/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qparameter Test: ##################################################################### -qt_add_test(tst_qparameter +qt_internal_add_test(tst_qparameter SOURCES tst_qparameter.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/render/qproximityfilter/CMakeLists.txt b/tests/auto/render/qproximityfilter/CMakeLists.txt index 8e221c6bb..e5caa85f7 100644 --- a/tests/auto/render/qproximityfilter/CMakeLists.txt +++ b/tests/auto/render/qproximityfilter/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qproximityfilter Test: ##################################################################### -qt_add_test(tst_qproximityfilter +qt_internal_add_test(tst_qproximityfilter SOURCES tst_qproximityfilter.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/render/qray3d/CMakeLists.txt b/tests/auto/render/qray3d/CMakeLists.txt index ac917e75a..073608c9b 100644 --- a/tests/auto/render/qray3d/CMakeLists.txt +++ b/tests/auto/render/qray3d/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qray3d Test: ##################################################################### -qt_add_test(tst_qray3d +qt_internal_add_test(tst_qray3d SOURCES tst_qray3d.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/render/qraycaster/CMakeLists.txt b/tests/auto/render/qraycaster/CMakeLists.txt index 0c9a2c18a..98590e7de 100644 --- a/tests/auto/render/qraycaster/CMakeLists.txt +++ b/tests/auto/render/qraycaster/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qraycaster Test: ##################################################################### -qt_add_test(tst_qraycaster +qt_internal_add_test(tst_qraycaster SOURCES tst_qraycaster.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/render/qrendercapture/CMakeLists.txt b/tests/auto/render/qrendercapture/CMakeLists.txt index fa73f41cf..30e22310c 100644 --- a/tests/auto/render/qrendercapture/CMakeLists.txt +++ b/tests/auto/render/qrendercapture/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qrendercapture Test: ##################################################################### -qt_add_test(tst_qrendercapture +qt_internal_add_test(tst_qrendercapture SOURCES tst_qrendercapture.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/render/qrenderpass/CMakeLists.txt b/tests/auto/render/qrenderpass/CMakeLists.txt index c778f57c6..b562daed8 100644 --- a/tests/auto/render/qrenderpass/CMakeLists.txt +++ b/tests/auto/render/qrenderpass/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qrenderpass Test: ##################################################################### -qt_add_test(tst_qrenderpass +qt_internal_add_test(tst_qrenderpass SOURCES tst_qrenderpass.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/render/qrenderpassfilter/CMakeLists.txt b/tests/auto/render/qrenderpassfilter/CMakeLists.txt index 1709266bd..9711d9e79 100644 --- a/tests/auto/render/qrenderpassfilter/CMakeLists.txt +++ b/tests/auto/render/qrenderpassfilter/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qrenderpassfilter Test: ##################################################################### -qt_add_test(tst_qrenderpassfilter +qt_internal_add_test(tst_qrenderpassfilter SOURCES tst_qrenderpassfilter.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/render/qrendersettings/CMakeLists.txt b/tests/auto/render/qrendersettings/CMakeLists.txt index 236eea355..1cc0673f1 100644 --- a/tests/auto/render/qrendersettings/CMakeLists.txt +++ b/tests/auto/render/qrendersettings/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qrendersettings Test: ##################################################################### -qt_add_test(tst_qrendersettings +qt_internal_add_test(tst_qrendersettings SOURCES tst_qrendersettings.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/render/qrenderstate/CMakeLists.txt b/tests/auto/render/qrenderstate/CMakeLists.txt index 0995ff958..5b71e872c 100644 --- a/tests/auto/render/qrenderstate/CMakeLists.txt +++ b/tests/auto/render/qrenderstate/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qrenderstate Test: ##################################################################### -qt_add_test(tst_qrenderstate +qt_internal_add_test(tst_qrenderstate SOURCES tst_qrenderstate.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/render/qrenderstateset/CMakeLists.txt b/tests/auto/render/qrenderstateset/CMakeLists.txt index 9c3d759da..359bef913 100644 --- a/tests/auto/render/qrenderstateset/CMakeLists.txt +++ b/tests/auto/render/qrenderstateset/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qrenderstateset Test: ##################################################################### -qt_add_test(tst_qrenderstateset +qt_internal_add_test(tst_qrenderstateset SOURCES tst_qrenderstateset.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/render/qrendersurfaceselector/CMakeLists.txt b/tests/auto/render/qrendersurfaceselector/CMakeLists.txt index eb001f308..a6f438089 100644 --- a/tests/auto/render/qrendersurfaceselector/CMakeLists.txt +++ b/tests/auto/render/qrendersurfaceselector/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qrendersurfaceselector Test: ##################################################################### -qt_add_test(tst_qrendersurfaceselector +qt_internal_add_test(tst_qrendersurfaceselector SOURCES tst_qrendersurfaceselector.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/render/qrendertarget/CMakeLists.txt b/tests/auto/render/qrendertarget/CMakeLists.txt index 393859ceb..cec7db335 100644 --- a/tests/auto/render/qrendertarget/CMakeLists.txt +++ b/tests/auto/render/qrendertarget/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qrendertarget Test: ##################################################################### -qt_add_test(tst_qrendertarget +qt_internal_add_test(tst_qrendertarget SOURCES tst_qrendertarget.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/render/qrendertargetoutput/CMakeLists.txt b/tests/auto/render/qrendertargetoutput/CMakeLists.txt index bf7f10d1e..1c8763c0e 100644 --- a/tests/auto/render/qrendertargetoutput/CMakeLists.txt +++ b/tests/auto/render/qrendertargetoutput/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qrendertargetoutput Test: ##################################################################### -qt_add_test(tst_qrendertargetoutput +qt_internal_add_test(tst_qrendertargetoutput SOURCES tst_qrendertargetoutput.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/render/qrendertargetselector/CMakeLists.txt b/tests/auto/render/qrendertargetselector/CMakeLists.txt index 3b2cc3af0..d4145d667 100644 --- a/tests/auto/render/qrendertargetselector/CMakeLists.txt +++ b/tests/auto/render/qrendertargetselector/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qrendertargetselector Test: ##################################################################### -qt_add_test(tst_qrendertargetselector +qt_internal_add_test(tst_qrendertargetselector SOURCES tst_qrendertargetselector.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/render/qscene2d/CMakeLists.txt b/tests/auto/render/qscene2d/CMakeLists.txt index 76dc7b575..ff585b314 100644 --- a/tests/auto/render/qscene2d/CMakeLists.txt +++ b/tests/auto/render/qscene2d/CMakeLists.txt @@ -4,7 +4,7 @@ ## qscene2d Test: ##################################################################### -qt_add_test(qscene2d +qt_internal_add_test(qscene2d SOURCES tst_qscene2d.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/render/qsceneloader/CMakeLists.txt b/tests/auto/render/qsceneloader/CMakeLists.txt index b6010d201..0b447eb19 100644 --- a/tests/auto/render/qsceneloader/CMakeLists.txt +++ b/tests/auto/render/qsceneloader/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qsceneloader Test: ##################################################################### -qt_add_test(tst_qsceneloader +qt_internal_add_test(tst_qsceneloader SOURCES tst_qsceneloader.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/render/qscreenraycaster/CMakeLists.txt b/tests/auto/render/qscreenraycaster/CMakeLists.txt index a7baaf887..4f63bddff 100644 --- a/tests/auto/render/qscreenraycaster/CMakeLists.txt +++ b/tests/auto/render/qscreenraycaster/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qscreenraycaster Test: ##################################################################### -qt_add_test(tst_qscreenraycaster +qt_internal_add_test(tst_qscreenraycaster SOURCES tst_qscreenraycaster.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/render/qsetfence/CMakeLists.txt b/tests/auto/render/qsetfence/CMakeLists.txt index cce3c7b9f..07f5b593d 100644 --- a/tests/auto/render/qsetfence/CMakeLists.txt +++ b/tests/auto/render/qsetfence/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qsetfence Test: ##################################################################### -qt_add_test(tst_qsetfence +qt_internal_add_test(tst_qsetfence SOURCES tst_qsetfence.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/render/qshaderimage/CMakeLists.txt b/tests/auto/render/qshaderimage/CMakeLists.txt index 05a3aeee6..88efbf38d 100644 --- a/tests/auto/render/qshaderimage/CMakeLists.txt +++ b/tests/auto/render/qshaderimage/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qshaderimage Test: ##################################################################### -qt_add_test(tst_qshaderimage +qt_internal_add_test(tst_qshaderimage SOURCES tst_qshaderimage.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/render/qshaderprogram/CMakeLists.txt b/tests/auto/render/qshaderprogram/CMakeLists.txt index 8d869f81c..670f76235 100644 --- a/tests/auto/render/qshaderprogram/CMakeLists.txt +++ b/tests/auto/render/qshaderprogram/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qshaderprogram Test: ##################################################################### -qt_add_test(tst_qshaderprogram +qt_internal_add_test(tst_qshaderprogram SOURCES tst_qshaderprogram.cpp PUBLIC_LIBRARIES @@ -23,7 +23,7 @@ set(shaders_resource_files "mainabsolute.frag" ) -qt_add_resource(tst_qshaderprogram "shaders" +qt_internal_add_resource(tst_qshaderprogram "shaders" PREFIX "/" FILES diff --git a/tests/auto/render/qshaderprogrambuilder/CMakeLists.txt b/tests/auto/render/qshaderprogrambuilder/CMakeLists.txt index 6c5f0cb54..816cada5a 100644 --- a/tests/auto/render/qshaderprogrambuilder/CMakeLists.txt +++ b/tests/auto/render/qshaderprogrambuilder/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qshaderprogrambuilder Test: ##################################################################### -qt_add_test(tst_qshaderprogrambuilder +qt_internal_add_test(tst_qshaderprogrambuilder SOURCES tst_qshaderprogrambuilder.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/render/qsharedgltexture/CMakeLists.txt b/tests/auto/render/qsharedgltexture/CMakeLists.txt index 0d917d6d7..758725b24 100644 --- a/tests/auto/render/qsharedgltexture/CMakeLists.txt +++ b/tests/auto/render/qsharedgltexture/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qsharedgltexture Test: ##################################################################### -qt_add_test(tst_qsharedgltexture +qt_internal_add_test(tst_qsharedgltexture SOURCES tst_qsharedgltexture.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/render/qsortpolicy/CMakeLists.txt b/tests/auto/render/qsortpolicy/CMakeLists.txt index 3cc1ee176..27fcda50e 100644 --- a/tests/auto/render/qsortpolicy/CMakeLists.txt +++ b/tests/auto/render/qsortpolicy/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qsortmethod Test: ##################################################################### -qt_add_test(tst_qsortmethod +qt_internal_add_test(tst_qsortmethod SOURCES tst_qsortpolicy.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/render/qtechnique/CMakeLists.txt b/tests/auto/render/qtechnique/CMakeLists.txt index 45060ea02..3334ed098 100644 --- a/tests/auto/render/qtechnique/CMakeLists.txt +++ b/tests/auto/render/qtechnique/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qtechnique Test: ##################################################################### -qt_add_test(tst_qtechnique +qt_internal_add_test(tst_qtechnique SOURCES tst_qtechnique.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/render/qtechniquefilter/CMakeLists.txt b/tests/auto/render/qtechniquefilter/CMakeLists.txt index 2bcf4696b..21679659e 100644 --- a/tests/auto/render/qtechniquefilter/CMakeLists.txt +++ b/tests/auto/render/qtechniquefilter/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qtechniquefilter Test: ##################################################################### -qt_add_test(tst_qtechniquefilter +qt_internal_add_test(tst_qtechniquefilter SOURCES tst_qtechniquefilter.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/render/qtexturedataupdate/CMakeLists.txt b/tests/auto/render/qtexturedataupdate/CMakeLists.txt index 3b66d7990..3a083208e 100644 --- a/tests/auto/render/qtexturedataupdate/CMakeLists.txt +++ b/tests/auto/render/qtexturedataupdate/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qtexturedataupdate Test: ##################################################################### -qt_add_test(tst_qtexturedataupdate +qt_internal_add_test(tst_qtexturedataupdate SOURCES tst_qtexturedataupdate.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/render/qtextureimage/CMakeLists.txt b/tests/auto/render/qtextureimage/CMakeLists.txt index 4b7f68038..7769fe076 100644 --- a/tests/auto/render/qtextureimage/CMakeLists.txt +++ b/tests/auto/render/qtextureimage/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qtextureimage Test: ##################################################################### -qt_add_test(tst_qtextureimage +qt_internal_add_test(tst_qtextureimage SOURCES tst_qtextureimage.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/render/qtextureimagedata/CMakeLists.txt b/tests/auto/render/qtextureimagedata/CMakeLists.txt index 6c15dd6de..3f0be8b45 100644 --- a/tests/auto/render/qtextureimagedata/CMakeLists.txt +++ b/tests/auto/render/qtextureimagedata/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qtextureimagedata Test: ##################################################################### -qt_add_test(tst_qtextureimagedata +qt_internal_add_test(tst_qtextureimagedata SOURCES tst_qtextureimagedata.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/render/qtextureloader/CMakeLists.txt b/tests/auto/render/qtextureloader/CMakeLists.txt index 8bd4f68d1..d8f3eaf9d 100644 --- a/tests/auto/render/qtextureloader/CMakeLists.txt +++ b/tests/auto/render/qtextureloader/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qtextureloader Test: ##################################################################### -qt_add_test(tst_qtextureloader +qt_internal_add_test(tst_qtextureloader SOURCES tst_qtextureloader.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/render/qviewport/CMakeLists.txt b/tests/auto/render/qviewport/CMakeLists.txt index 924ec2c22..527ee817a 100644 --- a/tests/auto/render/qviewport/CMakeLists.txt +++ b/tests/auto/render/qviewport/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qviewport Test: ##################################################################### -qt_add_test(tst_qviewport +qt_internal_add_test(tst_qviewport SOURCES tst_qviewport.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/render/qwaitfence/CMakeLists.txt b/tests/auto/render/qwaitfence/CMakeLists.txt index 6994577ca..001388b92 100644 --- a/tests/auto/render/qwaitfence/CMakeLists.txt +++ b/tests/auto/render/qwaitfence/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qwaitfence Test: ##################################################################### -qt_add_test(tst_qwaitfence +qt_internal_add_test(tst_qwaitfence SOURCES tst_qwaitfence.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/render/raycaster/CMakeLists.txt b/tests/auto/render/raycaster/CMakeLists.txt index 5f728d9ed..7a955c9b0 100644 --- a/tests/auto/render/raycaster/CMakeLists.txt +++ b/tests/auto/render/raycaster/CMakeLists.txt @@ -4,7 +4,7 @@ ## raycaster Test: ##################################################################### -qt_add_test(tst_raycaster +qt_internal_add_test(tst_raycaster SOURCES tst_raycaster.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/render/raycasting/CMakeLists.txt b/tests/auto/render/raycasting/CMakeLists.txt index 9d45d1208..20a39de93 100644 --- a/tests/auto/render/raycasting/CMakeLists.txt +++ b/tests/auto/render/raycasting/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_raycasting Test: ##################################################################### -qt_add_test(tst_raycasting +qt_internal_add_test(tst_raycasting SOURCES tst_raycasting.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/render/raycastingjob/CMakeLists.txt b/tests/auto/render/raycastingjob/CMakeLists.txt index c131d65a3..39a32da1f 100644 --- a/tests/auto/render/raycastingjob/CMakeLists.txt +++ b/tests/auto/render/raycastingjob/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_raycastingjob Test: ##################################################################### -qt_add_test(tst_raycastingjob +qt_internal_add_test(tst_raycastingjob SOURCES ../qmlscenereader/qmlscenereader.cpp ../qmlscenereader/qmlscenereader.h tst_raycastingjob.cpp @@ -34,7 +34,7 @@ set(raycastingjob_resource_files "testscene_worldraycastingparentlayer.qml" ) -qt_add_resource(tst_raycastingjob "raycastingjob" +qt_internal_add_resource(tst_raycastingjob "raycastingjob" PREFIX "/" FILES diff --git a/tests/auto/render/rendercapture/CMakeLists.txt b/tests/auto/render/rendercapture/CMakeLists.txt index c5b7cf609..51c7dcb27 100644 --- a/tests/auto/render/rendercapture/CMakeLists.txt +++ b/tests/auto/render/rendercapture/CMakeLists.txt @@ -4,7 +4,7 @@ ## rendercapture Test: ##################################################################### -qt_add_test(tst_rendercapture +qt_internal_add_test(tst_rendercapture SOURCES tst_rendercapture.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/render/renderpass/CMakeLists.txt b/tests/auto/render/renderpass/CMakeLists.txt index b95f54fd9..29bc40065 100644 --- a/tests/auto/render/renderpass/CMakeLists.txt +++ b/tests/auto/render/renderpass/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_renderpass Test: ##################################################################### -qt_add_test(tst_renderpass +qt_internal_add_test(tst_renderpass SOURCES tst_renderpass.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/render/rendertarget/CMakeLists.txt b/tests/auto/render/rendertarget/CMakeLists.txt index 1c017b1bd..a714058dd 100644 --- a/tests/auto/render/rendertarget/CMakeLists.txt +++ b/tests/auto/render/rendertarget/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_rendertarget Test: ##################################################################### -qt_add_test(tst_rendertarget +qt_internal_add_test(tst_rendertarget SOURCES tst_rendertarget.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/render/rhi/rhi_graphicspipelinemanager/CMakeLists.txt b/tests/auto/render/rhi/rhi_graphicspipelinemanager/CMakeLists.txt index 0875e4f71..a421a40b0 100644 --- a/tests/auto/render/rhi/rhi_graphicspipelinemanager/CMakeLists.txt +++ b/tests/auto/render/rhi/rhi_graphicspipelinemanager/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_rhi_graphicspipelinemanager Test: ##################################################################### -qt_add_test(tst_rhi_graphicspipelinemanager +qt_internal_add_test(tst_rhi_graphicspipelinemanager SOURCES tst_rhi_graphicspipelinemanager.cpp ) @@ -17,7 +17,7 @@ qt3d_setup_common_render_test(tst_rhi_graphicspipelinemanager USE_TEST_ASPECT) include(${PROJECT_SOURCE_DIR}/src/plugins/renderers/rhi/rhi.cmake) qt3d_setup_rhi_renderer_target(tst_rhi_graphicspipelinemanager) -qt_extend_target(tst_rhi_graphicspipelinemanager CONDITION gcov +qt_internal_extend_target(tst_rhi_graphicspipelinemanager CONDITION gcov COMPILE_OPTIONS -fprofile-arcs -ftest-coverage diff --git a/tests/auto/render/rhi/rhi_rendercommands/CMakeLists.txt b/tests/auto/render/rhi/rhi_rendercommands/CMakeLists.txt index 9a37a2587..1b5581f86 100644 --- a/tests/auto/render/rhi/rhi_rendercommands/CMakeLists.txt +++ b/tests/auto/render/rhi/rhi_rendercommands/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_rhi_rendercommands Test: ##################################################################### -qt_add_test(tst_rhi_rendercommands +qt_internal_add_test(tst_rhi_rendercommands SOURCES tst_rhi_rendercommands.cpp ) @@ -17,7 +17,7 @@ qt3d_setup_common_render_test(tst_rhi_rendercommands USE_TEST_ASPECT) include(${PROJECT_SOURCE_DIR}/src/plugins/renderers/rhi/rhi.cmake) qt3d_setup_rhi_renderer_target(tst_rhi_rendercommands) -qt_extend_target(tst_rhi_rendercommands CONDITION gcov +qt_internal_extend_target(tst_rhi_rendercommands CONDITION gcov COMPILE_OPTIONS -fprofile-arcs -ftest-coverage diff --git a/tests/auto/render/rhi/rhi_renderviews/CMakeLists.txt b/tests/auto/render/rhi/rhi_renderviews/CMakeLists.txt index e331c2954..58945c04c 100644 --- a/tests/auto/render/rhi/rhi_renderviews/CMakeLists.txt +++ b/tests/auto/render/rhi/rhi_renderviews/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_rhi_renderviews Test: ##################################################################### -qt_add_test(tst_rhi_renderviews +qt_internal_add_test(tst_rhi_renderviews SOURCES tst_rhi_renderviews.cpp ) @@ -17,7 +17,7 @@ qt3d_setup_common_render_test(tst_rhi_renderviews USE_TEST_ASPECT) include(${PROJECT_SOURCE_DIR}/src/plugins/renderers/rhi/rhi.cmake) qt3d_setup_rhi_renderer_target(tst_rhi_renderviews) -qt_extend_target(tst_rhi_renderviews CONDITION gcov +qt_internal_extend_target(tst_rhi_renderviews CONDITION gcov COMPILE_OPTIONS -fprofile-arcs -ftest-coverage diff --git a/tests/auto/render/scene2d/CMakeLists.txt b/tests/auto/render/scene2d/CMakeLists.txt index ee8df500b..db8d99280 100644 --- a/tests/auto/render/scene2d/CMakeLists.txt +++ b/tests/auto/render/scene2d/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_scene2d Test: ##################################################################### -qt_add_test(tst_scene2d +qt_internal_add_test(tst_scene2d SOURCES tst_scene2d.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/render/sceneloader/CMakeLists.txt b/tests/auto/render/sceneloader/CMakeLists.txt index 7cd5c7dd3..d93682014 100644 --- a/tests/auto/render/sceneloader/CMakeLists.txt +++ b/tests/auto/render/sceneloader/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_sceneloader Test: ##################################################################### -qt_add_test(tst_sceneloader +qt_internal_add_test(tst_sceneloader SOURCES tst_sceneloader.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/render/segmentvisitor/CMakeLists.txt b/tests/auto/render/segmentvisitor/CMakeLists.txt index f5c5bec96..5d8cb224e 100644 --- a/tests/auto/render/segmentvisitor/CMakeLists.txt +++ b/tests/auto/render/segmentvisitor/CMakeLists.txt @@ -4,7 +4,7 @@ ## segmentvisitor Test: ##################################################################### -qt_add_test(tst_segmentvisitor +qt_internal_add_test(tst_segmentvisitor SOURCES tst_segmentvisitor.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/render/setfence/CMakeLists.txt b/tests/auto/render/setfence/CMakeLists.txt index f3cabaac6..013d6b5b0 100644 --- a/tests/auto/render/setfence/CMakeLists.txt +++ b/tests/auto/render/setfence/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_setfence Test: ##################################################################### -qt_add_test(tst_setfence +qt_internal_add_test(tst_setfence SOURCES tst_setfence.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/render/shader/CMakeLists.txt b/tests/auto/render/shader/CMakeLists.txt index 3b9c5d8cd..7b103142f 100644 --- a/tests/auto/render/shader/CMakeLists.txt +++ b/tests/auto/render/shader/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_shader Test: ##################################################################### -qt_add_test(tst_shader +qt_internal_add_test(tst_shader SOURCES tst_shader.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/render/shaderbuilder/CMakeLists.txt b/tests/auto/render/shaderbuilder/CMakeLists.txt index a24057205..bcdf36f06 100644 --- a/tests/auto/render/shaderbuilder/CMakeLists.txt +++ b/tests/auto/render/shaderbuilder/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_shaderbuilder Test: ##################################################################### -qt_add_test(tst_shaderbuilder +qt_internal_add_test(tst_shaderbuilder SOURCES tst_shaderbuilder.cpp PUBLIC_LIBRARIES @@ -26,7 +26,7 @@ set(shaderbuilder_resource_files "prototypes.json" ) -qt_add_resource(tst_shaderbuilder "shaderbuilder" +qt_internal_add_resource(tst_shaderbuilder "shaderbuilder" PREFIX "/" FILES diff --git a/tests/auto/render/shadergraph/qshadergenerator/CMakeLists.txt b/tests/auto/render/shadergraph/qshadergenerator/CMakeLists.txt index dec233cc9..0c8113adf 100644 --- a/tests/auto/render/shadergraph/qshadergenerator/CMakeLists.txt +++ b/tests/auto/render/shadergraph/qshadergenerator/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qshadergenerator Test: ##################################################################### -qt_add_test(tst_qshadergenerator +qt_internal_add_test(tst_qshadergenerator SOURCES tst_qshadergenerator.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/render/shadergraph/qshadergraph/CMakeLists.txt b/tests/auto/render/shadergraph/qshadergraph/CMakeLists.txt index 55a56daf3..b270b171a 100644 --- a/tests/auto/render/shadergraph/qshadergraph/CMakeLists.txt +++ b/tests/auto/render/shadergraph/qshadergraph/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qshadergraph Test: ##################################################################### -qt_add_test(tst_qshadergraph +qt_internal_add_test(tst_qshadergraph SOURCES tst_qshadergraph.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/render/shadergraph/qshadergraphloader/CMakeLists.txt b/tests/auto/render/shadergraph/qshadergraphloader/CMakeLists.txt index 2a817770d..68a214246 100644 --- a/tests/auto/render/shadergraph/qshadergraphloader/CMakeLists.txt +++ b/tests/auto/render/shadergraph/qshadergraphloader/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qshadergraphloader Test: ##################################################################### -qt_add_test(tst_qshadergraphloader +qt_internal_add_test(tst_qshadergraphloader SOURCES tst_qshadergraphloader.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/render/shadergraph/qshadernodes/CMakeLists.txt b/tests/auto/render/shadergraph/qshadernodes/CMakeLists.txt index 056f7d910..3bb079957 100644 --- a/tests/auto/render/shadergraph/qshadernodes/CMakeLists.txt +++ b/tests/auto/render/shadergraph/qshadernodes/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qshadernodes Test: ##################################################################### -qt_add_test(tst_qshadernodes +qt_internal_add_test(tst_qshadernodes SOURCES tst_qshadernodes.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/render/shadergraph/qshadernodesloader/CMakeLists.txt b/tests/auto/render/shadergraph/qshadernodesloader/CMakeLists.txt index e258735f8..db460342a 100644 --- a/tests/auto/render/shadergraph/qshadernodesloader/CMakeLists.txt +++ b/tests/auto/render/shadergraph/qshadernodesloader/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qshadernodesloader Test: ##################################################################### -qt_add_test(tst_qshadernodesloader +qt_internal_add_test(tst_qshadernodesloader SOURCES tst_qshadernodesloader.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/render/shaderimage/CMakeLists.txt b/tests/auto/render/shaderimage/CMakeLists.txt index a47a2f969..afb63106b 100644 --- a/tests/auto/render/shaderimage/CMakeLists.txt +++ b/tests/auto/render/shaderimage/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_shaderimage Test: ##################################################################### -qt_add_test(tst_shaderimage +qt_internal_add_test(tst_shaderimage SOURCES tst_shaderimage.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/render/skeleton/CMakeLists.txt b/tests/auto/render/skeleton/CMakeLists.txt index 21e9e01b7..3ef0b74aa 100644 --- a/tests/auto/render/skeleton/CMakeLists.txt +++ b/tests/auto/render/skeleton/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_skeleton Test: ##################################################################### -qt_add_test(tst_skeleton +qt_internal_add_test(tst_skeleton SOURCES tst_skeleton.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/render/sortpolicy/CMakeLists.txt b/tests/auto/render/sortpolicy/CMakeLists.txt index cc4ab605d..edbc5b916 100644 --- a/tests/auto/render/sortpolicy/CMakeLists.txt +++ b/tests/auto/render/sortpolicy/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_sortpolicy Test: ##################################################################### -qt_add_test(tst_sortpolicy +qt_internal_add_test(tst_sortpolicy SOURCES tst_sortpolicy.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/render/technique/CMakeLists.txt b/tests/auto/render/technique/CMakeLists.txt index a9a616e33..364d98410 100644 --- a/tests/auto/render/technique/CMakeLists.txt +++ b/tests/auto/render/technique/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_technique Test: ##################################################################### -qt_add_test(tst_technique +qt_internal_add_test(tst_technique SOURCES tst_technique.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/render/texture/CMakeLists.txt b/tests/auto/render/texture/CMakeLists.txt index 2c181e3f2..b21103132 100644 --- a/tests/auto/render/texture/CMakeLists.txt +++ b/tests/auto/render/texture/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_texture Test: ##################################################################### -qt_add_test(tst_texture +qt_internal_add_test(tst_texture SOURCES tst_texture.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/render/transform/CMakeLists.txt b/tests/auto/render/transform/CMakeLists.txt index 28f69971a..35ac69af6 100644 --- a/tests/auto/render/transform/CMakeLists.txt +++ b/tests/auto/render/transform/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_transform Test: ##################################################################### -qt_add_test(tst_transform +qt_internal_add_test(tst_transform SOURCES tst_transform.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/render/triangleboundingvolume/CMakeLists.txt b/tests/auto/render/triangleboundingvolume/CMakeLists.txt index 60563be14..210f7ba12 100644 --- a/tests/auto/render/triangleboundingvolume/CMakeLists.txt +++ b/tests/auto/render/triangleboundingvolume/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_triangleboundingvolume Test: ##################################################################### -qt_add_test(tst_triangleboundingvolume +qt_internal_add_test(tst_triangleboundingvolume SOURCES tst_triangleboundingvolume.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/render/trianglevisitor/CMakeLists.txt b/tests/auto/render/trianglevisitor/CMakeLists.txt index 2d49ca1ab..6a5064154 100644 --- a/tests/auto/render/trianglevisitor/CMakeLists.txt +++ b/tests/auto/render/trianglevisitor/CMakeLists.txt @@ -4,7 +4,7 @@ ## trianglevisitor Test: ##################################################################### -qt_add_test(tst_trianglevisitor +qt_internal_add_test(tst_trianglevisitor SOURCES tst_trianglevisitor.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/render/uniform/CMakeLists.txt b/tests/auto/render/uniform/CMakeLists.txt index 8a4bb765f..327acef24 100644 --- a/tests/auto/render/uniform/CMakeLists.txt +++ b/tests/auto/render/uniform/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_uniform Test: ##################################################################### -qt_add_test(tst_uniform +qt_internal_add_test(tst_uniform SOURCES tst_uniform.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/render/updateshaderdatatransformjob/CMakeLists.txt b/tests/auto/render/updateshaderdatatransformjob/CMakeLists.txt index 94a3b24ee..fc964838c 100644 --- a/tests/auto/render/updateshaderdatatransformjob/CMakeLists.txt +++ b/tests/auto/render/updateshaderdatatransformjob/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_updateshaderdatatransformjob Test: ##################################################################### -qt_add_test(tst_updateshaderdatatransformjob +qt_internal_add_test(tst_updateshaderdatatransformjob SOURCES ../qmlscenereader/qmlscenereader.cpp ../qmlscenereader/qmlscenereader.h tst_updateshaderdatatransformjob.cpp @@ -31,7 +31,7 @@ set(updateshaderdatatransformjob_resource_files "test_scene_model_to_world.qml" ) -qt_add_resource(tst_updateshaderdatatransformjob "updateshaderdatatransformjob" +qt_internal_add_resource(tst_updateshaderdatatransformjob "updateshaderdatatransformjob" PREFIX "/" FILES diff --git a/tests/auto/render/vsyncframeadvanceservice/CMakeLists.txt b/tests/auto/render/vsyncframeadvanceservice/CMakeLists.txt index c04489978..3a3a58ffd 100644 --- a/tests/auto/render/vsyncframeadvanceservice/CMakeLists.txt +++ b/tests/auto/render/vsyncframeadvanceservice/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_vsyncframeadvanceservice Test: ##################################################################### -qt_add_test(tst_vsyncframeadvanceservice +qt_internal_add_test(tst_vsyncframeadvanceservice SOURCES tst_vsyncframeadvanceservice.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/render/waitfence/CMakeLists.txt b/tests/auto/render/waitfence/CMakeLists.txt index 61df44357..a2e12be66 100644 --- a/tests/auto/render/waitfence/CMakeLists.txt +++ b/tests/auto/render/waitfence/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_waitfence Test: ##################################################################### -qt_add_test(tst_waitfence +qt_internal_add_test(tst_waitfence SOURCES tst_waitfence.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/Qt3DBench/CMakeLists.txt b/tests/benchmarks/Qt3DBench/CMakeLists.txt index 078d6d8e8..f0b27a4a3 100644 --- a/tests/benchmarks/Qt3DBench/CMakeLists.txt +++ b/tests/benchmarks/Qt3DBench/CMakeLists.txt @@ -4,7 +4,7 @@ ## qt3dbench-qml Binary: ##################################################################### -qt_add_benchmark(qt3dbench-qml +qt_internal_add_benchmark(qt3dbench-qml GUI SOURCES main.cpp @@ -34,7 +34,7 @@ set(qt3dbench-qml_resource_files "shaders/shadowmap.vert" ) -qt_add_resource(qt3dbench-qml "qt3dbench-qml" +qt_internal_add_resource(qt3dbench-qml "qt3dbench-qml" PREFIX "/" FILES diff --git a/tests/benchmarks/core/qresourcesmanager/arraypolicy/CMakeLists.txt b/tests/benchmarks/core/qresourcesmanager/arraypolicy/CMakeLists.txt index fe0608de7..d76f52999 100644 --- a/tests/benchmarks/core/qresourcesmanager/arraypolicy/CMakeLists.txt +++ b/tests/benchmarks/core/qresourcesmanager/arraypolicy/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_arraypolicy Binary: ##################################################################### -qt_add_benchmark(tst_bench_arraypolicy +qt_internal_add_benchmark(tst_bench_arraypolicy SOURCES tst_bench_arraypolicy.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/core/qresourcesmanager/qresourcesmanager/CMakeLists.txt b/tests/benchmarks/core/qresourcesmanager/qresourcesmanager/CMakeLists.txt index a05d5c667..2e8e3f9d9 100644 --- a/tests/benchmarks/core/qresourcesmanager/qresourcesmanager/CMakeLists.txt +++ b/tests/benchmarks/core/qresourcesmanager/qresourcesmanager/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qresourcesmanager Binary: ##################################################################### -qt_add_benchmark(tst_bench_qresourcesmanager +qt_internal_add_benchmark(tst_bench_qresourcesmanager SOURCES tst_bench_qresourcesmanager.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/render/jobs/CMakeLists.txt b/tests/benchmarks/render/jobs/CMakeLists.txt index 78deeae4b..9dd7edc04 100644 --- a/tests/benchmarks/render/jobs/CMakeLists.txt +++ b/tests/benchmarks/render/jobs/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_jobs Binary: ##################################################################### -qt_add_benchmark(tst_bench_jobs +qt_internal_add_benchmark(tst_bench_jobs SOURCES tst_bench_jobs.cpp DEFINES @@ -26,7 +26,7 @@ qt3d_setup_common_render_test(tst_bench_jobs USE_TEST_ASPECT) include(${PROJECT_SOURCE_DIR}/src/plugins/renderers/opengl/opengl.cmake) qt3d_setup_opengl_renderer_target(tst_bench_jobs) -qt_extend_target(tst_bench_jobs CONDITION gcov +qt_internal_extend_target(tst_bench_jobs CONDITION gcov COMPILE_OPTIONS -fprofile-arcs -ftest-coverage diff --git a/tests/benchmarks/render/layerfiltering/CMakeLists.txt b/tests/benchmarks/render/layerfiltering/CMakeLists.txt index b6190fa80..2c768b03a 100644 --- a/tests/benchmarks/render/layerfiltering/CMakeLists.txt +++ b/tests/benchmarks/render/layerfiltering/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_layerfiltering Test: ##################################################################### -qt_add_test(tst_bench_layerfiltering +qt_internal_add_test(tst_bench_layerfiltering SOURCES tst_bench_layerfiltering.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/render/materialparametergathering/CMakeLists.txt b/tests/benchmarks/render/materialparametergathering/CMakeLists.txt index 78f46deba..c63258d2f 100644 --- a/tests/benchmarks/render/materialparametergathering/CMakeLists.txt +++ b/tests/benchmarks/render/materialparametergathering/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_materialparametergathering Test: ##################################################################### -qt_add_test(tst_bench_materialparametergathering +qt_internal_add_test(tst_bench_materialparametergathering SOURCES tst_bench_materialparametergathering.cpp PUBLIC_LIBRARIES @@ -22,7 +22,7 @@ qt3d_setup_common_render_test(tst_bench_materialparametergathering USE_TEST_ASPE include(${PROJECT_SOURCE_DIR}/src/plugins/renderers/opengl/opengl.cmake) qt3d_setup_opengl_renderer_target(tst_bench_materialparametergathering) -qt_extend_target(tst_bench_materialparametergathering CONDITION gcov +qt_internal_extend_target(tst_bench_materialparametergathering CONDITION gcov COMPILE_OPTIONS -fprofile-arcs -ftest-coverage diff --git a/tests/benchmarks/render/opengl/shaderparameterpack/CMakeLists.txt b/tests/benchmarks/render/opengl/shaderparameterpack/CMakeLists.txt index 74b31539d..6950c0398 100644 --- a/tests/benchmarks/render/opengl/shaderparameterpack/CMakeLists.txt +++ b/tests/benchmarks/render/opengl/shaderparameterpack/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_shaderparameterpack Test: ##################################################################### -qt_add_test(tst_bench_shaderparameterpack +qt_internal_add_test(tst_bench_shaderparameterpack SOURCES tst_bench_shaderparameterpack.cpp ) @@ -20,7 +20,7 @@ qt3d_setup_common_render_test(tst_bench_shaderparameterpack USE_TEST_ASPECT) include(${PROJECT_SOURCE_DIR}/src/plugins/renderers/opengl/opengl.cmake) qt3d_setup_opengl_renderer_target(tst_bench_shaderparameterpack) -qt_extend_target(tst_bench_shaderparameterpack CONDITION gcov +qt_internal_extend_target(tst_bench_shaderparameterpack CONDITION gcov COMPILE_OPTIONS -fprofile-arcs -ftest-coverage diff --git a/tests/manual/additional-attributes-qml/CMakeLists.txt b/tests/manual/additional-attributes-qml/CMakeLists.txt index 972d851b7..4a06f318f 100644 --- a/tests/manual/additional-attributes-qml/CMakeLists.txt +++ b/tests/manual/additional-attributes-qml/CMakeLists.txt @@ -4,7 +4,7 @@ ## additional-attributes-qml Binary: ##################################################################### -qt_add_manual_test(additional-attributes-qml +qt_internal_add_manual_test(additional-attributes-qml GUI SOURCES main.cpp @@ -25,7 +25,7 @@ set(additional-attributes-qml_resource_files "main.qml" ) -qt_add_resource(additional-attributes-qml "additional-attributes-qml" +qt_internal_add_resource(additional-attributes-qml "additional-attributes-qml" PREFIX "/" FILES diff --git a/tests/manual/anim-viewer/CMakeLists.txt b/tests/manual/anim-viewer/CMakeLists.txt index c214d550d..9245078fd 100644 --- a/tests/manual/anim-viewer/CMakeLists.txt +++ b/tests/manual/anim-viewer/CMakeLists.txt @@ -4,7 +4,7 @@ ## anim-viewer Binary: ##################################################################### -qt_add_manual_test(anim-viewer +qt_internal_add_manual_test(anim-viewer GUI SOURCES main.cpp @@ -27,7 +27,7 @@ set(qml_resource_files "main.qml" ) -qt_add_resource(anim-viewer "qml" +qt_internal_add_resource(anim-viewer "qml" PREFIX "/" FILES diff --git a/tests/manual/animation-keyframe-blendtree/CMakeLists.txt b/tests/manual/animation-keyframe-blendtree/CMakeLists.txt index c3ad2b8a0..a55b8722d 100644 --- a/tests/manual/animation-keyframe-blendtree/CMakeLists.txt +++ b/tests/manual/animation-keyframe-blendtree/CMakeLists.txt @@ -4,7 +4,7 @@ ## animation-keyframe-blendtree Binary: ##################################################################### -qt_add_manual_test(animation-keyframe-blendtree +qt_internal_add_manual_test(animation-keyframe-blendtree GUI SOURCES main.cpp @@ -22,7 +22,7 @@ set(main_resource_files "sliding-pulsing-cube.json" ) -qt_add_resource(animation-keyframe-blendtree "main" +qt_internal_add_resource(animation-keyframe-blendtree "main" PREFIX "/" FILES diff --git a/tests/manual/animation-keyframe-programmatic/CMakeLists.txt b/tests/manual/animation-keyframe-programmatic/CMakeLists.txt index 761cf0c42..4db418c85 100644 --- a/tests/manual/animation-keyframe-programmatic/CMakeLists.txt +++ b/tests/manual/animation-keyframe-programmatic/CMakeLists.txt @@ -4,7 +4,7 @@ ## animation-keyframe-programmatic Binary: ##################################################################### -qt_add_manual_test(animation-keyframe-programmatic +qt_internal_add_manual_test(animation-keyframe-programmatic GUI SOURCES animationfactory.cpp animationfactory.h @@ -21,7 +21,7 @@ set(main_resource_files "main.qml" ) -qt_add_resource(animation-keyframe-programmatic "main" +qt_internal_add_resource(animation-keyframe-programmatic "main" PREFIX "/" FILES diff --git a/tests/manual/animation-keyframe-simple/CMakeLists.txt b/tests/manual/animation-keyframe-simple/CMakeLists.txt index b15ee1b9f..0da25c50d 100644 --- a/tests/manual/animation-keyframe-simple/CMakeLists.txt +++ b/tests/manual/animation-keyframe-simple/CMakeLists.txt @@ -4,7 +4,7 @@ ## animation-keyframe-simple Binary: ##################################################################### -qt_add_manual_test(animation-keyframe-simple +qt_internal_add_manual_test(animation-keyframe-simple GUI SOURCES main.cpp @@ -23,7 +23,7 @@ set(main_resource_files "pulsing-moving-cube.json" ) -qt_add_resource(animation-keyframe-simple "main" +qt_internal_add_resource(animation-keyframe-simple "main" PREFIX "/" FILES diff --git a/tests/manual/assimp-cpp/CMakeLists.txt b/tests/manual/assimp-cpp/CMakeLists.txt index 99a7f2213..26ec5eb49 100644 --- a/tests/manual/assimp-cpp/CMakeLists.txt +++ b/tests/manual/assimp-cpp/CMakeLists.txt @@ -4,7 +4,7 @@ ## assimp-cpp Binary: ##################################################################### -qt_add_manual_test(assimp-cpp +qt_internal_add_manual_test(assimp-cpp GUI SOURCES main.cpp diff --git a/tests/manual/assimp/CMakeLists.txt b/tests/manual/assimp/CMakeLists.txt index c0a7059f9..3f5905ef0 100644 --- a/tests/manual/assimp/CMakeLists.txt +++ b/tests/manual/assimp/CMakeLists.txt @@ -4,7 +4,7 @@ ## assimp Binary: ##################################################################### -qt_add_manual_test(assimp +qt_internal_add_manual_test(assimp GUI SOURCES main.cpp @@ -25,7 +25,7 @@ set(assimp_resource_files "main.qml" ) -qt_add_resource(assimp "assimp" +qt_internal_add_resource(assimp "assimp" PREFIX "/" FILES @@ -38,7 +38,7 @@ set(test_scene_resource_files "assets/test_scene.dae" ) -qt_add_resource(assimp "test_scene" +qt_internal_add_resource(assimp "test_scene" PREFIX "/" BASE @@ -69,7 +69,7 @@ set(obj_resource_files "assets/obj/trefoil.obj" ) -qt_add_resource(assimp "obj" +qt_internal_add_resource(assimp "obj" PREFIX "/" BASE diff --git a/tests/manual/bigmodel-qml/CMakeLists.txt b/tests/manual/bigmodel-qml/CMakeLists.txt index e9713c409..1a7feaa39 100644 --- a/tests/manual/bigmodel-qml/CMakeLists.txt +++ b/tests/manual/bigmodel-qml/CMakeLists.txt @@ -4,7 +4,7 @@ ## bigmodel-qml Binary: ##################################################################### -qt_add_manual_test(bigmodel-qml +qt_internal_add_manual_test(bigmodel-qml GUI SOURCES main.cpp @@ -26,7 +26,7 @@ set(bigmodel-qml_resource_files "main.qml" ) -qt_add_resource(bigmodel-qml "bigmodel-qml" +qt_internal_add_resource(bigmodel-qml "bigmodel-qml" PREFIX "/" FILES diff --git a/tests/manual/bigscene-cpp/CMakeLists.txt b/tests/manual/bigscene-cpp/CMakeLists.txt index 2d1b8d51c..679379cfa 100644 --- a/tests/manual/bigscene-cpp/CMakeLists.txt +++ b/tests/manual/bigscene-cpp/CMakeLists.txt @@ -4,7 +4,7 @@ ## bigscene-cpp Binary: ##################################################################### -qt_add_manual_test(bigscene-cpp +qt_internal_add_manual_test(bigscene-cpp GUI SOURCES entity.cpp entity.h diff --git a/tests/manual/bigscene-instanced-qml/CMakeLists.txt b/tests/manual/bigscene-instanced-qml/CMakeLists.txt index aa40b0f4b..735d9fc40 100644 --- a/tests/manual/bigscene-instanced-qml/CMakeLists.txt +++ b/tests/manual/bigscene-instanced-qml/CMakeLists.txt @@ -4,7 +4,7 @@ ## bigscene-instanced-qml Binary: ##################################################################### -qt_add_manual_test(bigscene-instanced-qml +qt_internal_add_manual_test(bigscene-instanced-qml GUI SOURCES main.cpp @@ -27,7 +27,7 @@ set(bigscene-instanced-qml_resource_files "main.qml" ) -qt_add_resource(bigscene-instanced-qml "bigscene-instanced-qml" +qt_internal_add_resource(bigscene-instanced-qml "bigscene-instanced-qml" PREFIX "/" FILES diff --git a/tests/manual/blitframebuffer-qml/CMakeLists.txt b/tests/manual/blitframebuffer-qml/CMakeLists.txt index a684303d7..283c05a88 100644 --- a/tests/manual/blitframebuffer-qml/CMakeLists.txt +++ b/tests/manual/blitframebuffer-qml/CMakeLists.txt @@ -4,7 +4,7 @@ ## blitframebuffer-qml Binary: ##################################################################### -qt_add_manual_test(blitframebuffer-qml +qt_internal_add_manual_test(blitframebuffer-qml GUI SOURCES main.cpp @@ -25,7 +25,7 @@ set(blitframebuffer-qml_resource_files "main.qml" ) -qt_add_resource(blitframebuffer-qml "blitframebuffer-qml" +qt_internal_add_resource(blitframebuffer-qml "blitframebuffer-qml" PREFIX "/" FILES diff --git a/tests/manual/boundingvolumes/CMakeLists.txt b/tests/manual/boundingvolumes/CMakeLists.txt index 4df869ade..3b4dd1345 100644 --- a/tests/manual/boundingvolumes/CMakeLists.txt +++ b/tests/manual/boundingvolumes/CMakeLists.txt @@ -4,7 +4,7 @@ ## boundingvolumes Binary: ##################################################################### -qt_add_manual_test(boundingvolumes +qt_internal_add_manual_test(boundingvolumes GUI SOURCES main.cpp @@ -21,7 +21,7 @@ set(boundingvolumes_resource_files "main.qml" ) -qt_add_resource(boundingvolumes "boundingvolumes" +qt_internal_add_resource(boundingvolumes "boundingvolumes" PREFIX "/" FILES diff --git a/tests/manual/buffercapture-qml/CMakeLists.txt b/tests/manual/buffercapture-qml/CMakeLists.txt index d4d42b255..d385de583 100644 --- a/tests/manual/buffercapture-qml/CMakeLists.txt +++ b/tests/manual/buffercapture-qml/CMakeLists.txt @@ -4,7 +4,7 @@ ## buffercapture-qml Binary: ##################################################################### -qt_add_manual_test(buffercapture-qml +qt_internal_add_manual_test(buffercapture-qml GUI SOURCES main.cpp @@ -30,7 +30,7 @@ set(resources_resource_files "main.qml" ) -qt_add_resource(buffercapture-qml "resources" +qt_internal_add_resource(buffercapture-qml "resources" PREFIX "/" FILES diff --git a/tests/manual/clip-planes-qml/CMakeLists.txt b/tests/manual/clip-planes-qml/CMakeLists.txt index b2bb7d110..5cd5c3c23 100644 --- a/tests/manual/clip-planes-qml/CMakeLists.txt +++ b/tests/manual/clip-planes-qml/CMakeLists.txt @@ -4,7 +4,7 @@ ## clip-planes-qml Binary: ##################################################################### -qt_add_manual_test(clip-planes-qml +qt_internal_add_manual_test(clip-planes-qml GUI SOURCES main.cpp @@ -39,7 +39,7 @@ set(clip-planes-qml_resource_files "light.inc.frag" ) -qt_add_resource(clip-planes-qml "clip-planes-qml" +qt_internal_add_resource(clip-planes-qml "clip-planes-qml" PREFIX "/" FILES @@ -68,7 +68,7 @@ set(obj_resource_files "assets/obj/trefoil.obj" ) -qt_add_resource(clip-planes-qml "obj" +qt_internal_add_resource(clip-planes-qml "obj" PREFIX "/" BASE diff --git a/tests/manual/component-changes/CMakeLists.txt b/tests/manual/component-changes/CMakeLists.txt index d3552ebed..d78409f5f 100644 --- a/tests/manual/component-changes/CMakeLists.txt +++ b/tests/manual/component-changes/CMakeLists.txt @@ -4,7 +4,7 @@ ## component-changes Binary: ##################################################################### -qt_add_manual_test(component-changes +qt_internal_add_manual_test(component-changes GUI SOURCES main.cpp diff --git a/tests/manual/compressed_textures/CMakeLists.txt b/tests/manual/compressed_textures/CMakeLists.txt index d3a945b8f..0ca2a55d6 100644 --- a/tests/manual/compressed_textures/CMakeLists.txt +++ b/tests/manual/compressed_textures/CMakeLists.txt @@ -4,7 +4,7 @@ ## compressed_textures Binary: ##################################################################### -qt_add_manual_test(compressed_textures +qt_internal_add_manual_test(compressed_textures GUI SOURCES main.cpp @@ -27,7 +27,7 @@ set(compressed_textures_resource_files "main.qml" ) -qt_add_resource(compressed_textures "compressed_textures" +qt_internal_add_resource(compressed_textures "compressed_textures" PREFIX "/" FILES diff --git a/tests/manual/compute-manual/CMakeLists.txt b/tests/manual/compute-manual/CMakeLists.txt index 4b30aef71..9e28d8e49 100644 --- a/tests/manual/compute-manual/CMakeLists.txt +++ b/tests/manual/compute-manual/CMakeLists.txt @@ -4,7 +4,7 @@ ## compute-manual Binary: ##################################################################### -qt_add_manual_test(compute-manual +qt_internal_add_manual_test(compute-manual GUI SOURCES main.cpp @@ -29,7 +29,7 @@ set(compute-manual_resource_files "particles.vert" ) -qt_add_resource(compute-manual "compute-manual" +qt_internal_add_resource(compute-manual "compute-manual" PREFIX "/" FILES diff --git a/tests/manual/custom-mesh-cpp-indirect/CMakeLists.txt b/tests/manual/custom-mesh-cpp-indirect/CMakeLists.txt index 678abfbcf..628dd0239 100644 --- a/tests/manual/custom-mesh-cpp-indirect/CMakeLists.txt +++ b/tests/manual/custom-mesh-cpp-indirect/CMakeLists.txt @@ -4,7 +4,7 @@ ## custom-mesh-cpp-indirect Binary: ##################################################################### -qt_add_manual_test(custom-mesh-cpp-indirect +qt_internal_add_manual_test(custom-mesh-cpp-indirect GUI SOURCES main.cpp diff --git a/tests/manual/custom-mesh-cpp/CMakeLists.txt b/tests/manual/custom-mesh-cpp/CMakeLists.txt index 474028c26..656ab8a55 100644 --- a/tests/manual/custom-mesh-cpp/CMakeLists.txt +++ b/tests/manual/custom-mesh-cpp/CMakeLists.txt @@ -4,7 +4,7 @@ ## custom-mesh-cpp Binary: ##################################################################### -qt_add_manual_test(custom-mesh-cpp +qt_internal_add_manual_test(custom-mesh-cpp GUI SOURCES main.cpp diff --git a/tests/manual/custom-mesh-qml/CMakeLists.txt b/tests/manual/custom-mesh-qml/CMakeLists.txt index 594334bc2..3dedc4d6e 100644 --- a/tests/manual/custom-mesh-qml/CMakeLists.txt +++ b/tests/manual/custom-mesh-qml/CMakeLists.txt @@ -4,7 +4,7 @@ ## custom-mesh-qml Binary: ##################################################################### -qt_add_manual_test(custom-mesh-qml +qt_internal_add_manual_test(custom-mesh-qml GUI SOURCES main.cpp @@ -23,7 +23,7 @@ set(custom-mesh-qml_resource_files "main.qml" ) -qt_add_resource(custom-mesh-qml "custom-mesh-qml" +qt_internal_add_resource(custom-mesh-qml "custom-mesh-qml" PREFIX "/" FILES diff --git a/tests/manual/custom-mesh-update-data-cpp/CMakeLists.txt b/tests/manual/custom-mesh-update-data-cpp/CMakeLists.txt index ccb32c3e3..162863f35 100644 --- a/tests/manual/custom-mesh-update-data-cpp/CMakeLists.txt +++ b/tests/manual/custom-mesh-update-data-cpp/CMakeLists.txt @@ -4,7 +4,7 @@ ## custom-mesh-update-data-cpp Binary: ##################################################################### -qt_add_manual_test(custom-mesh-update-data-cpp +qt_internal_add_manual_test(custom-mesh-update-data-cpp GUI SOURCES main.cpp diff --git a/tests/manual/custom-mesh-update-data-qml/CMakeLists.txt b/tests/manual/custom-mesh-update-data-qml/CMakeLists.txt index e4d511f8d..72ff89ba3 100644 --- a/tests/manual/custom-mesh-update-data-qml/CMakeLists.txt +++ b/tests/manual/custom-mesh-update-data-qml/CMakeLists.txt @@ -4,7 +4,7 @@ ## custom-mesh-update-data-qml Binary: ##################################################################### -qt_add_manual_test(custom-mesh-update-data-qml +qt_internal_add_manual_test(custom-mesh-update-data-qml GUI SOURCES main.cpp @@ -23,7 +23,7 @@ set(custom-mesh-update-data-qml_resource_files "main.qml" ) -qt_add_resource(custom-mesh-update-data-qml "custom-mesh-update-data-qml" +qt_internal_add_resource(custom-mesh-update-data-qml "custom-mesh-update-data-qml" PREFIX "/" FILES diff --git a/tests/manual/cylinder-cpp/CMakeLists.txt b/tests/manual/cylinder-cpp/CMakeLists.txt index 90e206dad..543f1e9ce 100644 --- a/tests/manual/cylinder-cpp/CMakeLists.txt +++ b/tests/manual/cylinder-cpp/CMakeLists.txt @@ -4,7 +4,7 @@ ## cylinder-cpp Binary: ##################################################################### -qt_add_manual_test(cylinder-cpp +qt_internal_add_manual_test(cylinder-cpp GUI SOURCES main.cpp diff --git a/tests/manual/cylinder-parent-test/CMakeLists.txt b/tests/manual/cylinder-parent-test/CMakeLists.txt index bc6ba42ec..9081bf0f1 100644 --- a/tests/manual/cylinder-parent-test/CMakeLists.txt +++ b/tests/manual/cylinder-parent-test/CMakeLists.txt @@ -4,7 +4,7 @@ ## cylinder-parent-test Binary: ##################################################################### -qt_add_manual_test(cylinder-parent-test +qt_internal_add_manual_test(cylinder-parent-test GUI SOURCES main.cpp diff --git a/tests/manual/cylinder-qml/CMakeLists.txt b/tests/manual/cylinder-qml/CMakeLists.txt index 9ef2d8fc9..fa0498cb8 100644 --- a/tests/manual/cylinder-qml/CMakeLists.txt +++ b/tests/manual/cylinder-qml/CMakeLists.txt @@ -4,7 +4,7 @@ ## cylinder-qml Binary: ##################################################################### -qt_add_manual_test(cylinder-qml +qt_internal_add_manual_test(cylinder-qml GUI SOURCES main.cpp @@ -24,7 +24,7 @@ set(cylinder-qml_resource_files "main.qml" ) -qt_add_resource(cylinder-qml "cylinder-qml" +qt_internal_add_resource(cylinder-qml "cylinder-qml" PREFIX "/" FILES diff --git a/tests/manual/deferred-renderer-cpp/CMakeLists.txt b/tests/manual/deferred-renderer-cpp/CMakeLists.txt index 84caa0c8f..ea5b34426 100644 --- a/tests/manual/deferred-renderer-cpp/CMakeLists.txt +++ b/tests/manual/deferred-renderer-cpp/CMakeLists.txt @@ -4,7 +4,7 @@ ## deferred-renderer-cpp Binary: ##################################################################### -qt_add_manual_test(deferred-renderer-cpp +qt_internal_add_manual_test(deferred-renderer-cpp GUI SOURCES deferredrenderer.cpp deferredrenderer.h @@ -35,7 +35,7 @@ set(deferred-renderer-cpp_resource_files "geometry_gl3.vert" ) -qt_add_resource(deferred-renderer-cpp "deferred-renderer-cpp" +qt_internal_add_resource(deferred-renderer-cpp "deferred-renderer-cpp" PREFIX "/" FILES diff --git a/tests/manual/deferred-renderer-qml/CMakeLists.txt b/tests/manual/deferred-renderer-qml/CMakeLists.txt index f2f3b31dc..a5832f336 100644 --- a/tests/manual/deferred-renderer-qml/CMakeLists.txt +++ b/tests/manual/deferred-renderer-qml/CMakeLists.txt @@ -4,7 +4,7 @@ ## deferred-renderer-qml Binary: ##################################################################### -qt_add_manual_test(deferred-renderer-qml +qt_internal_add_manual_test(deferred-renderer-qml GUI SOURCES main.cpp @@ -39,7 +39,7 @@ set(deferred-renderer-qml_resource_files "main.qml" ) -qt_add_resource(deferred-renderer-qml "deferred-renderer-qml" +qt_internal_add_resource(deferred-renderer-qml "deferred-renderer-qml" PREFIX "/" FILES diff --git a/tests/manual/distancefieldtext/CMakeLists.txt b/tests/manual/distancefieldtext/CMakeLists.txt index 1218f0c22..69a6927a6 100644 --- a/tests/manual/distancefieldtext/CMakeLists.txt +++ b/tests/manual/distancefieldtext/CMakeLists.txt @@ -4,7 +4,7 @@ ## distancefieldtext Binary: ##################################################################### -qt_add_manual_test(distancefieldtext +qt_internal_add_manual_test(distancefieldtext GUI SOURCES main.cpp @@ -25,7 +25,7 @@ set(distancefieldtext_resource_files "main.qml" ) -qt_add_resource(distancefieldtext "distancefieldtext" +qt_internal_add_resource(distancefieldtext "distancefieldtext" PREFIX "/" FILES diff --git a/tests/manual/downloading/CMakeLists.txt b/tests/manual/downloading/CMakeLists.txt index e2914416a..3523b119f 100644 --- a/tests/manual/downloading/CMakeLists.txt +++ b/tests/manual/downloading/CMakeLists.txt @@ -4,7 +4,7 @@ ## downloading Binary: ##################################################################### -qt_add_manual_test(downloading +qt_internal_add_manual_test(downloading GUI SOURCES main.cpp @@ -24,7 +24,7 @@ set(downloading_resource_files "main.qml" ) -qt_add_resource(downloading "downloading" +qt_internal_add_resource(downloading "downloading" PREFIX "/" FILES diff --git a/tests/manual/dragging/CMakeLists.txt b/tests/manual/dragging/CMakeLists.txt index 5ce4e8b7c..078abe292 100644 --- a/tests/manual/dragging/CMakeLists.txt +++ b/tests/manual/dragging/CMakeLists.txt @@ -4,7 +4,7 @@ ## dragging Binary: ##################################################################### -qt_add_manual_test(dragging +qt_internal_add_manual_test(dragging GUI SOURCES main.cpp @@ -24,7 +24,7 @@ set(dragging_resource_files "main.qml" ) -qt_add_resource(dragging "dragging" +qt_internal_add_resource(dragging "dragging" PREFIX "/" FILES diff --git a/tests/manual/dynamic-model-loader-qml/CMakeLists.txt b/tests/manual/dynamic-model-loader-qml/CMakeLists.txt index 6ac3379e0..fe8f6717c 100644 --- a/tests/manual/dynamic-model-loader-qml/CMakeLists.txt +++ b/tests/manual/dynamic-model-loader-qml/CMakeLists.txt @@ -4,7 +4,7 @@ ## dynamic-model-loader-qml Binary: ##################################################################### -qt_add_manual_test(dynamic-model-loader-qml +qt_internal_add_manual_test(dynamic-model-loader-qml GUI SOURCES main.cpp @@ -26,7 +26,7 @@ set(dynamic-model-loader-qml_resource_files "main.qml" ) -qt_add_resource(dynamic-model-loader-qml "dynamic-model-loader-qml" +qt_internal_add_resource(dynamic-model-loader-qml "dynamic-model-loader-qml" PREFIX "/" FILES diff --git a/tests/manual/dynamicscene-cpp/CMakeLists.txt b/tests/manual/dynamicscene-cpp/CMakeLists.txt index a1a949b37..04c714e66 100644 --- a/tests/manual/dynamicscene-cpp/CMakeLists.txt +++ b/tests/manual/dynamicscene-cpp/CMakeLists.txt @@ -4,7 +4,7 @@ ## dynamicscene-cpp Binary: ##################################################################### -qt_add_manual_test(dynamicscene-cpp +qt_internal_add_manual_test(dynamicscene-cpp GUI SOURCES boxentity.cpp boxentity.h diff --git a/tests/manual/enabled-qml/CMakeLists.txt b/tests/manual/enabled-qml/CMakeLists.txt index b76029fe9..2636ad0eb 100644 --- a/tests/manual/enabled-qml/CMakeLists.txt +++ b/tests/manual/enabled-qml/CMakeLists.txt @@ -4,7 +4,7 @@ ## enabled-qml Binary: ##################################################################### -qt_add_manual_test(enabled-qml +qt_internal_add_manual_test(enabled-qml GUI SOURCES main.cpp @@ -22,7 +22,7 @@ set(enabled-qml_resource_files "main.qml" ) -qt_add_resource(enabled-qml "enabled-qml" +qt_internal_add_resource(enabled-qml "enabled-qml" PREFIX "/" FILES diff --git a/tests/manual/gltf/CMakeLists.txt b/tests/manual/gltf/CMakeLists.txt index a3128c5c5..034d9d85c 100644 --- a/tests/manual/gltf/CMakeLists.txt +++ b/tests/manual/gltf/CMakeLists.txt @@ -4,7 +4,7 @@ ## gltf Binary: ##################################################################### -qt_add_manual_test(gltf +qt_internal_add_manual_test(gltf GUI SOURCES main.cpp @@ -25,7 +25,7 @@ set(gltf_example_resource_files "main.qml" ) -qt_add_resource(gltf "gltf_example" +qt_internal_add_resource(gltf "gltf_example" PREFIX "/" FILES @@ -106,7 +106,7 @@ set(gltf_resource_files "assets/gltf/wine/wine3VS.glsl" ) -qt_add_resource(gltf "gltf" +qt_internal_add_resource(gltf "gltf" PREFIX "/" BASE diff --git a/tests/manual/gooch-qml/CMakeLists.txt b/tests/manual/gooch-qml/CMakeLists.txt index e2312a2b9..e287724ef 100644 --- a/tests/manual/gooch-qml/CMakeLists.txt +++ b/tests/manual/gooch-qml/CMakeLists.txt @@ -4,7 +4,7 @@ ## gooch-qml Binary: ##################################################################### -qt_add_manual_test(gooch-qml +qt_internal_add_manual_test(gooch-qml GUI SOURCES main.cpp @@ -25,7 +25,7 @@ set(gooch-qml_resource_files "main.qml" ) -qt_add_resource(gooch-qml "gooch-qml" +qt_internal_add_resource(gooch-qml "gooch-qml" PREFIX "/" FILES @@ -54,7 +54,7 @@ set(obj_resource_files "assets/obj/trefoil.obj" ) -qt_add_resource(gooch-qml "obj" +qt_internal_add_resource(gooch-qml "obj" PREFIX "/" BASE diff --git a/tests/manual/keyboardinput-qml/CMakeLists.txt b/tests/manual/keyboardinput-qml/CMakeLists.txt index 5aa9d9f74..c22458cd4 100644 --- a/tests/manual/keyboardinput-qml/CMakeLists.txt +++ b/tests/manual/keyboardinput-qml/CMakeLists.txt @@ -4,7 +4,7 @@ ## keyboardinput-qml Binary: ##################################################################### -qt_add_manual_test(keyboardinput-qml +qt_internal_add_manual_test(keyboardinput-qml GUI SOURCES main.cpp @@ -25,7 +25,7 @@ set(keyboardinput-qml_resource_files "main.qml" ) -qt_add_resource(keyboardinput-qml "keyboardinput-qml" +qt_internal_add_resource(keyboardinput-qml "keyboardinput-qml" PREFIX "/" FILES diff --git a/tests/manual/layerfilter-qml/CMakeLists.txt b/tests/manual/layerfilter-qml/CMakeLists.txt index 92edaa974..078876eea 100644 --- a/tests/manual/layerfilter-qml/CMakeLists.txt +++ b/tests/manual/layerfilter-qml/CMakeLists.txt @@ -4,7 +4,7 @@ ## layerfilter-qml Binary: ##################################################################### -qt_add_manual_test(layerfilter-qml +qt_internal_add_manual_test(layerfilter-qml GUI SOURCES main.cpp @@ -24,7 +24,7 @@ set(layerfilter-qml_resource_files "main.qml" ) -qt_add_resource(layerfilter-qml "layerfilter-qml" +qt_internal_add_resource(layerfilter-qml "layerfilter-qml" PREFIX "/" FILES diff --git a/tests/manual/loader-qml/CMakeLists.txt b/tests/manual/loader-qml/CMakeLists.txt index cbd7f679d..7d1acdf07 100644 --- a/tests/manual/loader-qml/CMakeLists.txt +++ b/tests/manual/loader-qml/CMakeLists.txt @@ -4,7 +4,7 @@ ## loader-qml Binary: ##################################################################### -qt_add_manual_test(loader-qml +qt_internal_add_manual_test(loader-qml GUI SOURCES main.cpp @@ -26,7 +26,7 @@ set(loader-qml_resource_files "main.qml" ) -qt_add_resource(loader-qml "loader-qml" +qt_internal_add_resource(loader-qml "loader-qml" PREFIX "/" FILES diff --git a/tests/manual/lod/CMakeLists.txt b/tests/manual/lod/CMakeLists.txt index 659db4d19..b3a703c41 100644 --- a/tests/manual/lod/CMakeLists.txt +++ b/tests/manual/lod/CMakeLists.txt @@ -4,7 +4,7 @@ ## lod Binary: ##################################################################### -qt_add_manual_test(lod +qt_internal_add_manual_test(lod GUI SOURCES main.cpp @@ -28,7 +28,7 @@ set(lod_resource_files "main.qml" ) -qt_add_resource(lod "lod" +qt_internal_add_resource(lod "lod" PREFIX "/" FILES diff --git a/tests/manual/manual-renderloop/CMakeLists.txt b/tests/manual/manual-renderloop/CMakeLists.txt index 20cd96c4d..d0d777939 100644 --- a/tests/manual/manual-renderloop/CMakeLists.txt +++ b/tests/manual/manual-renderloop/CMakeLists.txt @@ -4,7 +4,7 @@ ## manual-renderloop Binary: ##################################################################### -qt_add_manual_test(manual-renderloop +qt_internal_add_manual_test(manual-renderloop GUI SOURCES main.cpp diff --git a/tests/manual/mesh-morphing/CMakeLists.txt b/tests/manual/mesh-morphing/CMakeLists.txt index f13f2a2c2..7e330da3e 100644 --- a/tests/manual/mesh-morphing/CMakeLists.txt +++ b/tests/manual/mesh-morphing/CMakeLists.txt @@ -4,7 +4,7 @@ ## mesh-morphing Binary: ##################################################################### -qt_add_manual_test(mesh-morphing +qt_internal_add_manual_test(mesh-morphing GUI SOURCES main.cpp diff --git a/tests/manual/mouseinput-qml/CMakeLists.txt b/tests/manual/mouseinput-qml/CMakeLists.txt index 61473d0ff..09a3efe57 100644 --- a/tests/manual/mouseinput-qml/CMakeLists.txt +++ b/tests/manual/mouseinput-qml/CMakeLists.txt @@ -4,7 +4,7 @@ ## mouseinput-qml Binary: ##################################################################### -qt_add_manual_test(mouseinput-qml +qt_internal_add_manual_test(mouseinput-qml GUI SOURCES main.cpp @@ -24,7 +24,7 @@ set(mouseinput-qml_resource_files "main.qml" ) -qt_add_resource(mouseinput-qml "mouseinput-qml" +qt_internal_add_resource(mouseinput-qml "mouseinput-qml" PREFIX "/" FILES diff --git a/tests/manual/multiplewindows-qml/CMakeLists.txt b/tests/manual/multiplewindows-qml/CMakeLists.txt index 7765159f5..0dd2e817d 100644 --- a/tests/manual/multiplewindows-qml/CMakeLists.txt +++ b/tests/manual/multiplewindows-qml/CMakeLists.txt @@ -4,7 +4,7 @@ ## multiplewindows-qml Binary: ##################################################################### -qt_add_manual_test(multiplewindows-qml +qt_internal_add_manual_test(multiplewindows-qml GUI SOURCES main.cpp @@ -25,7 +25,7 @@ set(qml_resource_files "main.qml" ) -qt_add_resource(multiplewindows-qml "qml" +qt_internal_add_resource(multiplewindows-qml "qml" PREFIX "/" FILES diff --git a/tests/manual/paintedtexture-cpp/CMakeLists.txt b/tests/manual/paintedtexture-cpp/CMakeLists.txt index 85c29d2c2..5f3fd422b 100644 --- a/tests/manual/paintedtexture-cpp/CMakeLists.txt +++ b/tests/manual/paintedtexture-cpp/CMakeLists.txt @@ -4,7 +4,7 @@ ## paintedtexture-cpp Binary: ##################################################################### -qt_add_manual_test(paintedtexture-cpp +qt_internal_add_manual_test(paintedtexture-cpp GUI SOURCES main.cpp diff --git a/tests/manual/picking-qml/CMakeLists.txt b/tests/manual/picking-qml/CMakeLists.txt index 1de80aab8..f30d249a5 100644 --- a/tests/manual/picking-qml/CMakeLists.txt +++ b/tests/manual/picking-qml/CMakeLists.txt @@ -4,7 +4,7 @@ ## picking-qml Binary: ##################################################################### -qt_add_manual_test(picking-qml +qt_internal_add_manual_test(picking-qml GUI SOURCES main.cpp @@ -26,7 +26,7 @@ set(picking-qml_resource_files "main.qml" ) -qt_add_resource(picking-qml "picking-qml" +qt_internal_add_resource(picking-qml "picking-qml" PREFIX "/" FILES diff --git a/tests/manual/plasma/CMakeLists.txt b/tests/manual/plasma/CMakeLists.txt index 0db9b5008..4aed660b5 100644 --- a/tests/manual/plasma/CMakeLists.txt +++ b/tests/manual/plasma/CMakeLists.txt @@ -4,7 +4,7 @@ ## plasma Binary: ##################################################################### -qt_add_manual_test(plasma +qt_internal_add_manual_test(plasma GUI SOURCES main.cpp @@ -25,7 +25,7 @@ set(plasma_resource_files "plasma.vert" ) -qt_add_resource(plasma "plasma" +qt_internal_add_resource(plasma "plasma" PREFIX "/" FILES diff --git a/tests/manual/pointlinesize/CMakeLists.txt b/tests/manual/pointlinesize/CMakeLists.txt index f724fbee0..0c81e2a28 100644 --- a/tests/manual/pointlinesize/CMakeLists.txt +++ b/tests/manual/pointlinesize/CMakeLists.txt @@ -4,7 +4,7 @@ ## pointlinesize Binary: ##################################################################### -qt_add_manual_test(pointlinesize +qt_internal_add_manual_test(pointlinesize GUI SOURCES main.cpp @@ -25,7 +25,7 @@ set(pointlinesize_resource_files "main.qml" ) -qt_add_resource(pointlinesize "pointlinesize" +qt_internal_add_resource(pointlinesize "pointlinesize" PREFIX "/" FILES diff --git a/tests/manual/proximityfilter/CMakeLists.txt b/tests/manual/proximityfilter/CMakeLists.txt index fff1c8d8a..f2b9fdf5c 100644 --- a/tests/manual/proximityfilter/CMakeLists.txt +++ b/tests/manual/proximityfilter/CMakeLists.txt @@ -4,7 +4,7 @@ ## proximityfilter Binary: ##################################################################### -qt_add_manual_test(proximityfilter +qt_internal_add_manual_test(proximityfilter GUI SOURCES main.cpp @@ -23,7 +23,7 @@ set(proximityfilter_resource_files "main.qml" ) -qt_add_resource(proximityfilter "proximityfilter" +qt_internal_add_resource(proximityfilter "proximityfilter" PREFIX "/" FILES diff --git a/tests/manual/qtbug-72236/CMakeLists.txt b/tests/manual/qtbug-72236/CMakeLists.txt index 7f7ccd3cf..4df83ad3d 100644 --- a/tests/manual/qtbug-72236/CMakeLists.txt +++ b/tests/manual/qtbug-72236/CMakeLists.txt @@ -4,7 +4,7 @@ ## qtbug-72236 Binary: ##################################################################### -qt_add_manual_test(qtbug-72236 +qt_internal_add_manual_test(qtbug-72236 GUI SOURCES main.cpp diff --git a/tests/manual/qtbug-76766/CMakeLists.txt b/tests/manual/qtbug-76766/CMakeLists.txt index ef1d8c7c2..9910e8db9 100644 --- a/tests/manual/qtbug-76766/CMakeLists.txt +++ b/tests/manual/qtbug-76766/CMakeLists.txt @@ -4,7 +4,7 @@ ## qtbug-76766 Binary: ##################################################################### -qt_add_manual_test(qtbug-76766 +qt_internal_add_manual_test(qtbug-76766 GUI SOURCES main.cpp @@ -25,7 +25,7 @@ set(qml_resource_files "main.qml" ) -qt_add_resource(qtbug-76766 "qml" +qt_internal_add_resource(qtbug-76766 "qml" PREFIX "/" FILES @@ -36,7 +36,7 @@ set(shaders_resource_files "shaders/shader.vert" ) -qt_add_resource(qtbug-76766 "shaders" +qt_internal_add_resource(qtbug-76766 "shaders" PREFIX "/" FILES diff --git a/tests/manual/quickwidget-switch/CMakeLists.txt b/tests/manual/quickwidget-switch/CMakeLists.txt index 6ef9e1190..2d55dbbc5 100644 --- a/tests/manual/quickwidget-switch/CMakeLists.txt +++ b/tests/manual/quickwidget-switch/CMakeLists.txt @@ -4,7 +4,7 @@ ## quickwidget-switch Binary: ##################################################################### -qt_add_manual_test(quickwidget-switch +qt_internal_add_manual_test(quickwidget-switch GUI SOURCES main.cpp @@ -28,7 +28,7 @@ set(quickwidget-switch_resource_files "main.qml" ) -qt_add_resource(quickwidget-switch "quickwidget-switch" +qt_internal_add_resource(quickwidget-switch "quickwidget-switch" PREFIX "/" FILES diff --git a/tests/manual/quickwindow-switch/CMakeLists.txt b/tests/manual/quickwindow-switch/CMakeLists.txt index d1fa75f92..d6cf9c999 100644 --- a/tests/manual/quickwindow-switch/CMakeLists.txt +++ b/tests/manual/quickwindow-switch/CMakeLists.txt @@ -4,7 +4,7 @@ ## quickwindow-switch Binary: ##################################################################### -qt_add_manual_test(quickwindow-switch +qt_internal_add_manual_test(quickwindow-switch GUI SOURCES main.cpp @@ -26,7 +26,7 @@ set(quickwindow-switch_resource_files "main.qml" ) -qt_add_resource(quickwindow-switch "quickwindow-switch" +qt_internal_add_resource(quickwindow-switch "quickwindow-switch" PREFIX "/" FILES diff --git a/tests/manual/raster-cpp/CMakeLists.txt b/tests/manual/raster-cpp/CMakeLists.txt index d039fad82..d83abd1c7 100644 --- a/tests/manual/raster-cpp/CMakeLists.txt +++ b/tests/manual/raster-cpp/CMakeLists.txt @@ -4,7 +4,7 @@ ## raster-cpp Binary: ##################################################################### -qt_add_manual_test(raster-cpp +qt_internal_add_manual_test(raster-cpp GUI SOURCES main.cpp diff --git a/tests/manual/raster-qml/CMakeLists.txt b/tests/manual/raster-qml/CMakeLists.txt index 80ffbe893..8faf17b36 100644 --- a/tests/manual/raster-qml/CMakeLists.txt +++ b/tests/manual/raster-qml/CMakeLists.txt @@ -4,7 +4,7 @@ ## raster-qml Binary: ##################################################################### -qt_add_manual_test(raster-qml +qt_internal_add_manual_test(raster-qml GUI SOURCES main.cpp @@ -24,7 +24,7 @@ set(raster-qml_resource_files "main.qml" ) -qt_add_resource(raster-qml "raster-qml" +qt_internal_add_resource(raster-qml "raster-qml" PREFIX "/" FILES diff --git a/tests/manual/raycasting-qml/CMakeLists.txt b/tests/manual/raycasting-qml/CMakeLists.txt index 24be78aae..2ebceb50e 100644 --- a/tests/manual/raycasting-qml/CMakeLists.txt +++ b/tests/manual/raycasting-qml/CMakeLists.txt @@ -4,7 +4,7 @@ ## raycasting-qml Binary: ##################################################################### -qt_add_manual_test(raycasting-qml +qt_internal_add_manual_test(raycasting-qml GUI SOURCES main.cpp @@ -33,14 +33,14 @@ set(raycasting-shader_resource_files shaders/gl3/simpleColor.vert ) -qt_add_resource(raycasting-qml "raycasting-qml" +qt_internal_add_resource(raycasting-qml "raycasting-qml" PREFIX "/" FILES ${raycasting-qml_resource_files} ) -qt_add_resource(raycasting-qml "shaders" +qt_internal_add_resource(raycasting-qml "shaders" PREFIX "/" FILES diff --git a/tests/manual/render-qml-to-texture-qml/CMakeLists.txt b/tests/manual/render-qml-to-texture-qml/CMakeLists.txt index 5cecc8e3c..1e801381c 100644 --- a/tests/manual/render-qml-to-texture-qml/CMakeLists.txt +++ b/tests/manual/render-qml-to-texture-qml/CMakeLists.txt @@ -4,7 +4,7 @@ ## render-qml-to-texture-qml Binary: ##################################################################### -qt_add_manual_test(render-qml-to-texture-qml +qt_internal_add_manual_test(render-qml-to-texture-qml GUI SOURCES main.cpp @@ -25,7 +25,7 @@ set(render-qml-to-texture-qml_resource_files "main.qml" ) -qt_add_resource(render-qml-to-texture-qml "render-qml-to-texture-qml" +qt_internal_add_resource(render-qml-to-texture-qml "render-qml-to-texture-qml" PREFIX "/" FILES diff --git a/tests/manual/render-qml-to-texture/CMakeLists.txt b/tests/manual/render-qml-to-texture/CMakeLists.txt index b87c58dd2..6037d6c6d 100644 --- a/tests/manual/render-qml-to-texture/CMakeLists.txt +++ b/tests/manual/render-qml-to-texture/CMakeLists.txt @@ -4,7 +4,7 @@ ## render-qml-to-texture Binary: ##################################################################### -qt_add_manual_test(render-qml-to-texture +qt_internal_add_manual_test(render-qml-to-texture GUI SOURCES main.cpp @@ -32,7 +32,7 @@ set(render-qml-to-texture_resource_files "shaders/gl3/texturing.vert" ) -qt_add_resource(render-qml-to-texture "render-qml-to-texture" +qt_internal_add_resource(render-qml-to-texture "render-qml-to-texture" PREFIX "/" FILES diff --git a/tests/manual/rendercapture-cpp/CMakeLists.txt b/tests/manual/rendercapture-cpp/CMakeLists.txt index 5a54bfd23..e9f7ecce6 100644 --- a/tests/manual/rendercapture-cpp/CMakeLists.txt +++ b/tests/manual/rendercapture-cpp/CMakeLists.txt @@ -4,7 +4,7 @@ ## rendercapture-cpp Binary: ##################################################################### -qt_add_manual_test(rendercapture-cpp +qt_internal_add_manual_test(rendercapture-cpp GUI SOURCES main.cpp diff --git a/tests/manual/rendercapture-qml-fbo/CMakeLists.txt b/tests/manual/rendercapture-qml-fbo/CMakeLists.txt index 74d2a6f33..49d6c5149 100644 --- a/tests/manual/rendercapture-qml-fbo/CMakeLists.txt +++ b/tests/manual/rendercapture-qml-fbo/CMakeLists.txt @@ -4,7 +4,7 @@ ## rendercapture-qml-fbo Binary: ##################################################################### -qt_add_manual_test(rendercapture-qml-fbo +qt_internal_add_manual_test(rendercapture-qml-fbo GUI SOURCES main.cpp @@ -28,7 +28,7 @@ set(qml_resource_files "main.qml" ) -qt_add_resource(rendercapture-qml-fbo "qml" +qt_internal_add_resource(rendercapture-qml-fbo "qml" PREFIX "/" FILES diff --git a/tests/manual/rendercapture-qml/CMakeLists.txt b/tests/manual/rendercapture-qml/CMakeLists.txt index 04ae704bf..870612b50 100644 --- a/tests/manual/rendercapture-qml/CMakeLists.txt +++ b/tests/manual/rendercapture-qml/CMakeLists.txt @@ -4,7 +4,7 @@ ## rendercapture-qml Binary: ##################################################################### -qt_add_manual_test(rendercapture-qml +qt_internal_add_manual_test(rendercapture-qml GUI SOURCES main.cpp @@ -28,7 +28,7 @@ set(qml_resource_files "main.qml" ) -qt_add_resource(rendercapture-qml "qml" +qt_internal_add_resource(rendercapture-qml "qml" PREFIX "/" FILES diff --git a/tests/manual/rendertarget-cpp/CMakeLists.txt b/tests/manual/rendertarget-cpp/CMakeLists.txt index 97cfb0fe9..072f66f96 100644 --- a/tests/manual/rendertarget-cpp/CMakeLists.txt +++ b/tests/manual/rendertarget-cpp/CMakeLists.txt @@ -4,7 +4,7 @@ ## rendertarget-cpp Binary: ##################################################################### -qt_add_manual_test(rendertarget-cpp +qt_internal_add_manual_test(rendertarget-cpp GUI SOURCES main.cpp diff --git a/tests/manual/rhi/simple-rhi-cpp/CMakeLists.txt b/tests/manual/rhi/simple-rhi-cpp/CMakeLists.txt index 5d2f3338b..da80fbee9 100644 --- a/tests/manual/rhi/simple-rhi-cpp/CMakeLists.txt +++ b/tests/manual/rhi/simple-rhi-cpp/CMakeLists.txt @@ -4,7 +4,7 @@ ## simple-rhi-cpp Binary: ##################################################################### -qt_add_manual_test(simple-rhi-cpp +qt_internal_add_manual_test(simple-rhi-cpp GUI SOURCES main.cpp @@ -21,7 +21,7 @@ set(qmake_immediate_resource_files "qtlogo.png" ) -qt_add_resource(simple-rhi-cpp "qmake_immediate" +qt_internal_add_resource(simple-rhi-cpp "qmake_immediate" PREFIX "/" FILES diff --git a/tests/manual/rhi/ubo/CMakeLists.txt b/tests/manual/rhi/ubo/CMakeLists.txt index 24fa81a95..5c3144a99 100644 --- a/tests/manual/rhi/ubo/CMakeLists.txt +++ b/tests/manual/rhi/ubo/CMakeLists.txt @@ -2,7 +2,7 @@ ## ubo Binary: ##################################################################### -qt_add_manual_test(ubo +qt_internal_add_manual_test(ubo GUI SOURCES main.cpp @@ -28,7 +28,7 @@ set(qmake_immediate_resource_files "main.qml" ) -qt_add_resource(ubo "qmake_immediate" +qt_internal_add_resource(ubo "qmake_immediate" PREFIX "/" FILES diff --git a/tests/manual/rigged-simple/CMakeLists.txt b/tests/manual/rigged-simple/CMakeLists.txt index 6a77e2aa5..c8d716297 100644 --- a/tests/manual/rigged-simple/CMakeLists.txt +++ b/tests/manual/rigged-simple/CMakeLists.txt @@ -4,7 +4,7 @@ ## rigged-simple Binary: ##################################################################### -qt_add_manual_test(rigged-simple +qt_internal_add_manual_test(rigged-simple GUI SOURCES main.cpp @@ -29,7 +29,7 @@ set(rigged-simple_resource_files "skinnedPbr.vert" ) -qt_add_resource(rigged-simple "rigged-simple" +qt_internal_add_resource(rigged-simple "rigged-simple" PREFIX "/" FILES @@ -70,7 +70,7 @@ set(cubemaps_resource_files "assets/cubemaps/miramar/miramar_posz.webp" ) -qt_add_resource(rigged-simple "cubemaps" +qt_internal_add_resource(rigged-simple "cubemaps" PREFIX "/" BASE @@ -89,7 +89,7 @@ set(envmaps_resource_files "assets/envmaps/cedar-bridge/cedar_bridge_specular.dds" ) -qt_add_resource(rigged-simple "envmaps" +qt_internal_add_resource(rigged-simple "envmaps" PREFIX "/" BASE @@ -172,7 +172,7 @@ set(gltf_resource_files "assets/gltf/wine/wine3VS.glsl" ) -qt_add_resource(rigged-simple "gltf" +qt_internal_add_resource(rigged-simple "gltf" PREFIX "/" BASE diff --git a/tests/manual/scene3d-in-sync/CMakeLists.txt b/tests/manual/scene3d-in-sync/CMakeLists.txt index 2c172b9e7..cf2b45e5f 100644 --- a/tests/manual/scene3d-in-sync/CMakeLists.txt +++ b/tests/manual/scene3d-in-sync/CMakeLists.txt @@ -4,7 +4,7 @@ ## scene3d-in-sync Binary: ##################################################################### -qt_add_manual_test(scene3d-in-sync +qt_internal_add_manual_test(scene3d-in-sync GUI SOURCES main.cpp @@ -20,7 +20,7 @@ set(scene3d-in-sync_resource_files "main.qml" ) -qt_add_resource(scene3d-in-sync "scene3d-in-sync" +qt_internal_add_resource(scene3d-in-sync "scene3d-in-sync" PREFIX "/" FILES diff --git a/tests/manual/scene3d-loader/CMakeLists.txt b/tests/manual/scene3d-loader/CMakeLists.txt index 141065ea8..9d010d5d3 100644 --- a/tests/manual/scene3d-loader/CMakeLists.txt +++ b/tests/manual/scene3d-loader/CMakeLists.txt @@ -4,7 +4,7 @@ ## scene3d-loader Binary: ##################################################################### -qt_add_manual_test(scene3d-loader +qt_internal_add_manual_test(scene3d-loader GUI SOURCES main.cpp @@ -25,7 +25,7 @@ set(scene3d-loader_resource_files "main.qml" ) -qt_add_resource(scene3d-loader "scene3d-loader" +qt_internal_add_resource(scene3d-loader "scene3d-loader" PREFIX "/" FILES diff --git a/tests/manual/scene3d-visibility/CMakeLists.txt b/tests/manual/scene3d-visibility/CMakeLists.txt index ffa3adc4e..535d12fa8 100644 --- a/tests/manual/scene3d-visibility/CMakeLists.txt +++ b/tests/manual/scene3d-visibility/CMakeLists.txt @@ -4,7 +4,7 @@ ## scene3d-visibility Binary: ##################################################################### -qt_add_manual_test(scene3d-visibility +qt_internal_add_manual_test(scene3d-visibility GUI SOURCES main.cpp @@ -20,7 +20,7 @@ set(scene3d-visibility_resource_files "main.qml" ) -qt_add_resource(scene3d-visibility "scene3d-visibility" +qt_internal_add_resource(scene3d-visibility "scene3d-visibility" PREFIX "/" FILES diff --git a/tests/manual/shader-image-qml/CMakeLists.txt b/tests/manual/shader-image-qml/CMakeLists.txt index 451284f40..324654a59 100644 --- a/tests/manual/shader-image-qml/CMakeLists.txt +++ b/tests/manual/shader-image-qml/CMakeLists.txt @@ -4,7 +4,7 @@ ## shader-image-qml Binary: ##################################################################### -qt_add_manual_test(shader-image-qml +qt_internal_add_manual_test(shader-image-qml GUI SOURCES main.cpp @@ -25,7 +25,7 @@ set(shader-image-qml_resource_files "main.qml" ) -qt_add_resource(shader-image-qml "shader-image-qml" +qt_internal_add_resource(shader-image-qml "shader-image-qml" PREFIX "/" FILES diff --git a/tests/manual/shared_texture_image/CMakeLists.txt b/tests/manual/shared_texture_image/CMakeLists.txt index 96367e521..c4e6c601e 100644 --- a/tests/manual/shared_texture_image/CMakeLists.txt +++ b/tests/manual/shared_texture_image/CMakeLists.txt @@ -4,7 +4,7 @@ ## shared_texture_image Binary: ##################################################################### -qt_add_manual_test(shared_texture_image +qt_internal_add_manual_test(shared_texture_image GUI SOURCES main.cpp @@ -26,7 +26,7 @@ set(shared_texture_image_resource_files "main.qml" ) -qt_add_resource(shared_texture_image "shared_texture_image" +qt_internal_add_resource(shared_texture_image "shared_texture_image" PREFIX "/" FILES diff --git a/tests/manual/sharedtexture/CMakeLists.txt b/tests/manual/sharedtexture/CMakeLists.txt index 0ce55db2d..a83847203 100644 --- a/tests/manual/sharedtexture/CMakeLists.txt +++ b/tests/manual/sharedtexture/CMakeLists.txt @@ -4,7 +4,7 @@ ## sharedtexture Binary: ##################################################################### -qt_add_manual_test(sharedtexture +qt_internal_add_manual_test(sharedtexture GUI SOURCES main.cpp diff --git a/tests/manual/sharedtextureqml/CMakeLists.txt b/tests/manual/sharedtextureqml/CMakeLists.txt index c9a717ec0..2296f63e4 100644 --- a/tests/manual/sharedtextureqml/CMakeLists.txt +++ b/tests/manual/sharedtextureqml/CMakeLists.txt @@ -4,7 +4,7 @@ ## sharedtextureqml Binary: ##################################################################### -qt_add_manual_test(sharedtextureqml +qt_internal_add_manual_test(sharedtextureqml GUI SOURCES ../sharedtexture/videoplayer.cpp ../sharedtexture/videoplayer.h @@ -29,7 +29,7 @@ set(qml_resource_files "main.qml" ) -qt_add_resource(sharedtextureqml "qml" +qt_internal_add_resource(sharedtextureqml "qml" PREFIX "/" FILES diff --git a/tests/manual/simple-shaders-qml/CMakeLists.txt b/tests/manual/simple-shaders-qml/CMakeLists.txt index 9694f3848..83a01d49a 100644 --- a/tests/manual/simple-shaders-qml/CMakeLists.txt +++ b/tests/manual/simple-shaders-qml/CMakeLists.txt @@ -4,7 +4,7 @@ ## simple-shaders-qml Binary: ##################################################################### -qt_add_manual_test(simple-shaders-qml +qt_internal_add_manual_test(simple-shaders-qml GUI SOURCES main.cpp @@ -26,7 +26,7 @@ set(simple-shaders-qml_resource_files "simple-shader.vert" ) -qt_add_resource(simple-shaders-qml "simple-shaders-qml" +qt_internal_add_resource(simple-shaders-qml "simple-shaders-qml" PREFIX "/" FILES diff --git a/tests/manual/skinned-mesh/CMakeLists.txt b/tests/manual/skinned-mesh/CMakeLists.txt index f3c6cc7e5..e1c334d67 100644 --- a/tests/manual/skinned-mesh/CMakeLists.txt +++ b/tests/manual/skinned-mesh/CMakeLists.txt @@ -4,7 +4,7 @@ ## skinned-mesh Binary: ##################################################################### -qt_add_manual_test(skinned-mesh +qt_internal_add_manual_test(skinned-mesh GUI SOURCES main.cpp @@ -30,7 +30,7 @@ set(skinned-mesh_resource_files "skinnedPbr.vert" ) -qt_add_resource(skinned-mesh "skinned-mesh" +qt_internal_add_resource(skinned-mesh "skinned-mesh" PREFIX "/" FILES @@ -71,7 +71,7 @@ set(cubemaps_resource_files "assets/cubemaps/miramar/miramar_posz.webp" ) -qt_add_resource(skinned-mesh "cubemaps" +qt_internal_add_resource(skinned-mesh "cubemaps" PREFIX "/" BASE @@ -90,7 +90,7 @@ set(envmaps_resource_files "assets/envmaps/cedar-bridge/cedar_bridge_specular.dds" ) -qt_add_resource(skinned-mesh "envmaps" +qt_internal_add_resource(skinned-mesh "envmaps" PREFIX "/" BASE @@ -173,7 +173,7 @@ set(gltf_resource_files "assets/gltf/wine/wine3VS.glsl" ) -qt_add_resource(skinned-mesh "gltf" +qt_internal_add_resource(skinned-mesh "gltf" PREFIX "/" BASE diff --git a/tests/manual/skybox/CMakeLists.txt b/tests/manual/skybox/CMakeLists.txt index 49262914a..ba4f848c9 100644 --- a/tests/manual/skybox/CMakeLists.txt +++ b/tests/manual/skybox/CMakeLists.txt @@ -4,7 +4,7 @@ ## skybox Binary: ##################################################################### -qt_add_manual_test(skybox +qt_internal_add_manual_test(skybox GUI SOURCES main.cpp @@ -25,7 +25,7 @@ set(skybox_resource_files "main.qml" ) -qt_add_resource(skybox "skybox" +qt_internal_add_resource(skybox "skybox" PREFIX "/" FILES @@ -66,7 +66,7 @@ set(cubemaps_resource_files "assets/cubemaps/miramar/miramar_posz.webp" ) -qt_add_resource(skybox "cubemaps" +qt_internal_add_resource(skybox "cubemaps" PREFIX "/" BASE diff --git a/tests/manual/spritegrid/CMakeLists.txt b/tests/manual/spritegrid/CMakeLists.txt index d7de183cc..1746a9319 100644 --- a/tests/manual/spritegrid/CMakeLists.txt +++ b/tests/manual/spritegrid/CMakeLists.txt @@ -4,7 +4,7 @@ ## spritegrid Binary: ##################################################################### -qt_add_manual_test(spritegrid +qt_internal_add_manual_test(spritegrid GUI SOURCES main.cpp @@ -25,7 +25,7 @@ set(spritegrid_resource_files "spritegrid.png" ) -qt_add_resource(spritegrid "spritegrid" +qt_internal_add_resource(spritegrid "spritegrid" PREFIX "/" FILES diff --git a/tests/manual/subtree-enabler-qml/CMakeLists.txt b/tests/manual/subtree-enabler-qml/CMakeLists.txt index e96a4f29c..f5d528af9 100644 --- a/tests/manual/subtree-enabler-qml/CMakeLists.txt +++ b/tests/manual/subtree-enabler-qml/CMakeLists.txt @@ -4,7 +4,7 @@ ## subtree-enabler-qml Binary: ##################################################################### -qt_add_manual_test(subtree-enabler-qml +qt_internal_add_manual_test(subtree-enabler-qml GUI SOURCES main.cpp @@ -26,7 +26,7 @@ set(subtree-enabler-qml_resource_files "main.qml" ) -qt_add_resource(subtree-enabler-qml "subtree-enabler-qml" +qt_internal_add_resource(subtree-enabler-qml "subtree-enabler-qml" PREFIX "/" FILES diff --git a/tests/manual/tessellation-modes/CMakeLists.txt b/tests/manual/tessellation-modes/CMakeLists.txt index 637e60037..d55a778c3 100644 --- a/tests/manual/tessellation-modes/CMakeLists.txt +++ b/tests/manual/tessellation-modes/CMakeLists.txt @@ -4,7 +4,7 @@ ## tessellation-modes Binary: ##################################################################### -qt_add_manual_test(tessellation-modes +qt_internal_add_manual_test(tessellation-modes GUI SOURCES main.cpp @@ -39,7 +39,7 @@ set(tessellation-modes_resource_files "shaders/triangles.tes" ) -qt_add_resource(tessellation-modes "tessellation-modes" +qt_internal_add_resource(tessellation-modes "tessellation-modes" PREFIX "/" FILES diff --git a/tests/manual/texture-updates-cpp/CMakeLists.txt b/tests/manual/texture-updates-cpp/CMakeLists.txt index 0a9141859..84471f969 100644 --- a/tests/manual/texture-updates-cpp/CMakeLists.txt +++ b/tests/manual/texture-updates-cpp/CMakeLists.txt @@ -4,7 +4,7 @@ ## texture-updates-cpp Binary: ##################################################################### -qt_add_manual_test(texture-updates-cpp +qt_internal_add_manual_test(texture-updates-cpp GUI SOURCES main.cpp diff --git a/tests/manual/texture_property_updates/CMakeLists.txt b/tests/manual/texture_property_updates/CMakeLists.txt index 28e21153f..dc3ccb3aa 100644 --- a/tests/manual/texture_property_updates/CMakeLists.txt +++ b/tests/manual/texture_property_updates/CMakeLists.txt @@ -4,7 +4,7 @@ ## texture_property_updates Binary: ##################################################################### -qt_add_manual_test(texture_property_updates +qt_internal_add_manual_test(texture_property_updates GUI SOURCES main.cpp @@ -27,7 +27,7 @@ set(texture_property_updates_resource_files "main.qml" ) -qt_add_resource(texture_property_updates "texture_property_updates" +qt_internal_add_resource(texture_property_updates "texture_property_updates" PREFIX "/" FILES diff --git a/tests/manual/transforms-qml/CMakeLists.txt b/tests/manual/transforms-qml/CMakeLists.txt index 7612a0ede..793afa72c 100644 --- a/tests/manual/transforms-qml/CMakeLists.txt +++ b/tests/manual/transforms-qml/CMakeLists.txt @@ -4,7 +4,7 @@ ## transforms-qml Binary: ##################################################################### -qt_add_manual_test(transforms-qml +qt_internal_add_manual_test(transforms-qml GUI SOURCES main.cpp @@ -27,7 +27,7 @@ set(transforms-qml_resource_files "main.qml" ) -qt_add_resource(transforms-qml "transforms-qml" +qt_internal_add_resource(transforms-qml "transforms-qml" PREFIX "/" FILES @@ -56,7 +56,7 @@ set(obj_resource_files "assets/obj/trefoil.obj" ) -qt_add_resource(transforms-qml "obj" +qt_internal_add_resource(transforms-qml "obj" PREFIX "/" BASE diff --git a/tests/manual/transparency-qml-scene3d/CMakeLists.txt b/tests/manual/transparency-qml-scene3d/CMakeLists.txt index 7b560e5cc..5adfe4a5e 100644 --- a/tests/manual/transparency-qml-scene3d/CMakeLists.txt +++ b/tests/manual/transparency-qml-scene3d/CMakeLists.txt @@ -4,7 +4,7 @@ ## transparency-qml-scene3d Binary: ##################################################################### -qt_add_manual_test(transparency-qml-scene3d +qt_internal_add_manual_test(transparency-qml-scene3d GUI SOURCES main.cpp @@ -25,7 +25,7 @@ set(transparency-qml-scene3d_resource_files "main.qml" ) -qt_add_resource(transparency-qml-scene3d "transparency-qml-scene3d" +qt_internal_add_resource(transparency-qml-scene3d "transparency-qml-scene3d" PREFIX "/" FILES @@ -66,7 +66,7 @@ set(cubemaps_resource_files "assets/cubemaps/miramar/miramar_posz.webp" ) -qt_add_resource(transparency-qml-scene3d "cubemaps" +qt_internal_add_resource(transparency-qml-scene3d "cubemaps" PREFIX "/" BASE diff --git a/tests/manual/transparency-qml/CMakeLists.txt b/tests/manual/transparency-qml/CMakeLists.txt index b11f70ce0..0bf3e30ea 100644 --- a/tests/manual/transparency-qml/CMakeLists.txt +++ b/tests/manual/transparency-qml/CMakeLists.txt @@ -4,7 +4,7 @@ ## transparency-qml Binary: ##################################################################### -qt_add_manual_test(transparency-qml +qt_internal_add_manual_test(transparency-qml GUI SOURCES main.cpp @@ -24,7 +24,7 @@ set(transparency-qml_resource_files "main.qml" ) -qt_add_resource(transparency-qml "transparency-qml" +qt_internal_add_resource(transparency-qml "transparency-qml" PREFIX "/" FILES diff --git a/tests/manual/video-texture-qml/CMakeLists.txt b/tests/manual/video-texture-qml/CMakeLists.txt index 6ede10af2..113fca337 100644 --- a/tests/manual/video-texture-qml/CMakeLists.txt +++ b/tests/manual/video-texture-qml/CMakeLists.txt @@ -4,7 +4,7 @@ ## video-texture-qml Binary: ##################################################################### -qt_add_manual_test(video-texture-qml +qt_internal_add_manual_test(video-texture-qml GUI SOURCES main.cpp @@ -25,7 +25,7 @@ set(video-texture-qml_resource_files "main.qml" ) -qt_add_resource(video-texture-qml "video-texture-qml" +qt_internal_add_resource(video-texture-qml "video-texture-qml" PREFIX "/" FILES diff --git a/usecases/CMakeLists.txt b/usecases/CMakeLists.txt index 50b306bb4..f957d1020 100644 --- a/usecases/CMakeLists.txt +++ b/usecases/CMakeLists.txt @@ -4,7 +4,7 @@ ## use_cases Binary: ##################################################################### -qt_add_executable(use_cases +qt_internal_add_executable(use_cases GUI PUBLIC_LIBRARIES Qt::Gui |