diff options
| author | Alexandru Croitor <[email protected]> | 2020-09-22 10:16:58 +0200 |
|---|---|---|
| committer | Alexandru Croitor <[email protected]> | 2020-09-23 16:59:06 +0200 |
| commit | 403213240c7b2dc09378e1cb8c147131e368f90c (patch) | |
| tree | ff86910332629fe5e2fab59a30fb863a5febb366 | |
| parent | e0c62a48b8a826a46a143e57e94b2a0ea73c7cae (diff) | |
CMake: Regenerate projects to use new qt_internal_ API
Modify special case locations to use the new API as well.
Clean up some stale .prev files that are not needed anymore.
Clean up some project files that are not used anymore.
Task-number: QTBUG-86815
Change-Id: I9947da921f98686023c6bb053dfcc101851276b5
Reviewed-by: Joerg Bornemann <[email protected]>
Reviewed-by: Qt CI Bot <[email protected]>
1165 files changed, 2440 insertions, 2751 deletions
diff --git a/qmake/.prev_CMakeLists.txt b/qmake/.prev_CMakeLists.txt index aa265d4308c..74a2750ff2d 100644 --- a/qmake/.prev_CMakeLists.txt +++ b/qmake/.prev_CMakeLists.txt @@ -5,7 +5,7 @@ ##################################################################### qt_get_tool_target_name(target_name qmake) -qt_add_tool(${target_name} +qt_internal_add_tool(${target_name} SOURCES ../src/3rdparty/pcre2/src/config.h ../src/3rdparty/pcre2/src/pcre2.h @@ -172,7 +172,7 @@ qt_add_tool(${target_name} ## Scopes: ##################################################################### -qt_extend_target(${target_name} CONDITION WIN32 +qt_internal_extend_target(${target_name} CONDITION WIN32 SOURCES ../src/corelib/global/qoperatingsystemversion_win.cpp ../src/corelib/io/qfilesystemengine_win.cpp @@ -196,7 +196,7 @@ qt_extend_target(${target_name} CONDITION WIN32 ole32 ) -qt_extend_target(${target_name} CONDITION UNIX +qt_internal_extend_target(${target_name} CONDITION UNIX SOURCES ../src/corelib/io/qfilesystemengine_unix.cpp ../src/corelib/io/qfilesystemiterator_unix.cpp @@ -205,7 +205,7 @@ qt_extend_target(${target_name} CONDITION UNIX ../src/corelib/text/qlocale_unix.cpp ) -qt_extend_target(${target_name} CONDITION MACOS +qt_internal_extend_target(${target_name} CONDITION MACOS SOURCES qcore_foundation.mm qcore_mac.mm @@ -219,12 +219,12 @@ qt_extend_target(${target_name} CONDITION MACOS -fconstant-cfstrings ) -qt_extend_target(${target_name} CONDITION MINGW AND WIN32 +qt_internal_extend_target(${target_name} CONDITION MINGW AND WIN32 PUBLIC_LIBRARIES uuid ) -qt_extend_target(${target_name} CONDITION CLANG AND WIN32 +qt_internal_extend_target(${target_name} CONDITION CLANG AND WIN32 COMPILE_OPTIONS -Wno-microsoft-enum-value -fms-compatibility-version=19.00.23506 diff --git a/qmake/CMakeLists.txt b/qmake/CMakeLists.txt index 2f3eb78b797..65d847375eb 100644 --- a/qmake/CMakeLists.txt +++ b/qmake/CMakeLists.txt @@ -5,7 +5,7 @@ ##################################################################### qt_get_tool_target_name(target_name qmake) -qt_add_tool(${target_name} +qt_internal_add_tool(${target_name} NO_QT # special case TOOLS_TARGET Core # special case # GUI # special case: remove this @@ -191,7 +191,7 @@ qt_add_tool(${target_name} ## Scopes: ##################################################################### -qt_extend_target(${target_name} CONDITION WIN32 +qt_internal_extend_target(${target_name} CONDITION WIN32 SOURCES ../src/corelib/global/qoperatingsystemversion_win.cpp ../src/corelib/io/qfilesystemengine_win.cpp @@ -215,7 +215,7 @@ qt_extend_target(${target_name} CONDITION WIN32 ole32 ) -qt_extend_target(${target_name} CONDITION UNIX +qt_internal_extend_target(${target_name} CONDITION UNIX SOURCES ../src/corelib/io/qfilesystemengine_unix.cpp ../src/corelib/io/qfilesystemiterator_unix.cpp @@ -224,7 +224,7 @@ qt_extend_target(${target_name} CONDITION UNIX ../src/corelib/text/qlocale_unix.cpp ) -qt_extend_target(${target_name} CONDITION MACOS +qt_internal_extend_target(${target_name} CONDITION MACOS SOURCES ../src/corelib/kernel/qcore_foundation.mm # special case ../src/corelib/kernel/qcore_mac.mm # special case @@ -239,7 +239,7 @@ qt_extend_target(${target_name} CONDITION MACOS ) # special case big -extend_target(qmake CONDITION WIN32 +qt_internal_extend_target(qmake CONDITION WIN32 SOURCES ../src/corelib/io/qfilesystemengine_win.cpp ../src/corelib/io/qfilesystemiterator_win.cpp @@ -255,12 +255,12 @@ extend_target(qmake CONDITION WIN32 ole32 advapi32 kernel32 netapi32 ) -qt_extend_target(${target_name} CONDITION MINGW AND WIN32 +qt_internal_extend_target(${target_name} CONDITION MINGW AND WIN32 PUBLIC_LIBRARIES uuid ) -qt_extend_target(${target_name} CONDITION CLANG AND WIN32 +qt_internal_extend_target(${target_name} CONDITION CLANG AND WIN32 COMPILE_OPTIONS "-fms-compatibility-version=19.00.23506" "-Wno-microsoft-enum-value" diff --git a/src/3rdparty/freetype/CMakeLists.txt b/src/3rdparty/freetype/CMakeLists.txt index 728e9371c76..48d35285466 100644 --- a/src/3rdparty/freetype/CMakeLists.txt +++ b/src/3rdparty/freetype/CMakeLists.txt @@ -4,7 +4,7 @@ ## BundledFreetype Generic Library: ##################################################################### -qt_add_3rdparty_library(BundledFreetype +qt_internal_add_3rdparty_library(BundledFreetype QMAKE_LIB_NAME freetype STATIC INSTALL @@ -67,36 +67,36 @@ qt_set_symbol_visibility_hidden(BundledFreetype) ## Scopes: ##################################################################### -qt_extend_target(BundledFreetype CONDITION WIN32 +qt_internal_extend_target(BundledFreetype CONDITION WIN32 SOURCES src/base/ftsystem.c ) -qt_extend_target(BundledFreetype CONDITION UNIX +qt_internal_extend_target(BundledFreetype CONDITION UNIX SOURCES builds/unix/ftsystem.c INCLUDE_DIRECTORIES builds/unix ) -qt_extend_target(BundledFreetype CONDITION QT_FEATURE_png +qt_internal_extend_target(BundledFreetype CONDITION QT_FEATURE_png DEFINES FT_CONFIG_OPTION_USE_PNG LIBRARIES WrapPNG::WrapPNG ) -qt_extend_target(BundledFreetype CONDITION QT_FEATURE_system_zlib +qt_internal_extend_target(BundledFreetype CONDITION QT_FEATURE_system_zlib LIBRARIES ZLIB::ZLIB ) -qt_extend_target(BundledFreetype CONDITION NOT QT_FEATURE_system_zlib +qt_internal_extend_target(BundledFreetype CONDITION NOT QT_FEATURE_system_zlib INCLUDE_DIRECTORIES ../zlib/src ) -qt_extend_target(BundledFreetype CONDITION NOT QT_FEATURE_system_zlib AND NOT no_core_dep +qt_internal_extend_target(BundledFreetype CONDITION NOT QT_FEATURE_system_zlib AND NOT no_core_dep LIBRARIES Qt::Core ) diff --git a/src/3rdparty/harfbuzz-ng/.prev_CMakeLists.txt b/src/3rdparty/harfbuzz-ng/.prev_CMakeLists.txt index b178d205d50..37b4c00784f 100644 --- a/src/3rdparty/harfbuzz-ng/.prev_CMakeLists.txt +++ b/src/3rdparty/harfbuzz-ng/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## BundledHarfbuzz Generic Library: ##################################################################### -qt_add_3rdparty_library(BundledHarfbuzz +qt_internal_add_3rdparty_library(BundledHarfbuzz QMAKE_LIB_NAME harfbuzz STATIC SOURCES @@ -74,19 +74,19 @@ qt_set_symbol_visibility_hidden(BundledHarfbuzz) #### Keys ignored in scope 2:.:.:harfbuzz-ng.pro:APPLE: # SHAPERS = "coretext" -qt_extend_target(BundledHarfbuzz CONDITION UNIX +qt_internal_extend_target(BundledHarfbuzz CONDITION UNIX DEFINES HAVE_PTHREAD HAVE_SCHED_H HAVE_SCHED_YIELD ) -qt_extend_target(BundledHarfbuzz CONDITION WIN32 +qt_internal_extend_target(BundledHarfbuzz CONDITION WIN32 DEFINES HB_NO_WIN1256 ) -qt_extend_target(BundledHarfbuzz CONDITION SHAPERS___contains___opentype +qt_internal_extend_target(BundledHarfbuzz CONDITION SHAPERS___contains___opentype SOURCES src/hb-ot.h src/hb-ot-cff1-table.cc @@ -147,7 +147,7 @@ qt_extend_target(BundledHarfbuzz CONDITION SHAPERS___contains___opentype HAVE_OT ) -qt_extend_target(BundledHarfbuzz CONDITION SHAPERS_ISEMPTY OR SHAPERS___contains___fallback +qt_internal_extend_target(BundledHarfbuzz CONDITION SHAPERS_ISEMPTY OR SHAPERS___contains___fallback SOURCES src/hb-fallback-shape.cc DEFINES diff --git a/src/3rdparty/harfbuzz-ng/CMakeLists.txt b/src/3rdparty/harfbuzz-ng/CMakeLists.txt index 2f895ab4d3b..37e07f2350e 100644 --- a/src/3rdparty/harfbuzz-ng/CMakeLists.txt +++ b/src/3rdparty/harfbuzz-ng/CMakeLists.txt @@ -4,7 +4,7 @@ ## BundledHarfbuzz Generic Library: ##################################################################### -qt_add_3rdparty_library(BundledHarfbuzz +qt_internal_add_3rdparty_library(BundledHarfbuzz QMAKE_LIB_NAME harfbuzz STATIC SKIP_AUTOMOC # special case @@ -76,19 +76,19 @@ qt_set_symbol_visibility_hidden(BundledHarfbuzz) #### Keys ignored in scope 2:.:.:harfbuzz-ng.pro:APPLE: # SHAPERS = "coretext" -qt_extend_target(BundledHarfbuzz CONDITION UNIX +qt_internal_extend_target(BundledHarfbuzz CONDITION UNIX DEFINES HAVE_PTHREAD HAVE_SCHED_H HAVE_SCHED_YIELD ) -qt_extend_target(BundledHarfbuzz CONDITION WIN32 +qt_internal_extend_target(BundledHarfbuzz CONDITION WIN32 DEFINES HB_NO_WIN1256 ) -qt_extend_target(BundledHarfbuzz CONDITION TRUE # special case +qt_internal_extend_target(BundledHarfbuzz CONDITION TRUE # special case SOURCES src/hb-ot.h src/hb-ot-cff1-table.cc @@ -149,7 +149,7 @@ qt_extend_target(BundledHarfbuzz CONDITION TRUE # special case HAVE_OT ) -qt_extend_target(BundledHarfbuzz CONDITION SHAPERS_ISEMPTY OR SHAPERS___contains___fallback +qt_internal_extend_target(BundledHarfbuzz CONDITION SHAPERS_ISEMPTY OR SHAPERS___contains___fallback SOURCES src/hb-fallback-shape.cc DEFINES diff --git a/src/3rdparty/libpng/CMakeLists.txt b/src/3rdparty/libpng/CMakeLists.txt index 24fca5d9258..9ef367563b7 100644 --- a/src/3rdparty/libpng/CMakeLists.txt +++ b/src/3rdparty/libpng/CMakeLists.txt @@ -4,7 +4,7 @@ ## BundledLibpng Generic Library: ##################################################################### -qt_add_3rdparty_library(BundledLibpng +qt_internal_add_3rdparty_library(BundledLibpng QMAKE_LIB_NAME libpng STATIC INSTALL @@ -39,17 +39,17 @@ qt_set_symbol_visibility_hidden(BundledLibpng) ## Scopes: ##################################################################### -qt_extend_target(BundledLibpng CONDITION QT_FEATURE_system_zlib +qt_internal_extend_target(BundledLibpng CONDITION QT_FEATURE_system_zlib LIBRARIES ZLIB::ZLIB ) -qt_extend_target(BundledLibpng CONDITION NOT QT_FEATURE_system_zlib +qt_internal_extend_target(BundledLibpng CONDITION NOT QT_FEATURE_system_zlib INCLUDE_DIRECTORIES ../zlib/src ) -qt_extend_target(BundledLibpng CONDITION NOT QT_FEATURE_system_zlib AND NOT no_core_dep +qt_internal_extend_target(BundledLibpng CONDITION NOT QT_FEATURE_system_zlib AND NOT no_core_dep LIBRARIES Qt::Core ) diff --git a/src/3rdparty/pcre2/.prev_CMakeLists.txt b/src/3rdparty/pcre2/.prev_CMakeLists.txt index 5efac810c7a..e84899c227b 100644 --- a/src/3rdparty/pcre2/.prev_CMakeLists.txt +++ b/src/3rdparty/pcre2/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## BundledPcre2 Generic Library: ##################################################################### -qt_add_3rdparty_library(BundledPcre2 +qt_internal_add_3rdparty_library(BundledPcre2 QMAKE_LIB_NAME pcre2 STATIC SOURCES @@ -52,27 +52,27 @@ qt_set_symbol_visibility_hidden(BundledPcre2) ## Scopes: ##################################################################### -qt_extend_target(BundledPcre2 CONDITION QNX OR UIKIT +qt_internal_extend_target(BundledPcre2 CONDITION QNX OR UIKIT DEFINES PCRE2_DISABLE_JIT ) -qt_extend_target(BundledPcre2 CONDITION (TEST_architecture_arch STREQUAL "arm") AND WIN32 +qt_internal_extend_target(BundledPcre2 CONDITION (TEST_architecture_arch STREQUAL "arm") AND WIN32 DEFINES PCRE2_DISABLE_JIT ) -qt_extend_target(BundledPcre2 CONDITION (TEST_architecture_arch STREQUAL "arm64") AND WIN32 +qt_internal_extend_target(BundledPcre2 CONDITION (TEST_architecture_arch STREQUAL "arm64") AND WIN32 DEFINES PCRE2_DISABLE_JIT ) -qt_extend_target(BundledPcre2 CONDITION MACOS AND (TEST_architecture_arch STREQUAL "arm64") +qt_internal_extend_target(BundledPcre2 CONDITION MACOS AND (TEST_architecture_arch STREQUAL "arm64") DEFINES PCRE2_DISABLE_JIT ) -qt_extend_target(BundledPcre2 CONDITION WIN32 +qt_internal_extend_target(BundledPcre2 CONDITION WIN32 PUBLIC_DEFINES PCRE2_STATIC ) diff --git a/src/3rdparty/pcre2/CMakeLists.txt b/src/3rdparty/pcre2/CMakeLists.txt index 575424c887b..23b6e738cd4 100644 --- a/src/3rdparty/pcre2/CMakeLists.txt +++ b/src/3rdparty/pcre2/CMakeLists.txt @@ -4,7 +4,7 @@ ## BundledPcre2 Generic Library: ##################################################################### -qt_add_3rdparty_library(BundledPcre2 +qt_internal_add_3rdparty_library(BundledPcre2 QMAKE_LIB_NAME pcre2 STATIC SOURCES @@ -52,27 +52,27 @@ qt_set_symbol_visibility_hidden(BundledPcre2) ## Scopes: ##################################################################### -qt_extend_target(BundledPcre2 CONDITION QNX OR UIKIT +qt_internal_extend_target(BundledPcre2 CONDITION QNX OR UIKIT DEFINES PCRE2_DISABLE_JIT ) -qt_extend_target(BundledPcre2 CONDITION (TEST_architecture_arch STREQUAL "arm") AND WIN32 +qt_internal_extend_target(BundledPcre2 CONDITION (TEST_architecture_arch STREQUAL "arm") AND WIN32 DEFINES PCRE2_DISABLE_JIT ) -qt_extend_target(BundledPcre2 CONDITION (TEST_architecture_arch STREQUAL "arm64") AND WIN32 +qt_internal_extend_target(BundledPcre2 CONDITION (TEST_architecture_arch STREQUAL "arm64") AND WIN32 DEFINES PCRE2_DISABLE_JIT ) -qt_extend_target(BundledPcre2 CONDITION MACOS AND (TEST_architecture_arch STREQUAL "arm64") +qt_internal_extend_target(BundledPcre2 CONDITION MACOS AND (TEST_architecture_arch STREQUAL "arm64") DEFINES PCRE2_DISABLE_JIT ) -qt_extend_target(BundledPcre2 CONDITION WIN32 +qt_internal_extend_target(BundledPcre2 CONDITION WIN32 PUBLIC_DEFINES PCRE2_STATIC ) diff --git a/src/concurrent/CMakeLists.txt b/src/concurrent/CMakeLists.txt index 74224460401..876ddaf1bae 100644 --- a/src/concurrent/CMakeLists.txt +++ b/src/concurrent/CMakeLists.txt @@ -4,7 +4,7 @@ ## Concurrent Module: ##################################################################### -qt_add_module(Concurrent +qt_internal_add_module(Concurrent EXCEPTIONS SOURCES qtaskbuilder.h @@ -39,11 +39,11 @@ qt_add_module(Concurrent ## Scopes: ##################################################################### -qt_extend_target(Concurrent CONDITION MSVC AND (TEST_architecture_arch STREQUAL "i386") +qt_internal_extend_target(Concurrent CONDITION MSVC AND (TEST_architecture_arch STREQUAL "i386") LINK_OPTIONS "/BASE:0x66000000" ) -qt_add_docs(Concurrent +qt_internal_add_docs(Concurrent doc/qtconcurrent.qdocconf ) diff --git a/src/corelib/.prev_CMakeLists.txt b/src/corelib/.prev_CMakeLists.txt index e024f49c931..59231ae5210 100644 --- a/src/corelib/.prev_CMakeLists.txt +++ b/src/corelib/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## Core Module: ##################################################################### -qt_add_module(Core +qt_internal_add_module(Core GENERATE_METATYPES QMAKE_MODULE_CONFIG moc resources EXCEPTIONS @@ -233,7 +233,7 @@ qt_add_module(Core ) -qt_add_simd_part(Core SIMD mips_dsp +qt_internal_add_simd_part(Core SIMD mips_dsp SOURCES ../gui/painting/qt_mips_asm_dsp_p.h text/qstring_mips_dsp_asm.S @@ -297,12 +297,12 @@ endif() #### Keys ignored in scope 2:.:.:corelib.pro:QT_FEATURE_gc_binaries: # MODULE_CONFIG = "gc_binaries" -qt_extend_target(Core CONDITION NOT QT_NAMESPACE_ISEMPTY +qt_internal_extend_target(Core CONDITION NOT QT_NAMESPACE_ISEMPTY PUBLIC_DEFINES QT_NAMESPACE= ) -qt_extend_target(Core CONDITION ANDROID +qt_internal_extend_target(Core CONDITION ANDROID SOURCES kernel/qsharedmemory_android.cpp kernel/qsystemsemaphore_android.cpp @@ -310,7 +310,7 @@ qt_extend_target(Core CONDITION ANDROID LIBS_SUFFIX="_${CMAKE_SYSTEM_PROCESSOR}.so" ) -qt_extend_target(Core CONDITION MSVC AND (TEST_architecture_arch STREQUAL "i386") +qt_internal_extend_target(Core CONDITION MSVC AND (TEST_architecture_arch STREQUAL "i386") LINK_OPTIONS "/BASE:0x67000000" ) @@ -318,7 +318,7 @@ qt_extend_target(Core CONDITION MSVC AND (TEST_architecture_arch STREQUAL "i386" #### Keys ignored in scope 6:.:.:corelib.pro:FREEBSD OR OPENBSD: # QMAKE_LFLAGS_NOUNDEF = <EMPTY> -qt_extend_target(Core CONDITION QT_FEATURE_animation +qt_internal_extend_target(Core CONDITION QT_FEATURE_animation SOURCES animation/qabstractanimation.cpp animation/qabstractanimation.h animation/qabstractanimation_p.h animation/qanimationgroup.cpp animation/qanimationgroup.h animation/qanimationgroup_p.h @@ -329,7 +329,7 @@ qt_extend_target(Core CONDITION QT_FEATURE_animation animation/qvariantanimation.cpp animation/qvariantanimation.h animation/qvariantanimation_p.h ) -qt_extend_target(Core CONDITION WIN32 +qt_internal_extend_target(Core CONDITION WIN32 SOURCES global/qoperatingsystemversion_win.cpp global/qoperatingsystemversion_win_p.h io/qfilesystemengine_win.cpp @@ -368,7 +368,7 @@ qt_extend_target(Core CONDITION WIN32 userenv ) -qt_extend_target(Core CONDITION APPLE +qt_internal_extend_target(Core CONDITION APPLE SOURCES global/qoperatingsystemversion_darwin.mm io/qfilesystemengine_mac.mm @@ -385,7 +385,7 @@ qt_extend_target(Core CONDITION APPLE ${FWFoundation} ) -qt_extend_target(Core CONDITION MACOS +qt_internal_extend_target(Core CONDITION MACOS LIBRARIES ${FWAppKit} ${FWApplicationServices} @@ -396,7 +396,7 @@ qt_extend_target(Core CONDITION MACOS ${FWIOKit} ) -qt_extend_target(Core CONDITION INTEGRITY +qt_internal_extend_target(Core CONDITION INTEGRITY LIBRARIES ivfs net @@ -430,26 +430,26 @@ qt_extend_target(Core CONDITION INTEGRITY #### Keys ignored in scope 27:.:global:global/global.pri:else: # f16c_cxx = "false" -qt_extend_target(Core CONDITION _ss_f16c_cxx +qt_internal_extend_target(Core CONDITION _ss_f16c_cxx DEFINES QFLOAT16_INCLUDE_FAST ) if(NOT _ss_f16c_cxx) - qt_add_simd_part(Core SIMD f16c + qt_internal_add_simd_part(Core SIMD f16c SOURCES global/qfloat16_f16c.c ) endif() -qt_extend_target(Core CONDITION NOT CMAKE_CROSSCOMPILING AND NOT _x_-armcc_x_ AND NOT static AND (hurd_x_ OR linux_x_) +qt_internal_extend_target(Core CONDITION NOT CMAKE_CROSSCOMPILING AND NOT _x_-armcc_x_ AND NOT static AND (hurd_x_ OR linux_x_) DEFINES ELF_INTERPRETER=\\\"=Creadelf-l/bin/ls|perl-n-e\'['quote', ['if', ['/program', 'interpreter:', ['.*'], ']/'], '{', 'print', '$1;', '}']]\'\\\" LINK_OPTIONS "-Wl,-e,qt_core_boilerplate" ) -qt_extend_target(Core CONDITION LINUX AND NOT static +qt_internal_extend_target(Core CONDITION LINUX AND NOT static SOURCES global/minimum-linux_p.h ) @@ -466,17 +466,17 @@ qt_extend_target(Core CONDITION LINUX AND NOT static #### Keys ignored in scope 35:.:global:global/global.pri:silent: # no_pch_assembler.commands = "@echo" "compiling[no_pch]" "${QMAKE_FILE_IN}" "&&" -qt_extend_target(Core CONDITION LINUX AND NOT precompile_header AND NOT static +qt_internal_extend_target(Core CONDITION LINUX AND NOT precompile_header AND NOT static SOURCES global/minimum-linux.S ) -qt_extend_target(Core CONDITION QT_FEATURE_slog2 +qt_internal_extend_target(Core CONDITION QT_FEATURE_slog2 LIBRARIES Slog2::Slog2 ) -qt_extend_target(Core CONDITION QT_FEATURE_journald +qt_internal_extend_target(Core CONDITION QT_FEATURE_journald LIBRARIES PkgConfig::Libsystemd ) @@ -493,12 +493,12 @@ qt_extend_target(Core CONDITION QT_FEATURE_journald #### Keys ignored in scope 40:.:global:global/global.pri:silent: # versiontagging_compiler.commands = "@echo" "compiling[versiontagging]" "${QMAKE_FILE_IN}" "&&" -qt_extend_target(Core CONDITION NOT GCC OR NOT ltcg +qt_internal_extend_target(Core CONDITION NOT GCC OR NOT ltcg SOURCES global/qversiontagging.cpp ) -qt_extend_target(Core CONDITION UNIX +qt_internal_extend_target(Core CONDITION UNIX SOURCES io/qfilesystemengine_unix.cpp io/qfilesystemiterator_unix.cpp @@ -511,7 +511,7 @@ qt_extend_target(Core CONDITION UNIX thread/qthread_unix.cpp ) -qt_extend_target(Core CONDITION QT_FEATURE_thread +qt_internal_extend_target(Core CONDITION QT_FEATURE_thread SOURCES thread/qatomic.cpp thread/qatomic.h thread/qatomic_bootstrap.h @@ -529,33 +529,33 @@ qt_extend_target(Core CONDITION QT_FEATURE_thread thread/qthreadstorage.cpp ) -qt_extend_target(Core CONDITION QT_FEATURE_thread AND WIN32 +qt_internal_extend_target(Core CONDITION QT_FEATURE_thread AND WIN32 SOURCES thread/qmutex_win.cpp thread/qwaitcondition_win.cpp ) -qt_extend_target(Core CONDITION QT_FEATURE_thread AND UNIX +qt_internal_extend_target(Core CONDITION QT_FEATURE_thread AND UNIX SOURCES thread/qwaitcondition_unix.cpp ) -qt_extend_target(Core CONDITION APPLE AND QT_FEATURE_thread +qt_internal_extend_target(Core CONDITION APPLE AND QT_FEATURE_thread SOURCES thread/qmutex_mac.cpp ) -qt_extend_target(Core CONDITION LINUX AND QT_FEATURE_thread +qt_internal_extend_target(Core CONDITION LINUX AND QT_FEATURE_thread SOURCES thread/qmutex_linux.cpp ) -qt_extend_target(Core CONDITION QT_FEATURE_thread AND UNIX AND NOT APPLE AND NOT LINUX +qt_internal_extend_target(Core CONDITION QT_FEATURE_thread AND UNIX AND NOT APPLE AND NOT LINUX SOURCES thread/qmutex_unix.cpp ) -qt_extend_target(Core CONDITION QT_FEATURE_future +qt_internal_extend_target(Core CONDITION QT_FEATURE_future SOURCES thread/qexception.cpp thread/qexception.h thread/qfuture.h @@ -567,23 +567,23 @@ qt_extend_target(Core CONDITION QT_FEATURE_future thread/qresultstore.cpp thread/qresultstore.h ) -qt_extend_target(Core CONDITION QT_FEATURE_std_atomic64 +qt_internal_extend_target(Core CONDITION QT_FEATURE_std_atomic64 PUBLIC_LIBRARIES WrapAtomic::WrapAtomic ) -qt_extend_target(Core CONDITION ICC +qt_internal_extend_target(Core CONDITION ICC COMPILE_OPTIONS -fp-model strict ) -qt_extend_target(Core CONDITION QT_FEATURE_system_zlib +qt_internal_extend_target(Core CONDITION QT_FEATURE_system_zlib LIBRARIES ZLIB::ZLIB ) -qt_extend_target(Core CONDITION NOT QT_FEATURE_system_zlib +qt_internal_extend_target(Core CONDITION NOT QT_FEATURE_system_zlib SOURCES ../3rdparty/zlib/src/adler32.c ../3rdparty/zlib/src/compress.c @@ -604,18 +604,18 @@ qt_extend_target(Core CONDITION NOT QT_FEATURE_system_zlib ../3rdparty/zlib/src ) -qt_extend_target(Core CONDITION QT_FEATURE_commandlineparser +qt_internal_extend_target(Core CONDITION QT_FEATURE_commandlineparser SOURCES tools/qcommandlineoption.cpp tools/qcommandlineoption.h tools/qcommandlineparser.cpp tools/qcommandlineparser.h ) -qt_extend_target(Core CONDITION QT_FEATURE_system_doubleconversion +qt_internal_extend_target(Core CONDITION QT_FEATURE_system_doubleconversion LIBRARIES WrapDoubleConversion::WrapDoubleConversion ) -qt_extend_target(Core CONDITION QT_FEATURE_doubleconversion AND NOT QT_FEATURE_system_doubleconversion +qt_internal_extend_target(Core CONDITION QT_FEATURE_doubleconversion AND NOT QT_FEATURE_system_doubleconversion SOURCES ../3rdparty/double-conversion/bignum.cc ../3rdparty/double-conversion/bignum.h ../3rdparty/double-conversion/bignum-dtoa.cc ../3rdparty/double-conversion/bignum-dtoa.h @@ -633,38 +633,38 @@ qt_extend_target(Core CONDITION QT_FEATURE_doubleconversion AND NOT QT_FEATURE_s ../3rdparty/double-conversion/include ) -qt_extend_target(Core CONDITION QT_FEATURE_system_libb2 +qt_internal_extend_target(Core CONDITION QT_FEATURE_system_libb2 LIBRARIES PkgConfig::Libb2 ) -qt_extend_target(Core CONDITION QT_FEATURE_easingcurve +qt_internal_extend_target(Core CONDITION QT_FEATURE_easingcurve SOURCES tools/qeasingcurve.cpp tools/qeasingcurve.h tools/qtimeline.cpp tools/qtimeline.h ) -qt_extend_target(Core CONDITION UNIX AND NOT HAIKU AND NOT INTEGRITY AND NOT VXWORKS AND NOT WASM AND (NOT ICC OR NOT MACOS) +qt_internal_extend_target(Core CONDITION UNIX AND NOT HAIKU AND NOT INTEGRITY AND NOT VXWORKS AND NOT WASM AND (NOT ICC OR NOT MACOS) LIBRARIES m ) -qt_extend_target(Core CONDITION APPLE AND NOT NACL +qt_internal_extend_target(Core CONDITION APPLE AND NOT NACL SOURCES text/qlocale_mac.mm ) -qt_extend_target(Core CONDITION UNIX AND (NACL OR NOT APPLE) +qt_internal_extend_target(Core CONDITION UNIX AND (NACL OR NOT APPLE) SOURCES text/qlocale_unix.cpp ) -qt_extend_target(Core CONDITION WIN32 AND (NACL OR NOT APPLE) +qt_internal_extend_target(Core CONDITION WIN32 AND (NACL OR NOT APPLE) SOURCES text/qlocale_win.cpp ) -qt_extend_target(Core CONDITION QT_FEATURE_icu +qt_internal_extend_target(Core CONDITION QT_FEATURE_icu SOURCES text/qcollator_icu.cpp text/qlocale_icu.cpp @@ -672,159 +672,159 @@ qt_extend_target(Core CONDITION QT_FEATURE_icu ICU::i18n ICU::uc ICU::data ) -qt_extend_target(Core CONDITION WIN32 AND NOT QT_FEATURE_icu +qt_internal_extend_target(Core CONDITION WIN32 AND NOT QT_FEATURE_icu SOURCES text/qcollator_win.cpp ) -qt_extend_target(Core CONDITION MACOS AND NOT QT_FEATURE_icu +qt_internal_extend_target(Core CONDITION MACOS AND NOT QT_FEATURE_icu SOURCES text/qcollator_macx.cpp ) -qt_extend_target(Core CONDITION UNIX AND NOT MACOS AND NOT QT_FEATURE_icu +qt_internal_extend_target(Core CONDITION UNIX AND NOT MACOS AND NOT QT_FEATURE_icu SOURCES text/qcollator_posix.cpp ) -qt_extend_target(Core CONDITION QT_FEATURE_regularexpression +qt_internal_extend_target(Core CONDITION QT_FEATURE_regularexpression SOURCES text/qregularexpression.cpp text/qregularexpression.h LIBRARIES WrapPCRE2::WrapPCRE2 ) -qt_extend_target(Core CONDITION QT_FEATURE_hijricalendar +qt_internal_extend_target(Core CONDITION QT_FEATURE_hijricalendar SOURCES time/qhijricalendar.cpp time/qhijricalendar_p.h time/qhijricalendar_data_p.h ) -qt_extend_target(Core CONDITION QT_FEATURE_islamiccivilcalendar +qt_internal_extend_target(Core CONDITION QT_FEATURE_islamiccivilcalendar SOURCES time/qislamiccivilcalendar.cpp time/qislamiccivilcalendar_p.h ) -qt_extend_target(Core CONDITION QT_FEATURE_jalalicalendar +qt_internal_extend_target(Core CONDITION QT_FEATURE_jalalicalendar SOURCES time/qjalalicalendar.cpp time/qjalalicalendar_p.h time/qjalalicalendar_data_p.h ) -qt_extend_target(Core CONDITION QT_FEATURE_timezone +qt_internal_extend_target(Core CONDITION QT_FEATURE_timezone SOURCES time/qtimezone.cpp time/qtimezone.h time/qtimezoneprivate.cpp time/qtimezoneprivate_p.h time/qtimezoneprivate_data_p.h ) -qt_extend_target(Core CONDITION APPLE AND QT_FEATURE_timezone AND NOT NACL +qt_internal_extend_target(Core CONDITION APPLE AND QT_FEATURE_timezone AND NOT NACL SOURCES time/qtimezoneprivate_mac.mm ) -qt_extend_target(Core CONDITION ANDROID AND QT_FEATURE_timezone AND NOT ANDROID_EMBEDDED AND (NACL OR NOT APPLE) +qt_internal_extend_target(Core CONDITION ANDROID AND QT_FEATURE_timezone AND NOT ANDROID_EMBEDDED AND (NACL OR NOT APPLE) SOURCES time/qtimezoneprivate_android.cpp ) -qt_extend_target(Core CONDITION QT_FEATURE_timezone AND UNIX AND (ANDROID_EMBEDDED OR NOT ANDROID) AND (NACL OR NOT APPLE) +qt_internal_extend_target(Core CONDITION QT_FEATURE_timezone AND UNIX AND (ANDROID_EMBEDDED OR NOT ANDROID) AND (NACL OR NOT APPLE) SOURCES time/qtimezoneprivate_tz.cpp ) -qt_extend_target(Core CONDITION QT_FEATURE_icu AND QT_FEATURE_timezone AND UNIX AND (ANDROID_EMBEDDED OR NOT ANDROID) AND (NACL OR NOT APPLE) +qt_internal_extend_target(Core CONDITION QT_FEATURE_icu AND QT_FEATURE_timezone AND UNIX AND (ANDROID_EMBEDDED OR NOT ANDROID) AND (NACL OR NOT APPLE) SOURCES time/qtimezoneprivate_icu.cpp ) -qt_extend_target(Core CONDITION QT_FEATURE_icu AND QT_FEATURE_timezone AND WIN32 AND (ANDROID_EMBEDDED OR NOT ANDROID) AND (NACL OR NOT APPLE) +qt_internal_extend_target(Core CONDITION QT_FEATURE_icu AND QT_FEATURE_timezone AND WIN32 AND (ANDROID_EMBEDDED OR NOT ANDROID) AND (NACL OR NOT APPLE) SOURCES time/qtimezoneprivate_icu.cpp ) -qt_extend_target(Core CONDITION QT_FEATURE_timezone AND WIN32 AND NOT QT_FEATURE_icu AND (ANDROID_EMBEDDED OR NOT ANDROID) AND (NACL OR NOT APPLE) +qt_internal_extend_target(Core CONDITION QT_FEATURE_timezone AND WIN32 AND NOT QT_FEATURE_icu AND (ANDROID_EMBEDDED OR NOT ANDROID) AND (NACL OR NOT APPLE) SOURCES time/qtimezoneprivate_win.cpp ) -qt_extend_target(Core CONDITION QT_FEATURE_datetimeparser +qt_internal_extend_target(Core CONDITION QT_FEATURE_datetimeparser SOURCES time/qdatetimeparser.cpp time/qdatetimeparser_p.h ) -qt_extend_target(Core CONDITION QT_FEATURE_zstd +qt_internal_extend_target(Core CONDITION QT_FEATURE_zstd LIBRARIES ZSTD::ZSTD ) -qt_extend_target(Core CONDITION QT_FEATURE_filesystemwatcher +qt_internal_extend_target(Core CONDITION QT_FEATURE_filesystemwatcher SOURCES io/qfilesystemwatcher.cpp io/qfilesystemwatcher.h io/qfilesystemwatcher_p.h io/qfilesystemwatcher_polling.cpp io/qfilesystemwatcher_polling_p.h ) -qt_extend_target(Core CONDITION QT_FEATURE_filesystemwatcher AND WIN32 +qt_internal_extend_target(Core CONDITION QT_FEATURE_filesystemwatcher AND WIN32 SOURCES io/qfilesystemwatcher_win.cpp io/qfilesystemwatcher_win_p.h ) -qt_extend_target(Core CONDITION MACOS AND QT_FEATURE_filesystemwatcher +qt_internal_extend_target(Core CONDITION MACOS AND QT_FEATURE_filesystemwatcher SOURCES io/qfilesystemwatcher_fsevents.mm io/qfilesystemwatcher_fsevents_p.h ) -qt_extend_target(Core CONDITION QT_FEATURE_filesystemwatcher AND QT_FEATURE_inotify AND UNIX AND NOT MACOS +qt_internal_extend_target(Core CONDITION QT_FEATURE_filesystemwatcher AND QT_FEATURE_inotify AND UNIX AND NOT MACOS SOURCES io/qfilesystemwatcher_inotify.cpp io/qfilesystemwatcher_inotify_p.h ) -qt_extend_target(Core CONDITION QT_FEATURE_filesystemwatcher AND UNIX AND NOT MACOS AND NOT QT_FEATURE_inotify AND (APPLE OR FREEBSD OR NETBSD OR OPENBSD) +qt_internal_extend_target(Core CONDITION QT_FEATURE_filesystemwatcher AND UNIX AND NOT MACOS AND NOT QT_FEATURE_inotify AND (APPLE OR FREEBSD OR NETBSD OR OPENBSD) SOURCES io/qfilesystemwatcher_kqueue.cpp io/qfilesystemwatcher_kqueue_p.h ) -qt_extend_target(Core CONDITION QT_FEATURE_processenvironment +qt_internal_extend_target(Core CONDITION QT_FEATURE_processenvironment SOURCES io/qprocess.cpp io/qprocess.h io/qprocess_p.h ) -qt_extend_target(Core CONDITION QT_FEATURE_processenvironment AND WIN32 +qt_internal_extend_target(Core CONDITION QT_FEATURE_processenvironment AND WIN32 SOURCES io/qprocess_win.cpp ) -qt_extend_target(Core CONDITION QT_FEATURE_processenvironment AND UNIX +qt_internal_extend_target(Core CONDITION QT_FEATURE_processenvironment AND UNIX SOURCES io/qprocess_unix.cpp ) -qt_extend_target(Core CONDITION QT_FEATURE_settings +qt_internal_extend_target(Core CONDITION QT_FEATURE_settings SOURCES io/qsettings.cpp io/qsettings.h io/qsettings_p.h ) -qt_extend_target(Core CONDITION QT_FEATURE_settings AND WIN32 +qt_internal_extend_target(Core CONDITION QT_FEATURE_settings AND WIN32 SOURCES io/qsettings_win.cpp ) -qt_extend_target(Core CONDITION APPLE AND QT_FEATURE_settings AND NOT NACL +qt_internal_extend_target(Core CONDITION APPLE AND QT_FEATURE_settings AND NOT NACL SOURCES io/qsettings_mac.cpp ) -qt_extend_target(Core CONDITION QT_FEATURE_settings AND WASM +qt_internal_extend_target(Core CONDITION QT_FEATURE_settings AND WASM SOURCES io/qsettings_wasm.cpp ) -qt_extend_target(Core CONDITION QT_FEATURE_filesystemiterator AND WIN32 +qt_internal_extend_target(Core CONDITION QT_FEATURE_filesystemiterator AND WIN32 SOURCES io/qfilesystemiterator_win.cpp ) -qt_extend_target(Core CONDITION QT_FEATURE_process AND UNIX +qt_internal_extend_target(Core CONDITION QT_FEATURE_process AND UNIX SOURCES ../3rdparty/forkfd/forkfd.h io/forkfd_qt.cpp @@ -832,22 +832,22 @@ qt_extend_target(Core CONDITION QT_FEATURE_process AND UNIX ../3rdparty/forkfd ) -qt_extend_target(Core CONDITION APPLE AND QT_FEATURE_processenvironment +qt_internal_extend_target(Core CONDITION APPLE AND QT_FEATURE_processenvironment SOURCES io/qprocess_darwin.mm ) -qt_extend_target(Core CONDITION APPLE AND NOT MACOS +qt_internal_extend_target(Core CONDITION APPLE AND NOT MACOS PUBLIC_LIBRARIES ${FWMobileCoreServices} ) -qt_extend_target(Core CONDITION UNIX AND NOT APPLE +qt_internal_extend_target(Core CONDITION UNIX AND NOT APPLE SOURCES kernel/qelapsedtimer_unix.cpp ) -qt_extend_target(Core CONDITION ANDROID AND NOT ANDROID_EMBEDDED +qt_internal_extend_target(Core CONDITION ANDROID AND NOT ANDROID_EMBEDDED SOURCES io/qstandardpaths_android.cpp io/qstorageinfo_unix.cpp @@ -856,7 +856,7 @@ qt_extend_target(Core CONDITION ANDROID AND NOT ANDROID_EMBEDDED kernel/qjnionload.cpp ) -qt_extend_target(Core CONDITION HAIKU AND (ANDROID_EMBEDDED OR NOT ANDROID) +qt_internal_extend_target(Core CONDITION HAIKU AND (ANDROID_EMBEDDED OR NOT ANDROID) SOURCES io/qstandardpaths_haiku.cpp io/qstorageinfo_unix.cpp @@ -864,92 +864,92 @@ qt_extend_target(Core CONDITION HAIKU AND (ANDROID_EMBEDDED OR NOT ANDROID) be ) -qt_extend_target(Core CONDITION UNIX AND NOT APPLE AND NOT HAIKU AND (ANDROID_EMBEDDED OR NOT ANDROID) +qt_internal_extend_target(Core CONDITION UNIX AND NOT APPLE AND NOT HAIKU AND (ANDROID_EMBEDDED OR NOT ANDROID) SOURCES io/qstandardpaths_unix.cpp io/qstorageinfo_unix.cpp ) -qt_extend_target(Core CONDITION QT_FEATURE_proxymodel +qt_internal_extend_target(Core CONDITION QT_FEATURE_proxymodel SOURCES itemmodels/qabstractproxymodel.cpp itemmodels/qabstractproxymodel.h itemmodels/qabstractproxymodel_p.h ) -qt_extend_target(Core CONDITION QT_FEATURE_concatenatetablesproxymodel AND QT_FEATURE_proxymodel +qt_internal_extend_target(Core CONDITION QT_FEATURE_concatenatetablesproxymodel AND QT_FEATURE_proxymodel SOURCES itemmodels/qconcatenatetablesproxymodel.cpp itemmodels/qconcatenatetablesproxymodel.h ) -qt_extend_target(Core CONDITION QT_FEATURE_identityproxymodel AND QT_FEATURE_proxymodel +qt_internal_extend_target(Core CONDITION QT_FEATURE_identityproxymodel AND QT_FEATURE_proxymodel SOURCES itemmodels/qidentityproxymodel.cpp itemmodels/qidentityproxymodel.h ) -qt_extend_target(Core CONDITION QT_FEATURE_proxymodel AND QT_FEATURE_sortfilterproxymodel +qt_internal_extend_target(Core CONDITION QT_FEATURE_proxymodel AND QT_FEATURE_sortfilterproxymodel SOURCES itemmodels/qsortfilterproxymodel.cpp itemmodels/qsortfilterproxymodel.h ) -qt_extend_target(Core CONDITION QT_FEATURE_proxymodel AND QT_FEATURE_transposeproxymodel +qt_internal_extend_target(Core CONDITION QT_FEATURE_proxymodel AND QT_FEATURE_transposeproxymodel SOURCES itemmodels/qtransposeproxymodel.cpp itemmodels/qtransposeproxymodel.h itemmodels/qtransposeproxymodel_p.h ) -qt_extend_target(Core CONDITION QT_FEATURE_stringlistmodel +qt_internal_extend_target(Core CONDITION QT_FEATURE_stringlistmodel SOURCES itemmodels/qstringlistmodel.cpp itemmodels/qstringlistmodel.h ) -qt_extend_target(Core CONDITION QT_FEATURE_library +qt_internal_extend_target(Core CONDITION QT_FEATURE_library SOURCES plugin/qelfparser_p.cpp plugin/qelfparser_p.h plugin/qlibrary.cpp plugin/qlibrary.h plugin/qlibrary_p.h plugin/qmachparser.cpp plugin/qmachparser_p.h ) -qt_extend_target(Core CONDITION QT_FEATURE_library AND UNIX +qt_internal_extend_target(Core CONDITION QT_FEATURE_library AND UNIX SOURCES plugin/qlibrary_unix.cpp ) -qt_extend_target(Core CONDITION QT_FEATURE_library AND WIN32 +qt_internal_extend_target(Core CONDITION QT_FEATURE_library AND WIN32 SOURCES plugin/qlibrary_win.cpp ) -qt_extend_target(Core CONDITION QT_FEATURE_dlopen AND QT_FEATURE_library +qt_internal_extend_target(Core CONDITION QT_FEATURE_dlopen AND QT_FEATURE_library LIBRARIES ${CMAKE_DL_LIBS} ) -qt_extend_target(Core CONDITION APPLE AND (IOS OR TVOS) +qt_internal_extend_target(Core CONDITION APPLE AND (IOS OR TVOS) LIBRARIES ${FWUIKit} ) -qt_extend_target(Core CONDITION WATCHOS +qt_internal_extend_target(Core CONDITION WATCHOS LIBRARIES ${FWWatchKit} ) -qt_extend_target(Core CONDITION QT_FEATURE_poll_select AND UNIX +qt_internal_extend_target(Core CONDITION QT_FEATURE_poll_select AND UNIX SOURCES kernel/qpoll.cpp ) -qt_extend_target(Core CONDITION QT_FEATURE_glib AND UNIX +qt_internal_extend_target(Core CONDITION QT_FEATURE_glib AND UNIX SOURCES kernel/qeventdispatcher_glib.cpp kernel/qeventdispatcher_glib_p.h LIBRARIES GLIB2::GLIB2 ) -qt_extend_target(Core CONDITION QT_FEATURE_clock_gettime AND UNIX +qt_internal_extend_target(Core CONDITION QT_FEATURE_clock_gettime AND UNIX LIBRARIES WrapRt::WrapRt ) -qt_extend_target(Core CONDITION UNIX AND NOT ANDROID +qt_internal_extend_target(Core CONDITION UNIX AND NOT ANDROID SOURCES kernel/qsharedmemory_posix.cpp kernel/qsharedmemory_systemv.cpp @@ -959,12 +959,12 @@ qt_extend_target(Core CONDITION UNIX AND NOT ANDROID kernel/qsystemsemaphore_unix.cpp ) -qt_extend_target(Core CONDITION VXWORKS +qt_internal_extend_target(Core CONDITION VXWORKS SOURCES kernel/qfunctions_vxworks.cpp kernel/qfunctions_vxworks.h ) -qt_extend_target(Core CONDITION QNX AND QT_FEATURE_qqnx_pps +qt_internal_extend_target(Core CONDITION QNX AND QT_FEATURE_qqnx_pps SOURCES kernel/qppsattribute.cpp kernel/qppsattribute_p.h kernel/qppsattributeprivate_p.h @@ -974,17 +974,17 @@ qt_extend_target(Core CONDITION QNX AND QT_FEATURE_qqnx_pps PPS::PPS ) -qt_extend_target(Core CONDITION QT_FEATURE_cborstreamreader +qt_internal_extend_target(Core CONDITION QT_FEATURE_cborstreamreader SOURCES serialization/qcborstreamreader.cpp serialization/qcborstreamreader.h ) -qt_extend_target(Core CONDITION QT_FEATURE_cborstreamwriter +qt_internal_extend_target(Core CONDITION QT_FEATURE_cborstreamwriter SOURCES serialization/qcborstreamwriter.cpp serialization/qcborstreamwriter.h ) -qt_extend_target(Core CONDITION QT_FEATURE_mimetype +qt_internal_extend_target(Core CONDITION QT_FEATURE_mimetype SOURCES mimetypes/qmimedatabase.cpp mimetypes/qmimedatabase.h mimetypes/qmimedatabase_p.h mimetypes/qmimeglobpattern.cpp mimetypes/qmimeglobpattern_p.h @@ -999,7 +999,7 @@ qt_extend_target(Core CONDITION QT_FEATURE_mimetype # MIME_DATABASE = "mimetypes/mime/packages/freedesktop.org.xml" # OTHER_FILES = "$$MIME_DATABASE" -qt_extend_target(Core CONDITION QT_FEATURE_mimetype AND QT_FEATURE_mimetype_database +qt_internal_extend_target(Core CONDITION QT_FEATURE_mimetype AND QT_FEATURE_mimetype_database INCLUDE_DIRECTORIES .rcc ) @@ -1031,14 +1031,14 @@ qt_extend_target(Core CONDITION QT_FEATURE_mimetype AND QT_FEATURE_mimetype_data #### Keys ignored in scope 180:.:mimetypes:mimetypes/mimetypes.pri:QT_FEATURE_zstd: # mimedb.commands = "--zstd" -qt_extend_target(Core CONDITION WASM +qt_internal_extend_target(Core CONDITION WASM SOURCES platform/wasm/qstdweb.cpp platform/wasm/qstdweb_p.h ) -qt_create_tracepoints(Core qtcore.tracepoints) -qt_add_docs(Core +qt_internal_create_tracepoints(Core qtcore.tracepoints) +qt_internal_add_docs(Core doc/qtcore.qdocconf ) diff --git a/src/corelib/CMakeLists.txt b/src/corelib/CMakeLists.txt index 7a9256daf82..c32a3ab573c 100644 --- a/src/corelib/CMakeLists.txt +++ b/src/corelib/CMakeLists.txt @@ -26,7 +26,7 @@ endif() ## Core Module: ##################################################################### -qt_add_module(Core +qt_internal_add_module(Core GENERATE_METATYPES QMAKE_MODULE_CONFIG moc resources EXCEPTIONS @@ -287,7 +287,7 @@ endif() # Handle QObject: Automoc does not work for this as it would # require to spill internals into users: -qt_add_module(Core_qobject STATIC +qt_internal_add_module(Core_qobject STATIC NO_SYNC_QT NO_CONFIG_HEADER_FILE NO_MODULE_HEADERS @@ -307,7 +307,7 @@ set_target_properties(Core_qobject PROPERTIES ) target_include_directories(Core_qobject PRIVATE "${CMAKE_CURRENT_BINARY_DIR}/kernel") # for moc_qobject.cpp target_link_libraries(Core_qobject PRIVATE Qt::Platform Qt::GlobalConfig) -extend_target(Core LIBRARIES Qt::Core_qobject) +qt_internal_extend_target(Core LIBRARIES Qt::Core_qobject) add_dependencies(Core_qobject ${QT_CMAKE_EXPORT_NAMESPACE}::moc) set(core_qobject_metatypes_json_args) @@ -355,7 +355,7 @@ if (LINUX AND NOT CMAKE_CROSSCOMPILING AND BUILD_SHARED_LIBS) endif() # special case end -qt_add_simd_part(Core SIMD mips_dsp +qt_internal_add_simd_part(Core SIMD mips_dsp SOURCES ../gui/painting/qt_mips_asm_dsp_p.h text/qstring_mips_dsp_asm.S @@ -421,13 +421,13 @@ endif() # special case begin # remove because it's handled manually -#qt_extend_target(Core CONDITION NOT QT_NAMESPACE_ISEMPTY +#qt_internal_extend_target(Core CONDITION NOT QT_NAMESPACE_ISEMPTY # PUBLIC_DEFINES # QT_NAMESPACE= #) # special case end -qt_extend_target(Core CONDITION ANDROID +qt_internal_extend_target(Core CONDITION ANDROID SOURCES kernel/qsharedmemory_android.cpp kernel/qsystemsemaphore_android.cpp @@ -435,7 +435,7 @@ qt_extend_target(Core CONDITION ANDROID LIBS_SUFFIX="_${ANDROID_ABI}.so" # special case ) -qt_extend_target(Core CONDITION MSVC AND (TEST_architecture_arch STREQUAL "i386") +qt_internal_extend_target(Core CONDITION MSVC AND (TEST_architecture_arch STREQUAL "i386") LINK_OPTIONS "/BASE:0x67000000" ) @@ -443,7 +443,7 @@ qt_extend_target(Core CONDITION MSVC AND (TEST_architecture_arch STREQUAL "i386" #### Keys ignored in scope 6:.:.:corelib.pro:FREEBSD OR OPENBSD: # QMAKE_LFLAGS_NOUNDEF = <EMPTY> -qt_extend_target(Core CONDITION QT_FEATURE_animation +qt_internal_extend_target(Core CONDITION QT_FEATURE_animation SOURCES animation/qabstractanimation.cpp animation/qabstractanimation.h animation/qabstractanimation_p.h animation/qanimationgroup.cpp animation/qanimationgroup.h animation/qanimationgroup_p.h @@ -454,7 +454,7 @@ qt_extend_target(Core CONDITION QT_FEATURE_animation animation/qvariantanimation.cpp animation/qvariantanimation.h animation/qvariantanimation_p.h ) -qt_extend_target(Core CONDITION WIN32 +qt_internal_extend_target(Core CONDITION WIN32 SOURCES global/qoperatingsystemversion_win.cpp global/qoperatingsystemversion_win_p.h io/qfilesystemengine_win.cpp @@ -492,7 +492,7 @@ qt_extend_target(Core CONDITION WIN32 userenv ) -qt_extend_target(Core CONDITION APPLE +qt_internal_extend_target(Core CONDITION APPLE SOURCES global/qoperatingsystemversion_darwin.mm io/qfilesystemengine_mac.mm @@ -509,7 +509,7 @@ qt_extend_target(Core CONDITION APPLE ${FWFoundation} ) -qt_extend_target(Core CONDITION MACOS +qt_internal_extend_target(Core CONDITION MACOS LIBRARIES ${FWAppKit} ${FWApplicationServices} @@ -520,7 +520,7 @@ qt_extend_target(Core CONDITION MACOS ${FWIOKit} ) -qt_extend_target(Core CONDITION INTEGRITY +qt_internal_extend_target(Core CONDITION INTEGRITY LIBRARIES ivfs net @@ -554,11 +554,11 @@ qt_extend_target(Core CONDITION INTEGRITY #### Keys ignored in scope 27:.:global:global/global.pri:else: # f16c_cxx = "false" -# extend_target(Core CONDITION _ss_f16c_cxx ... # special case remove: Handled manually +# qt_internal_extend_target(Core CONDITION _ss_f16c_cxx ... # special case remove: Handled manually # special case begin # Remove this because it's handled manually -#extend_target(Core CONDITION NOT _x_-armcc_x_ AND NOT cross_compile AND NOT static AND (hurd_x_ OR linux_x_) +#qt_internal_extend_target(Core CONDITION NOT _x_-armcc_x_ AND NOT cross_compile AND NOT static AND (hurd_x_ OR linux_x_) # DEFINES # ELF_INTERPRETER=\\\"=Creadelf-l/bin/ls|perl-n-e\'['quote', ['if', ['/program', 'interpreter:', ['.*'], ']/'], '{', 'print', '$1;', '}']]\'\\\" # LINK_OPTIONS @@ -566,7 +566,7 @@ qt_extend_target(Core CONDITION INTEGRITY #) # special case end -qt_extend_target(Core CONDITION LINUX AND NOT static +qt_internal_extend_target(Core CONDITION LINUX AND NOT static SOURCES global/minimum-linux_p.h ) @@ -583,17 +583,17 @@ qt_extend_target(Core CONDITION LINUX AND NOT static #### Keys ignored in scope 35:.:global:global/global.pri:silent: # no_pch_assembler.commands = "@echo" "compiling[no_pch]" "${QMAKE_FILE_IN}" "&&" -qt_extend_target(Core CONDITION LINUX AND NOT precompile_header AND NOT static +qt_internal_extend_target(Core CONDITION LINUX AND NOT precompile_header AND NOT static SOURCES global/minimum-linux.S ) -qt_extend_target(Core CONDITION QT_FEATURE_slog2 +qt_internal_extend_target(Core CONDITION QT_FEATURE_slog2 LIBRARIES Slog2::Slog2 ) -qt_extend_target(Core CONDITION QT_FEATURE_journald +qt_internal_extend_target(Core CONDITION QT_FEATURE_journald LIBRARIES PkgConfig::Libsystemd ) @@ -610,12 +610,12 @@ qt_extend_target(Core CONDITION QT_FEATURE_journald #### Keys ignored in scope 40:.:global:global/global.pri:silent: # versiontagging_compiler.commands = "@echo" "compiling[versiontagging]" "${QMAKE_FILE_IN}" "&&" -qt_extend_target(Core CONDITION NOT GCC OR NOT ltcg +qt_internal_extend_target(Core CONDITION NOT GCC OR NOT ltcg SOURCES global/qversiontagging.cpp ) -qt_extend_target(Core CONDITION UNIX +qt_internal_extend_target(Core CONDITION UNIX SOURCES io/qfilesystemengine_unix.cpp io/qfilesystemiterator_unix.cpp @@ -628,7 +628,7 @@ qt_extend_target(Core CONDITION UNIX thread/qthread_unix.cpp ) -qt_extend_target(Core CONDITION QT_FEATURE_thread +qt_internal_extend_target(Core CONDITION QT_FEATURE_thread SOURCES thread/qatomic.cpp thread/qatomic.h thread/qatomic_bootstrap.h @@ -646,33 +646,33 @@ qt_extend_target(Core CONDITION QT_FEATURE_thread thread/qthreadstorage.cpp ) -qt_extend_target(Core CONDITION QT_FEATURE_thread AND WIN32 +qt_internal_extend_target(Core CONDITION QT_FEATURE_thread AND WIN32 SOURCES thread/qmutex_win.cpp thread/qwaitcondition_win.cpp ) -qt_extend_target(Core CONDITION QT_FEATURE_thread AND UNIX +qt_internal_extend_target(Core CONDITION QT_FEATURE_thread AND UNIX SOURCES thread/qwaitcondition_unix.cpp ) -qt_extend_target(Core CONDITION APPLE AND QT_FEATURE_thread +qt_internal_extend_target(Core CONDITION APPLE AND QT_FEATURE_thread SOURCES thread/qmutex_mac.cpp ) -qt_extend_target(Core CONDITION LINUX AND QT_FEATURE_thread +qt_internal_extend_target(Core CONDITION LINUX AND QT_FEATURE_thread SOURCES thread/qmutex_linux.cpp ) -qt_extend_target(Core CONDITION QT_FEATURE_thread AND UNIX AND NOT APPLE AND NOT LINUX +qt_internal_extend_target(Core CONDITION QT_FEATURE_thread AND UNIX AND NOT APPLE AND NOT LINUX SOURCES thread/qmutex_unix.cpp ) -qt_extend_target(Core CONDITION QT_FEATURE_future +qt_internal_extend_target(Core CONDITION QT_FEATURE_future SOURCES thread/qexception.cpp thread/qexception.h thread/qfuture.h @@ -684,23 +684,23 @@ qt_extend_target(Core CONDITION QT_FEATURE_future thread/qresultstore.cpp thread/qresultstore.h ) -qt_extend_target(Core CONDITION QT_FEATURE_std_atomic64 +qt_internal_extend_target(Core CONDITION QT_FEATURE_std_atomic64 PUBLIC_LIBRARIES WrapAtomic::WrapAtomic ) -qt_extend_target(Core CONDITION ICC +qt_internal_extend_target(Core CONDITION ICC COMPILE_OPTIONS -fp-model strict ) -qt_extend_target(Core CONDITION QT_FEATURE_system_zlib +qt_internal_extend_target(Core CONDITION QT_FEATURE_system_zlib LIBRARIES ZLIB::ZLIB ) -qt_extend_target(Core CONDITION NOT QT_FEATURE_system_zlib +qt_internal_extend_target(Core CONDITION NOT QT_FEATURE_system_zlib SOURCES ../3rdparty/zlib/src/adler32.c ../3rdparty/zlib/src/compress.c @@ -721,18 +721,18 @@ qt_extend_target(Core CONDITION NOT QT_FEATURE_system_zlib ../3rdparty/zlib/src ) -qt_extend_target(Core CONDITION QT_FEATURE_commandlineparser +qt_internal_extend_target(Core CONDITION QT_FEATURE_commandlineparser SOURCES tools/qcommandlineoption.cpp tools/qcommandlineoption.h tools/qcommandlineparser.cpp tools/qcommandlineparser.h ) -qt_extend_target(Core CONDITION QT_FEATURE_system_doubleconversion +qt_internal_extend_target(Core CONDITION QT_FEATURE_system_doubleconversion LIBRARIES WrapDoubleConversion::WrapDoubleConversion ) -qt_extend_target(Core CONDITION QT_FEATURE_doubleconversion AND NOT QT_FEATURE_system_doubleconversion +qt_internal_extend_target(Core CONDITION QT_FEATURE_doubleconversion AND NOT QT_FEATURE_system_doubleconversion SOURCES ../3rdparty/double-conversion/bignum.cc ../3rdparty/double-conversion/bignum.h ../3rdparty/double-conversion/bignum-dtoa.cc ../3rdparty/double-conversion/bignum-dtoa.h @@ -750,38 +750,38 @@ qt_extend_target(Core CONDITION QT_FEATURE_doubleconversion AND NOT QT_FEATURE_s ../3rdparty/double-conversion/include ) -qt_extend_target(Core CONDITION QT_FEATURE_system_libb2 +qt_internal_extend_target(Core CONDITION QT_FEATURE_system_libb2 LIBRARIES PkgConfig::Libb2 ) -qt_extend_target(Core CONDITION QT_FEATURE_easingcurve +qt_internal_extend_target(Core CONDITION QT_FEATURE_easingcurve SOURCES tools/qeasingcurve.cpp tools/qeasingcurve.h tools/qtimeline.cpp tools/qtimeline.h ) -qt_extend_target(Core CONDITION UNIX AND NOT HAIKU AND NOT INTEGRITY AND NOT VXWORKS AND NOT WASM AND (NOT ICC OR NOT MACOS) +qt_internal_extend_target(Core CONDITION UNIX AND NOT HAIKU AND NOT INTEGRITY AND NOT VXWORKS AND NOT WASM AND (NOT ICC OR NOT MACOS) LIBRARIES m ) -qt_extend_target(Core CONDITION APPLE AND NOT NACL +qt_internal_extend_target(Core CONDITION APPLE AND NOT NACL SOURCES text/qlocale_mac.mm ) -qt_extend_target(Core CONDITION UNIX AND (NACL OR NOT APPLE) +qt_internal_extend_target(Core CONDITION UNIX AND (NACL OR NOT APPLE) SOURCES text/qlocale_unix.cpp ) -qt_extend_target(Core CONDITION WIN32 AND (NACL OR NOT APPLE) +qt_internal_extend_target(Core CONDITION WIN32 AND (NACL OR NOT APPLE) SOURCES text/qlocale_win.cpp ) -qt_extend_target(Core CONDITION QT_FEATURE_icu +qt_internal_extend_target(Core CONDITION QT_FEATURE_icu SOURCES text/qcollator_icu.cpp text/qlocale_icu.cpp @@ -789,159 +789,159 @@ qt_extend_target(Core CONDITION QT_FEATURE_icu ICU::i18n ICU::uc ICU::data ) -qt_extend_target(Core CONDITION WIN32 AND NOT QT_FEATURE_icu +qt_internal_extend_target(Core CONDITION WIN32 AND NOT QT_FEATURE_icu SOURCES text/qcollator_win.cpp ) -qt_extend_target(Core CONDITION MACOS AND NOT QT_FEATURE_icu +qt_internal_extend_target(Core CONDITION MACOS AND NOT QT_FEATURE_icu SOURCES text/qcollator_macx.cpp ) -qt_extend_target(Core CONDITION UNIX AND NOT MACOS AND NOT QT_FEATURE_icu +qt_internal_extend_target(Core CONDITION UNIX AND NOT MACOS AND NOT QT_FEATURE_icu SOURCES text/qcollator_posix.cpp ) -qt_extend_target(Core CONDITION QT_FEATURE_regularexpression +qt_internal_extend_target(Core CONDITION QT_FEATURE_regularexpression SOURCES text/qregularexpression.cpp text/qregularexpression.h LIBRARIES WrapPCRE2::WrapPCRE2 ) -qt_extend_target(Core CONDITION QT_FEATURE_hijricalendar +qt_internal_extend_target(Core CONDITION QT_FEATURE_hijricalendar SOURCES time/qhijricalendar.cpp time/qhijricalendar_p.h time/qhijricalendar_data_p.h ) -qt_extend_target(Core CONDITION QT_FEATURE_islamiccivilcalendar +qt_internal_extend_target(Core CONDITION QT_FEATURE_islamiccivilcalendar SOURCES time/qislamiccivilcalendar.cpp time/qislamiccivilcalendar_p.h ) -qt_extend_target(Core CONDITION QT_FEATURE_jalalicalendar +qt_internal_extend_target(Core CONDITION QT_FEATURE_jalalicalendar SOURCES time/qjalalicalendar.cpp time/qjalalicalendar_p.h time/qjalalicalendar_data_p.h ) -qt_extend_target(Core CONDITION QT_FEATURE_timezone +qt_internal_extend_target(Core CONDITION QT_FEATURE_timezone SOURCES time/qtimezone.cpp time/qtimezone.h time/qtimezoneprivate.cpp time/qtimezoneprivate_p.h time/qtimezoneprivate_data_p.h ) -qt_extend_target(Core CONDITION APPLE AND QT_FEATURE_timezone AND NOT NACL +qt_internal_extend_target(Core CONDITION APPLE AND QT_FEATURE_timezone AND NOT NACL SOURCES time/qtimezoneprivate_mac.mm ) -qt_extend_target(Core CONDITION ANDROID AND QT_FEATURE_timezone AND NOT ANDROID_EMBEDDED AND (NACL OR NOT APPLE) +qt_internal_extend_target(Core CONDITION ANDROID AND QT_FEATURE_timezone AND NOT ANDROID_EMBEDDED AND (NACL OR NOT APPLE) SOURCES time/qtimezoneprivate_android.cpp ) -qt_extend_target(Core CONDITION QT_FEATURE_timezone AND UNIX AND (ANDROID_EMBEDDED OR NOT ANDROID) AND (NACL OR NOT APPLE) +qt_internal_extend_target(Core CONDITION QT_FEATURE_timezone AND UNIX AND (ANDROID_EMBEDDED OR NOT ANDROID) AND (NACL OR NOT APPLE) SOURCES time/qtimezoneprivate_tz.cpp ) -qt_extend_target(Core CONDITION QT_FEATURE_icu AND QT_FEATURE_timezone AND UNIX AND (ANDROID_EMBEDDED OR NOT ANDROID) AND (NACL OR NOT APPLE) +qt_internal_extend_target(Core CONDITION QT_FEATURE_icu AND QT_FEATURE_timezone AND UNIX AND (ANDROID_EMBEDDED OR NOT ANDROID) AND (NACL OR NOT APPLE) SOURCES time/qtimezoneprivate_icu.cpp ) -qt_extend_target(Core CONDITION QT_FEATURE_icu AND QT_FEATURE_timezone AND WIN32 AND (ANDROID_EMBEDDED OR NOT ANDROID) AND (NACL OR NOT APPLE) +qt_internal_extend_target(Core CONDITION QT_FEATURE_icu AND QT_FEATURE_timezone AND WIN32 AND (ANDROID_EMBEDDED OR NOT ANDROID) AND (NACL OR NOT APPLE) SOURCES time/qtimezoneprivate_icu.cpp ) -qt_extend_target(Core CONDITION QT_FEATURE_timezone AND WIN32 AND NOT QT_FEATURE_icu AND (ANDROID_EMBEDDED OR NOT ANDROID) AND (NACL OR NOT APPLE) +qt_internal_extend_target(Core CONDITION QT_FEATURE_timezone AND WIN32 AND NOT QT_FEATURE_icu AND (ANDROID_EMBEDDED OR NOT ANDROID) AND (NACL OR NOT APPLE) SOURCES time/qtimezoneprivate_win.cpp ) -qt_extend_target(Core CONDITION QT_FEATURE_datetimeparser +qt_internal_extend_target(Core CONDITION QT_FEATURE_datetimeparser SOURCES time/qdatetimeparser.cpp time/qdatetimeparser_p.h ) -qt_extend_target(Core CONDITION QT_FEATURE_zstd +qt_internal_extend_target(Core CONDITION QT_FEATURE_zstd LIBRARIES ZSTD::ZSTD ) -qt_extend_target(Core CONDITION QT_FEATURE_filesystemwatcher +qt_internal_extend_target(Core CONDITION QT_FEATURE_filesystemwatcher SOURCES io/qfilesystemwatcher.cpp io/qfilesystemwatcher.h io/qfilesystemwatcher_p.h io/qfilesystemwatcher_polling.cpp io/qfilesystemwatcher_polling_p.h ) -qt_extend_target(Core CONDITION QT_FEATURE_filesystemwatcher AND WIN32 +qt_internal_extend_target(Core CONDITION QT_FEATURE_filesystemwatcher AND WIN32 SOURCES io/qfilesystemwatcher_win.cpp io/qfilesystemwatcher_win_p.h ) -qt_extend_target(Core CONDITION MACOS AND QT_FEATURE_filesystemwatcher +qt_internal_extend_target(Core CONDITION MACOS AND QT_FEATURE_filesystemwatcher SOURCES io/qfilesystemwatcher_fsevents.mm io/qfilesystemwatcher_fsevents_p.h ) -qt_extend_target(Core CONDITION QT_FEATURE_filesystemwatcher AND QT_FEATURE_inotify AND UNIX AND NOT MACOS +qt_internal_extend_target(Core CONDITION QT_FEATURE_filesystemwatcher AND QT_FEATURE_inotify AND UNIX AND NOT MACOS SOURCES io/qfilesystemwatcher_inotify.cpp io/qfilesystemwatcher_inotify_p.h ) -qt_extend_target(Core CONDITION QT_FEATURE_filesystemwatcher AND UNIX AND NOT MACOS AND NOT QT_FEATURE_inotify AND (APPLE OR FREEBSD OR NETBSD OR OPENBSD) +qt_internal_extend_target(Core CONDITION QT_FEATURE_filesystemwatcher AND UNIX AND NOT MACOS AND NOT QT_FEATURE_inotify AND (APPLE OR FREEBSD OR NETBSD OR OPENBSD) SOURCES io/qfilesystemwatcher_kqueue.cpp io/qfilesystemwatcher_kqueue_p.h ) -qt_extend_target(Core CONDITION QT_FEATURE_processenvironment +qt_internal_extend_target(Core CONDITION QT_FEATURE_processenvironment SOURCES io/qprocess.cpp io/qprocess.h io/qprocess_p.h ) -qt_extend_target(Core CONDITION QT_FEATURE_processenvironment AND WIN32 +qt_internal_extend_target(Core CONDITION QT_FEATURE_processenvironment AND WIN32 SOURCES io/qprocess_win.cpp ) -qt_extend_target(Core CONDITION QT_FEATURE_processenvironment AND UNIX +qt_internal_extend_target(Core CONDITION QT_FEATURE_processenvironment AND UNIX SOURCES io/qprocess_unix.cpp ) -qt_extend_target(Core CONDITION QT_FEATURE_settings +qt_internal_extend_target(Core CONDITION QT_FEATURE_settings SOURCES io/qsettings.cpp io/qsettings.h io/qsettings_p.h ) -qt_extend_target(Core CONDITION QT_FEATURE_settings AND WIN32 +qt_internal_extend_target(Core CONDITION QT_FEATURE_settings AND WIN32 SOURCES io/qsettings_win.cpp ) -qt_extend_target(Core CONDITION APPLE AND QT_FEATURE_settings AND NOT NACL +qt_internal_extend_target(Core CONDITION APPLE AND QT_FEATURE_settings AND NOT NACL SOURCES io/qsettings_mac.cpp ) -qt_extend_target(Core CONDITION QT_FEATURE_settings AND WASM +qt_internal_extend_target(Core CONDITION QT_FEATURE_settings AND WASM SOURCES io/qsettings_wasm.cpp ) -qt_extend_target(Core CONDITION QT_FEATURE_filesystemiterator AND WIN32 +qt_internal_extend_target(Core CONDITION QT_FEATURE_filesystemiterator AND WIN32 SOURCES io/qfilesystemiterator_win.cpp ) -qt_extend_target(Core CONDITION QT_FEATURE_process AND UNIX +qt_internal_extend_target(Core CONDITION QT_FEATURE_process AND UNIX SOURCES ../3rdparty/forkfd/forkfd.h io/forkfd_qt.cpp @@ -949,22 +949,22 @@ qt_extend_target(Core CONDITION QT_FEATURE_process AND UNIX ../3rdparty/forkfd ) -qt_extend_target(Core CONDITION APPLE AND QT_FEATURE_processenvironment +qt_internal_extend_target(Core CONDITION APPLE AND QT_FEATURE_processenvironment SOURCES io/qprocess_darwin.mm ) -qt_extend_target(Core CONDITION APPLE AND NOT MACOS +qt_internal_extend_target(Core CONDITION APPLE AND NOT MACOS PUBLIC_LIBRARIES ${FWMobileCoreServices} ) -qt_extend_target(Core CONDITION UNIX AND NOT APPLE +qt_internal_extend_target(Core CONDITION UNIX AND NOT APPLE SOURCES kernel/qelapsedtimer_unix.cpp ) -qt_extend_target(Core CONDITION ANDROID AND NOT ANDROID_EMBEDDED +qt_internal_extend_target(Core CONDITION ANDROID AND NOT ANDROID_EMBEDDED SOURCES io/qstandardpaths_android.cpp io/qstorageinfo_unix.cpp @@ -973,7 +973,7 @@ qt_extend_target(Core CONDITION ANDROID AND NOT ANDROID_EMBEDDED kernel/qjnionload.cpp ) -qt_extend_target(Core CONDITION HAIKU AND (ANDROID_EMBEDDED OR NOT ANDROID) +qt_internal_extend_target(Core CONDITION HAIKU AND (ANDROID_EMBEDDED OR NOT ANDROID) SOURCES io/qstandardpaths_haiku.cpp io/qstorageinfo_unix.cpp @@ -981,92 +981,92 @@ qt_extend_target(Core CONDITION HAIKU AND (ANDROID_EMBEDDED OR NOT ANDROID) be ) -qt_extend_target(Core CONDITION UNIX AND NOT APPLE AND NOT HAIKU AND (ANDROID_EMBEDDED OR NOT ANDROID) +qt_internal_extend_target(Core CONDITION UNIX AND NOT APPLE AND NOT HAIKU AND (ANDROID_EMBEDDED OR NOT ANDROID) SOURCES io/qstandardpaths_unix.cpp io/qstorageinfo_unix.cpp ) -qt_extend_target(Core CONDITION QT_FEATURE_proxymodel +qt_internal_extend_target(Core CONDITION QT_FEATURE_proxymodel SOURCES itemmodels/qabstractproxymodel.cpp itemmodels/qabstractproxymodel.h itemmodels/qabstractproxymodel_p.h ) -qt_extend_target(Core CONDITION QT_FEATURE_concatenatetablesproxymodel AND QT_FEATURE_proxymodel +qt_internal_extend_target(Core CONDITION QT_FEATURE_concatenatetablesproxymodel AND QT_FEATURE_proxymodel SOURCES itemmodels/qconcatenatetablesproxymodel.cpp itemmodels/qconcatenatetablesproxymodel.h ) -qt_extend_target(Core CONDITION QT_FEATURE_identityproxymodel AND QT_FEATURE_proxymodel +qt_internal_extend_target(Core CONDITION QT_FEATURE_identityproxymodel AND QT_FEATURE_proxymodel SOURCES itemmodels/qidentityproxymodel.cpp itemmodels/qidentityproxymodel.h ) -qt_extend_target(Core CONDITION QT_FEATURE_proxymodel AND QT_FEATURE_sortfilterproxymodel +qt_internal_extend_target(Core CONDITION QT_FEATURE_proxymodel AND QT_FEATURE_sortfilterproxymodel SOURCES itemmodels/qsortfilterproxymodel.cpp itemmodels/qsortfilterproxymodel.h ) -qt_extend_target(Core CONDITION QT_FEATURE_proxymodel AND QT_FEATURE_transposeproxymodel +qt_internal_extend_target(Core CONDITION QT_FEATURE_proxymodel AND QT_FEATURE_transposeproxymodel SOURCES itemmodels/qtransposeproxymodel.cpp itemmodels/qtransposeproxymodel.h itemmodels/qtransposeproxymodel_p.h ) -qt_extend_target(Core CONDITION QT_FEATURE_stringlistmodel +qt_internal_extend_target(Core CONDITION QT_FEATURE_stringlistmodel SOURCES itemmodels/qstringlistmodel.cpp itemmodels/qstringlistmodel.h ) -qt_extend_target(Core CONDITION QT_FEATURE_library +qt_internal_extend_target(Core CONDITION QT_FEATURE_library SOURCES plugin/qelfparser_p.cpp plugin/qelfparser_p.h plugin/qlibrary.cpp plugin/qlibrary.h plugin/qlibrary_p.h plugin/qmachparser.cpp plugin/qmachparser_p.h ) -qt_extend_target(Core CONDITION QT_FEATURE_library AND UNIX +qt_internal_extend_target(Core CONDITION QT_FEATURE_library AND UNIX SOURCES plugin/qlibrary_unix.cpp ) -qt_extend_target(Core CONDITION QT_FEATURE_library AND WIN32 +qt_internal_extend_target(Core CONDITION QT_FEATURE_library AND WIN32 SOURCES plugin/qlibrary_win.cpp ) -qt_extend_target(Core CONDITION QT_FEATURE_dlopen AND QT_FEATURE_library +qt_internal_extend_target(Core CONDITION QT_FEATURE_dlopen AND QT_FEATURE_library LIBRARIES ${CMAKE_DL_LIBS} ) -qt_extend_target(Core CONDITION APPLE AND (IOS OR TVOS) +qt_internal_extend_target(Core CONDITION APPLE AND (IOS OR TVOS) LIBRARIES ${FWUIKit} ) -qt_extend_target(Core CONDITION WATCHOS +qt_internal_extend_target(Core CONDITION WATCHOS LIBRARIES ${FWWatchKit} ) -qt_extend_target(Core CONDITION QT_FEATURE_poll_select AND UNIX +qt_internal_extend_target(Core CONDITION QT_FEATURE_poll_select AND UNIX SOURCES kernel/qpoll.cpp ) -qt_extend_target(Core CONDITION QT_FEATURE_glib AND UNIX +qt_internal_extend_target(Core CONDITION QT_FEATURE_glib AND UNIX SOURCES kernel/qeventdispatcher_glib.cpp kernel/qeventdispatcher_glib_p.h LIBRARIES GLIB2::GLIB2 ) -qt_extend_target(Core CONDITION QT_FEATURE_clock_gettime AND UNIX +qt_internal_extend_target(Core CONDITION QT_FEATURE_clock_gettime AND UNIX LIBRARIES WrapRt::WrapRt ) -qt_extend_target(Core CONDITION UNIX AND NOT ANDROID +qt_internal_extend_target(Core CONDITION UNIX AND NOT ANDROID SOURCES kernel/qsharedmemory_posix.cpp kernel/qsharedmemory_systemv.cpp @@ -1076,12 +1076,12 @@ qt_extend_target(Core CONDITION UNIX AND NOT ANDROID kernel/qsystemsemaphore_unix.cpp ) -qt_extend_target(Core CONDITION VXWORKS +qt_internal_extend_target(Core CONDITION VXWORKS SOURCES kernel/qfunctions_vxworks.cpp kernel/qfunctions_vxworks.h ) -qt_extend_target(Core CONDITION QNX AND QT_FEATURE_qqnx_pps +qt_internal_extend_target(Core CONDITION QNX AND QT_FEATURE_qqnx_pps SOURCES kernel/qppsattribute.cpp kernel/qppsattribute_p.h kernel/qppsattributeprivate_p.h @@ -1091,17 +1091,17 @@ qt_extend_target(Core CONDITION QNX AND QT_FEATURE_qqnx_pps PPS::PPS ) -qt_extend_target(Core CONDITION QT_FEATURE_cborstreamreader +qt_internal_extend_target(Core CONDITION QT_FEATURE_cborstreamreader SOURCES serialization/qcborstreamreader.cpp serialization/qcborstreamreader.h ) -qt_extend_target(Core CONDITION QT_FEATURE_cborstreamwriter +qt_internal_extend_target(Core CONDITION QT_FEATURE_cborstreamwriter SOURCES serialization/qcborstreamwriter.cpp serialization/qcborstreamwriter.h ) -qt_extend_target(Core CONDITION QT_FEATURE_mimetype +qt_internal_extend_target(Core CONDITION QT_FEATURE_mimetype SOURCES mimetypes/qmimedatabase.cpp mimetypes/qmimedatabase.h mimetypes/qmimedatabase_p.h mimetypes/qmimeglobpattern.cpp mimetypes/qmimeglobpattern_p.h @@ -1117,7 +1117,7 @@ qt_extend_target(Core CONDITION QT_FEATURE_mimetype # OTHER_FILES = "$$MIME_DATABASE" # special case begin -# qt_extend_target(Core CONDITION QT_FEATURE_mimetype AND QT_FEATURE_mimetype_database +# qt_internal_extend_target(Core CONDITION QT_FEATURE_mimetype AND QT_FEATURE_mimetype_database # INCLUDE_DIRECTORIES # .rcc #) @@ -1189,7 +1189,7 @@ endif() # special case end -qt_extend_target(Core CONDITION WASM +qt_internal_extend_target(Core CONDITION WASM SOURCES platform/wasm/qstdweb.cpp platform/wasm/qstdweb_p.h ) @@ -1198,12 +1198,12 @@ qt_extend_target(Core CONDITION WASM # needs refinement for the other compiler specific cases. if(TEST_arch_${TEST_architecture_arch}_subarch_f16c) # Equivalent to contains(QT_CPU_FEATURES.$$QT_ARCH, f16c) - extend_target(Core + qt_internal_extend_target(Core DEFINES QFLOAT16_INCLUDE_FAST ) else() - qt_add_simd_part(Core SIMD f16c + qt_internal_add_simd_part(Core SIMD f16c SOURCES global/qfloat16_f16c.c ) @@ -1245,13 +1245,13 @@ if(APPLE AND CMAKE_OSX_DEPLOYMENT_TARGET) endif() # special case end -qt_create_tracepoints(Core qtcore.tracepoints) +qt_internal_create_tracepoints(Core qtcore.tracepoints) # special case begin if(TARGET Core_tracepoints_header) add_dependencies(Core_qobject Core_tracepoints_header) endif() # special case end -qt_add_docs(Core +qt_internal_add_docs(Core doc/qtcore.qdocconf ) @@ -1259,7 +1259,7 @@ qt_add_docs(Core # Handle qtzlib.pro to create headers for the # QtZlibPrivate target, equivalent to Qt += zlib-private if(NOT QT_FEATURE_system_zlib) - qt_add_module(Zlib + qt_internal_add_module(Zlib INTERNAL_MODULE HEADER_MODULE NO_CONFIG_HEADER_FILE diff --git a/src/corelib/mimetypes/mimetypes_resources.cmake b/src/corelib/mimetypes/mimetypes_resources.cmake index a91d25cc2cf..4b89c8aa9e6 100644 --- a/src/corelib/mimetypes/mimetypes_resources.cmake +++ b/src/corelib/mimetypes/mimetypes_resources.cmake @@ -12,7 +12,7 @@ function(corelib_add_mimetypes_resources target) set_source_files_properties("${source_file}" PROPERTIES QT_RESOURCE_ALIAS "freedesktop.org.xml" ) - qt_add_resource(${target} "mimetypes" + qt_internal_add_resource(${target} "mimetypes" PREFIX "/qt-project.org/qmime/packages" FILES diff --git a/src/dbus/.prev_CMakeLists.txt b/src/dbus/.prev_CMakeLists.txt index 1136ebe19bd..a8a1c216122 100644 --- a/src/dbus/.prev_CMakeLists.txt +++ b/src/dbus/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## DBus Module: ##################################################################### -qt_add_module(DBus +qt_internal_add_module(DBus QMAKE_MODULE_CONFIG dbusadaptors dbusinterfaces SOURCES dbus_minimal_p.h @@ -56,21 +56,21 @@ qt_add_module(DBus ## Scopes: ##################################################################### -qt_extend_target(DBus CONDITION QT_FEATURE_dbus_linked +qt_internal_extend_target(DBus CONDITION QT_FEATURE_dbus_linked DEFINES QT_LINKED_LIBDBUS LIBRARIES dbus-1 ) -qt_extend_target(DBus CONDITION WIN32 +qt_internal_extend_target(DBus CONDITION WIN32 LIBRARIES advapi32 netapi32 user32 ws2_32 ) -qt_add_docs(DBus +qt_internal_add_docs(DBus doc/qtdbus.qdocconf ) diff --git a/src/dbus/CMakeLists.txt b/src/dbus/CMakeLists.txt index ea1d7abaa1b..d7a82f9fe3a 100644 --- a/src/dbus/CMakeLists.txt +++ b/src/dbus/CMakeLists.txt @@ -4,7 +4,7 @@ ## DBus Module: ##################################################################### -qt_add_module(DBus +qt_internal_add_module(DBus QMAKE_MODULE_CONFIG dbusadaptors dbusinterfaces SOURCES dbus_minimal_p.h @@ -59,21 +59,21 @@ set_source_files_properties(qdbusmarshaller.cpp ## Scopes: ##################################################################### -qt_extend_target(DBus CONDITION QT_FEATURE_dbus_linked +qt_internal_extend_target(DBus CONDITION QT_FEATURE_dbus_linked DEFINES QT_LINKED_LIBDBUS LIBRARIES dbus-1 ) -qt_extend_target(DBus CONDITION WIN32 +qt_internal_extend_target(DBus CONDITION WIN32 LIBRARIES advapi32 netapi32 user32 ws2_32 ) -qt_add_docs(DBus +qt_internal_add_docs(DBus doc/qtdbus.qdocconf ) diff --git a/src/gui/.prev_CMakeLists.txt b/src/gui/.prev_CMakeLists.txt index f0c3dd16627..8f86f91e9c2 100644 --- a/src/gui/.prev_CMakeLists.txt +++ b/src/gui/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## Gui Module: ##################################################################### -qt_add_module(Gui +qt_internal_add_module(Gui GENERATE_METATYPES PLUGIN_TYPES accessiblebridge platforms platforms/darwin xcbglintegrations platformthemes platforminputcontexts generic iconengines imageformats egldeviceintegrations SOURCES @@ -238,7 +238,7 @@ set(qpdf_resource_files "qpdfa_metadata.xml" ) -qt_add_resource(Gui "qpdf" +qt_internal_add_resource(Gui "qpdf" PREFIX "/qpdf/" BASE @@ -258,7 +258,7 @@ endif() ## Scopes: ##################################################################### -qt_extend_target(Gui CONDITION QT_FEATURE_opengl +qt_internal_extend_target(Gui CONDITION QT_FEATURE_opengl SOURCES kernel/qopenglcontext.cpp kernel/qopenglcontext.h kernel/qopenglcontext_p.h kernel/qopenglcontext_platform.h @@ -275,7 +275,7 @@ qt_extend_target(Gui CONDITION QT_FEATURE_opengl #### Keys ignored in scope 2:.:.:gui.pro:QT_FEATURE_opengl: # MODULE_CONFIG = "opengl" -qt_extend_target(Gui CONDITION MACOS +qt_internal_extend_target(Gui CONDITION MACOS SOURCES platform/macos/qcocoaplatforminterface.mm LIBRARIES @@ -284,7 +284,7 @@ qt_extend_target(Gui CONDITION MACOS ${FWAppKit} ) -qt_extend_target(Gui CONDITION APPLE +qt_internal_extend_target(Gui CONDITION APPLE SOURCES image/qimage_darwin.mm painting/qcoregraphics.mm painting/qcoregraphics_p.h @@ -301,12 +301,12 @@ qt_extend_target(Gui CONDITION APPLE ${FWImageIO} ) -qt_extend_target(Gui CONDITION QT_FEATURE_animation +qt_internal_extend_target(Gui CONDITION QT_FEATURE_animation SOURCES animation/qguivariantanimation.cpp ) -qt_extend_target(Gui CONDITION WIN32 +qt_internal_extend_target(Gui CONDITION WIN32 SOURCES image/qpixmap_win.cpp kernel/qwindowdefs_win.h @@ -334,7 +334,7 @@ qt_extend_target(Gui CONDITION WIN32 #### Keys ignored in scope 7:.:.:gui.pro:WIN32: # CMAKE_WINDOWS_BUILD = "True" -qt_extend_target(Gui CONDITION QT_FEATURE_egl +qt_internal_extend_target(Gui CONDITION QT_FEATURE_egl SOURCES opengl/platform/egl/qeglconvenience.cpp opengl/platform/egl/qeglconvenience_p.h opengl/platform/egl/qeglstreamconvenience.cpp opengl/platform/egl/qeglstreamconvenience_p.h @@ -376,7 +376,7 @@ qt_extend_target(Gui CONDITION QT_FEATURE_egl #### Keys ignored in scope 18:.:.:gui.pro:APPLE: # CMAKE_GL_HEADER_NAME = "gl.h" -qt_extend_target(Gui CONDITION QT_FEATURE_accessibility +qt_internal_extend_target(Gui CONDITION QT_FEATURE_accessibility SOURCES accessible/qaccessible.cpp accessible/qaccessible.h accessible/qaccessiblebridge.cpp accessible/qaccessiblebridge.h @@ -387,14 +387,14 @@ qt_extend_target(Gui CONDITION QT_FEATURE_accessibility accessible/qplatformaccessibility.cpp accessible/qplatformaccessibility.h ) -qt_extend_target(Gui CONDITION APPLE AND QT_FEATURE_accessibility +qt_internal_extend_target(Gui CONDITION APPLE AND QT_FEATURE_accessibility SOURCES accessible/qaccessiblecache_mac.mm LIBRARIES ${FWFoundation} ) -qt_extend_target(Gui CONDITION QT_FEATURE_accessibility AND WIN32 +qt_internal_extend_target(Gui CONDITION QT_FEATURE_accessibility AND WIN32 SOURCES accessible/windows/apisupport/qwindowsuiawrapper.cpp accessible/windows/apisupport/qwindowsuiawrapper_p.h accessible/windows/apisupport/uiaattributeids_p.h @@ -409,7 +409,7 @@ qt_extend_target(Gui CONDITION QT_FEATURE_accessibility AND WIN32 accessible/windows/apisupport/uiatypes_p.h ) -qt_extend_target(Gui CONDITION QT_FEATURE_accessibility AND QT_FEATURE_accessibility_atspi_bridge +qt_internal_extend_target(Gui CONDITION QT_FEATURE_accessibility AND QT_FEATURE_accessibility_atspi_bridge SOURCES accessible/linux/atspiadaptor.cpp accessible/linux/atspiadaptor_p.h accessible/linux/dbusconnection.cpp accessible/linux/dbusconnection_p.h @@ -426,13 +426,13 @@ qt_extend_target(Gui CONDITION QT_FEATURE_accessibility AND QT_FEATURE_accessibi PkgConfig::ATSPI2_nolink ) -qt_extend_target(Gui CONDITION QT_FEATURE_action +qt_internal_extend_target(Gui CONDITION QT_FEATURE_action SOURCES kernel/qaction.cpp kernel/qaction.h kernel/qaction_p.h kernel/qactiongroup.cpp kernel/qactiongroup.h kernel/qactiongroup_p.h ) -qt_extend_target(Gui CONDITION QT_FEATURE_draganddrop +qt_internal_extend_target(Gui CONDITION QT_FEATURE_draganddrop SOURCES kernel/qdnd.cpp kernel/qdnd_p.h kernel/qdrag.cpp kernel/qdrag.h @@ -441,19 +441,19 @@ qt_extend_target(Gui CONDITION QT_FEATURE_draganddrop kernel/qsimpledrag.cpp kernel/qsimpledrag_p.h ) -qt_extend_target(Gui CONDITION QT_FEATURE_shortcut +qt_internal_extend_target(Gui CONDITION QT_FEATURE_shortcut SOURCES kernel/qkeysequence.cpp kernel/qkeysequence.h kernel/qkeysequence_p.h kernel/qshortcut.cpp kernel/qshortcut.h kernel/qshortcut_p.h kernel/qshortcutmap.cpp kernel/qshortcutmap_p.h ) -qt_extend_target(Gui CONDITION QT_FEATURE_movie +qt_internal_extend_target(Gui CONDITION QT_FEATURE_movie SOURCES image/qmovie.cpp image/qmovie.h ) -qt_extend_target(Gui CONDITION QT_FEATURE_png +qt_internal_extend_target(Gui CONDITION QT_FEATURE_png SOURCES image/qpnghandler.cpp image/qpnghandler_p.h LIBRARIES @@ -463,69 +463,69 @@ qt_extend_target(Gui CONDITION QT_FEATURE_png #### Keys ignored in scope 40:.:image:image/image.pri:WIN32 AND MINGW: # GCC_VERSION = "$${QMAKE_GCC_MAJOR_VERSION}.$${QMAKE_GCC_MINOR_VERSION}.$${QMAKE_GCC_PATCH_VERSION}" -qt_extend_target(Gui CONDITION ((QT_FEATURE_png) AND (WIN32 AND MINGW)) AND (GCC_VERSION___equals___8.1.0) +qt_internal_extend_target(Gui CONDITION ((QT_FEATURE_png) AND (WIN32 AND MINGW)) AND (GCC_VERSION___equals___8.1.0) COMPILE_OPTIONS -fno-reorder-blocks-and-partition ) if(NOT ANDROID) - qt_add_simd_part(Gui SIMD sse2 + qt_internal_add_simd_part(Gui SIMD sse2 SOURCES painting/qdrawhelper_sse2.cpp ) - qt_add_simd_part(Gui SIMD ssse3 + qt_internal_add_simd_part(Gui SIMD ssse3 SOURCES image/qimage_ssse3.cpp painting/qdrawhelper_ssse3.cpp ) - qt_add_simd_part(Gui SIMD sse4_1 + qt_internal_add_simd_part(Gui SIMD sse4_1 SOURCES painting/qdrawhelper_sse4.cpp painting/qimagescale_sse4.cpp ) - qt_add_simd_part(Gui SIMD neon + qt_internal_add_simd_part(Gui SIMD neon SOURCES image/qimage_neon.cpp painting/qdrawhelper_neon.cpp painting/qdrawhelper_neon_p.h painting/qimagescale_neon.cpp ) - qt_add_simd_part(Gui SIMD mips_dsp + qt_internal_add_simd_part(Gui SIMD mips_dsp SOURCES painting/qdrawhelper_mips_dsp.cpp painting/qdrawhelper_mips_dsp_p.h painting/qdrawhelper_mips_dsp_asm.S painting/qt_mips_asm_dsp_p.h ) - qt_add_simd_part(Gui SIMD mips_dspr2 + qt_internal_add_simd_part(Gui SIMD mips_dspr2 SOURCES image/qimage_mips_dspr2.cpp image/qimage_mips_dspr2_asm.S painting/qdrawhelper_mips_dspr2_asm.S ) - qt_add_simd_part(Gui SIMD arch_haswell + qt_internal_add_simd_part(Gui SIMD arch_haswell SOURCES painting/qdrawhelper_avx2.cpp ) endif() -qt_extend_target(Gui CONDITION ANDROID +qt_internal_extend_target(Gui CONDITION ANDROID SOURCES platform/android/qandroidplatforminterface.cpp ) -qt_extend_target(Gui CONDITION (NOT (NOT ANDROID)) AND (TEST_architecture_arch STREQUAL arm64 ORTEST_architecture_arch STREQUAL arm) +qt_internal_extend_target(Gui CONDITION (NOT (NOT ANDROID)) AND (TEST_architecture_arch STREQUAL arm64 ORTEST_architecture_arch STREQUAL arm) SOURCES image/qimage_neon.cpp painting/qdrawhelper_neon.cpp painting/qdrawhelper_neon_p.h painting/qimagescale_neon.cpp ) -qt_extend_target(Gui CONDITION ANDROID AND (TEST_architecture_arch STREQUAL i386 OR TEST_architecture_arch STREQUAL x86_64) +qt_internal_extend_target(Gui CONDITION ANDROID AND (TEST_architecture_arch STREQUAL i386 OR TEST_architecture_arch STREQUAL x86_64) SOURCES image/qimage_ssse3.cpp painting/qdrawhelper_sse2.cpp @@ -536,14 +536,14 @@ qt_extend_target(Gui CONDITION ANDROID AND (TEST_architecture_arch STREQUAL i386 QT_COMPILER_SUPPORTS_SSSE3 QT_COMPILER_SUPPORTS_SSSE3 ) -qt_extend_target(Gui CONDITION QT_FEATURE_harfbuzz +qt_internal_extend_target(Gui CONDITION QT_FEATURE_harfbuzz SOURCES text/qharfbuzzng.cpp text/qharfbuzzng_p.h LIBRARIES WrapHarfbuzz::WrapHarfbuzz ) -qt_extend_target(Gui CONDITION QT_FEATURE_textodfwriter +qt_internal_extend_target(Gui CONDITION QT_FEATURE_textodfwriter SOURCES text/qtextodfwriter.cpp text/qtextodfwriter_p.h text/qzip.cpp @@ -551,17 +551,17 @@ qt_extend_target(Gui CONDITION QT_FEATURE_textodfwriter text/qzipwriter_p.h ) -qt_extend_target(Gui CONDITION QT_FEATURE_textmarkdownreader +qt_internal_extend_target(Gui CONDITION QT_FEATURE_textmarkdownreader SOURCES text/qtextmarkdownimporter.cpp text/qtextmarkdownimporter_p.h ) -qt_extend_target(Gui CONDITION QT_FEATURE_system_textmarkdownreader AND QT_FEATURE_textmarkdownreader +qt_internal_extend_target(Gui CONDITION QT_FEATURE_system_textmarkdownreader AND QT_FEATURE_textmarkdownreader LIBRARIES libmd4c ) -qt_extend_target(Gui CONDITION QT_FEATURE_textmarkdownreader AND NOT QT_FEATURE_system_textmarkdownreader +qt_internal_extend_target(Gui CONDITION QT_FEATURE_textmarkdownreader AND NOT QT_FEATURE_system_textmarkdownreader SOURCES ../3rdparty/md4c/md4c.c ../3rdparty/md4c/md4c.h DEFINES @@ -570,18 +570,18 @@ qt_extend_target(Gui CONDITION QT_FEATURE_textmarkdownreader AND NOT QT_FEATURE_ ../3rdparty/md4c ) -qt_extend_target(Gui CONDITION QT_FEATURE_textmarkdownwriter +qt_internal_extend_target(Gui CONDITION QT_FEATURE_textmarkdownwriter SOURCES text/qtextmarkdownwriter.cpp text/qtextmarkdownwriter_p.h ) -qt_extend_target(Gui CONDITION QT_FEATURE_cssparser +qt_internal_extend_target(Gui CONDITION QT_FEATURE_cssparser SOURCES painting/qcssutil.cpp text/qcssparser.cpp text/qcssparser_p.h ) -qt_extend_target(Gui CONDITION QT_FEATURE_freetype +qt_internal_extend_target(Gui CONDITION QT_FEATURE_freetype SOURCES text/freetype/qfontengine_ft.cpp text/freetype/qfontengine_ft_p.h text/freetype/qfreetypefontdatabase.cpp text/freetype/qfreetypefontdatabase_p.h @@ -589,12 +589,12 @@ qt_extend_target(Gui CONDITION QT_FEATURE_freetype WrapFreetype::WrapFreetype ) -qt_extend_target(Gui CONDITION QT_FEATURE_freetype AND UNIX AND NOT APPLE +qt_internal_extend_target(Gui CONDITION QT_FEATURE_freetype AND UNIX AND NOT APPLE SOURCES text/unix/qgenericunixfontdatabase_p.h ) -qt_extend_target(Gui CONDITION QT_FEATURE_fontconfig AND QT_FEATURE_freetype AND UNIX AND NOT APPLE +qt_internal_extend_target(Gui CONDITION QT_FEATURE_fontconfig AND QT_FEATURE_freetype AND UNIX AND NOT APPLE SOURCES text/unix/qfontconfigdatabase.cpp text/unix/qfontconfigdatabase_p.h text/unix/qfontenginemultifontconfig.cpp text/unix/qfontenginemultifontconfig_p.h @@ -602,61 +602,61 @@ qt_extend_target(Gui CONDITION QT_FEATURE_fontconfig AND QT_FEATURE_freetype AND Fontconfig::Fontconfig ) -qt_extend_target(Gui CONDITION APPLE AND NOT MACOS +qt_internal_extend_target(Gui CONDITION APPLE AND NOT MACOS LIBRARIES ${FWUIKit} ) -qt_extend_target(Gui CONDITION APPLE AND QT_FEATURE_freetype +qt_internal_extend_target(Gui CONDITION APPLE AND QT_FEATURE_freetype LIBRARIES WrapFreetype::WrapFreetype ) -qt_extend_target(Gui CONDITION QT_FEATURE_freetype AND WIN32 +qt_internal_extend_target(Gui CONDITION QT_FEATURE_freetype AND WIN32 SOURCES text/windows/qwindowsfontdatabase_ft.cpp text/windows/qwindowsfontdatabase_ft_p.h LIBRARIES WrapFreetype::WrapFreetype ) -qt_extend_target(Gui CONDITION QT_FEATURE_direct2d AND QT_FEATURE_directwrite AND WIN32 +qt_internal_extend_target(Gui CONDITION QT_FEATURE_direct2d AND QT_FEATURE_directwrite AND WIN32 SOURCES text/windows/qwindowsfontenginedirectwrite.cpp text/windows/qwindowsfontenginedirectwrite_p.h LIBRARIES d2d1 ) -qt_extend_target(Gui CONDITION QT_FEATURE_direct2d AND QT_FEATURE_directwrite AND QT_FEATURE_directwrite3 AND WIN32 +qt_internal_extend_target(Gui CONDITION QT_FEATURE_direct2d AND QT_FEATURE_directwrite AND QT_FEATURE_directwrite3 AND WIN32 SOURCES text/windows/qwindowsdirectwritefontdatabase.cpp text/windows/qwindowsdirectwritefontdatabase_p.h LIBRARIES dwrite_3 ) -qt_extend_target(Gui CONDITION QT_FEATURE_direct2d AND QT_FEATURE_directwrite AND WIN32 AND NOT QT_FEATURE_directwrite3 +qt_internal_extend_target(Gui CONDITION QT_FEATURE_direct2d AND QT_FEATURE_directwrite AND WIN32 AND NOT QT_FEATURE_directwrite3 LIBRARIES dwrite_2 ) -qt_extend_target(Gui CONDITION MINGW AND WIN32 +qt_internal_extend_target(Gui CONDITION MINGW AND WIN32 LIBRARIES uuid ) -qt_extend_target(Gui CONDITION UNIX AND NOT ANDROID AND NOT INTEGRITY AND NOT (TEST_architecture_arch STREQUAL "arm64") AND NOT UIKIT +qt_internal_extend_target(Gui CONDITION UNIX AND NOT ANDROID AND NOT INTEGRITY AND NOT (TEST_architecture_arch STREQUAL "arm64") AND NOT UIKIT DEFINES ENABLE_PIXMAN_DRAWHELPERS ) if(UNIX AND NOT ANDROID AND NOT INTEGRITY AND NOT (TEST_architecture_arch STREQUAL "arm64") AND NOT UIKIT) - qt_add_simd_part(Gui SIMD neon + qt_internal_add_simd_part(Gui SIMD neon SOURCES ../3rdparty/pixman/pixman-arm-neon-asm.S painting/qdrawhelper_neon_asm.S ) endif() -qt_extend_target(Gui CONDITION ANDROID AND TEST_architecture_arch STREQUAL x86_64 +qt_internal_extend_target(Gui CONDITION ANDROID AND TEST_architecture_arch STREQUAL x86_64 SOURCES painting/qdrawhelper_sse4.cpp painting/qimagescale_sse4.cpp @@ -665,78 +665,78 @@ qt_extend_target(Gui CONDITION ANDROID AND TEST_architecture_arch STREQUAL x86_6 QT_COMPILER_SUPPORTS_SSE4_2 ) -qt_extend_target(Gui CONDITION QT_FEATURE_system_zlib +qt_internal_extend_target(Gui CONDITION QT_FEATURE_system_zlib LIBRARIES ZLIB::ZLIB ) -qt_extend_target(Gui CONDITION NOT QT_FEATURE_system_zlib +qt_internal_extend_target(Gui CONDITION NOT QT_FEATURE_system_zlib INCLUDE_DIRECTORIES ../3rdparty/zlib/src ) -qt_extend_target(Gui CONDITION NOT QT_FEATURE_system_zlib AND NOT no_core_dep +qt_internal_extend_target(Gui CONDITION NOT QT_FEATURE_system_zlib AND NOT no_core_dep LIBRARIES Qt::Core ) -qt_extend_target(Gui CONDITION QT_FEATURE_regularexpression +qt_internal_extend_target(Gui CONDITION QT_FEATURE_regularexpression SOURCES util/qshadergenerator.cpp util/qshadergenerator_p.h ) -qt_extend_target(Gui CONDITION QT_FEATURE_undocommand +qt_internal_extend_target(Gui CONDITION QT_FEATURE_undocommand SOURCES util/qundostack.cpp util/qundostack.h util/qundostack_p.h ) -qt_extend_target(Gui CONDITION QT_FEATURE_undogroup +qt_internal_extend_target(Gui CONDITION QT_FEATURE_undogroup SOURCES util/qundogroup.cpp util/qundogroup.h ) -qt_extend_target(Gui CONDITION QT_FEATURE_opengl AND QT_FEATURE_xlib AND NOT QT_FEATURE_opengles2 +qt_internal_extend_target(Gui CONDITION QT_FEATURE_opengl AND QT_FEATURE_xlib AND NOT QT_FEATURE_opengles2 SOURCES opengl/platform/unix/qglxconvenience.cpp opengl/platform/unix/qglxconvenience_p.h LIBRARIES X11::X11 ) -qt_extend_target(Gui CONDITION QT_FEATURE_egl AND QT_FEATURE_opengl +qt_internal_extend_target(Gui CONDITION QT_FEATURE_egl AND QT_FEATURE_opengl SOURCES opengl/platform/egl/qeglpbuffer.cpp opengl/platform/egl/qeglpbuffer_p.h opengl/platform/egl/qeglplatformcontext.cpp opengl/platform/egl/qeglplatformcontext_p.h ) -qt_extend_target(Gui CONDITION QT_FEATURE_egl AND QT_FEATURE_egl_x11 +qt_internal_extend_target(Gui CONDITION QT_FEATURE_egl AND QT_FEATURE_egl_x11 SOURCES opengl/platform/egl/qxlibeglintegration.cpp opengl/platform/egl/qxlibeglintegration_p.h LIBRARIES X11::X11 ) -qt_extend_target(Gui CONDITION QT_FEATURE_egl AND NOT QT_FEATURE_egl_x11 +qt_internal_extend_target(Gui CONDITION QT_FEATURE_egl AND NOT QT_FEATURE_egl_x11 DEFINES QT_EGL_NO_X11 ) -qt_extend_target(Gui CONDITION QT_FEATURE_dlopen AND QT_FEATURE_egl +qt_internal_extend_target(Gui CONDITION QT_FEATURE_dlopen AND QT_FEATURE_egl LIBRARIES ${CMAKE_DL_LIBS} ) -qt_extend_target(Gui CONDITION QT_FEATURE_standarditemmodel +qt_internal_extend_target(Gui CONDITION QT_FEATURE_standarditemmodel SOURCES itemmodels/qstandarditemmodel.cpp itemmodels/qstandarditemmodel.h itemmodels/qstandarditemmodel_p.h ) -qt_extend_target(Gui CONDITION QT_FEATURE_filesystemmodel +qt_internal_extend_target(Gui CONDITION QT_FEATURE_filesystemmodel SOURCES itemmodels/qfileinfogatherer.cpp itemmodels/qfileinfogatherer_p.h itemmodels/qfilesystemmodel.cpp itemmodels/qfilesystemmodel.h itemmodels/qfilesystemmodel_p.h ) -qt_extend_target(Gui CONDITION QT_FEATURE_vulkan +qt_internal_extend_target(Gui CONDITION QT_FEATURE_vulkan SOURCES rhi/qrhivulkan.cpp rhi/qrhivulkan_p.h rhi/qrhivulkan_p_p.h @@ -771,12 +771,12 @@ qt_extend_target(Gui CONDITION QT_FEATURE_vulkan #### Keys ignored in scope 113:.:vulkan:vulkan/vulkan.pri:else: # qvkgen_h.CONFIG = "target_predeps" "no_link" -qt_extend_target(Gui CONDITION WASM +qt_internal_extend_target(Gui CONDITION WASM SOURCES platform/wasm/qwasmlocalfileaccess.cpp platform/wasm/qwasmlocalfileaccess_p.h ) -qt_extend_target(Gui CONDITION UNIX +qt_internal_extend_target(Gui CONDITION UNIX SOURCES platform/unix/qgenericunixeventdispatcher.cpp platform/unix/qgenericunixeventdispatcher_p.h platform/unix/qunixeventdispatcher.cpp @@ -784,29 +784,29 @@ qt_extend_target(Gui CONDITION UNIX platform/unix/qunixplatforminterface.cpp ) -qt_extend_target(Gui CONDITION QT_FEATURE_glib AND UNIX +qt_internal_extend_target(Gui CONDITION QT_FEATURE_glib AND UNIX SOURCES platform/unix/qeventdispatcher_glib.cpp platform/unix/qeventdispatcher_glib_p.h LIBRARIES GLIB2::GLIB2 ) -qt_extend_target(Gui CONDITION UNIX AND (QT_FEATURE_xcb OR NOT UIKIT) +qt_internal_extend_target(Gui CONDITION UNIX AND (QT_FEATURE_xcb OR NOT UIKIT) SOURCES platform/unix/qgenericunixservices.cpp platform/unix/qgenericunixservices_p.h ) -qt_extend_target(Gui CONDITION TARGET Qt::DBus AND UNIX AND (QT_FEATURE_xcb OR NOT UIKIT) +qt_internal_extend_target(Gui CONDITION TARGET Qt::DBus AND UNIX AND (QT_FEATURE_xcb OR NOT UIKIT) LIBRARIES Qt::DBus ) -qt_extend_target(Gui CONDITION UNIX AND (QT_FEATURE_xcb OR NOT MACOS) AND (QT_FEATURE_xcb OR NOT UIKIT) +qt_internal_extend_target(Gui CONDITION UNIX AND (QT_FEATURE_xcb OR NOT MACOS) AND (QT_FEATURE_xcb OR NOT UIKIT) SOURCES platform/unix/qgenericunixthemes.cpp platform/unix/qgenericunixthemes_p.h ) -qt_extend_target(Gui CONDITION TARGET Qt::DBus AND UNIX AND (QT_FEATURE_xcb OR NOT MACOS) AND (QT_FEATURE_xcb OR NOT UIKIT) +qt_internal_extend_target(Gui CONDITION TARGET Qt::DBus AND UNIX AND (QT_FEATURE_xcb OR NOT MACOS) AND (QT_FEATURE_xcb OR NOT UIKIT) SOURCES platform/unix/dbusmenu/qdbusmenuadaptor.cpp platform/unix/dbusmenu/qdbusmenuadaptor_p.h platform/unix/dbusmenu/qdbusmenubar.cpp platform/unix/dbusmenu/qdbusmenubar_p.h @@ -816,7 +816,7 @@ qt_extend_target(Gui CONDITION TARGET Qt::DBus AND UNIX AND (QT_FEATURE_xcb OR N platform/unix/dbusmenu/qdbusplatformmenu.cpp platform/unix/dbusmenu/qdbusplatformmenu_p.h ) -qt_extend_target(Gui CONDITION QT_FEATURE_systemtrayicon AND TARGET Qt::DBus AND UNIX AND (QT_FEATURE_xcb OR NOT MACOS) AND (QT_FEATURE_xcb OR NOT UIKIT) +qt_internal_extend_target(Gui CONDITION QT_FEATURE_systemtrayicon AND TARGET Qt::DBus AND UNIX AND (QT_FEATURE_xcb OR NOT MACOS) AND (QT_FEATURE_xcb OR NOT UIKIT) SOURCES platform/unix/dbustray/qdbustrayicon.cpp platform/unix/dbustray/qdbustrayicon_p.h platform/unix/dbustray/qdbustraytypes.cpp platform/unix/dbustray/qdbustraytypes_p.h @@ -824,7 +824,7 @@ qt_extend_target(Gui CONDITION QT_FEATURE_systemtrayicon AND TARGET Qt::DBus AND platform/unix/dbustray/qxdgnotificationproxy.cpp platform/unix/dbustray/qxdgnotificationproxy_p.h ) -qt_extend_target(Gui CONDITION QT_FEATURE_xkbcommon AND UNIX +qt_internal_extend_target(Gui CONDITION QT_FEATURE_xkbcommon AND UNIX SOURCES platform/unix/qxkbcommon.cpp platform/unix/qxkbcommon_p.h platform/unix/qxkbcommon_3rdparty.cpp @@ -832,7 +832,7 @@ qt_extend_target(Gui CONDITION QT_FEATURE_xkbcommon AND UNIX XKB::XKB ) -qt_extend_target(Gui CONDITION IOS OR MACOS +qt_internal_extend_target(Gui CONDITION IOS OR MACOS SOURCES rhi/qrhimetal.mm rhi/qrhimetal_p.h rhi/qrhimetal_p_p.h @@ -840,7 +840,7 @@ qt_extend_target(Gui CONDITION IOS OR MACOS ${FWMetal} ) -qt_extend_target(Gui CONDITION NOT GCC OR NOT QT_COMPILER_VERSION_MAJOR STREQUAL 5 +qt_internal_extend_target(Gui CONDITION NOT GCC OR NOT QT_COMPILER_VERSION_MAJOR STREQUAL 5 SOURCES painting/qdrawhelper.cpp NO_PCH_SOURCES @@ -848,8 +848,8 @@ qt_extend_target(Gui CONDITION NOT GCC OR NOT QT_COMPILER_VERSION_MAJOR STREQUAL ) -qt_create_tracepoints(Gui qtgui.tracepoints) -qt_add_docs(Gui +qt_internal_create_tracepoints(Gui qtgui.tracepoints) +qt_internal_add_docs(Gui doc/qtgui.qdocconf ) diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt index 6d496e2d7f8..29ae78aa044 100644 --- a/src/gui/CMakeLists.txt +++ b/src/gui/CMakeLists.txt @@ -52,7 +52,7 @@ endif() # special case end -qt_add_module(Gui +qt_internal_add_module(Gui GENERATE_METATYPES PLUGIN_TYPES accessiblebridge platforms platforms/darwin xcbglintegrations platformthemes platforminputcontexts generic iconengines imageformats egldeviceintegrations FEATURE_DEPENDENCIES # special case: @@ -292,7 +292,7 @@ set(qpdf_resource_files "qpdfa_metadata.xml" ) -qt_add_resource(Gui "qpdf" +qt_internal_add_resource(Gui "qpdf" PREFIX "/qpdf/" BASE @@ -307,7 +307,7 @@ if(QT_FEATURE_reduce_relocations AND UNIX AND GCC) endif() # special case begin -qt_extend_target(Gui CONDITION QT_FEATURE_standarditemmodel +qt_internal_extend_target(Gui CONDITION QT_FEATURE_standarditemmodel SOURCES itemmodels/qstandarditemmodel.cpp itemmodels/qstandarditemmodel.h itemmodels/qstandarditemmodel_p.h ) @@ -327,7 +327,7 @@ qt_extend_target(Gui CONDITION QT_FEATURE_standarditemmodel # feature is available). # On Windows with 'dynamic' OpenGL we must not link to opengl32. # DO NOT MOVE THIS TO THE BEGINNING OF THE FILE, the feature variables are not -# available until the qt_add_module call. +# available until the qt_internal_add_module call. if(QT_FEATURE_opengl) if(QT_FEATURE_opengles2) find_package(GLESv2) @@ -338,7 +338,7 @@ if(QT_FEATURE_opengl) endif() # special case end -qt_extend_target(Gui CONDITION QT_FEATURE_opengl +qt_internal_extend_target(Gui CONDITION QT_FEATURE_opengl SOURCES kernel/qopenglcontext.cpp kernel/qopenglcontext.h kernel/qopenglcontext_p.h kernel/qopenglcontext_platform.h @@ -352,7 +352,7 @@ qt_extend_target(Gui CONDITION QT_FEATURE_opengl rhi/qrhigles2_p_p.h ) -qt_extend_target(Gui CONDITION ANDROID +qt_internal_extend_target(Gui CONDITION ANDROID SOURCES platform/android/qandroidplatforminterface.cpp ) @@ -360,7 +360,7 @@ qt_extend_target(Gui CONDITION ANDROID #### Keys ignored in scope 2:.:.:gui.pro:QT_FEATURE_opengl: # MODULE_CONFIG = "opengl" -qt_extend_target(Gui CONDITION MACOS +qt_internal_extend_target(Gui CONDITION MACOS SOURCES platform/macos/qcocoaplatforminterface.mm LIBRARIES @@ -369,7 +369,7 @@ qt_extend_target(Gui CONDITION MACOS ${FWAppKit} ) -qt_extend_target(Gui CONDITION APPLE +qt_internal_extend_target(Gui CONDITION APPLE SOURCES image/qimage_darwin.mm painting/qcoregraphics.mm painting/qcoregraphics_p.h @@ -386,12 +386,12 @@ qt_extend_target(Gui CONDITION APPLE ${FWImageIO} ) -qt_extend_target(Gui CONDITION QT_FEATURE_animation +qt_internal_extend_target(Gui CONDITION QT_FEATURE_animation SOURCES animation/qguivariantanimation.cpp ) -qt_extend_target(Gui CONDITION WIN32 +qt_internal_extend_target(Gui CONDITION WIN32 SOURCES image/qpixmap_win.cpp kernel/qwindowdefs_win.h @@ -425,7 +425,7 @@ if(QT_FEATURE_egl) endif() # special case end -qt_extend_target(Gui CONDITION QT_FEATURE_egl +qt_internal_extend_target(Gui CONDITION QT_FEATURE_egl SOURCES opengl/platform/egl/qeglconvenience.cpp opengl/platform/egl/qeglconvenience_p.h opengl/platform/egl/qeglstreamconvenience.cpp opengl/platform/egl/qeglstreamconvenience_p.h @@ -471,7 +471,7 @@ qt_extend_target(Gui CONDITION QT_FEATURE_egl #### Keys ignored in scope 18:.:.:gui.pro:APPLE: # CMAKE_GL_HEADER_NAME = "gl.h" -qt_extend_target(Gui CONDITION QT_FEATURE_accessibility +qt_internal_extend_target(Gui CONDITION QT_FEATURE_accessibility SOURCES accessible/qaccessible.cpp accessible/qaccessible.h accessible/qaccessiblebridge.cpp accessible/qaccessiblebridge.h @@ -482,14 +482,14 @@ qt_extend_target(Gui CONDITION QT_FEATURE_accessibility accessible/qplatformaccessibility.cpp accessible/qplatformaccessibility.h ) -qt_extend_target(Gui CONDITION APPLE AND QT_FEATURE_accessibility +qt_internal_extend_target(Gui CONDITION APPLE AND QT_FEATURE_accessibility SOURCES accessible/qaccessiblecache_mac.mm LIBRARIES ${FWFoundation} ) -qt_extend_target(Gui CONDITION QT_FEATURE_accessibility AND WIN32 +qt_internal_extend_target(Gui CONDITION QT_FEATURE_accessibility AND WIN32 SOURCES accessible/windows/apisupport/qwindowsuiawrapper.cpp accessible/windows/apisupport/qwindowsuiawrapper_p.h accessible/windows/apisupport/uiaattributeids_p.h @@ -504,7 +504,7 @@ qt_extend_target(Gui CONDITION QT_FEATURE_accessibility AND WIN32 accessible/windows/apisupport/uiatypes_p.h ) -qt_extend_target(Gui CONDITION QT_FEATURE_accessibility AND QT_FEATURE_accessibility_atspi_bridge +qt_internal_extend_target(Gui CONDITION QT_FEATURE_accessibility AND QT_FEATURE_accessibility_atspi_bridge SOURCES accessible/linux/atspiadaptor.cpp accessible/linux/atspiadaptor_p.h accessible/linux/dbusconnection.cpp accessible/linux/dbusconnection_p.h @@ -529,13 +529,13 @@ qt_extend_target(Gui CONDITION QT_FEATURE_accessibility AND QT_FEATURE_accessibi PkgConfig::ATSPI2_nolink ) -qt_extend_target(Gui CONDITION QT_FEATURE_action +qt_internal_extend_target(Gui CONDITION QT_FEATURE_action SOURCES kernel/qaction.cpp kernel/qaction.h kernel/qaction_p.h kernel/qactiongroup.cpp kernel/qactiongroup.h kernel/qactiongroup_p.h ) -qt_extend_target(Gui CONDITION QT_FEATURE_draganddrop +qt_internal_extend_target(Gui CONDITION QT_FEATURE_draganddrop SOURCES kernel/qdnd.cpp kernel/qdnd_p.h kernel/qdrag.cpp kernel/qdrag.h @@ -544,19 +544,19 @@ qt_extend_target(Gui CONDITION QT_FEATURE_draganddrop kernel/qsimpledrag.cpp kernel/qsimpledrag_p.h ) -qt_extend_target(Gui CONDITION QT_FEATURE_shortcut +qt_internal_extend_target(Gui CONDITION QT_FEATURE_shortcut SOURCES kernel/qkeysequence.cpp kernel/qkeysequence.h kernel/qkeysequence_p.h kernel/qshortcut.cpp kernel/qshortcut.h kernel/qshortcut_p.h kernel/qshortcutmap.cpp kernel/qshortcutmap_p.h ) -qt_extend_target(Gui CONDITION QT_FEATURE_movie +qt_internal_extend_target(Gui CONDITION QT_FEATURE_movie SOURCES image/qmovie.cpp image/qmovie.h ) -qt_extend_target(Gui CONDITION QT_FEATURE_png +qt_internal_extend_target(Gui CONDITION QT_FEATURE_png SOURCES image/qpnghandler.cpp image/qpnghandler_p.h LIBRARIES @@ -566,69 +566,69 @@ qt_extend_target(Gui CONDITION QT_FEATURE_png #### Keys ignored in scope 40:.:image:image/image.pri:WIN32 AND MINGW: # GCC_VERSION = "$${QMAKE_GCC_MAJOR_VERSION}.$${QMAKE_GCC_MINOR_VERSION}.$${QMAKE_GCC_PATCH_VERSION}" -qt_extend_target(Gui CONDITION ((QT_FEATURE_png) AND (WIN32 AND MINGW)) AND (GCC_VERSION___equals___8.1.0) +qt_internal_extend_target(Gui CONDITION ((QT_FEATURE_png) AND (WIN32 AND MINGW)) AND (GCC_VERSION___equals___8.1.0) COMPILE_OPTIONS -fno-reorder-blocks-and-partition ) if(NOT ANDROID) - qt_add_simd_part(Gui SIMD sse2 + qt_internal_add_simd_part(Gui SIMD sse2 SOURCES painting/qdrawhelper_sse2.cpp ) - qt_add_simd_part(Gui SIMD ssse3 + qt_internal_add_simd_part(Gui SIMD ssse3 SOURCES image/qimage_ssse3.cpp painting/qdrawhelper_ssse3.cpp ) - qt_add_simd_part(Gui SIMD sse4_1 + qt_internal_add_simd_part(Gui SIMD sse4_1 SOURCES painting/qdrawhelper_sse4.cpp painting/qimagescale_sse4.cpp ) - qt_add_simd_part(Gui SIMD neon + qt_internal_add_simd_part(Gui SIMD neon SOURCES image/qimage_neon.cpp painting/qdrawhelper_neon.cpp painting/qdrawhelper_neon_p.h painting/qimagescale_neon.cpp ) - qt_add_simd_part(Gui SIMD mips_dsp + qt_internal_add_simd_part(Gui SIMD mips_dsp SOURCES painting/qdrawhelper_mips_dsp.cpp painting/qdrawhelper_mips_dsp_p.h painting/qdrawhelper_mips_dsp_asm.S painting/qt_mips_asm_dsp_p.h ) - qt_add_simd_part(Gui SIMD mips_dspr2 + qt_internal_add_simd_part(Gui SIMD mips_dspr2 SOURCES image/qimage_mips_dspr2.cpp image/qimage_mips_dspr2_asm.S painting/qdrawhelper_mips_dspr2_asm.S ) - qt_add_simd_part(Gui SIMD arch_haswell + qt_internal_add_simd_part(Gui SIMD arch_haswell SOURCES painting/qdrawhelper_avx2.cpp ) endif() -qt_extend_target(Gui CONDITION ANDROID +qt_internal_extend_target(Gui CONDITION ANDROID SOURCES platform/android/qandroidplatforminterface.cpp ) -qt_extend_target(Gui CONDITION ANDROID AND (TEST_architecture_arch STREQUAL arm64 OR TEST_architecture_arch STREQUAL arm) # special case +qt_internal_extend_target(Gui CONDITION ANDROID AND (TEST_architecture_arch STREQUAL arm64 OR TEST_architecture_arch STREQUAL arm) # special case SOURCES image/qimage_neon.cpp painting/qdrawhelper_neon.cpp painting/qdrawhelper_neon_p.h painting/qimagescale_neon.cpp ) -qt_extend_target(Gui CONDITION ANDROID AND (TEST_architecture_arch STREQUAL i386 OR TEST_architecture_arch STREQUAL x86_64) +qt_internal_extend_target(Gui CONDITION ANDROID AND (TEST_architecture_arch STREQUAL i386 OR TEST_architecture_arch STREQUAL x86_64) SOURCES image/qimage_ssse3.cpp painting/qdrawhelper_sse2.cpp @@ -648,7 +648,7 @@ if (MINGW AND CMAKE_CXX_COMPILER_VERSION VERSION_EQUAL 8.1.0) endif() # special case end -qt_extend_target(Gui CONDITION QT_FEATURE_harfbuzz +qt_internal_extend_target(Gui CONDITION QT_FEATURE_harfbuzz SOURCES text/qharfbuzzng.cpp text/qharfbuzzng_p.h LIBRARIES @@ -659,13 +659,13 @@ qt_extend_target(Gui CONDITION QT_FEATURE_harfbuzz # Replicate what src/3rdparty/harfbuzz-ng/harfbuzz-ng.pro does, which is link CoreText # when targeting uikit. -qt_extend_target(Gui CONDITION QT_FEATURE_harfbuzz AND UIKIT +qt_internal_extend_target(Gui CONDITION QT_FEATURE_harfbuzz AND UIKIT LIBRARIES ${FWCoreText} ) # special case end -qt_extend_target(Gui CONDITION QT_FEATURE_textodfwriter +qt_internal_extend_target(Gui CONDITION QT_FEATURE_textodfwriter SOURCES text/qtextodfwriter.cpp text/qtextodfwriter_p.h text/qzip.cpp @@ -673,17 +673,17 @@ qt_extend_target(Gui CONDITION QT_FEATURE_textodfwriter text/qzipwriter_p.h ) -qt_extend_target(Gui CONDITION QT_FEATURE_textmarkdownreader +qt_internal_extend_target(Gui CONDITION QT_FEATURE_textmarkdownreader SOURCES text/qtextmarkdownimporter.cpp text/qtextmarkdownimporter_p.h ) -qt_extend_target(Gui CONDITION QT_FEATURE_system_textmarkdownreader AND QT_FEATURE_textmarkdownreader +qt_internal_extend_target(Gui CONDITION QT_FEATURE_system_textmarkdownreader AND QT_FEATURE_textmarkdownreader LIBRARIES libmd4c ) -qt_extend_target(Gui CONDITION QT_FEATURE_textmarkdownreader AND NOT QT_FEATURE_system_textmarkdownreader +qt_internal_extend_target(Gui CONDITION QT_FEATURE_textmarkdownreader AND NOT QT_FEATURE_system_textmarkdownreader SOURCES ../3rdparty/md4c/md4c.c ../3rdparty/md4c/md4c.h DEFINES @@ -692,18 +692,18 @@ qt_extend_target(Gui CONDITION QT_FEATURE_textmarkdownreader AND NOT QT_FEATURE_ ../3rdparty/md4c ) -qt_extend_target(Gui CONDITION QT_FEATURE_textmarkdownwriter +qt_internal_extend_target(Gui CONDITION QT_FEATURE_textmarkdownwriter SOURCES text/qtextmarkdownwriter.cpp text/qtextmarkdownwriter_p.h ) -qt_extend_target(Gui CONDITION QT_FEATURE_cssparser +qt_internal_extend_target(Gui CONDITION QT_FEATURE_cssparser SOURCES painting/qcssutil.cpp text/qcssparser.cpp text/qcssparser_p.h ) -qt_extend_target(Gui CONDITION QT_FEATURE_freetype +qt_internal_extend_target(Gui CONDITION QT_FEATURE_freetype SOURCES text/freetype/qfontengine_ft.cpp text/freetype/qfontengine_ft_p.h text/freetype/qfreetypefontdatabase.cpp text/freetype/qfreetypefontdatabase_p.h @@ -711,12 +711,12 @@ qt_extend_target(Gui CONDITION QT_FEATURE_freetype WrapFreetype::WrapFreetype ) -qt_extend_target(Gui CONDITION QT_FEATURE_freetype AND UNIX AND NOT APPLE +qt_internal_extend_target(Gui CONDITION QT_FEATURE_freetype AND UNIX AND NOT APPLE SOURCES text/unix/qgenericunixfontdatabase_p.h ) -qt_extend_target(Gui CONDITION QT_FEATURE_fontconfig AND QT_FEATURE_freetype AND UNIX AND NOT APPLE +qt_internal_extend_target(Gui CONDITION QT_FEATURE_fontconfig AND QT_FEATURE_freetype AND UNIX AND NOT APPLE SOURCES text/unix/qfontconfigdatabase.cpp text/unix/qfontconfigdatabase_p.h text/unix/qfontenginemultifontconfig.cpp text/unix/qfontenginemultifontconfig_p.h @@ -724,61 +724,61 @@ qt_extend_target(Gui CONDITION QT_FEATURE_fontconfig AND QT_FEATURE_freetype AND Fontconfig::Fontconfig ) -qt_extend_target(Gui CONDITION APPLE AND NOT MACOS +qt_internal_extend_target(Gui CONDITION APPLE AND NOT MACOS LIBRARIES ${FWUIKit} ) -qt_extend_target(Gui CONDITION APPLE AND QT_FEATURE_freetype +qt_internal_extend_target(Gui CONDITION APPLE AND QT_FEATURE_freetype LIBRARIES WrapFreetype::WrapFreetype ) -qt_extend_target(Gui CONDITION QT_FEATURE_freetype AND WIN32 +qt_internal_extend_target(Gui CONDITION QT_FEATURE_freetype AND WIN32 SOURCES text/windows/qwindowsfontdatabase_ft.cpp text/windows/qwindowsfontdatabase_ft_p.h LIBRARIES WrapFreetype::WrapFreetype ) -qt_extend_target(Gui CONDITION QT_FEATURE_direct2d AND QT_FEATURE_directwrite AND WIN32 +qt_internal_extend_target(Gui CONDITION QT_FEATURE_direct2d AND QT_FEATURE_directwrite AND WIN32 SOURCES text/windows/qwindowsfontenginedirectwrite.cpp text/windows/qwindowsfontenginedirectwrite_p.h LIBRARIES d2d1 ) -qt_extend_target(Gui CONDITION QT_FEATURE_direct2d AND QT_FEATURE_directwrite AND QT_FEATURE_directwrite3 AND WIN32 +qt_internal_extend_target(Gui CONDITION QT_FEATURE_direct2d AND QT_FEATURE_directwrite AND QT_FEATURE_directwrite3 AND WIN32 SOURCES text/windows/qwindowsdirectwritefontdatabase.cpp text/windows/qwindowsdirectwritefontdatabase_p.h LIBRARIES dwrite # special case ) -qt_extend_target(Gui CONDITION QT_FEATURE_direct2d AND QT_FEATURE_directwrite AND WIN32 AND NOT QT_FEATURE_directwrite3 +qt_internal_extend_target(Gui CONDITION QT_FEATURE_direct2d AND QT_FEATURE_directwrite AND WIN32 AND NOT QT_FEATURE_directwrite3 LIBRARIES dwrite # special case ) -qt_extend_target(Gui CONDITION MINGW AND WIN32 +qt_internal_extend_target(Gui CONDITION MINGW AND WIN32 LIBRARIES uuid ) -qt_extend_target(Gui CONDITION UNIX AND NOT ANDROID AND NOT INTEGRITY AND NOT (TEST_architecture_arch STREQUAL "arm64") AND NOT UIKIT +qt_internal_extend_target(Gui CONDITION UNIX AND NOT ANDROID AND NOT INTEGRITY AND NOT (TEST_architecture_arch STREQUAL "arm64") AND NOT UIKIT DEFINES ENABLE_PIXMAN_DRAWHELPERS ) if(UNIX AND NOT ANDROID AND NOT INTEGRITY AND NOT (TEST_architecture_arch STREQUAL "arm64") AND NOT UIKIT) - qt_add_simd_part(Gui SIMD neon + qt_internal_add_simd_part(Gui SIMD neon SOURCES ../3rdparty/pixman/pixman-arm-neon-asm.S painting/qdrawhelper_neon_asm.S ) endif() -qt_extend_target(Gui CONDITION ANDROID AND TEST_architecture_arch STREQUAL x86_64 +qt_internal_extend_target(Gui CONDITION ANDROID AND TEST_architecture_arch STREQUAL x86_64 SOURCES painting/qdrawhelper_sse4.cpp painting/qimagescale_sse4.cpp @@ -787,78 +787,78 @@ qt_extend_target(Gui CONDITION ANDROID AND TEST_architecture_arch STREQUAL x86_6 QT_COMPILER_SUPPORTS_SSE4_2 ) -qt_extend_target(Gui CONDITION QT_FEATURE_system_zlib +qt_internal_extend_target(Gui CONDITION QT_FEATURE_system_zlib LIBRARIES ZLIB::ZLIB ) -qt_extend_target(Gui CONDITION NOT QT_FEATURE_system_zlib +qt_internal_extend_target(Gui CONDITION NOT QT_FEATURE_system_zlib INCLUDE_DIRECTORIES ../3rdparty/zlib/src ) -qt_extend_target(Gui CONDITION NOT QT_FEATURE_system_zlib AND NOT no_core_dep +qt_internal_extend_target(Gui CONDITION NOT QT_FEATURE_system_zlib AND NOT no_core_dep LIBRARIES Qt::Core ) -qt_extend_target(Gui CONDITION QT_FEATURE_regularexpression +qt_internal_extend_target(Gui CONDITION QT_FEATURE_regularexpression SOURCES util/qshadergenerator.cpp util/qshadergenerator_p.h ) -qt_extend_target(Gui CONDITION QT_FEATURE_undocommand +qt_internal_extend_target(Gui CONDITION QT_FEATURE_undocommand SOURCES util/qundostack.cpp util/qundostack.h util/qundostack_p.h ) -qt_extend_target(Gui CONDITION QT_FEATURE_undogroup +qt_internal_extend_target(Gui CONDITION QT_FEATURE_undogroup SOURCES util/qundogroup.cpp util/qundogroup.h ) -qt_extend_target(Gui CONDITION QT_FEATURE_opengl AND QT_FEATURE_xlib AND NOT QT_FEATURE_opengles2 +qt_internal_extend_target(Gui CONDITION QT_FEATURE_opengl AND QT_FEATURE_xlib AND NOT QT_FEATURE_opengles2 SOURCES opengl/platform/unix/qglxconvenience.cpp opengl/platform/unix/qglxconvenience_p.h LIBRARIES X11::X11 ) -qt_extend_target(Gui CONDITION QT_FEATURE_egl AND QT_FEATURE_opengl +qt_internal_extend_target(Gui CONDITION QT_FEATURE_egl AND QT_FEATURE_opengl SOURCES opengl/platform/egl/qeglpbuffer.cpp opengl/platform/egl/qeglpbuffer_p.h opengl/platform/egl/qeglplatformcontext.cpp opengl/platform/egl/qeglplatformcontext_p.h ) -qt_extend_target(Gui CONDITION QT_FEATURE_egl AND QT_FEATURE_egl_x11 +qt_internal_extend_target(Gui CONDITION QT_FEATURE_egl AND QT_FEATURE_egl_x11 SOURCES opengl/platform/egl/qxlibeglintegration.cpp opengl/platform/egl/qxlibeglintegration_p.h LIBRARIES X11::X11 ) -qt_extend_target(Gui CONDITION QT_FEATURE_egl AND NOT QT_FEATURE_egl_x11 +qt_internal_extend_target(Gui CONDITION QT_FEATURE_egl AND NOT QT_FEATURE_egl_x11 DEFINES QT_EGL_NO_X11 ) -qt_extend_target(Gui CONDITION QT_FEATURE_dlopen AND QT_FEATURE_egl +qt_internal_extend_target(Gui CONDITION QT_FEATURE_dlopen AND QT_FEATURE_egl LIBRARIES ${CMAKE_DL_LIBS} ) -qt_extend_target(Gui CONDITION QT_FEATURE_standarditemmodel +qt_internal_extend_target(Gui CONDITION QT_FEATURE_standarditemmodel SOURCES itemmodels/qstandarditemmodel.cpp itemmodels/qstandarditemmodel.h itemmodels/qstandarditemmodel_p.h ) -qt_extend_target(Gui CONDITION QT_FEATURE_filesystemmodel +qt_internal_extend_target(Gui CONDITION QT_FEATURE_filesystemmodel SOURCES itemmodels/qfileinfogatherer.cpp itemmodels/qfileinfogatherer_p.h itemmodels/qfilesystemmodel.cpp itemmodels/qfilesystemmodel.h itemmodels/qfilesystemmodel_p.h ) -qt_extend_target(Gui CONDITION QT_FEATURE_vulkan +qt_internal_extend_target(Gui CONDITION QT_FEATURE_vulkan SOURCES rhi/qrhivulkan.cpp rhi/qrhivulkan_p.h rhi/qrhivulkan_p_p.h @@ -901,7 +901,7 @@ if (QT_FEATURE_vulkan) COMMENT "Generating vulkan data" ) - extend_target(Gui + qt_internal_extend_target(Gui SOURCES "${CMAKE_CURRENT_BINARY_DIR}/vulkan/${vulkan_fun}" "${CMAKE_CURRENT_BINARY_DIR}/vulkan/${vulkan_fun_p}" @@ -942,12 +942,12 @@ add_custom_command( #### Keys ignored in scope 113:.:vulkan:vulkan/vulkan.pri:else: # qvkgen_h.CONFIG = "target_predeps" "no_link" -qt_extend_target(Gui CONDITION WASM +qt_internal_extend_target(Gui CONDITION WASM SOURCES platform/wasm/qwasmlocalfileaccess.cpp platform/wasm/qwasmlocalfileaccess_p.h ) -qt_extend_target(Gui CONDITION UNIX +qt_internal_extend_target(Gui CONDITION UNIX SOURCES platform/unix/qgenericunixeventdispatcher.cpp platform/unix/qgenericunixeventdispatcher_p.h platform/unix/qunixeventdispatcher.cpp @@ -955,29 +955,29 @@ qt_extend_target(Gui CONDITION UNIX platform/unix/qunixplatforminterface.cpp ) -qt_extend_target(Gui CONDITION QT_FEATURE_glib AND UNIX +qt_internal_extend_target(Gui CONDITION QT_FEATURE_glib AND UNIX SOURCES platform/unix/qeventdispatcher_glib.cpp platform/unix/qeventdispatcher_glib_p.h LIBRARIES GLIB2::GLIB2 ) -qt_extend_target(Gui CONDITION UNIX AND (QT_FEATURE_xcb OR NOT UIKIT) +qt_internal_extend_target(Gui CONDITION UNIX AND (QT_FEATURE_xcb OR NOT UIKIT) SOURCES platform/unix/qgenericunixservices.cpp platform/unix/qgenericunixservices_p.h ) -qt_extend_target(Gui CONDITION TARGET Qt::DBus AND UNIX AND (QT_FEATURE_xcb OR NOT UIKIT) +qt_internal_extend_target(Gui CONDITION TARGET Qt::DBus AND UNIX AND (QT_FEATURE_xcb OR NOT UIKIT) LIBRARIES Qt::DBus ) -qt_extend_target(Gui CONDITION UNIX AND (QT_FEATURE_xcb OR NOT MACOS) AND (QT_FEATURE_xcb OR NOT UIKIT) +qt_internal_extend_target(Gui CONDITION UNIX AND (QT_FEATURE_xcb OR NOT MACOS) AND (QT_FEATURE_xcb OR NOT UIKIT) SOURCES platform/unix/qgenericunixthemes.cpp platform/unix/qgenericunixthemes_p.h ) -qt_extend_target(Gui CONDITION TARGET Qt::DBus AND UNIX AND (QT_FEATURE_xcb OR NOT MACOS) AND (QT_FEATURE_xcb OR NOT UIKIT) +qt_internal_extend_target(Gui CONDITION TARGET Qt::DBus AND UNIX AND (QT_FEATURE_xcb OR NOT MACOS) AND (QT_FEATURE_xcb OR NOT UIKIT) SOURCES platform/unix/dbusmenu/qdbusmenuadaptor.cpp platform/unix/dbusmenu/qdbusmenuadaptor_p.h platform/unix/dbusmenu/qdbusmenubar.cpp platform/unix/dbusmenu/qdbusmenubar_p.h @@ -987,7 +987,7 @@ qt_extend_target(Gui CONDITION TARGET Qt::DBus AND UNIX AND (QT_FEATURE_xcb OR N platform/unix/dbusmenu/qdbusplatformmenu.cpp platform/unix/dbusmenu/qdbusplatformmenu_p.h ) -qt_extend_target(Gui CONDITION QT_FEATURE_systemtrayicon AND TARGET Qt::DBus AND UNIX AND (QT_FEATURE_xcb OR NOT MACOS) AND (QT_FEATURE_xcb OR NOT UIKIT) +qt_internal_extend_target(Gui CONDITION QT_FEATURE_systemtrayicon AND TARGET Qt::DBus AND UNIX AND (QT_FEATURE_xcb OR NOT MACOS) AND (QT_FEATURE_xcb OR NOT UIKIT) SOURCES platform/unix/dbustray/qdbustrayicon.cpp platform/unix/dbustray/qdbustrayicon_p.h platform/unix/dbustray/qdbustraytypes.cpp platform/unix/dbustray/qdbustraytypes_p.h @@ -995,7 +995,7 @@ qt_extend_target(Gui CONDITION QT_FEATURE_systemtrayicon AND TARGET Qt::DBus AND platform/unix/dbustray/qxdgnotificationproxy.cpp platform/unix/dbustray/qxdgnotificationproxy_p.h ) -qt_extend_target(Gui CONDITION QT_FEATURE_xkbcommon AND UNIX +qt_internal_extend_target(Gui CONDITION QT_FEATURE_xkbcommon AND UNIX SOURCES platform/unix/qxkbcommon.cpp platform/unix/qxkbcommon_p.h platform/unix/qxkbcommon_3rdparty.cpp @@ -1003,7 +1003,7 @@ qt_extend_target(Gui CONDITION QT_FEATURE_xkbcommon AND UNIX XKB::XKB ) -qt_extend_target(Gui CONDITION IOS OR MACOS +qt_internal_extend_target(Gui CONDITION IOS OR MACOS SOURCES rhi/qrhimetal.mm rhi/qrhimetal_p.h rhi/qrhimetal_p_p.h @@ -1011,7 +1011,7 @@ qt_extend_target(Gui CONDITION IOS OR MACOS ${FWMetal} ) -qt_extend_target(Gui # special case CONDITION NOT GCC OR NOT QT_COMPILER_VERSION_MAJOR STREQUAL 5 # source subtraction gone wrong +qt_internal_extend_target(Gui # special case CONDITION NOT GCC OR NOT QT_COMPILER_VERSION_MAJOR STREQUAL 5 # source subtraction gone wrong SOURCES painting/qdrawhelper.cpp NO_PCH_SOURCES @@ -1019,8 +1019,8 @@ qt_extend_target(Gui # special case CONDITION NOT GCC OR NOT QT_COMPILER_VERSION ) -qt_create_tracepoints(Gui qtgui.tracepoints) -qt_add_docs(Gui +qt_internal_create_tracepoints(Gui qtgui.tracepoints) +qt_internal_add_docs(Gui doc/qtgui.qdocconf ) diff --git a/src/gui/accessible/linux/.prev_CMakeLists.txt b/src/gui/accessible/linux/.prev_CMakeLists.txt deleted file mode 100644 index ffb0ca96109..00000000000 --- a/src/gui/accessible/linux/.prev_CMakeLists.txt +++ /dev/null @@ -1,40 +0,0 @@ -# Generated from linuxaccessibility.pro. - -##################################################################### -## LinuxAccessibilitySupport Module: -##################################################################### - -qt_add_module(LinuxAccessibilitySupport - STATIC - INTERNAL_MODULE - SOURCES - application.cpp application_p.h - atspiadaptor.cpp atspiadaptor_p.h - bridge.cpp bridge_p.h - cache.cpp cache_p.h - constant_mappings.cpp constant_mappings_p.h - dbusconnection.cpp dbusconnection_p.h - struct_marshallers.cpp struct_marshallers_p.h - DBUS_ADAPTOR_SOURCES - dbusxml/Cache.xml - dbusxml/DeviceEventController.xml - DBUS_ADAPTOR_FLAGS - "-i" "struct_marshallers_p.h" - DBUS_INTERFACE_SOURCES - dbusxml/Bus.xml - dbusxml/Socket.xml - DBUS_INTERFACE_FLAGS - "-i" "struct_marshallers_p.h" - DEFINES - QT_NO_CAST_FROM_ASCII - PUBLIC_LIBRARIES - PkgConfig::ATSPI2_nolink - Qt::CorePrivate - Qt::DBus - Qt::GuiPrivate - PRECOMPILED_HEADER - "../../corelib/global/qt_pch.h" -) - -#### Keys ignored in scope 1:.:.:linuxaccessibility.pro:<TRUE>: -# MODULE = "linuxaccessibility_support" diff --git a/src/gui/accessible/linux/CMakeLists.txt b/src/gui/accessible/linux/CMakeLists.txt deleted file mode 100644 index 0e1a7a9d16d..00000000000 --- a/src/gui/accessible/linux/CMakeLists.txt +++ /dev/null @@ -1,42 +0,0 @@ -# Generated from linuxaccessibility.pro. - -qt_find_package(ATSPI2) # special case - -##################################################################### -## LinuxAccessibilitySupport Module: -##################################################################### - -qt_add_module(LinuxAccessibilitySupport - STATIC - INTERNAL_MODULE - SOURCES - application.cpp application_p.h - atspiadaptor.cpp atspiadaptor_p.h - bridge.cpp bridge_p.h - cache.cpp cache_p.h - constant_mappings.cpp constant_mappings_p.h - dbusconnection.cpp dbusconnection_p.h - struct_marshallers.cpp struct_marshallers_p.h - DBUS_ADAPTOR_SOURCES - dbusxml/Cache.xml - dbusxml/DeviceEventController.xml - DBUS_ADAPTOR_FLAGS - "-i" "struct_marshallers_p.h" - DBUS_INTERFACE_SOURCES - dbusxml/Bus.xml - dbusxml/Socket.xml - DBUS_INTERFACE_FLAGS - "-i" "struct_marshallers_p.h" - DEFINES - QT_NO_CAST_FROM_ASCII - PUBLIC_LIBRARIES - PkgConfig::ATSPI2_nolink - Qt::CorePrivate - Qt::DBus - Qt::GuiPrivate - PRECOMPILED_HEADER - "../../corelib/global/qt_pch.h" -) - -#### Keys ignored in scope 1:.:.:linuxaccessibility.pro:<TRUE>: -# MODULE = "linuxaccessibility_support" diff --git a/src/network/.prev_CMakeLists.txt b/src/network/.prev_CMakeLists.txt index 623ea27e26a..a9da13bd316 100644 --- a/src/network/.prev_CMakeLists.txt +++ b/src/network/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## Network Module: ##################################################################### -qt_add_module(Network +qt_internal_add_module(Network PLUGIN_TYPES networkaccessbackends SOURCES access/qabstractnetworkcache.cpp access/qabstractnetworkcache.h access/qabstractnetworkcache_p.h @@ -67,35 +67,35 @@ qt_add_module(Network ## Scopes: ##################################################################### -qt_extend_target(Network CONDITION MSVC AND (TEST_architecture_arch STREQUAL "i386") +qt_internal_extend_target(Network CONDITION MSVC AND (TEST_architecture_arch STREQUAL "i386") LINK_OPTIONS "/BASE:0x64000000" ) -qt_extend_target(Network CONDITION QT_FEATURE_networkdiskcache +qt_internal_extend_target(Network CONDITION QT_FEATURE_networkdiskcache SOURCES access/qnetworkdiskcache.cpp access/qnetworkdiskcache.h access/qnetworkdiskcache_p.h ) -qt_extend_target(Network CONDITION QT_FEATURE_settings +qt_internal_extend_target(Network CONDITION QT_FEATURE_settings SOURCES access/qhstsstore.cpp access/qhstsstore_p.h ) -qt_extend_target(Network CONDITION APPLE +qt_internal_extend_target(Network CONDITION APPLE LIBRARIES ${FWCoreFoundation} ${FWSecurity} ) -qt_extend_target(Network CONDITION WASM +qt_internal_extend_target(Network CONDITION WASM SOURCES access/qhttpmultipart.cpp access/qhttpmultipart.h access/qhttpmultipart_p.h access/qhttpnetworkheader.cpp access/qhttpnetworkheader_p.h access/qnetworkreplywasmimpl.cpp access/qnetworkreplywasmimpl_p.h ) -qt_extend_target(Network CONDITION QT_FEATURE_http +qt_internal_extend_target(Network CONDITION QT_FEATURE_http SOURCES access/http2/bitstreams.cpp access/http2/bitstreams_p.h access/http2/hpack.cpp access/http2/hpack_p.h @@ -120,70 +120,70 @@ qt_extend_target(Network CONDITION QT_FEATURE_http socket/qhttpsocketengine.cpp socket/qhttpsocketengine_p.h ) -qt_extend_target(Network CONDITION QT_FEATURE_brotli AND QT_FEATURE_http +qt_internal_extend_target(Network CONDITION QT_FEATURE_brotli AND QT_FEATURE_http LIBRARIES WrapBrotli::WrapBrotliDec ) -qt_extend_target(Network CONDITION QT_FEATURE_http AND QT_FEATURE_zstd +qt_internal_extend_target(Network CONDITION QT_FEATURE_http AND QT_FEATURE_zstd LIBRARIES ZSTD::ZSTD ) -qt_extend_target(Network CONDITION QT_FEATURE_system_zlib +qt_internal_extend_target(Network CONDITION QT_FEATURE_system_zlib LIBRARIES ZLIB::ZLIB ) -qt_extend_target(Network CONDITION NOT QT_FEATURE_system_zlib +qt_internal_extend_target(Network CONDITION NOT QT_FEATURE_system_zlib INCLUDE_DIRECTORIES ../3rdparty/zlib/src ) -qt_extend_target(Network CONDITION NOT QT_FEATURE_system_zlib AND NOT no_core_dep +qt_internal_extend_target(Network CONDITION NOT QT_FEATURE_system_zlib AND NOT no_core_dep LIBRARIES Qt::Core ) -qt_extend_target(Network CONDITION QT_FEATURE_topleveldomain +qt_internal_extend_target(Network CONDITION QT_FEATURE_topleveldomain SOURCES kernel/qtldurl.cpp kernel/qtldurl_p.h kernel/qurltlds_p.h ) -qt_extend_target(Network CONDITION QT_FEATURE_dnslookup +qt_internal_extend_target(Network CONDITION QT_FEATURE_dnslookup SOURCES kernel/qdnslookup.cpp kernel/qdnslookup.h kernel/qdnslookup_p.h ) -qt_extend_target(Network CONDITION UNIX +qt_internal_extend_target(Network CONDITION UNIX SOURCES kernel/qhostinfo_unix.cpp socket/qnativesocketengine_unix.cpp socket/qnet_unix_p.h ) -qt_extend_target(Network CONDITION QT_FEATURE_dlopen AND UNIX +qt_internal_extend_target(Network CONDITION QT_FEATURE_dlopen AND UNIX LIBRARIES ${CMAKE_DL_LIBS} ) -qt_extend_target(Network CONDITION QT_FEATURE_linux_netlink AND UNIX +qt_internal_extend_target(Network CONDITION QT_FEATURE_linux_netlink AND UNIX SOURCES kernel/qnetworkinterface_linux.cpp ) -qt_extend_target(Network CONDITION UNIX AND NOT QT_FEATURE_linux_netlink +qt_internal_extend_target(Network CONDITION UNIX AND NOT QT_FEATURE_linux_netlink SOURCES kernel/qnetworkinterface_unix.cpp ) -qt_extend_target(Network CONDITION ANDROID AND QT_FEATURE_dnslookup +qt_internal_extend_target(Network CONDITION ANDROID AND QT_FEATURE_dnslookup SOURCES kernel/qdnslookup_android.cpp ) -qt_extend_target(Network CONDITION WIN32 +qt_internal_extend_target(Network CONDITION WIN32 SOURCES kernel/qhostinfo_win.cpp kernel/qnetworkinterface_win.cpp @@ -195,50 +195,50 @@ qt_extend_target(Network CONDITION WIN32 iphlpapi ) -qt_extend_target(Network CONDITION QT_FEATURE_dnslookup AND WIN32 +qt_internal_extend_target(Network CONDITION QT_FEATURE_dnslookup AND WIN32 SOURCES kernel/qdnslookup_win.cpp ) -qt_extend_target(Network CONDITION APPLE AND NOT UIKIT +qt_internal_extend_target(Network CONDITION APPLE AND NOT UIKIT LIBRARIES ${FWCoreServices} ${FWSystemConfiguration} ) -qt_extend_target(Network CONDITION IOS OR MACOS +qt_internal_extend_target(Network CONDITION IOS OR MACOS SOURCES kernel/qnetconmonitor_darwin.mm LIBRARIES ${FWSystemConfiguration} ) -qt_extend_target(Network CONDITION QT_FEATURE_netlistmgr AND NOT IOS AND NOT MACOS +qt_internal_extend_target(Network CONDITION QT_FEATURE_netlistmgr AND NOT IOS AND NOT MACOS SOURCES kernel/qnetconmonitor_win.cpp ) -qt_extend_target(Network CONDITION NOT IOS AND NOT MACOS AND NOT QT_FEATURE_netlistmgr +qt_internal_extend_target(Network CONDITION NOT IOS AND NOT MACOS AND NOT QT_FEATURE_netlistmgr SOURCES kernel/qnetconmonitor_stub.cpp ) -qt_extend_target(Network CONDITION QT_FEATURE_gssapi +qt_internal_extend_target(Network CONDITION QT_FEATURE_gssapi LIBRARIES GSSAPI::GSSAPI ) -qt_extend_target(Network CONDITION UIKIT +qt_internal_extend_target(Network CONDITION UIKIT SOURCES kernel/qnetworkinterface_uikit_p.h ) -qt_extend_target(Network CONDITION MACOS +qt_internal_extend_target(Network CONDITION MACOS SOURCES kernel/qnetworkproxy_mac.cpp ) -qt_extend_target(Network CONDITION QT_FEATURE_libproxy AND UNIX AND NOT MACOS +qt_internal_extend_target(Network CONDITION QT_FEATURE_libproxy AND UNIX AND NOT MACOS SOURCES kernel/qnetworkproxy_libproxy.cpp LIBRARIES @@ -246,12 +246,12 @@ qt_extend_target(Network CONDITION QT_FEATURE_libproxy AND UNIX AND NOT MACOS PkgConfig::Libproxy ) -qt_extend_target(Network CONDITION ANDROID AND NOT QT_FEATURE_libproxy +qt_internal_extend_target(Network CONDITION ANDROID AND NOT QT_FEATURE_libproxy SOURCES kernel/qnetworkproxy_android.cpp ) -qt_extend_target(Network CONDITION UNIX AND NOT ANDROID AND NOT MACOS AND NOT QT_FEATURE_libproxy +qt_internal_extend_target(Network CONDITION UNIX AND NOT ANDROID AND NOT MACOS AND NOT QT_FEATURE_libproxy SOURCES kernel/qnetworkproxy_generic.cpp ) @@ -262,29 +262,29 @@ if(ANDROID AND (ANDROID)) ) endif() -qt_extend_target(Network CONDITION QT_FEATURE_socks5 +qt_internal_extend_target(Network CONDITION QT_FEATURE_socks5 SOURCES socket/qsocks5socketengine.cpp socket/qsocks5socketengine_p.h ) -qt_extend_target(Network CONDITION QT_FEATURE_sctp +qt_internal_extend_target(Network CONDITION QT_FEATURE_sctp SOURCES socket/qsctpserver.cpp socket/qsctpserver.h socket/qsctpserver_p.h socket/qsctpsocket.cpp socket/qsctpsocket.h socket/qsctpsocket_p.h ) -qt_extend_target(Network CONDITION MSVC +qt_internal_extend_target(Network CONDITION MSVC MOC_OPTIONS "-D_WINSOCK_DEPRECATED_NO_WARNINGS" ) -qt_extend_target(Network CONDITION QT_FEATURE_localserver +qt_internal_extend_target(Network CONDITION QT_FEATURE_localserver SOURCES socket/qlocalserver.cpp socket/qlocalserver.h socket/qlocalserver_p.h socket/qlocalsocket.cpp socket/qlocalsocket.h socket/qlocalsocket_p.h ) -qt_extend_target(Network CONDITION INTEGRITY AND QT_FEATURE_localserver +qt_internal_extend_target(Network CONDITION INTEGRITY AND QT_FEATURE_localserver SOURCES socket/qlocalserver_tcp.cpp socket/qlocalsocket_tcp.cpp @@ -292,29 +292,29 @@ qt_extend_target(Network CONDITION INTEGRITY AND QT_FEATURE_localserver QT_LOCALSOCKET_TCP ) -qt_extend_target(Network CONDITION QT_FEATURE_localserver AND UNIX AND NOT INTEGRITY +qt_internal_extend_target(Network CONDITION QT_FEATURE_localserver AND UNIX AND NOT INTEGRITY SOURCES socket/qlocalserver_unix.cpp socket/qlocalsocket_unix.cpp ) -qt_extend_target(Network CONDITION QT_FEATURE_localserver AND WIN32 +qt_internal_extend_target(Network CONDITION QT_FEATURE_localserver AND WIN32 SOURCES socket/qlocalserver_win.cpp socket/qlocalsocket_win.cpp ) -qt_extend_target(Network CONDITION QT_FEATURE_system_proxies +qt_internal_extend_target(Network CONDITION QT_FEATURE_system_proxies DEFINES QT_USE_SYSTEM_PROXIES ) -qt_extend_target(Network CONDITION NOT QT_FEATURE_openssl +qt_internal_extend_target(Network CONDITION NOT QT_FEATURE_openssl SOURCES ssl/qsslcertificate_qt.cpp ) -qt_extend_target(Network CONDITION QT_FEATURE_ssl +qt_internal_extend_target(Network CONDITION QT_FEATURE_ssl SOURCES ssl/qocspresponse.cpp ssl/qocspresponse.h ssl/qocspresponse_p.h ssl/qsslcipher.cpp ssl/qsslcipher.h ssl/qsslcipher_p.h @@ -327,7 +327,7 @@ qt_extend_target(Network CONDITION QT_FEATURE_ssl ssl/qsslsocket.cpp ssl/qsslsocket.h ssl/qsslsocket_p.h ) -qt_extend_target(Network CONDITION QT_FEATURE_schannel AND QT_FEATURE_ssl +qt_internal_extend_target(Network CONDITION QT_FEATURE_schannel AND QT_FEATURE_ssl SOURCES ssl/qsslcertificate_schannel.cpp ssl/qssldiffiehellmanparameters_dummy.cpp @@ -343,7 +343,7 @@ qt_extend_target(Network CONDITION QT_FEATURE_schannel AND QT_FEATURE_ssl ncrypt ) -qt_extend_target(Network CONDITION QT_FEATURE_securetransport AND QT_FEATURE_ssl +qt_internal_extend_target(Network CONDITION QT_FEATURE_securetransport AND QT_FEATURE_ssl SOURCES ssl/qssldiffiehellmanparameters_dummy.cpp ssl/qsslellipticcurve_dummy.cpp @@ -354,12 +354,12 @@ qt_extend_target(Network CONDITION QT_FEATURE_securetransport AND QT_FEATURE_ssl ssl/qsslsocket_qt.cpp ) -qt_extend_target(Network CONDITION QT_FEATURE_dtls AND QT_FEATURE_ssl +qt_internal_extend_target(Network CONDITION QT_FEATURE_dtls AND QT_FEATURE_ssl SOURCES ssl/qdtls.cpp ssl/qdtls.h ssl/qdtls_p.h ) -qt_extend_target(Network CONDITION QT_FEATURE_openssl AND QT_FEATURE_ssl +qt_internal_extend_target(Network CONDITION QT_FEATURE_openssl AND QT_FEATURE_ssl SOURCES ssl/qsslcertificate_openssl.cpp ssl/qsslcontext_openssl.cpp ssl/qsslcontext_openssl_p.h @@ -372,54 +372,54 @@ qt_extend_target(Network CONDITION QT_FEATURE_openssl AND QT_FEATURE_ssl OPENSSL_API_COMPAT=0x10100000L ) -qt_extend_target(Network CONDITION QT_FEATURE_dtls AND QT_FEATURE_openssl AND QT_FEATURE_ssl +qt_internal_extend_target(Network CONDITION QT_FEATURE_dtls AND QT_FEATURE_openssl AND QT_FEATURE_ssl SOURCES ssl/qdtls_openssl.cpp ssl/qdtls_openssl_p.h ) -qt_extend_target(Network CONDITION QT_FEATURE_ocsp AND QT_FEATURE_openssl AND QT_FEATURE_ssl +qt_internal_extend_target(Network CONDITION QT_FEATURE_ocsp AND QT_FEATURE_openssl AND QT_FEATURE_ssl SOURCES ssl/qocsp_p.h ) -qt_extend_target(Network CONDITION APPLE AND QT_FEATURE_openssl AND QT_FEATURE_ssl +qt_internal_extend_target(Network CONDITION APPLE AND QT_FEATURE_openssl AND QT_FEATURE_ssl SOURCES ssl/qsslsocket_mac_shared.cpp ) -qt_extend_target(Network CONDITION ANDROID AND QT_FEATURE_openssl AND QT_FEATURE_ssl AND NOT ANDROID_EMBEDDED +qt_internal_extend_target(Network CONDITION ANDROID AND QT_FEATURE_openssl AND QT_FEATURE_ssl AND NOT ANDROID_EMBEDDED SOURCES ssl/qsslsocket_openssl_android.cpp ) -qt_extend_target(Network CONDITION ANDROID AND QT_FEATURE_openssl AND QT_FEATURE_openssl_linked AND QT_FEATURE_ssl AND (build_pass OR single_android_abi) +qt_internal_extend_target(Network CONDITION ANDROID AND QT_FEATURE_openssl AND QT_FEATURE_openssl_linked AND QT_FEATURE_ssl AND (build_pass OR single_android_abi) LIBRARIES crypto_${CMAKE_SYSTEM_PROCESSOR} ssl_${CMAKE_SYSTEM_PROCESSOR} ) -qt_extend_target(Network CONDITION QT_FEATURE_openssl AND QT_FEATURE_openssl_linked AND QT_FEATURE_ssl AND NOT ANDROID +qt_internal_extend_target(Network CONDITION QT_FEATURE_openssl AND QT_FEATURE_openssl_linked AND QT_FEATURE_ssl AND NOT ANDROID LIBRARIES WrapOpenSSL::WrapOpenSSL ) -qt_extend_target(Network CONDITION QT_FEATURE_openssl AND QT_FEATURE_ssl AND NOT QT_FEATURE_openssl_linked +qt_internal_extend_target(Network CONDITION QT_FEATURE_openssl AND QT_FEATURE_ssl AND NOT QT_FEATURE_openssl_linked LIBRARIES WrapOpenSSLHeaders::WrapOpenSSLHeaders ) -qt_extend_target(Network CONDITION QT_FEATURE_openssl AND QT_FEATURE_ssl AND WIN32 +qt_internal_extend_target(Network CONDITION QT_FEATURE_openssl AND QT_FEATURE_ssl AND WIN32 SOURCES ssl/qwindowscarootfetcher.cpp ssl/qwindowscarootfetcher_p.h LIBRARIES crypt32 ) -qt_extend_target(Network CONDITION QT_FEATURE_dnslookup AND UNIX AND NOT ANDROID AND NOT INTEGRITY +qt_internal_extend_target(Network CONDITION QT_FEATURE_dnslookup AND UNIX AND NOT ANDROID AND NOT INTEGRITY SOURCES kernel/qdnslookup_unix.cpp ) -qt_add_docs(Network +qt_internal_add_docs(Network doc/qtnetwork.qdocconf ) diff --git a/src/network/CMakeLists.txt b/src/network/CMakeLists.txt index d19457e0e01..d94fff5f7f8 100644 --- a/src/network/CMakeLists.txt +++ b/src/network/CMakeLists.txt @@ -4,7 +4,7 @@ ## Network Module: ##################################################################### -qt_add_module(Network +qt_internal_add_module(Network PLUGIN_TYPES networkaccessbackends SOURCES access/qabstractnetworkcache.cpp access/qabstractnetworkcache.h access/qabstractnetworkcache_p.h @@ -67,35 +67,35 @@ qt_add_module(Network ## Scopes: ##################################################################### -qt_extend_target(Network CONDITION MSVC AND (TEST_architecture_arch STREQUAL "i386") +qt_internal_extend_target(Network CONDITION MSVC AND (TEST_architecture_arch STREQUAL "i386") LINK_OPTIONS "/BASE:0x64000000" ) -qt_extend_target(Network CONDITION QT_FEATURE_networkdiskcache +qt_internal_extend_target(Network CONDITION QT_FEATURE_networkdiskcache SOURCES access/qnetworkdiskcache.cpp access/qnetworkdiskcache.h access/qnetworkdiskcache_p.h ) -qt_extend_target(Network CONDITION QT_FEATURE_settings +qt_internal_extend_target(Network CONDITION QT_FEATURE_settings SOURCES access/qhstsstore.cpp access/qhstsstore_p.h ) -qt_extend_target(Network CONDITION APPLE +qt_internal_extend_target(Network CONDITION APPLE LIBRARIES ${FWCoreFoundation} ${FWSecurity} ) -qt_extend_target(Network CONDITION WASM +qt_internal_extend_target(Network CONDITION WASM SOURCES access/qhttpmultipart.cpp access/qhttpmultipart.h access/qhttpmultipart_p.h access/qhttpnetworkheader.cpp access/qhttpnetworkheader_p.h access/qnetworkreplywasmimpl.cpp access/qnetworkreplywasmimpl_p.h ) -qt_extend_target(Network CONDITION QT_FEATURE_http +qt_internal_extend_target(Network CONDITION QT_FEATURE_http SOURCES access/http2/bitstreams.cpp access/http2/bitstreams_p.h access/http2/hpack.cpp access/http2/hpack_p.h @@ -120,70 +120,70 @@ qt_extend_target(Network CONDITION QT_FEATURE_http socket/qhttpsocketengine.cpp socket/qhttpsocketengine_p.h ) -qt_extend_target(Network CONDITION QT_FEATURE_brotli AND QT_FEATURE_http +qt_internal_extend_target(Network CONDITION QT_FEATURE_brotli AND QT_FEATURE_http LIBRARIES WrapBrotli::WrapBrotliDec ) -qt_extend_target(Network CONDITION QT_FEATURE_http AND QT_FEATURE_zstd +qt_internal_extend_target(Network CONDITION QT_FEATURE_http AND QT_FEATURE_zstd LIBRARIES ZSTD::ZSTD ) -qt_extend_target(Network CONDITION QT_FEATURE_system_zlib +qt_internal_extend_target(Network CONDITION QT_FEATURE_system_zlib LIBRARIES ZLIB::ZLIB ) -qt_extend_target(Network CONDITION NOT QT_FEATURE_system_zlib +qt_internal_extend_target(Network CONDITION NOT QT_FEATURE_system_zlib INCLUDE_DIRECTORIES ../3rdparty/zlib/src ) -qt_extend_target(Network CONDITION NOT QT_FEATURE_system_zlib AND NOT no_core_dep +qt_internal_extend_target(Network CONDITION NOT QT_FEATURE_system_zlib AND NOT no_core_dep LIBRARIES Qt::Core ) -qt_extend_target(Network CONDITION QT_FEATURE_topleveldomain +qt_internal_extend_target(Network CONDITION QT_FEATURE_topleveldomain SOURCES kernel/qtldurl.cpp kernel/qtldurl_p.h kernel/qurltlds_p.h ) -qt_extend_target(Network CONDITION QT_FEATURE_dnslookup +qt_internal_extend_target(Network CONDITION QT_FEATURE_dnslookup SOURCES kernel/qdnslookup.cpp kernel/qdnslookup.h kernel/qdnslookup_p.h ) -qt_extend_target(Network CONDITION UNIX +qt_internal_extend_target(Network CONDITION UNIX SOURCES kernel/qhostinfo_unix.cpp socket/qnativesocketengine_unix.cpp socket/qnet_unix_p.h ) -qt_extend_target(Network CONDITION QT_FEATURE_dlopen AND UNIX +qt_internal_extend_target(Network CONDITION QT_FEATURE_dlopen AND UNIX LIBRARIES ${CMAKE_DL_LIBS} ) -qt_extend_target(Network CONDITION QT_FEATURE_linux_netlink AND UNIX +qt_internal_extend_target(Network CONDITION QT_FEATURE_linux_netlink AND UNIX SOURCES kernel/qnetworkinterface_linux.cpp ) -qt_extend_target(Network CONDITION UNIX AND NOT QT_FEATURE_linux_netlink +qt_internal_extend_target(Network CONDITION UNIX AND NOT QT_FEATURE_linux_netlink SOURCES kernel/qnetworkinterface_unix.cpp ) -qt_extend_target(Network CONDITION ANDROID AND QT_FEATURE_dnslookup +qt_internal_extend_target(Network CONDITION ANDROID AND QT_FEATURE_dnslookup SOURCES kernel/qdnslookup_android.cpp ) -qt_extend_target(Network CONDITION WIN32 +qt_internal_extend_target(Network CONDITION WIN32 SOURCES kernel/qhostinfo_win.cpp kernel/qnetworkinterface_win.cpp @@ -195,50 +195,50 @@ qt_extend_target(Network CONDITION WIN32 iphlpapi ) -qt_extend_target(Network CONDITION QT_FEATURE_dnslookup AND WIN32 +qt_internal_extend_target(Network CONDITION QT_FEATURE_dnslookup AND WIN32 SOURCES kernel/qdnslookup_win.cpp ) -qt_extend_target(Network CONDITION APPLE AND NOT UIKIT +qt_internal_extend_target(Network CONDITION APPLE AND NOT UIKIT LIBRARIES ${FWCoreServices} ${FWSystemConfiguration} ) -qt_extend_target(Network CONDITION IOS OR MACOS +qt_internal_extend_target(Network CONDITION IOS OR MACOS SOURCES kernel/qnetconmonitor_darwin.mm LIBRARIES ${FWSystemConfiguration} ) -qt_extend_target(Network CONDITION QT_FEATURE_netlistmgr AND NOT IOS AND NOT MACOS +qt_internal_extend_target(Network CONDITION QT_FEATURE_netlistmgr AND NOT IOS AND NOT MACOS SOURCES kernel/qnetconmonitor_win.cpp ) -qt_extend_target(Network CONDITION NOT IOS AND NOT MACOS AND NOT QT_FEATURE_netlistmgr +qt_internal_extend_target(Network CONDITION NOT IOS AND NOT MACOS AND NOT QT_FEATURE_netlistmgr SOURCES kernel/qnetconmonitor_stub.cpp ) -qt_extend_target(Network CONDITION QT_FEATURE_gssapi +qt_internal_extend_target(Network CONDITION QT_FEATURE_gssapi LIBRARIES GSSAPI::GSSAPI ) -qt_extend_target(Network CONDITION UIKIT +qt_internal_extend_target(Network CONDITION UIKIT SOURCES kernel/qnetworkinterface_uikit_p.h ) -qt_extend_target(Network CONDITION MACOS +qt_internal_extend_target(Network CONDITION MACOS SOURCES kernel/qnetworkproxy_mac.cpp ) -qt_extend_target(Network CONDITION QT_FEATURE_libproxy AND UNIX AND NOT MACOS +qt_internal_extend_target(Network CONDITION QT_FEATURE_libproxy AND UNIX AND NOT MACOS SOURCES kernel/qnetworkproxy_libproxy.cpp LIBRARIES @@ -246,12 +246,12 @@ qt_extend_target(Network CONDITION QT_FEATURE_libproxy AND UNIX AND NOT MACOS PkgConfig::Libproxy ) -qt_extend_target(Network CONDITION ANDROID +qt_internal_extend_target(Network CONDITION ANDROID # special case SOURCES kernel/qnetworkproxy_android.cpp ) -qt_extend_target(Network CONDITION UNIX AND NOT ANDROID AND NOT MACOS AND NOT QT_FEATURE_libproxy AND (UNIX OR WINRT) +qt_internal_extend_target(Network CONDITION UNIX AND NOT ANDROID AND NOT MACOS AND NOT QT_FEATURE_libproxy AND (UNIX OR WINRT) # special case SOURCES kernel/qnetworkproxy_generic.cpp ) @@ -262,29 +262,29 @@ if(ANDROID AND (ANDROID)) ) endif() -qt_extend_target(Network CONDITION QT_FEATURE_socks5 +qt_internal_extend_target(Network CONDITION QT_FEATURE_socks5 SOURCES socket/qsocks5socketengine.cpp socket/qsocks5socketengine_p.h ) -qt_extend_target(Network CONDITION QT_FEATURE_sctp +qt_internal_extend_target(Network CONDITION QT_FEATURE_sctp SOURCES socket/qsctpserver.cpp socket/qsctpserver.h socket/qsctpserver_p.h socket/qsctpsocket.cpp socket/qsctpsocket.h socket/qsctpsocket_p.h ) -qt_extend_target(Network CONDITION MSVC +qt_internal_extend_target(Network CONDITION MSVC MOC_OPTIONS "-D_WINSOCK_DEPRECATED_NO_WARNINGS" ) -qt_extend_target(Network CONDITION QT_FEATURE_localserver +qt_internal_extend_target(Network CONDITION QT_FEATURE_localserver SOURCES socket/qlocalserver.cpp socket/qlocalserver.h socket/qlocalserver_p.h socket/qlocalsocket.cpp socket/qlocalsocket.h socket/qlocalsocket_p.h ) -qt_extend_target(Network CONDITION INTEGRITY AND QT_FEATURE_localserver +qt_internal_extend_target(Network CONDITION INTEGRITY AND QT_FEATURE_localserver SOURCES socket/qlocalserver_tcp.cpp socket/qlocalsocket_tcp.cpp @@ -292,29 +292,29 @@ qt_extend_target(Network CONDITION INTEGRITY AND QT_FEATURE_localserver QT_LOCALSOCKET_TCP ) -qt_extend_target(Network CONDITION QT_FEATURE_localserver AND UNIX AND NOT INTEGRITY +qt_internal_extend_target(Network CONDITION QT_FEATURE_localserver AND UNIX AND NOT INTEGRITY SOURCES socket/qlocalserver_unix.cpp socket/qlocalsocket_unix.cpp ) -qt_extend_target(Network CONDITION QT_FEATURE_localserver AND WIN32 +qt_internal_extend_target(Network CONDITION QT_FEATURE_localserver AND WIN32 SOURCES socket/qlocalserver_win.cpp socket/qlocalsocket_win.cpp ) -qt_extend_target(Network CONDITION QT_FEATURE_system_proxies +qt_internal_extend_target(Network CONDITION QT_FEATURE_system_proxies DEFINES QT_USE_SYSTEM_PROXIES ) -qt_extend_target(Network CONDITION NOT QT_FEATURE_openssl +qt_internal_extend_target(Network CONDITION NOT QT_FEATURE_openssl SOURCES ssl/qsslcertificate_qt.cpp ) -qt_extend_target(Network CONDITION QT_FEATURE_ssl +qt_internal_extend_target(Network CONDITION QT_FEATURE_ssl SOURCES ssl/qocspresponse.cpp ssl/qocspresponse.h ssl/qocspresponse_p.h ssl/qsslcipher.cpp ssl/qsslcipher.h ssl/qsslcipher_p.h @@ -327,7 +327,7 @@ qt_extend_target(Network CONDITION QT_FEATURE_ssl ssl/qsslsocket.cpp ssl/qsslsocket.h ssl/qsslsocket_p.h ) -qt_extend_target(Network CONDITION QT_FEATURE_schannel AND QT_FEATURE_ssl +qt_internal_extend_target(Network CONDITION QT_FEATURE_schannel AND QT_FEATURE_ssl SOURCES ssl/qsslcertificate_schannel.cpp ssl/qssldiffiehellmanparameters_dummy.cpp @@ -343,7 +343,7 @@ qt_extend_target(Network CONDITION QT_FEATURE_schannel AND QT_FEATURE_ssl ncrypt ) -qt_extend_target(Network CONDITION QT_FEATURE_securetransport AND QT_FEATURE_ssl +qt_internal_extend_target(Network CONDITION QT_FEATURE_securetransport AND QT_FEATURE_ssl SOURCES ssl/qssldiffiehellmanparameters_dummy.cpp ssl/qsslellipticcurve_dummy.cpp @@ -354,12 +354,12 @@ qt_extend_target(Network CONDITION QT_FEATURE_securetransport AND QT_FEATURE_ssl ssl/qsslsocket_qt.cpp ) -qt_extend_target(Network CONDITION QT_FEATURE_dtls AND QT_FEATURE_ssl +qt_internal_extend_target(Network CONDITION QT_FEATURE_dtls AND QT_FEATURE_ssl SOURCES ssl/qdtls.cpp ssl/qdtls.h ssl/qdtls_p.h ) -qt_extend_target(Network CONDITION QT_FEATURE_openssl AND QT_FEATURE_ssl +qt_internal_extend_target(Network CONDITION QT_FEATURE_openssl AND QT_FEATURE_ssl SOURCES ssl/qsslcertificate_openssl.cpp ssl/qsslcontext_openssl.cpp ssl/qsslcontext_openssl_p.h @@ -372,57 +372,57 @@ qt_extend_target(Network CONDITION QT_FEATURE_openssl AND QT_FEATURE_ssl OPENSSL_API_COMPAT=0x10100000L ) -qt_extend_target(Network CONDITION QT_FEATURE_dtls AND QT_FEATURE_openssl AND QT_FEATURE_ssl +qt_internal_extend_target(Network CONDITION QT_FEATURE_dtls AND QT_FEATURE_openssl AND QT_FEATURE_ssl SOURCES ssl/qdtls_openssl.cpp ssl/qdtls_openssl_p.h ) -qt_extend_target(Network CONDITION QT_FEATURE_ocsp AND QT_FEATURE_openssl AND QT_FEATURE_ssl +qt_internal_extend_target(Network CONDITION QT_FEATURE_ocsp AND QT_FEATURE_openssl AND QT_FEATURE_ssl SOURCES ssl/qocsp_p.h ) -qt_extend_target(Network CONDITION APPLE AND QT_FEATURE_openssl AND QT_FEATURE_ssl +qt_internal_extend_target(Network CONDITION APPLE AND QT_FEATURE_openssl AND QT_FEATURE_ssl SOURCES ssl/qsslsocket_mac_shared.cpp ) -qt_extend_target(Network CONDITION ANDROID AND QT_FEATURE_openssl AND QT_FEATURE_ssl AND NOT ANDROID_EMBEDDED +qt_internal_extend_target(Network CONDITION ANDROID AND QT_FEATURE_openssl AND QT_FEATURE_ssl AND NOT ANDROID_EMBEDDED SOURCES ssl/qsslsocket_openssl_android.cpp ) -qt_extend_target(Network CONDITION ANDROID AND QT_FEATURE_openssl AND QT_FEATURE_openssl_linked AND QT_FEATURE_ssl AND (build_pass OR single_android_abi) +qt_internal_extend_target(Network CONDITION ANDROID AND QT_FEATURE_openssl AND QT_FEATURE_openssl_linked AND QT_FEATURE_ssl AND (build_pass OR single_android_abi) LIBRARIES crypto_${CMAKE_SYSTEM_PROCESSOR} ssl_${CMAKE_SYSTEM_PROCESSOR} ) -qt_extend_target(Network CONDITION QT_FEATURE_openssl AND QT_FEATURE_openssl_linked AND QT_FEATURE_ssl AND NOT ANDROID +qt_internal_extend_target(Network CONDITION QT_FEATURE_openssl AND QT_FEATURE_openssl_linked AND QT_FEATURE_ssl AND NOT ANDROID LIBRARIES WrapOpenSSL::WrapOpenSSL ) -qt_extend_target(Network CONDITION QT_FEATURE_openssl AND QT_FEATURE_ssl AND NOT QT_FEATURE_openssl_linked +qt_internal_extend_target(Network CONDITION QT_FEATURE_openssl AND QT_FEATURE_ssl AND NOT QT_FEATURE_openssl_linked LIBRARIES WrapOpenSSLHeaders::WrapOpenSSLHeaders ) -qt_extend_target(Network CONDITION QT_FEATURE_openssl AND QT_FEATURE_ssl AND WIN32 +qt_internal_extend_target(Network CONDITION QT_FEATURE_openssl AND QT_FEATURE_ssl AND WIN32 SOURCES ssl/qwindowscarootfetcher.cpp ssl/qwindowscarootfetcher_p.h LIBRARIES crypt32 ) -qt_extend_target(Network CONDITION QT_FEATURE_dnslookup AND UNIX AND NOT ANDROID AND NOT INTEGRITY +qt_internal_extend_target(Network CONDITION QT_FEATURE_dnslookup AND UNIX AND NOT ANDROID AND NOT INTEGRITY SOURCES kernel/qdnslookup_unix.cpp ) -qt_add_docs(Network +qt_internal_add_docs(Network doc/qtnetwork.qdocconf ) -qt_extend_target(Network CONDITION WIN32 PUBLIC_LIBRARIES ws2_32) # special case: mkspecs/common/msvc-desktop.conf +qt_internal_extend_target(Network CONDITION WIN32 PUBLIC_LIBRARIES ws2_32) # special case: mkspecs/common/msvc-desktop.conf -qt_extend_target(Network CONDITION QNX PUBLIC_LIBRARIES socket) # special case: mkspecs/common/qcc-base-qnx.conf +qt_internal_extend_target(Network CONDITION QNX PUBLIC_LIBRARIES socket) # special case: mkspecs/common/qcc-base-qnx.conf diff --git a/src/opengl/.prev_CMakeLists.txt b/src/opengl/.prev_CMakeLists.txt index 1d8544ab8e0..a6e2e565613 100644 --- a/src/opengl/.prev_CMakeLists.txt +++ b/src/opengl/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## OpenGL Module: ##################################################################### -qt_add_module(OpenGL +qt_internal_add_module(OpenGL SOURCES qopengl2pexvertexarray.cpp qopengl2pexvertexarray_p.h qopenglbuffer.cpp qopenglbuffer.h @@ -49,12 +49,12 @@ qt_add_module(OpenGL ## Scopes: ##################################################################### -qt_extend_target(OpenGL CONDITION QT_FEATURE_opengles2 +qt_internal_extend_target(OpenGL CONDITION QT_FEATURE_opengles2 SOURCES qopenglfunctions_es2.cpp qopenglfunctions_es2.h ) -qt_extend_target(OpenGL CONDITION NOT QT_FEATURE_opengles2 +qt_internal_extend_target(OpenGL CONDITION NOT QT_FEATURE_opengles2 SOURCES qopenglfunctions_1_0.cpp qopenglfunctions_1_0.h qopenglfunctions_1_1.cpp qopenglfunctions_1_1.h @@ -86,22 +86,22 @@ qt_extend_target(OpenGL CONDITION NOT QT_FEATURE_opengles2 qopengltimerquery.cpp qopengltimerquery.h ) -qt_extend_target(OpenGL CONDITION QT_FEATURE_vulkan +qt_internal_extend_target(OpenGL CONDITION QT_FEATURE_vulkan SOURCES qvkconvenience.cpp qvkconvenience_p.h PUBLIC_LIBRARIES Vulkan::Vulkan_nolink ) -qt_extend_target(OpenGL CONDITION QT_FEATURE_egl +qt_internal_extend_target(OpenGL CONDITION QT_FEATURE_egl SOURCES qopenglcompositor.cpp qopenglcompositor_p.h qopenglcompositorbackingstore.cpp qopenglcompositorbackingstore_p.h ) -qt_create_tracepoints(OpenGL qtopengl.tracepoints) -qt_add_docs(OpenGL +qt_internal_create_tracepoints(OpenGL qtopengl.tracepoints) +qt_internal_add_docs(OpenGL doc/qtopengl.qdocconf ) diff --git a/src/opengl/CMakeLists.txt b/src/opengl/CMakeLists.txt index 781301dc0f6..a6e2e565613 100644 --- a/src/opengl/CMakeLists.txt +++ b/src/opengl/CMakeLists.txt @@ -4,7 +4,7 @@ ## OpenGL Module: ##################################################################### -qt_add_module(OpenGL +qt_internal_add_module(OpenGL SOURCES qopengl2pexvertexarray.cpp qopengl2pexvertexarray_p.h qopenglbuffer.cpp qopenglbuffer.h @@ -49,12 +49,12 @@ qt_add_module(OpenGL ## Scopes: ##################################################################### -qt_extend_target(OpenGL CONDITION QT_FEATURE_opengles2 +qt_internal_extend_target(OpenGL CONDITION QT_FEATURE_opengles2 SOURCES qopenglfunctions_es2.cpp qopenglfunctions_es2.h ) -qt_extend_target(OpenGL CONDITION NOT QT_FEATURE_opengles2 +qt_internal_extend_target(OpenGL CONDITION NOT QT_FEATURE_opengles2 SOURCES qopenglfunctions_1_0.cpp qopenglfunctions_1_0.h qopenglfunctions_1_1.cpp qopenglfunctions_1_1.h @@ -86,21 +86,22 @@ qt_extend_target(OpenGL CONDITION NOT QT_FEATURE_opengles2 qopengltimerquery.cpp qopengltimerquery.h ) -qt_extend_target(OpenGL CONDITION QT_FEATURE_vulkan +qt_internal_extend_target(OpenGL CONDITION QT_FEATURE_vulkan SOURCES qvkconvenience.cpp qvkconvenience_p.h PUBLIC_LIBRARIES Vulkan::Vulkan_nolink ) -qt_extend_target(OpenGL CONDITION QT_FEATURE_egl +qt_internal_extend_target(OpenGL CONDITION QT_FEATURE_egl SOURCES qopenglcompositor.cpp qopenglcompositor_p.h qopenglcompositorbackingstore.cpp qopenglcompositorbackingstore_p.h ) -qt_create_tracepoints(OpenGL qtopengl.tracepoints) -qt_add_docs(OpenGL + +qt_internal_create_tracepoints(OpenGL qtopengl.tracepoints) +qt_internal_add_docs(OpenGL doc/qtopengl.qdocconf ) diff --git a/src/openglwidgets/CMakeLists.txt b/src/openglwidgets/CMakeLists.txt index d58944e596f..2a34171cca3 100644 --- a/src/openglwidgets/CMakeLists.txt +++ b/src/openglwidgets/CMakeLists.txt @@ -4,7 +4,7 @@ ## OpenGLWidgets Module: ##################################################################### -qt_add_module(OpenGLWidgets +qt_internal_add_module(OpenGLWidgets SOURCES qopenglwidget.cpp qopenglwidget.h DEFINES diff --git a/src/platformsupport/devicediscovery/.prev_CMakeLists.txt b/src/platformsupport/devicediscovery/.prev_CMakeLists.txt index 8ecabb4a1b4..dcbc74363b3 100644 --- a/src/platformsupport/devicediscovery/.prev_CMakeLists.txt +++ b/src/platformsupport/devicediscovery/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## DeviceDiscoverySupport Module: ##################################################################### -qt_add_module(DeviceDiscoverySupport +qt_internal_add_module(DeviceDiscoverySupport STATIC INTERNAL_MODULE SOURCES @@ -22,19 +22,19 @@ qt_add_module(DeviceDiscoverySupport ## Scopes: ##################################################################### -qt_extend_target(DeviceDiscoverySupport CONDITION QT_FEATURE_libudev +qt_internal_extend_target(DeviceDiscoverySupport CONDITION QT_FEATURE_libudev SOURCES qdevicediscovery_udev.cpp qdevicediscovery_udev_p.h LIBRARIES PkgConfig::Libudev ) -qt_extend_target(DeviceDiscoverySupport CONDITION QT_FEATURE_evdev AND NOT QT_FEATURE_libudev +qt_internal_extend_target(DeviceDiscoverySupport CONDITION QT_FEATURE_evdev AND NOT QT_FEATURE_libudev SOURCES qdevicediscovery_static.cpp qdevicediscovery_static_p.h ) -qt_extend_target(DeviceDiscoverySupport CONDITION NOT QT_FEATURE_evdev AND NOT QT_FEATURE_libudev +qt_internal_extend_target(DeviceDiscoverySupport CONDITION NOT QT_FEATURE_evdev AND NOT QT_FEATURE_libudev SOURCES qdevicediscovery_dummy.cpp qdevicediscovery_dummy_p.h ) diff --git a/src/platformsupport/devicediscovery/CMakeLists.txt b/src/platformsupport/devicediscovery/CMakeLists.txt index 171db55f5b3..5eede39e681 100644 --- a/src/platformsupport/devicediscovery/CMakeLists.txt +++ b/src/platformsupport/devicediscovery/CMakeLists.txt @@ -4,7 +4,7 @@ ## DeviceDiscoverySupport Module: ##################################################################### -qt_add_module(DeviceDiscoverySupport +qt_internal_add_module(DeviceDiscoverySupport CONFIG_MODULE_NAME devicediscovery_support # special case STATIC INTERNAL_MODULE @@ -23,19 +23,19 @@ qt_add_module(DeviceDiscoverySupport ## Scopes: ##################################################################### -qt_extend_target(DeviceDiscoverySupport CONDITION QT_FEATURE_libudev +qt_internal_extend_target(DeviceDiscoverySupport CONDITION QT_FEATURE_libudev SOURCES qdevicediscovery_udev.cpp qdevicediscovery_udev_p.h LIBRARIES PkgConfig::Libudev ) -qt_extend_target(DeviceDiscoverySupport CONDITION QT_FEATURE_evdev AND NOT QT_FEATURE_libudev +qt_internal_extend_target(DeviceDiscoverySupport CONDITION QT_FEATURE_evdev AND NOT QT_FEATURE_libudev SOURCES qdevicediscovery_static.cpp qdevicediscovery_static_p.h ) -qt_extend_target(DeviceDiscoverySupport CONDITION NOT QT_FEATURE_evdev AND NOT QT_FEATURE_libudev +qt_internal_extend_target(DeviceDiscoverySupport CONDITION NOT QT_FEATURE_evdev AND NOT QT_FEATURE_libudev SOURCES qdevicediscovery_dummy.cpp qdevicediscovery_dummy_p.h ) diff --git a/src/platformsupport/fbconvenience/CMakeLists.txt b/src/platformsupport/fbconvenience/CMakeLists.txt index 804b2c15ecb..c310cb1faa0 100644 --- a/src/platformsupport/fbconvenience/CMakeLists.txt +++ b/src/platformsupport/fbconvenience/CMakeLists.txt @@ -4,7 +4,7 @@ ## FbSupport Module: ##################################################################### -qt_add_module(FbSupport +qt_internal_add_module(FbSupport STATIC INTERNAL_MODULE SOURCES diff --git a/src/platformsupport/input/.prev_CMakeLists.txt b/src/platformsupport/input/.prev_CMakeLists.txt index b2e95790328..17d3748ea2d 100644 --- a/src/platformsupport/input/.prev_CMakeLists.txt +++ b/src/platformsupport/input/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## InputSupport Module: ##################################################################### -qt_add_module(InputSupport +qt_internal_add_module(InputSupport STATIC INTERNAL_MODULE DEFINES @@ -23,7 +23,7 @@ qt_add_module(InputSupport ## Scopes: ##################################################################### -qt_extend_target(InputSupport CONDITION QT_FEATURE_evdev +qt_internal_extend_target(InputSupport CONDITION QT_FEATURE_evdev SOURCES evdevkeyboard/qevdevkeyboard_defaultmap_p.h evdevkeyboard/qevdevkeyboardhandler.cpp evdevkeyboard/qevdevkeyboardhandler_p.h @@ -36,35 +36,35 @@ qt_extend_target(InputSupport CONDITION QT_FEATURE_evdev evdevtouch/../shared ) -qt_extend_target(InputSupport CONDITION QT_FEATURE_evdev AND QT_FEATURE_tabletevent +qt_internal_extend_target(InputSupport CONDITION QT_FEATURE_evdev AND QT_FEATURE_tabletevent SOURCES evdevtablet/qevdevtablethandler.cpp evdevtablet/qevdevtablethandler_p.h evdevtablet/qevdevtabletmanager.cpp evdevtablet/qevdevtabletmanager_p.h ) -qt_extend_target(InputSupport CONDITION QT_FEATURE_evdev AND QT_FEATURE_libudev AND QT_FEATURE_tabletevent +qt_internal_extend_target(InputSupport CONDITION QT_FEATURE_evdev AND QT_FEATURE_libudev AND QT_FEATURE_tabletevent LIBRARIES PkgConfig::Libudev ) -qt_extend_target(InputSupport CONDITION QT_FEATURE_evdev AND QT_FEATURE_libudev +qt_internal_extend_target(InputSupport CONDITION QT_FEATURE_evdev AND QT_FEATURE_libudev LIBRARIES PkgConfig::Libudev ) -qt_extend_target(InputSupport CONDITION QT_FEATURE_evdev AND QT_FEATURE_mtdev +qt_internal_extend_target(InputSupport CONDITION QT_FEATURE_evdev AND QT_FEATURE_mtdev LIBRARIES PkgConfig::Mtdev ) -qt_extend_target(InputSupport CONDITION QT_FEATURE_tslib +qt_internal_extend_target(InputSupport CONDITION QT_FEATURE_tslib SOURCES tslib/qtslib.cpp tslib/qtslib_p.h PUBLIC_LIBRARIES PkgConfig::Tslib ) -qt_extend_target(InputSupport CONDITION QT_FEATURE_libinput +qt_internal_extend_target(InputSupport CONDITION QT_FEATURE_libinput SOURCES libinput/qlibinputhandler.cpp libinput/qlibinputhandler_p.h libinput/qlibinputkeyboard.cpp libinput/qlibinputkeyboard_p.h @@ -77,19 +77,19 @@ qt_extend_target(InputSupport CONDITION QT_FEATURE_libinput PkgConfig::Libudev ) -qt_extend_target(InputSupport CONDITION QT_FEATURE_libinput AND QT_FEATURE_xkbcommon +qt_internal_extend_target(InputSupport CONDITION QT_FEATURE_libinput AND QT_FEATURE_xkbcommon LIBRARIES XKB::XKB ) -qt_extend_target(InputSupport CONDITION QT_FEATURE_evdev OR QT_FEATURE_libinput +qt_internal_extend_target(InputSupport CONDITION QT_FEATURE_evdev OR QT_FEATURE_libinput SOURCES shared/devicehandlerlist_p.h shared/qevdevutil.cpp shared/qevdevutil_p.h shared/qtouchoutputmapping.cpp shared/qtouchoutputmapping_p.h ) -qt_extend_target(InputSupport CONDITION QT_FEATURE_integrityhid +qt_internal_extend_target(InputSupport CONDITION QT_FEATURE_integrityhid SOURCES integrityhid/qintegrityhidmanager.cpp integrityhid/qintegrityhidmanager.h LIBRARIES diff --git a/src/platformsupport/input/CMakeLists.txt b/src/platformsupport/input/CMakeLists.txt index 5b0c3104187..0d6c3a34ae0 100644 --- a/src/platformsupport/input/CMakeLists.txt +++ b/src/platformsupport/input/CMakeLists.txt @@ -9,7 +9,7 @@ qt_find_package(Mtdev) # special case ## InputSupport Module: ##################################################################### -qt_add_module(InputSupport +qt_internal_add_module(InputSupport STATIC INTERNAL_MODULE DEFINES @@ -28,7 +28,7 @@ qt_add_module(InputSupport ## Scopes: ##################################################################### -qt_extend_target(InputSupport CONDITION QT_FEATURE_evdev +qt_internal_extend_target(InputSupport CONDITION QT_FEATURE_evdev SOURCES evdevkeyboard/qevdevkeyboard_defaultmap_p.h evdevkeyboard/qevdevkeyboardhandler.cpp evdevkeyboard/qevdevkeyboardhandler_p.h @@ -41,35 +41,35 @@ qt_extend_target(InputSupport CONDITION QT_FEATURE_evdev evdevtouch/../shared ) -qt_extend_target(InputSupport CONDITION QT_FEATURE_evdev AND QT_FEATURE_tabletevent +qt_internal_extend_target(InputSupport CONDITION QT_FEATURE_evdev AND QT_FEATURE_tabletevent SOURCES evdevtablet/qevdevtablethandler.cpp evdevtablet/qevdevtablethandler_p.h evdevtablet/qevdevtabletmanager.cpp evdevtablet/qevdevtabletmanager_p.h ) -qt_extend_target(InputSupport CONDITION QT_FEATURE_evdev AND QT_FEATURE_libudev AND QT_FEATURE_tabletevent +qt_internal_extend_target(InputSupport CONDITION QT_FEATURE_evdev AND QT_FEATURE_libudev AND QT_FEATURE_tabletevent LIBRARIES PkgConfig::Libudev ) -qt_extend_target(InputSupport CONDITION QT_FEATURE_evdev AND QT_FEATURE_libudev +qt_internal_extend_target(InputSupport CONDITION QT_FEATURE_evdev AND QT_FEATURE_libudev LIBRARIES PkgConfig::Libudev ) -qt_extend_target(InputSupport CONDITION QT_FEATURE_evdev AND QT_FEATURE_mtdev +qt_internal_extend_target(InputSupport CONDITION QT_FEATURE_evdev AND QT_FEATURE_mtdev LIBRARIES PkgConfig::Mtdev ) -qt_extend_target(InputSupport CONDITION QT_FEATURE_tslib +qt_internal_extend_target(InputSupport CONDITION QT_FEATURE_tslib SOURCES tslib/qtslib.cpp tslib/qtslib_p.h PUBLIC_LIBRARIES PkgConfig::Tslib ) -qt_extend_target(InputSupport CONDITION QT_FEATURE_libinput +qt_internal_extend_target(InputSupport CONDITION QT_FEATURE_libinput SOURCES libinput/qlibinputhandler.cpp libinput/qlibinputhandler_p.h libinput/qlibinputkeyboard.cpp libinput/qlibinputkeyboard_p.h @@ -82,19 +82,19 @@ qt_extend_target(InputSupport CONDITION QT_FEATURE_libinput PkgConfig::Libudev ) -qt_extend_target(InputSupport CONDITION QT_FEATURE_libinput AND QT_FEATURE_xkbcommon +qt_internal_extend_target(InputSupport CONDITION QT_FEATURE_libinput AND QT_FEATURE_xkbcommon LIBRARIES XKB::XKB ) -qt_extend_target(InputSupport CONDITION QT_FEATURE_evdev OR QT_FEATURE_libinput +qt_internal_extend_target(InputSupport CONDITION QT_FEATURE_evdev OR QT_FEATURE_libinput SOURCES shared/devicehandlerlist_p.h shared/qevdevutil.cpp shared/qevdevutil_p.h shared/qtouchoutputmapping.cpp shared/qtouchoutputmapping_p.h ) -qt_extend_target(InputSupport CONDITION QT_FEATURE_integrityhid +qt_internal_extend_target(InputSupport CONDITION QT_FEATURE_integrityhid SOURCES integrityhid/qintegrityhidmanager.cpp integrityhid/qintegrityhidmanager.h LIBRARIES diff --git a/src/platformsupport/kmsconvenience/.prev_CMakeLists.txt b/src/platformsupport/kmsconvenience/.prev_CMakeLists.txt index 5b0fd005661..cc037d9ef58 100644 --- a/src/platformsupport/kmsconvenience/.prev_CMakeLists.txt +++ b/src/platformsupport/kmsconvenience/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## KmsSupport Module: ##################################################################### -qt_add_module(KmsSupport +qt_internal_add_module(KmsSupport STATIC INTERNAL_MODULE SOURCES diff --git a/src/platformsupport/kmsconvenience/CMakeLists.txt b/src/platformsupport/kmsconvenience/CMakeLists.txt index 8001ee27ded..d53dcda19f9 100644 --- a/src/platformsupport/kmsconvenience/CMakeLists.txt +++ b/src/platformsupport/kmsconvenience/CMakeLists.txt @@ -6,7 +6,7 @@ qt_find_package(Libdrm) # special case ## KmsSupport Module: ##################################################################### -qt_add_module(KmsSupport +qt_internal_add_module(KmsSupport STATIC INTERNAL_MODULE SOURCES diff --git a/src/plugins/imageformats/jpeg/.prev_CMakeLists.txt b/src/plugins/imageformats/jpeg/.prev_CMakeLists.txt index 95b3aceff5d..bab14249d68 100644 --- a/src/plugins/imageformats/jpeg/.prev_CMakeLists.txt +++ b/src/plugins/imageformats/jpeg/.prev_CMakeLists.txt @@ -23,12 +23,12 @@ qt_internal_add_plugin(QJpegPlugin ## Scopes: ##################################################################### -qt_extend_target(QJpegPlugin CONDITION QT_FEATURE_system_jpeg +qt_internal_extend_target(QJpegPlugin CONDITION QT_FEATURE_system_jpeg PUBLIC_LIBRARIES JPEG::JPEG ) -qt_extend_target(QJpegPlugin CONDITION NOT QT_FEATURE_system_jpeg +qt_internal_extend_target(QJpegPlugin CONDITION NOT QT_FEATURE_system_jpeg SOURCES ../../../3rdparty/libjpeg/src/jaricom.c ../../../3rdparty/libjpeg/src/jcapimin.c @@ -88,7 +88,7 @@ qt_extend_target(QJpegPlugin CONDITION NOT QT_FEATURE_system_jpeg #### Keys ignored in scope 5:.:../../../3rdparty:../../../3rdparty/libjpeg.pri:GCC: # QMAKE_CFLAGS_WARN_ON = "-Wno-unused-parameter" "-Wno-main" -qt_extend_target(QJpegPlugin CONDITION MSVC AND NOT QT_FEATURE_system_jpeg +qt_internal_extend_target(QJpegPlugin CONDITION MSVC AND NOT QT_FEATURE_system_jpeg DEFINES _CRT_SECURE_NO_WARNINGS ) diff --git a/src/plugins/imageformats/jpeg/CMakeLists.txt b/src/plugins/imageformats/jpeg/CMakeLists.txt index 52c3aa69111..7e69e1aba65 100644 --- a/src/plugins/imageformats/jpeg/CMakeLists.txt +++ b/src/plugins/imageformats/jpeg/CMakeLists.txt @@ -25,12 +25,12 @@ qt_internal_add_plugin(QJpegPlugin ## Scopes: ##################################################################### -qt_extend_target(QJpegPlugin CONDITION QT_FEATURE_system_jpeg +qt_internal_extend_target(QJpegPlugin CONDITION QT_FEATURE_system_jpeg PUBLIC_LIBRARIES JPEG::JPEG ) -qt_extend_target(QJpegPlugin CONDITION NOT QT_FEATURE_system_jpeg +qt_internal_extend_target(QJpegPlugin CONDITION NOT QT_FEATURE_system_jpeg SOURCES ../../../3rdparty/libjpeg/src/jaricom.c ../../../3rdparty/libjpeg/src/jcapimin.c @@ -98,7 +98,7 @@ endif() #### Keys ignored in scope 5:.:../../../3rdparty:../../../3rdparty/libjpeg.pri:GCC: # QMAKE_CFLAGS_WARN_ON = "-Wno-unused-parameter" "-Wno-main" -qt_extend_target(QJpegPlugin CONDITION MSVC AND NOT QT_FEATURE_system_jpeg +qt_internal_extend_target(QJpegPlugin CONDITION MSVC AND NOT QT_FEATURE_system_jpeg DEFINES _CRT_SECURE_NO_WARNINGS ) diff --git a/src/plugins/platforms/android/.prev_CMakeLists.txt b/src/plugins/platforms/android/.prev_CMakeLists.txt index 5b2dada6535..7345de1f818 100644 --- a/src/plugins/platforms/android/.prev_CMakeLists.txt +++ b/src/plugins/platforms/android/.prev_CMakeLists.txt @@ -60,17 +60,17 @@ qt_internal_add_plugin(QAndroidIntegrationPlugin ## Scopes: ##################################################################### -qt_extend_target(QAndroidIntegrationPlugin CONDITION QT_FEATURE_android_style_assets +qt_internal_extend_target(QAndroidIntegrationPlugin CONDITION QT_FEATURE_android_style_assets SOURCES extract.cpp ) -qt_extend_target(QAndroidIntegrationPlugin CONDITION NOT QT_FEATURE_android_style_assets +qt_internal_extend_target(QAndroidIntegrationPlugin CONDITION NOT QT_FEATURE_android_style_assets SOURCES extract-dummy.cpp ) -qt_extend_target(QAndroidIntegrationPlugin CONDITION QT_FEATURE_vulkan +qt_internal_extend_target(QAndroidIntegrationPlugin CONDITION QT_FEATURE_vulkan SOURCES qandroidplatformvulkaninstance.cpp qandroidplatformvulkaninstance.h qandroidplatformvulkanwindow.cpp qandroidplatformvulkanwindow.h diff --git a/src/plugins/platforms/android/CMakeLists.txt b/src/plugins/platforms/android/CMakeLists.txt index 7fcd42a9bbc..2e323325b00 100644 --- a/src/plugins/platforms/android/CMakeLists.txt +++ b/src/plugins/platforms/android/CMakeLists.txt @@ -63,17 +63,17 @@ qt_internal_add_plugin(QAndroidIntegrationPlugin ## Scopes: ##################################################################### -qt_extend_target(QAndroidIntegrationPlugin CONDITION QT_FEATURE_android_style_assets +qt_internal_extend_target(QAndroidIntegrationPlugin CONDITION QT_FEATURE_android_style_assets SOURCES extract.cpp ) -qt_extend_target(QAndroidIntegrationPlugin CONDITION NOT QT_FEATURE_android_style_assets +qt_internal_extend_target(QAndroidIntegrationPlugin CONDITION NOT QT_FEATURE_android_style_assets SOURCES extract-dummy.cpp ) -qt_extend_target(QAndroidIntegrationPlugin CONDITION QT_FEATURE_vulkan +qt_internal_extend_target(QAndroidIntegrationPlugin CONDITION QT_FEATURE_vulkan SOURCES qandroidplatformvulkaninstance.cpp qandroidplatformvulkaninstance.h qandroidplatformvulkanwindow.cpp qandroidplatformvulkanwindow.h diff --git a/src/plugins/platforms/cocoa/.prev_CMakeLists.txt b/src/plugins/platforms/cocoa/.prev_CMakeLists.txt index ee40e32033d..d42cf811d59 100644 --- a/src/plugins/platforms/cocoa/.prev_CMakeLists.txt +++ b/src/plugins/platforms/cocoa/.prev_CMakeLists.txt @@ -67,7 +67,7 @@ set(qcocoaresources_resource_files "images/waitcursor.png" ) -qt_add_resource(QCocoaIntegrationPlugin "qcocoaresources" +qt_internal_add_resource(QCocoaIntegrationPlugin "qcocoaresources" PREFIX "/qt-project.org/mac/cursors" FILES @@ -81,23 +81,23 @@ qt_add_resource(QCocoaIntegrationPlugin "qcocoaresources" ## Scopes: ##################################################################### -qt_extend_target(QCocoaIntegrationPlugin CONDITION QT_FEATURE_opengl +qt_internal_extend_target(QCocoaIntegrationPlugin CONDITION QT_FEATURE_opengl SOURCES qcocoaglcontext.h qcocoaglcontext.mm ) -qt_extend_target(QCocoaIntegrationPlugin CONDITION QT_FEATURE_vulkan +qt_internal_extend_target(QCocoaIntegrationPlugin CONDITION QT_FEATURE_vulkan SOURCES qcocoavulkaninstance.h qcocoavulkaninstance.mm ) -qt_extend_target(QCocoaIntegrationPlugin CONDITION QT_FEATURE_accessibility +qt_internal_extend_target(QCocoaIntegrationPlugin CONDITION QT_FEATURE_accessibility SOURCES qcocoaaccessibility.h qcocoaaccessibility.mm qcocoaaccessibilityelement.h qcocoaaccessibilityelement.mm ) -qt_extend_target(QCocoaIntegrationPlugin CONDITION QT_FEATURE_sessionmanager +qt_internal_extend_target(QCocoaIntegrationPlugin CONDITION QT_FEATURE_sessionmanager SOURCES qcocoasessionmanager.cpp qcocoasessionmanager.h ) diff --git a/src/plugins/platforms/cocoa/CMakeLists.txt b/src/plugins/platforms/cocoa/CMakeLists.txt index 51d70389502..d9832c2c6c1 100644 --- a/src/plugins/platforms/cocoa/CMakeLists.txt +++ b/src/plugins/platforms/cocoa/CMakeLists.txt @@ -77,7 +77,7 @@ set(qcocoaresources_resource_files "images/waitcursor.png" ) -qt_add_resource(QCocoaIntegrationPlugin "qcocoaresources" +qt_internal_add_resource(QCocoaIntegrationPlugin "qcocoaresources" PREFIX "/qt-project.org/mac/cursors" FILES @@ -91,23 +91,23 @@ qt_add_resource(QCocoaIntegrationPlugin "qcocoaresources" ## Scopes: ##################################################################### -qt_extend_target(QCocoaIntegrationPlugin CONDITION QT_FEATURE_opengl +qt_internal_extend_target(QCocoaIntegrationPlugin CONDITION QT_FEATURE_opengl SOURCES qcocoaglcontext.h qcocoaglcontext.mm ) -qt_extend_target(QCocoaIntegrationPlugin CONDITION QT_FEATURE_vulkan +qt_internal_extend_target(QCocoaIntegrationPlugin CONDITION QT_FEATURE_vulkan SOURCES qcocoavulkaninstance.h qcocoavulkaninstance.mm ) -qt_extend_target(QCocoaIntegrationPlugin CONDITION QT_FEATURE_accessibility +qt_internal_extend_target(QCocoaIntegrationPlugin CONDITION QT_FEATURE_accessibility SOURCES qcocoaaccessibility.h qcocoaaccessibility.mm qcocoaaccessibilityelement.h qcocoaaccessibilityelement.mm ) -qt_extend_target(QCocoaIntegrationPlugin CONDITION QT_FEATURE_sessionmanager +qt_internal_extend_target(QCocoaIntegrationPlugin CONDITION QT_FEATURE_sessionmanager SOURCES qcocoasessionmanager.cpp qcocoasessionmanager.h ) diff --git a/src/plugins/platforms/directfb/.prev_CMakeLists.txt b/src/plugins/platforms/directfb/.prev_CMakeLists.txt index c6957d57ec0..074c9eff3fe 100644 --- a/src/plugins/platforms/directfb/.prev_CMakeLists.txt +++ b/src/plugins/platforms/directfb/.prev_CMakeLists.txt @@ -32,14 +32,14 @@ qt_internal_add_plugin(QDirectFbIntegrationPlugin ## Scopes: ##################################################################### -qt_extend_target(QDirectFbIntegrationPlugin CONDITION QT_CONFIG___contains___directfb_egl +qt_internal_extend_target(QDirectFbIntegrationPlugin CONDITION QT_CONFIG___contains___directfb_egl SOURCES qdirectfb_egl.cpp qdirectfb_egl.h DEFINES DIRECTFB_GL_EGL ) -qt_extend_target(QDirectFbIntegrationPlugin CONDITION NOT DIRECTFB_PLATFORM_HOOKS_SOURCES_ISEMPTY +qt_internal_extend_target(QDirectFbIntegrationPlugin CONDITION NOT DIRECTFB_PLATFORM_HOOKS_SOURCES_ISEMPTY DEFINES DIRECTFB_PLATFORM_HOOKS ) @@ -47,7 +47,7 @@ qt_extend_target(QDirectFbIntegrationPlugin CONDITION NOT DIRECTFB_PLATFORM_HOOK #### Keys ignored in scope 3:.:.:directfb.pro:NOT DIRECTFB_PLATFORM_HOOKS_SOURCES_ISEMPTY: # QMAKE_LIBDIR = "$$DIRECTFB_PLATFORM_HOOKS_LIBDIR" -qt_extend_target(QDirectFbIntegrationPlugin CONDITION DIRECTFB_PLATFORM_HOOKS_SOURCES_ISEMPTY +qt_internal_extend_target(QDirectFbIntegrationPlugin CONDITION DIRECTFB_PLATFORM_HOOKS_SOURCES_ISEMPTY SOURCES qdirectfbeglhooks_stub.cpp ) diff --git a/src/plugins/platforms/directfb/CMakeLists.txt b/src/plugins/platforms/directfb/CMakeLists.txt index 5e4a2f2baac..c66d8bd169e 100644 --- a/src/plugins/platforms/directfb/CMakeLists.txt +++ b/src/plugins/platforms/directfb/CMakeLists.txt @@ -38,14 +38,14 @@ qt_internal_add_plugin(QDirectFbIntegrationPlugin ## Scopes: ##################################################################### -qt_extend_target(QDirectFbIntegrationPlugin CONDITION QT_CONFIG___contains___directfb_egl +qt_internal_extend_target(QDirectFbIntegrationPlugin CONDITION QT_CONFIG___contains___directfb_egl SOURCES qdirectfb_egl.cpp qdirectfb_egl.h DEFINES DIRECTFB_GL_EGL ) -qt_extend_target(QDirectFbIntegrationPlugin CONDITION NOT DIRECTFB_PLATFORM_HOOKS_SOURCES_ISEMPTY +qt_internal_extend_target(QDirectFbIntegrationPlugin CONDITION NOT DIRECTFB_PLATFORM_HOOKS_SOURCES_ISEMPTY DEFINES DIRECTFB_PLATFORM_HOOKS ) @@ -53,7 +53,7 @@ qt_extend_target(QDirectFbIntegrationPlugin CONDITION NOT DIRECTFB_PLATFORM_HOOK #### Keys ignored in scope 3:.:.:directfb.pro:NOT DIRECTFB_PLATFORM_HOOKS_SOURCES_ISEMPTY: # QMAKE_LIBDIR = "$$DIRECTFB_PLATFORM_HOOKS_LIBDIR" -qt_extend_target(QDirectFbIntegrationPlugin CONDITION DIRECTFB_PLATFORM_HOOKS_SOURCES_ISEMPTY +qt_internal_extend_target(QDirectFbIntegrationPlugin CONDITION DIRECTFB_PLATFORM_HOOKS_SOURCES_ISEMPTY SOURCES qdirectfbeglhooks_stub.cpp ) diff --git a/src/plugins/platforms/eglfs/.prev_CMakeLists.txt b/src/plugins/platforms/eglfs/.prev_CMakeLists.txt index 2fbaf4d0181..cd1acc22e28 100644 --- a/src/plugins/platforms/eglfs/.prev_CMakeLists.txt +++ b/src/plugins/platforms/eglfs/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## EglFSDeviceIntegration Module: ##################################################################### -qt_add_module(EglFSDeviceIntegration +qt_internal_add_module(EglFSDeviceIntegration INTERNAL_MODULE SOURCES api/qeglfsdeviceintegration.cpp api/qeglfsdeviceintegration_p.h @@ -32,12 +32,12 @@ qt_add_module(EglFSDeviceIntegration ## Scopes: ##################################################################### -qt_extend_target(EglFSDeviceIntegration CONDITION TARGET Qt::InputSupportPrivate +qt_internal_extend_target(EglFSDeviceIntegration CONDITION TARGET Qt::InputSupportPrivate PUBLIC_LIBRARIES Qt::InputSupportPrivate ) -qt_extend_target(EglFSDeviceIntegration CONDITION QT_FEATURE_opengl +qt_internal_extend_target(EglFSDeviceIntegration CONDITION QT_FEATURE_opengl SOURCES api/qeglfscontext.cpp api/qeglfscontext_p.h api/qeglfscursor.cpp api/qeglfscursor_p.h @@ -45,12 +45,12 @@ qt_extend_target(EglFSDeviceIntegration CONDITION QT_FEATURE_opengl Qt::OpenGLPrivate ) -qt_extend_target(EglFSDeviceIntegration CONDITION NOT EGLFS_PLATFORM_HOOKS_SOURCES_ISEMPTY +qt_internal_extend_target(EglFSDeviceIntegration CONDITION NOT EGLFS_PLATFORM_HOOKS_SOURCES_ISEMPTY DEFINES EGLFS_PLATFORM_HOOKS ) -qt_extend_target(EglFSDeviceIntegration CONDITION NOT EGLFS_DEVICE_INTEGRATION_ISEMPTY +qt_internal_extend_target(EglFSDeviceIntegration CONDITION NOT EGLFS_DEVICE_INTEGRATION_ISEMPTY DEFINES EGLFS_PREFERRED_PLUGIN= ) @@ -62,7 +62,7 @@ if(QT_FEATURE_cursor) "cursor.json" ) - qt_add_resource(EglFSDeviceIntegration "cursor" + qt_internal_add_resource(EglFSDeviceIntegration "cursor" PREFIX "/" FILES @@ -70,7 +70,7 @@ if(QT_FEATURE_cursor) ) endif() -qt_extend_target(EglFSDeviceIntegration CONDITION QT_FEATURE_vulkan +qt_internal_extend_target(EglFSDeviceIntegration CONDITION QT_FEATURE_vulkan SOURCES api/vulkan/qeglfsvulkaninstance.cpp api/vulkan/qeglfsvulkaninstance_p.h api/vulkan/qeglfsvulkanwindow.cpp api/vulkan/qeglfsvulkanwindow_p.h diff --git a/src/plugins/platforms/eglfs/CMakeLists.txt b/src/plugins/platforms/eglfs/CMakeLists.txt index f74a15f9e64..00b24aa03c8 100644 --- a/src/plugins/platforms/eglfs/CMakeLists.txt +++ b/src/plugins/platforms/eglfs/CMakeLists.txt @@ -5,7 +5,7 @@ qt_find_package(EGL) # special case ## EglFSDeviceIntegration Module: ##################################################################### -qt_add_module(EglFSDeviceIntegration +qt_internal_add_module(EglFSDeviceIntegration INTERNAL_MODULE SOURCES api/qeglfsdeviceintegration.cpp api/qeglfsdeviceintegration_p.h @@ -34,12 +34,12 @@ qt_add_module(EglFSDeviceIntegration ## Scopes: ##################################################################### -qt_extend_target(EglFSDeviceIntegration CONDITION TARGET Qt::InputSupportPrivate +qt_internal_extend_target(EglFSDeviceIntegration CONDITION TARGET Qt::InputSupportPrivate PUBLIC_LIBRARIES Qt::InputSupportPrivate ) -qt_extend_target(EglFSDeviceIntegration CONDITION QT_FEATURE_opengl +qt_internal_extend_target(EglFSDeviceIntegration CONDITION QT_FEATURE_opengl SOURCES api/qeglfscontext.cpp api/qeglfscontext_p.h api/qeglfscursor.cpp api/qeglfscursor_p.h @@ -49,12 +49,12 @@ qt_extend_target(EglFSDeviceIntegration CONDITION QT_FEATURE_opengl # special case begin # comment out -#qt_extend_target(EglFSDeviceIntegration CONDITION NOT EGLFS_PLATFORM_HOOKS_SOURCES_ISEMPTY +#qt_internal_extend_target(EglFSDeviceIntegration CONDITION NOT EGLFS_PLATFORM_HOOKS_SOURCES_ISEMPTY #DEFINES #EGLFS_PLATFORM_HOOKS #) -#qt_extend_target(EglFSDeviceIntegration CONDITION NOT EGLFS_DEVICE_INTEGRATION_ISEMPTY +#qt_internal_extend_target(EglFSDeviceIntegration CONDITION NOT EGLFS_DEVICE_INTEGRATION_ISEMPTY #DEFINES #EGLFS_PREFERRED_PLUGIN= #) @@ -67,7 +67,7 @@ if(QT_FEATURE_cursor) "cursor.json" ) - qt_add_resource(EglFSDeviceIntegration "cursor" + qt_internal_add_resource(EglFSDeviceIntegration "cursor" PREFIX "/" FILES @@ -75,7 +75,7 @@ if(QT_FEATURE_cursor) ) endif() -qt_extend_target(EglFSDeviceIntegration CONDITION QT_FEATURE_vulkan +qt_internal_extend_target(EglFSDeviceIntegration CONDITION QT_FEATURE_vulkan SOURCES api/vulkan/qeglfsvulkaninstance.cpp api/vulkan/qeglfsvulkaninstance_p.h api/vulkan/qeglfsvulkanwindow.cpp api/vulkan/qeglfsvulkanwindow_p.h diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/CMakeLists.txt b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/CMakeLists.txt index 61ae1b932ab..61b5470cdfd 100644 --- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/CMakeLists.txt +++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/CMakeLists.txt @@ -32,7 +32,7 @@ qt_internal_add_plugin(QEglFSKmsEglDeviceIntegrationPlugin # OTHER_FILES = "$$PWD/eglfs_kms_egldevice.json" # begin special case -qt_extend_target(QEglFSKmsEglDeviceIntegrationPlugin +qt_internal_extend_target(QEglFSKmsEglDeviceIntegrationPlugin CONDITION QNX COMPILE_OPTIONS -fpermissive ) diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/.prev_CMakeLists.txt b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/.prev_CMakeLists.txt index ec11b355af2..3d600c52f13 100644 --- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/.prev_CMakeLists.txt +++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## EglFsKmsSupport Module: ##################################################################### -qt_add_module(EglFsKmsSupport +qt_internal_add_module(EglFsKmsSupport INTERNAL_MODULE NO_MODULE_HEADERS SOURCES diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/CMakeLists.txt b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/CMakeLists.txt index 0090dbb1eed..d71f1407f83 100644 --- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/CMakeLists.txt +++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/CMakeLists.txt @@ -4,7 +4,7 @@ ## EglFsKmsSupport Module: ##################################################################### -qt_add_module(EglFsKmsSupport +qt_internal_add_module(EglFsKmsSupport INTERNAL_MODULE NO_MODULE_HEADERS SOURCES @@ -28,7 +28,7 @@ qt_add_module(EglFsKmsSupport ) # begin special case -qt_extend_target(EglFsKmsSupport +qt_internal_extend_target(EglFsKmsSupport CONDITION QNX COMPILE_OPTIONS -fpermissive ) diff --git a/src/plugins/platforms/ios/.prev_CMakeLists.txt b/src/plugins/platforms/ios/.prev_CMakeLists.txt index 138f323878b..2e494c7d23f 100644 --- a/src/plugins/platforms/ios/.prev_CMakeLists.txt +++ b/src/plugins/platforms/ios/.prev_CMakeLists.txt @@ -42,12 +42,12 @@ qt_internal_add_plugin(QIOSIntegrationPlugin ## Scopes: ##################################################################### -qt_extend_target(QIOSIntegrationPlugin CONDITION QT_FEATURE_opengl +qt_internal_extend_target(QIOSIntegrationPlugin CONDITION QT_FEATURE_opengl PUBLIC_LIBRARIES Qt::OpenGLPrivate ) -qt_extend_target(QIOSIntegrationPlugin CONDITION NOT TVOS +qt_internal_extend_target(QIOSIntegrationPlugin CONDITION NOT TVOS SOURCES qiosclipboard.h qiosclipboard.mm qiosdocumentpickercontroller.h qiosdocumentpickercontroller.mm diff --git a/src/plugins/platforms/ios/CMakeLists.txt b/src/plugins/platforms/ios/CMakeLists.txt index 995dcc0a9d6..e238cf70fa7 100644 --- a/src/plugins/platforms/ios/CMakeLists.txt +++ b/src/plugins/platforms/ios/CMakeLists.txt @@ -45,12 +45,12 @@ qt_disable_apple_app_extension_api_only(QIOSIntegrationPlugin) ## Scopes: ##################################################################### -qt_extend_target(QIOSIntegrationPlugin CONDITION QT_FEATURE_opengl +qt_internal_extend_target(QIOSIntegrationPlugin CONDITION QT_FEATURE_opengl PUBLIC_LIBRARIES Qt::OpenGLPrivate ) -qt_extend_target(QIOSIntegrationPlugin CONDITION NOT TVOS +qt_internal_extend_target(QIOSIntegrationPlugin CONDITION NOT TVOS SOURCES qiosclipboard.h qiosclipboard.mm qiosdocumentpickercontroller.h qiosdocumentpickercontroller.mm diff --git a/src/plugins/platforms/linuxfb/.prev_CMakeLists.txt b/src/plugins/platforms/linuxfb/.prev_CMakeLists.txt index 258b70603ef..920404ec77f 100644 --- a/src/plugins/platforms/linuxfb/.prev_CMakeLists.txt +++ b/src/plugins/platforms/linuxfb/.prev_CMakeLists.txt @@ -27,12 +27,12 @@ qt_internal_add_plugin(QLinuxFbIntegrationPlugin ## Scopes: ##################################################################### -qt_extend_target(QLinuxFbIntegrationPlugin CONDITION TARGET Qt::InputSupportPrivate +qt_internal_extend_target(QLinuxFbIntegrationPlugin CONDITION TARGET Qt::InputSupportPrivate PUBLIC_LIBRARIES Qt::InputSupportPrivate ) -qt_extend_target(QLinuxFbIntegrationPlugin CONDITION TARGET Qt::KmsSupportPrivate +qt_internal_extend_target(QLinuxFbIntegrationPlugin CONDITION TARGET Qt::KmsSupportPrivate SOURCES qlinuxfbdrmscreen.cpp qlinuxfbdrmscreen.h PUBLIC_LIBRARIES diff --git a/src/plugins/platforms/linuxfb/CMakeLists.txt b/src/plugins/platforms/linuxfb/CMakeLists.txt index ea5642f1c00..d903fdc6a73 100644 --- a/src/plugins/platforms/linuxfb/CMakeLists.txt +++ b/src/plugins/platforms/linuxfb/CMakeLists.txt @@ -28,12 +28,12 @@ qt_internal_add_plugin(QLinuxFbIntegrationPlugin ## Scopes: ##################################################################### -qt_extend_target(QLinuxFbIntegrationPlugin CONDITION TARGET Qt::InputSupportPrivate +qt_internal_extend_target(QLinuxFbIntegrationPlugin CONDITION TARGET Qt::InputSupportPrivate PUBLIC_LIBRARIES Qt::InputSupportPrivate ) -qt_extend_target(QLinuxFbIntegrationPlugin CONDITION TARGET Qt::KmsSupportPrivate +qt_internal_extend_target(QLinuxFbIntegrationPlugin CONDITION TARGET Qt::KmsSupportPrivate SOURCES qlinuxfbdrmscreen.cpp qlinuxfbdrmscreen.h PUBLIC_LIBRARIES diff --git a/src/plugins/platforms/minimal/.prev_CMakeLists.txt b/src/plugins/platforms/minimal/.prev_CMakeLists.txt index bb670b4dd48..b51b64ef990 100644 --- a/src/plugins/platforms/minimal/.prev_CMakeLists.txt +++ b/src/plugins/platforms/minimal/.prev_CMakeLists.txt @@ -26,7 +26,7 @@ qt_internal_add_plugin(QMinimalIntegrationPlugin ## Scopes: ##################################################################### -qt_extend_target(QMinimalIntegrationPlugin CONDITION QT_FEATURE_freetype +qt_internal_extend_target(QMinimalIntegrationPlugin CONDITION QT_FEATURE_freetype LIBRARIES WrapFreetype::WrapFreetype ) diff --git a/src/plugins/platforms/minimal/CMakeLists.txt b/src/plugins/platforms/minimal/CMakeLists.txt index bf2e644251b..3f6945ed262 100644 --- a/src/plugins/platforms/minimal/CMakeLists.txt +++ b/src/plugins/platforms/minimal/CMakeLists.txt @@ -29,7 +29,7 @@ qt_internal_add_plugin(QMinimalIntegrationPlugin ## Scopes: ##################################################################### -qt_extend_target(QMinimalIntegrationPlugin CONDITION QT_FEATURE_freetype +qt_internal_extend_target(QMinimalIntegrationPlugin CONDITION QT_FEATURE_freetype LIBRARIES WrapFreetype::WrapFreetype ) diff --git a/src/plugins/platforms/minimalegl/.prev_CMakeLists.txt b/src/plugins/platforms/minimalegl/.prev_CMakeLists.txt index 15ce608f042..9483f417625 100644 --- a/src/plugins/platforms/minimalegl/.prev_CMakeLists.txt +++ b/src/plugins/platforms/minimalegl/.prev_CMakeLists.txt @@ -27,7 +27,7 @@ qt_internal_add_plugin(QMinimalEglIntegrationPlugin ## Scopes: ##################################################################### -qt_extend_target(QMinimalEglIntegrationPlugin CONDITION QT_FEATURE_opengl +qt_internal_extend_target(QMinimalEglIntegrationPlugin CONDITION QT_FEATURE_opengl SOURCES qminimaleglbackingstore.cpp qminimaleglbackingstore.h PUBLIC_LIBRARIES diff --git a/src/plugins/platforms/minimalegl/CMakeLists.txt b/src/plugins/platforms/minimalegl/CMakeLists.txt index beb4d54257b..1758eb3af01 100644 --- a/src/plugins/platforms/minimalegl/CMakeLists.txt +++ b/src/plugins/platforms/minimalegl/CMakeLists.txt @@ -30,7 +30,7 @@ qt_internal_add_plugin(QMinimalEglIntegrationPlugin ## Scopes: ##################################################################### -qt_extend_target(QMinimalEglIntegrationPlugin CONDITION QT_FEATURE_opengl +qt_internal_extend_target(QMinimalEglIntegrationPlugin CONDITION QT_FEATURE_opengl SOURCES qminimaleglbackingstore.cpp qminimaleglbackingstore.h PUBLIC_LIBRARIES diff --git a/src/plugins/platforms/offscreen/.prev_CMakeLists.txt b/src/plugins/platforms/offscreen/.prev_CMakeLists.txt index 319502ccc6a..aa827366d35 100644 --- a/src/plugins/platforms/offscreen/.prev_CMakeLists.txt +++ b/src/plugins/platforms/offscreen/.prev_CMakeLists.txt @@ -27,7 +27,7 @@ qt_internal_add_plugin(QOffscreenIntegrationPlugin ## Scopes: ##################################################################### -qt_extend_target(QOffscreenIntegrationPlugin CONDITION QT_FEATURE_opengl AND QT_FEATURE_xlib AND NOT QT_FEATURE_opengles2 +qt_internal_extend_target(QOffscreenIntegrationPlugin CONDITION QT_FEATURE_opengl AND QT_FEATURE_xlib AND NOT QT_FEATURE_opengles2 SOURCES qoffscreenintegration_x11.cpp qoffscreenintegration_x11.h LIBRARIES diff --git a/src/plugins/platforms/offscreen/CMakeLists.txt b/src/plugins/platforms/offscreen/CMakeLists.txt index 7a312701c69..160aa7df93f 100644 --- a/src/plugins/platforms/offscreen/CMakeLists.txt +++ b/src/plugins/platforms/offscreen/CMakeLists.txt @@ -28,7 +28,7 @@ qt_internal_add_plugin(QOffscreenIntegrationPlugin ## Scopes: ##################################################################### -qt_extend_target(QOffscreenIntegrationPlugin CONDITION QT_FEATURE_opengl AND QT_FEATURE_xlib AND NOT QT_FEATURE_opengles2 +qt_internal_extend_target(QOffscreenIntegrationPlugin CONDITION QT_FEATURE_opengl AND QT_FEATURE_xlib AND NOT QT_FEATURE_opengles2 SOURCES qoffscreenintegration_x11.cpp qoffscreenintegration_x11.h LIBRARIES diff --git a/src/plugins/platforms/vnc/.prev_CMakeLists.txt b/src/plugins/platforms/vnc/.prev_CMakeLists.txt index ab11e57f0dc..48e172ed70e 100644 --- a/src/plugins/platforms/vnc/.prev_CMakeLists.txt +++ b/src/plugins/platforms/vnc/.prev_CMakeLists.txt @@ -30,7 +30,7 @@ qt_internal_add_plugin(QVncIntegrationPlugin ## Scopes: ##################################################################### -qt_extend_target(QVncIntegrationPlugin CONDITION TARGET Qt::InputSupportPrivate +qt_internal_extend_target(QVncIntegrationPlugin CONDITION TARGET Qt::InputSupportPrivate PUBLIC_LIBRARIES Qt::InputSupportPrivate ) diff --git a/src/plugins/platforms/vnc/CMakeLists.txt b/src/plugins/platforms/vnc/CMakeLists.txt index 5024459cf4b..f3782b54346 100644 --- a/src/plugins/platforms/vnc/CMakeLists.txt +++ b/src/plugins/platforms/vnc/CMakeLists.txt @@ -31,7 +31,7 @@ qt_internal_add_plugin(QVncIntegrationPlugin ## Scopes: ##################################################################### -qt_extend_target(QVncIntegrationPlugin CONDITION TARGET Qt::InputSupportPrivate +qt_internal_extend_target(QVncIntegrationPlugin CONDITION TARGET Qt::InputSupportPrivate PUBLIC_LIBRARIES Qt::InputSupportPrivate ) diff --git a/src/plugins/platforms/windows/.prev_CMakeLists.txt b/src/plugins/platforms/windows/.prev_CMakeLists.txt index d3e488ed201..cbb7bbcaa87 100644 --- a/src/plugins/platforms/windows/.prev_CMakeLists.txt +++ b/src/plugins/platforms/windows/.prev_CMakeLists.txt @@ -69,7 +69,7 @@ set(openglblacklists_resource_files "openglblacklists/default.json" ) -qt_add_resource(QWindowsIntegrationPlugin "openglblacklists" +qt_internal_add_resource(QWindowsIntegrationPlugin "openglblacklists" PREFIX "/qt-project.org/windows/openglblacklists" FILES @@ -83,7 +83,7 @@ qt_add_resource(QWindowsIntegrationPlugin "openglblacklists" ## Scopes: ##################################################################### -qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_opengl +qt_internal_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_opengl SOURCES qwindowsglcontext.cpp qwindowsglcontext.h qwindowsopenglcontext.h @@ -94,44 +94,44 @@ qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_opengl #### Keys ignored in scope 3:.:.:windows.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN: # PLUGIN_EXTENDS = "-" -qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_opengl AND NOT QT_FEATURE_dynamicgl +qt_internal_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_opengl AND NOT QT_FEATURE_dynamicgl PUBLIC_LIBRARIES opengl32 ) -qt_extend_target(QWindowsIntegrationPlugin CONDITION MINGW +qt_internal_extend_target(QWindowsIntegrationPlugin CONDITION MINGW PUBLIC_LIBRARIES uuid ) -qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_systemtrayicon +qt_internal_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_systemtrayicon SOURCES qwindowssystemtrayicon.cpp qwindowssystemtrayicon.h ) -qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_vulkan +qt_internal_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_vulkan SOURCES qwindowsvulkaninstance.cpp qwindowsvulkaninstance.h ) -qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_clipboard +qt_internal_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_clipboard SOURCES qwindowsclipboard.cpp qwindowsclipboard.h ) -qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_clipboard AND QT_FEATURE_draganddrop +qt_internal_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_clipboard AND QT_FEATURE_draganddrop SOURCES qwindowsdrag.cpp qwindowsdrag.h ) -qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_tabletevent +qt_internal_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_tabletevent SOURCES qwindowstabletsupport.cpp qwindowstabletsupport.h INCLUDE_DIRECTORIES ${QT_SOURCE_TREE}/src/3rdparty/wintab ) -qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_sessionmanager +qt_internal_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_sessionmanager SOURCES qwindowssessionmanager.cpp qwindowssessionmanager.h ) @@ -162,7 +162,7 @@ if(QT_FEATURE_imageformat_png) "images/splitvcursor_64.png" ) - qt_add_resource(QWindowsIntegrationPlugin "cursors" + qt_internal_add_resource(QWindowsIntegrationPlugin "cursors" PREFIX "/qt-project.org/windows/cursors" FILES @@ -170,7 +170,7 @@ if(QT_FEATURE_imageformat_png) ) endif() -qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_accessibility +qt_internal_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_accessibility SOURCES uiautomation/qwindowsuiaaccessibility.cpp uiautomation/qwindowsuiaaccessibility.h uiautomation/qwindowsuiabaseprovider.cpp uiautomation/qwindowsuiabaseprovider.h @@ -193,7 +193,7 @@ qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_accessibility uiautomation/qwindowsuiawindowprovider.cpp uiautomation/qwindowsuiawindowprovider.h ) -qt_extend_target(QWindowsIntegrationPlugin CONDITION MINGW AND QT_FEATURE_accessibility +qt_internal_extend_target(QWindowsIntegrationPlugin CONDITION MINGW AND QT_FEATURE_accessibility PUBLIC_LIBRARIES uuid ) diff --git a/src/plugins/platforms/windows/CMakeLists.txt b/src/plugins/platforms/windows/CMakeLists.txt index fe12102811c..2f1182190db 100644 --- a/src/plugins/platforms/windows/CMakeLists.txt +++ b/src/plugins/platforms/windows/CMakeLists.txt @@ -70,7 +70,7 @@ set(openglblacklists_resource_files "openglblacklists/default.json" ) -qt_add_resource(QWindowsIntegrationPlugin "openglblacklists" +qt_internal_add_resource(QWindowsIntegrationPlugin "openglblacklists" PREFIX "/qt-project.org/windows/openglblacklists" FILES @@ -84,7 +84,7 @@ qt_add_resource(QWindowsIntegrationPlugin "openglblacklists" ## Scopes: ##################################################################### -qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_opengl +qt_internal_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_opengl SOURCES qwindowsglcontext.cpp qwindowsglcontext.h qwindowsopenglcontext.h @@ -95,44 +95,44 @@ qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_opengl #### Keys ignored in scope 3:.:.:windows.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN: # PLUGIN_EXTENDS = "-" -qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_opengl AND NOT QT_FEATURE_dynamicgl +qt_internal_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_opengl AND NOT QT_FEATURE_dynamicgl PUBLIC_LIBRARIES opengl32 ) -qt_extend_target(QWindowsIntegrationPlugin CONDITION MINGW +qt_internal_extend_target(QWindowsIntegrationPlugin CONDITION MINGW PUBLIC_LIBRARIES uuid ) -qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_systemtrayicon +qt_internal_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_systemtrayicon SOURCES qwindowssystemtrayicon.cpp qwindowssystemtrayicon.h ) -qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_vulkan +qt_internal_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_vulkan SOURCES qwindowsvulkaninstance.cpp qwindowsvulkaninstance.h ) -qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_clipboard +qt_internal_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_clipboard SOURCES qwindowsclipboard.cpp qwindowsclipboard.h ) -qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_clipboard AND QT_FEATURE_draganddrop +qt_internal_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_clipboard AND QT_FEATURE_draganddrop SOURCES qwindowsdrag.cpp qwindowsdrag.h ) -qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_tabletevent +qt_internal_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_tabletevent SOURCES qwindowstabletsupport.cpp qwindowstabletsupport.h INCLUDE_DIRECTORIES ${QT_SOURCE_TREE}/src/3rdparty/wintab ) -qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_sessionmanager +qt_internal_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_sessionmanager SOURCES qwindowssessionmanager.cpp qwindowssessionmanager.h ) @@ -163,7 +163,7 @@ if(QT_FEATURE_imageformat_png) "images/splitvcursor_64.png" ) - qt_add_resource(QWindowsIntegrationPlugin "cursors" + qt_internal_add_resource(QWindowsIntegrationPlugin "cursors" PREFIX "/qt-project.org/windows/cursors" FILES @@ -171,7 +171,7 @@ if(QT_FEATURE_imageformat_png) ) endif() -qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_accessibility +qt_internal_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_accessibility SOURCES uiautomation/qwindowsuiaaccessibility.cpp uiautomation/qwindowsuiaaccessibility.h uiautomation/qwindowsuiabaseprovider.cpp uiautomation/qwindowsuiabaseprovider.h @@ -194,7 +194,7 @@ qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_accessibility uiautomation/qwindowsuiawindowprovider.cpp uiautomation/qwindowsuiawindowprovider.h ) -qt_extend_target(QWindowsIntegrationPlugin CONDITION MINGW AND QT_FEATURE_accessibility +qt_internal_extend_target(QWindowsIntegrationPlugin CONDITION MINGW AND QT_FEATURE_accessibility PUBLIC_LIBRARIES uuid ) diff --git a/src/plugins/platforms/xcb/.prev_CMakeLists.txt b/src/plugins/platforms/xcb/.prev_CMakeLists.txt index 67802a85ae2..58f635c081f 100644 --- a/src/plugins/platforms/xcb/.prev_CMakeLists.txt +++ b/src/plugins/platforms/xcb/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## XcbQpa Module: ##################################################################### -qt_add_module(XcbQpa +qt_internal_add_module(XcbQpa INTERNAL_MODULE NO_MODULE_HEADERS SOURCES @@ -61,50 +61,50 @@ qt_add_module(XcbQpa ## Scopes: ##################################################################### -qt_extend_target(XcbQpa CONDITION QT_FEATURE_opengl +qt_internal_extend_target(XcbQpa CONDITION QT_FEATURE_opengl PUBLIC_LIBRARIES Qt::OpenGLPrivate ) -qt_extend_target(XcbQpa CONDITION QT_FEATURE_glib +qt_internal_extend_target(XcbQpa CONDITION QT_FEATURE_glib LIBRARIES GLIB2::GLIB2 ) -qt_extend_target(XcbQpa CONDITION QT_FEATURE_draganddrop +qt_internal_extend_target(XcbQpa CONDITION QT_FEATURE_draganddrop SOURCES qxcbdrag.cpp qxcbdrag.h ) -qt_extend_target(XcbQpa CONDITION QT_FEATURE_xcb_xlib +qt_internal_extend_target(XcbQpa CONDITION QT_FEATURE_xcb_xlib PUBLIC_LIBRARIES X11::XCB ) -qt_extend_target(XcbQpa CONDITION QT_FEATURE_xcb_sm +qt_internal_extend_target(XcbQpa CONDITION QT_FEATURE_xcb_sm SOURCES qxcbsessionmanager.cpp qxcbsessionmanager.h PUBLIC_LIBRARIES ${X11_SM_LIB} ${X11_ICE_LIB} ) -qt_extend_target(XcbQpa CONDITION QT_FEATURE_vulkan +qt_internal_extend_target(XcbQpa CONDITION QT_FEATURE_vulkan SOURCES qxcbvulkaninstance.cpp qxcbvulkaninstance.h qxcbvulkanwindow.cpp qxcbvulkanwindow.h ) -qt_extend_target(XcbQpa CONDITION QT_FEATURE_dlopen +qt_internal_extend_target(XcbQpa CONDITION QT_FEATURE_dlopen PUBLIC_LIBRARIES ${CMAKE_DL_LIBS} ) -qt_extend_target(XcbQpa CONDITION CLANG AND NOT ICC +qt_internal_extend_target(XcbQpa CONDITION CLANG AND NOT ICC COMPILE_OPTIONS -ftemplate-depth=1024 ) -qt_extend_target(XcbQpa CONDITION QT_FEATURE_xcb_native_painting +qt_internal_extend_target(XcbQpa CONDITION QT_FEATURE_xcb_native_painting SOURCES nativepainting/qbackingstore_x11.cpp nativepainting/qbackingstore_x11_p.h nativepainting/qcolormap_x11.cpp nativepainting/qcolormap_x11_p.h @@ -117,12 +117,12 @@ qt_extend_target(XcbQpa CONDITION QT_FEATURE_xcb_native_painting nativepainting ) -qt_extend_target(XcbQpa CONDITION QT_FEATURE_xcb_native_painting AND QT_FEATURE_xrender +qt_internal_extend_target(XcbQpa CONDITION QT_FEATURE_xcb_native_painting AND QT_FEATURE_xrender PUBLIC_LIBRARIES PkgConfig::XRender ) -qt_extend_target(XcbQpa CONDITION QT_FEATURE_fontconfig AND QT_FEATURE_xcb_native_painting +qt_internal_extend_target(XcbQpa CONDITION QT_FEATURE_fontconfig AND QT_FEATURE_xcb_native_painting LIBRARIES WrapFreetype::WrapFreetype ) diff --git a/src/plugins/platforms/xcb/CMakeLists.txt b/src/plugins/platforms/xcb/CMakeLists.txt index 182ec53d8be..7e78e9502f5 100644 --- a/src/plugins/platforms/xcb/CMakeLists.txt +++ b/src/plugins/platforms/xcb/CMakeLists.txt @@ -4,7 +4,7 @@ ## XcbQpa Module: ##################################################################### -qt_add_module(XcbQpa +qt_internal_add_module(XcbQpa INTERNAL_MODULE NO_MODULE_HEADERS SOURCES @@ -65,22 +65,22 @@ qt_disable_apple_app_extension_api_only(XcbQpa) ## Scopes: ##################################################################### -qt_extend_target(XcbQpa CONDITION QT_FEATURE_opengl +qt_internal_extend_target(XcbQpa CONDITION QT_FEATURE_opengl PUBLIC_LIBRARIES Qt::OpenGLPrivate ) -qt_extend_target(XcbQpa CONDITION QT_FEATURE_glib +qt_internal_extend_target(XcbQpa CONDITION QT_FEATURE_glib LIBRARIES GLIB2::GLIB2 ) -qt_extend_target(XcbQpa CONDITION QT_FEATURE_draganddrop +qt_internal_extend_target(XcbQpa CONDITION QT_FEATURE_draganddrop SOURCES qxcbdrag.cpp qxcbdrag.h ) -qt_extend_target(XcbQpa CONDITION QT_FEATURE_xcb_xlib +qt_internal_extend_target(XcbQpa CONDITION QT_FEATURE_xcb_xlib PUBLIC_LIBRARIES X11::XCB # special case begin @@ -91,30 +91,30 @@ qt_extend_target(XcbQpa CONDITION QT_FEATURE_xcb_xlib # special case end ) -qt_extend_target(XcbQpa CONDITION QT_FEATURE_xcb_sm +qt_internal_extend_target(XcbQpa CONDITION QT_FEATURE_xcb_sm SOURCES qxcbsessionmanager.cpp qxcbsessionmanager.h PUBLIC_LIBRARIES ${X11_SM_LIB} ${X11_ICE_LIB} ) -qt_extend_target(XcbQpa CONDITION QT_FEATURE_vulkan +qt_internal_extend_target(XcbQpa CONDITION QT_FEATURE_vulkan SOURCES qxcbvulkaninstance.cpp qxcbvulkaninstance.h qxcbvulkanwindow.cpp qxcbvulkanwindow.h ) -qt_extend_target(XcbQpa CONDITION QT_FEATURE_dlopen +qt_internal_extend_target(XcbQpa CONDITION QT_FEATURE_dlopen PUBLIC_LIBRARIES ${CMAKE_DL_LIBS} ) -qt_extend_target(XcbQpa CONDITION CLANG AND NOT ICC +qt_internal_extend_target(XcbQpa CONDITION CLANG AND NOT ICC COMPILE_OPTIONS -ftemplate-depth=1024 ) -qt_extend_target(XcbQpa CONDITION QT_FEATURE_xcb_native_painting +qt_internal_extend_target(XcbQpa CONDITION QT_FEATURE_xcb_native_painting SOURCES nativepainting/qbackingstore_x11.cpp nativepainting/qbackingstore_x11_p.h nativepainting/qcolormap_x11.cpp nativepainting/qcolormap_x11_p.h @@ -127,19 +127,19 @@ qt_extend_target(XcbQpa CONDITION QT_FEATURE_xcb_native_painting nativepainting ) -qt_extend_target(XcbQpa CONDITION QT_FEATURE_xcb_native_painting AND QT_FEATURE_xrender +qt_internal_extend_target(XcbQpa CONDITION QT_FEATURE_xcb_native_painting AND QT_FEATURE_xrender PUBLIC_LIBRARIES PkgConfig::XRender ) -qt_extend_target(XcbQpa CONDITION QT_FEATURE_fontconfig AND QT_FEATURE_xcb_native_painting +qt_internal_extend_target(XcbQpa CONDITION QT_FEATURE_fontconfig AND QT_FEATURE_xcb_native_painting LIBRARIES WrapFreetype::WrapFreetype ) # special case begin if(TARGET XCB::XINPUT) - qt_extend_target(XcbQpa LIBRARIES XCB::XINPUT) + qt_internal_extend_target(XcbQpa LIBRARIES XCB::XINPUT) else() set(xinput_source "${PROJECT_SOURCE_DIR}/src/3rdparty/xcb/libxcb/xinput.c") set_source_files_properties( diff --git a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/CMakeLists.txt b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/CMakeLists.txt index 94d9b603105..24cdf8f6363 100644 --- a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/CMakeLists.txt +++ b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/CMakeLists.txt @@ -29,12 +29,12 @@ qt_internal_add_plugin(QXcbGlxIntegrationPlugin ## Scopes: ##################################################################### -qt_extend_target(QXcbGlxIntegrationPlugin CONDITION QT_FEATURE_xcb_glx +qt_internal_extend_target(QXcbGlxIntegrationPlugin CONDITION QT_FEATURE_xcb_glx PUBLIC_LIBRARIES XCB::GLX ) -qt_extend_target(QXcbGlxIntegrationPlugin CONDITION QT_FEATURE_dlopen AND NOT static +qt_internal_extend_target(QXcbGlxIntegrationPlugin CONDITION QT_FEATURE_dlopen AND NOT static PUBLIC_LIBRARIES ${CMAKE_DL_LIBS} ) diff --git a/src/plugins/sqldrivers/db2/CMakeLists.txt b/src/plugins/sqldrivers/db2/CMakeLists.txt index cebd2165927..061eeae2fd8 100644 --- a/src/plugins/sqldrivers/db2/CMakeLists.txt +++ b/src/plugins/sqldrivers/db2/CMakeLists.txt @@ -26,7 +26,7 @@ qt_internal_add_plugin(QDB2DriverPlugin ## Scopes: ##################################################################### -qt_extend_target(QDB2DriverPlugin CONDITION (TEST_architecture_arch STREQUAL "x86_64") +qt_internal_extend_target(QDB2DriverPlugin CONDITION (TEST_architecture_arch STREQUAL "x86_64") DEFINES ODBC64 ) diff --git a/src/plugins/sqldrivers/oci/CMakeLists.txt b/src/plugins/sqldrivers/oci/CMakeLists.txt index 93af813691f..617fce8453d 100644 --- a/src/plugins/sqldrivers/oci/CMakeLists.txt +++ b/src/plugins/sqldrivers/oci/CMakeLists.txt @@ -26,7 +26,7 @@ qt_internal_add_plugin(QOCIDriverPlugin ## Scopes: ##################################################################### -qt_extend_target(QOCIDriverPlugin CONDITION APPLE +qt_internal_extend_target(QOCIDriverPlugin CONDITION APPLE LINK_OPTIONS "-Wl,-flat_namespace,-U,_environ" ) diff --git a/src/plugins/sqldrivers/odbc/.prev_CMakeLists.txt b/src/plugins/sqldrivers/odbc/.prev_CMakeLists.txt index 5c71b578c0b..0411d271ccc 100644 --- a/src/plugins/sqldrivers/odbc/.prev_CMakeLists.txt +++ b/src/plugins/sqldrivers/odbc/.prev_CMakeLists.txt @@ -26,7 +26,7 @@ qt_internal_add_plugin(QODBCDriverPlugin ## Scopes: ##################################################################### -qt_extend_target(QODBCDriverPlugin CONDITION UNIX +qt_internal_extend_target(QODBCDriverPlugin CONDITION UNIX DEFINES UNICODE ) diff --git a/src/plugins/sqldrivers/odbc/CMakeLists.txt b/src/plugins/sqldrivers/odbc/CMakeLists.txt index ab8f1eb2b69..1c86a79acf4 100644 --- a/src/plugins/sqldrivers/odbc/CMakeLists.txt +++ b/src/plugins/sqldrivers/odbc/CMakeLists.txt @@ -28,7 +28,7 @@ qt_internal_add_plugin(QODBCDriverPlugin ## Scopes: ##################################################################### -qt_extend_target(QODBCDriverPlugin CONDITION UNIX +qt_internal_extend_target(QODBCDriverPlugin CONDITION UNIX DEFINES UNICODE ) diff --git a/src/plugins/sqldrivers/sqlite/.prev_CMakeLists.txt b/src/plugins/sqldrivers/sqlite/.prev_CMakeLists.txt index 25796d9bb58..c34e2119f92 100644 --- a/src/plugins/sqldrivers/sqlite/.prev_CMakeLists.txt +++ b/src/plugins/sqldrivers/sqlite/.prev_CMakeLists.txt @@ -26,12 +26,12 @@ qt_internal_add_plugin(QSQLiteDriverPlugin ## Scopes: ##################################################################### -qt_extend_target(QSQLiteDriverPlugin CONDITION QT_FEATURE_system_sqlite +qt_internal_extend_target(QSQLiteDriverPlugin CONDITION QT_FEATURE_system_sqlite PUBLIC_LIBRARIES SQLite::SQLite3 ) -qt_extend_target(QSQLiteDriverPlugin CONDITION NOT QT_FEATURE_system_sqlite +qt_internal_extend_target(QSQLiteDriverPlugin CONDITION NOT QT_FEATURE_system_sqlite SOURCES ../../../3rdparty/sqlite/sqlite3.c DEFINES @@ -46,37 +46,37 @@ qt_extend_target(QSQLiteDriverPlugin CONDITION NOT QT_FEATURE_system_sqlite ../../../3rdparty/sqlite ) -qt_extend_target(QSQLiteDriverPlugin CONDITION CMAKE_BUILD_TYPE STREQUAL Release AND NOT QT_FEATURE_system_sqlite +qt_internal_extend_target(QSQLiteDriverPlugin CONDITION CMAKE_BUILD_TYPE STREQUAL Release AND NOT QT_FEATURE_system_sqlite DEFINES NDEBUG ) -qt_extend_target(QSQLiteDriverPlugin CONDITION NOT QT_FEATURE_largefile AND NOT QT_FEATURE_system_sqlite +qt_internal_extend_target(QSQLiteDriverPlugin CONDITION NOT QT_FEATURE_largefile AND NOT QT_FEATURE_system_sqlite DEFINES SQLITE_DISABLE_LFS ) -qt_extend_target(QSQLiteDriverPlugin CONDITION QT_FEATURE_posix_fallocate AND NOT QT_FEATURE_system_sqlite +qt_internal_extend_target(QSQLiteDriverPlugin CONDITION QT_FEATURE_posix_fallocate AND NOT QT_FEATURE_system_sqlite DEFINES HAVE_POSIX_FALLOCATE=1 ) -qt_extend_target(QSQLiteDriverPlugin CONDITION QNX AND NOT QT_FEATURE_system_sqlite +qt_internal_extend_target(QSQLiteDriverPlugin CONDITION QNX AND NOT QT_FEATURE_system_sqlite DEFINES _QNX_SOURCE ) -qt_extend_target(QSQLiteDriverPlugin CONDITION UNIX AND NOT QT_FEATURE_system_sqlite +qt_internal_extend_target(QSQLiteDriverPlugin CONDITION UNIX AND NOT QT_FEATURE_system_sqlite DEFINES HAVE_USLEEP=1 ) -qt_extend_target(QSQLiteDriverPlugin CONDITION QT_FEATURE_dlopen AND NOT QT_FEATURE_system_sqlite +qt_internal_extend_target(QSQLiteDriverPlugin CONDITION QT_FEATURE_dlopen AND NOT QT_FEATURE_system_sqlite PUBLIC_LIBRARIES ${CMAKE_DL_LIBS} ) -qt_extend_target(QSQLiteDriverPlugin CONDITION NOT QT_FEATURE_dlopen AND NOT QT_FEATURE_system_sqlite +qt_internal_extend_target(QSQLiteDriverPlugin CONDITION NOT QT_FEATURE_dlopen AND NOT QT_FEATURE_system_sqlite DEFINES SQLITE_OMIT_LOAD_EXTENSION ) diff --git a/src/plugins/sqldrivers/sqlite/CMakeLists.txt b/src/plugins/sqldrivers/sqlite/CMakeLists.txt index 154516b5ffa..2da5233525c 100644 --- a/src/plugins/sqldrivers/sqlite/CMakeLists.txt +++ b/src/plugins/sqldrivers/sqlite/CMakeLists.txt @@ -26,7 +26,7 @@ qt_internal_add_plugin(QSQLiteDriverPlugin ## Scopes: ##################################################################### -qt_extend_target(QSQLiteDriverPlugin CONDITION QT_FEATURE_system_sqlite +qt_internal_extend_target(QSQLiteDriverPlugin CONDITION QT_FEATURE_system_sqlite PUBLIC_LIBRARIES SQLite::SQLite3 ) @@ -38,7 +38,7 @@ if (NOT QT_FEATURE_system_sqlite) endif() # special case end -qt_extend_target(QSQLiteDriverPlugin CONDITION NOT QT_FEATURE_system_sqlite +qt_internal_extend_target(QSQLiteDriverPlugin CONDITION NOT QT_FEATURE_system_sqlite SOURCES ../../../3rdparty/sqlite/sqlite3.c DEFINES @@ -53,37 +53,37 @@ qt_extend_target(QSQLiteDriverPlugin CONDITION NOT QT_FEATURE_system_sqlite ../../../3rdparty/sqlite ) -qt_extend_target(QSQLiteDriverPlugin CONDITION CMAKE_BUILD_TYPE STREQUAL Release AND NOT QT_FEATURE_system_sqlite +qt_internal_extend_target(QSQLiteDriverPlugin CONDITION CMAKE_BUILD_TYPE STREQUAL Release AND NOT QT_FEATURE_system_sqlite DEFINES NDEBUG ) -qt_extend_target(QSQLiteDriverPlugin CONDITION NOT QT_FEATURE_largefile AND NOT QT_FEATURE_system_sqlite +qt_internal_extend_target(QSQLiteDriverPlugin CONDITION NOT QT_FEATURE_largefile AND NOT QT_FEATURE_system_sqlite DEFINES SQLITE_DISABLE_LFS ) -qt_extend_target(QSQLiteDriverPlugin CONDITION QT_FEATURE_posix_fallocate AND NOT QT_FEATURE_system_sqlite +qt_internal_extend_target(QSQLiteDriverPlugin CONDITION QT_FEATURE_posix_fallocate AND NOT QT_FEATURE_system_sqlite DEFINES HAVE_POSIX_FALLOCATE=1 ) -qt_extend_target(QSQLiteDriverPlugin CONDITION QNX AND NOT QT_FEATURE_system_sqlite +qt_internal_extend_target(QSQLiteDriverPlugin CONDITION QNX AND NOT QT_FEATURE_system_sqlite DEFINES _QNX_SOURCE ) -qt_extend_target(QSQLiteDriverPlugin CONDITION UNIX AND NOT QT_FEATURE_system_sqlite +qt_internal_extend_target(QSQLiteDriverPlugin CONDITION UNIX AND NOT QT_FEATURE_system_sqlite DEFINES HAVE_USLEEP=1 ) -qt_extend_target(QSQLiteDriverPlugin CONDITION QT_FEATURE_dlopen AND NOT QT_FEATURE_system_sqlite +qt_internal_extend_target(QSQLiteDriverPlugin CONDITION QT_FEATURE_dlopen AND NOT QT_FEATURE_system_sqlite PUBLIC_LIBRARIES ${CMAKE_DL_LIBS} ) -qt_extend_target(QSQLiteDriverPlugin CONDITION NOT QT_FEATURE_dlopen AND NOT QT_FEATURE_system_sqlite +qt_internal_extend_target(QSQLiteDriverPlugin CONDITION NOT QT_FEATURE_dlopen AND NOT QT_FEATURE_system_sqlite DEFINES SQLITE_OMIT_LOAD_EXTENSION ) diff --git a/src/printsupport/CMakeLists.txt b/src/printsupport/CMakeLists.txt index 65c7a945a31..63720301485 100644 --- a/src/printsupport/CMakeLists.txt +++ b/src/printsupport/CMakeLists.txt @@ -4,7 +4,7 @@ ## PrintSupport Module: ##################################################################### -qt_add_module(PrintSupport +qt_internal_add_module(PrintSupport PLUGIN_TYPES printsupport SOURCES kernel/qpaintengine_alpha.cpp kernel/qpaintengine_alpha_p.h @@ -44,7 +44,7 @@ qt_add_module(PrintSupport ## Scopes: ##################################################################### -qt_extend_target(PrintSupport CONDITION MACOS +qt_internal_extend_target(PrintSupport CONDITION MACOS SOURCES platform/macos/qcocoaprintdevice.mm platform/macos/qcocoaprintdevice_p.h platform/macos/qcocoaprintersupport.mm platform/macos/qcocoaprintersupport_p.h @@ -57,13 +57,13 @@ qt_extend_target(PrintSupport CONDITION MACOS "platform/macos/qcocoaprintersupport.mm" ) -qt_extend_target(PrintSupport CONDITION QT_FEATURE_printpreviewwidget +qt_internal_extend_target(PrintSupport CONDITION QT_FEATURE_printpreviewwidget SOURCES kernel/qpaintengine_preview.cpp kernel/qpaintengine_preview_p.h widgets/qprintpreviewwidget.cpp widgets/qprintpreviewwidget.h ) -qt_extend_target(PrintSupport CONDITION WIN32 +qt_internal_extend_target(PrintSupport CONDITION WIN32 SOURCES kernel/qprintengine_win.cpp kernel/qprintengine_win_p.h LIBRARIES @@ -73,19 +73,19 @@ qt_extend_target(PrintSupport CONDITION WIN32 winspool ) -qt_extend_target(PrintSupport CONDITION QT_FEATURE_cups AND UNIX AND NOT APPLE +qt_internal_extend_target(PrintSupport CONDITION QT_FEATURE_cups AND UNIX AND NOT APPLE SOURCES kernel/qcups.cpp kernel/qcups_p.h ) -qt_extend_target(PrintSupport CONDITION QT_FEATURE_cupsjobwidget AND UNIX AND NOT APPLE +qt_internal_extend_target(PrintSupport CONDITION QT_FEATURE_cupsjobwidget AND UNIX AND NOT APPLE SOURCES widgets/qcupsjobwidget.cpp widgets/qcupsjobwidget.ui widgets/qcupsjobwidget_p.h ENABLE_AUTOGEN_TOOLS uic ) -qt_extend_target(PrintSupport CONDITION QT_FEATURE_printdialog +qt_internal_extend_target(PrintSupport CONDITION QT_FEATURE_printdialog SOURCES dialogs/qabstractprintdialog.cpp dialogs/qabstractprintdialog.h dialogs/qabstractprintdialog_p.h dialogs/qpagesetupdialog.cpp dialogs/qpagesetupdialog.h dialogs/qpagesetupdialog_p.h @@ -130,7 +130,7 @@ if(QT_FEATURE_printdialog) "images/zoom-out-32.png" ) - qt_add_resource(PrintSupport "qprintdialog" + qt_internal_add_resource(PrintSupport "qprintdialog" PREFIX "/qt-project.org/dialogs/qprintpreviewdialog" BASE @@ -143,7 +143,7 @@ if(QT_FEATURE_printdialog) "images/status-gray-scale.png" ) - qt_add_resource(PrintSupport "qprintdialog1" + qt_internal_add_resource(PrintSupport "qprintdialog1" PREFIX "/qt-project.org/dialogs/qprintdialog" BASE @@ -153,7 +153,7 @@ if(QT_FEATURE_printdialog) ) endif() -qt_extend_target(PrintSupport CONDITION MACOS AND QT_FEATURE_printdialog +qt_internal_extend_target(PrintSupport CONDITION MACOS AND QT_FEATURE_printdialog SOURCES dialogs/qpagesetupdialog_mac.mm dialogs/qprintdialog_mac.mm @@ -161,13 +161,13 @@ qt_extend_target(PrintSupport CONDITION MACOS AND QT_FEATURE_printdialog ${FWAppKit} ) -qt_extend_target(PrintSupport CONDITION QT_FEATURE_printdialog AND WIN32 +qt_internal_extend_target(PrintSupport CONDITION QT_FEATURE_printdialog AND WIN32 SOURCES dialogs/qpagesetupdialog_win.cpp dialogs/qprintdialog_win.cpp ) -qt_extend_target(PrintSupport CONDITION QT_FEATURE_printdialog AND UNIX AND NOT APPLE +qt_internal_extend_target(PrintSupport CONDITION QT_FEATURE_printdialog AND UNIX AND NOT APPLE SOURCES dialogs/qpagesetupdialog_unix.cpp dialogs/qpagesetupdialog_unix_p.h dialogs/qprintdialog_unix.cpp @@ -180,11 +180,11 @@ qt_extend_target(PrintSupport CONDITION QT_FEATURE_printdialog AND UNIX AND NOT uic ) -qt_extend_target(PrintSupport CONDITION QT_FEATURE_printpreviewdialog +qt_internal_extend_target(PrintSupport CONDITION QT_FEATURE_printpreviewdialog SOURCES dialogs/qprintpreviewdialog.cpp dialogs/qprintpreviewdialog.h ) -qt_add_docs(PrintSupport +qt_internal_add_docs(PrintSupport doc/qtprintsupport.qdocconf ) diff --git a/src/sql/CMakeLists.txt b/src/sql/CMakeLists.txt index 1bf3a3df2a7..43ec949fddb 100644 --- a/src/sql/CMakeLists.txt +++ b/src/sql/CMakeLists.txt @@ -4,7 +4,7 @@ ## Sql Module: ##################################################################### -qt_add_module(Sql +qt_internal_add_module(Sql PLUGIN_TYPES sqldrivers SOURCES kernel/qsqlcachedresult.cpp kernel/qsqlcachedresult_p.h @@ -39,19 +39,19 @@ qt_add_module(Sql ## Scopes: ##################################################################### -qt_extend_target(Sql CONDITION MSVC AND (TEST_architecture_arch STREQUAL "i386") +qt_internal_extend_target(Sql CONDITION MSVC AND (TEST_architecture_arch STREQUAL "i386") LINK_OPTIONS "/BASE:0x62000000" ) -qt_extend_target(Sql CONDITION QT_FEATURE_sqlmodel +qt_internal_extend_target(Sql CONDITION QT_FEATURE_sqlmodel SOURCES models/qsqlquerymodel.cpp models/qsqlquerymodel.h models/qsqlquerymodel_p.h models/qsqlrelationaldelegate.cpp models/qsqlrelationaldelegate.h models/qsqlrelationaltablemodel.cpp models/qsqlrelationaltablemodel.h models/qsqltablemodel.cpp models/qsqltablemodel.h models/qsqltablemodel_p.h ) -qt_add_docs(Sql +qt_internal_add_docs(Sql doc/qtsql.qdocconf ) diff --git a/src/testlib/.prev_CMakeLists.txt b/src/testlib/.prev_CMakeLists.txt index 2eef3edbeff..a00c4cef132 100644 --- a/src/testlib/.prev_CMakeLists.txt +++ b/src/testlib/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## Test Module: ##################################################################### -qt_add_module(Test +qt_internal_add_module(Test QMAKE_MODULE_CONFIG console testlib_defines EXCEPTIONS SOURCES @@ -72,29 +72,29 @@ qt_add_module(Test #### Keys ignored in scope 2:.:.:testlib.pro:UNIX AND NOT embedded: # QMAKE_PKGCONFIG_DESCRIPTION = "Qt" "Unit" "Testing" "Library" -qt_extend_target(Test CONDITION QT_FEATURE_itemmodeltester +qt_internal_extend_target(Test CONDITION QT_FEATURE_itemmodeltester SOURCES qabstractitemmodeltester.cpp qabstractitemmodeltester.h ) -qt_extend_target(Test CONDITION QT_FEATURE_valgrind +qt_internal_extend_target(Test CONDITION QT_FEATURE_valgrind SOURCES qbenchmarkvalgrind.cpp qbenchmarkvalgrind_p.h ) -qt_extend_target(Test CONDITION embedded +qt_internal_extend_target(Test CONDITION embedded COMPILE_OPTIONS -fno-rtti ) -qt_extend_target(Test CONDITION APPLE +qt_internal_extend_target(Test CONDITION APPLE SOURCES qappletestlogger.cpp qappletestlogger_p.h PUBLIC_LIBRARIES ${FWSecurity} ) -qt_extend_target(Test CONDITION MACOS +qt_internal_extend_target(Test CONDITION MACOS SOURCES qtestutil_macos.mm qtestutil_macos_p.h PUBLIC_LIBRARIES @@ -104,7 +104,7 @@ qt_extend_target(Test CONDITION MACOS ${FWIOKit} ) -qt_extend_target(Test CONDITION (APPLE) AND (OFF AND NOT lessThan(QMAKE_XCODE_VERSION, "6.0")) +qt_internal_extend_target(Test CONDITION (APPLE) AND (OFF AND NOT lessThan(QMAKE_XCODE_VERSION, "6.0")) SOURCES qxctestlogger.mm qxctestlogger_p.h DEFINES @@ -113,7 +113,7 @@ qt_extend_target(Test CONDITION (APPLE) AND (OFF AND NOT lessThan(QMAKE_XCODE_VE ${FWFoundation} ) -qt_extend_target(Test CONDITION ((APPLE) AND (OFF AND NOT lessThan(QMAKE_XCODE_VERSION, "6.0"))) AND (NOT QMAKE_MAC_SDK_PLATFORM_PATH_ISEMPTY) +qt_internal_extend_target(Test CONDITION ((APPLE) AND (OFF AND NOT lessThan(QMAKE_XCODE_VERSION, "6.0"))) AND (NOT QMAKE_MAC_SDK_PLATFORM_PATH_ISEMPTY) COMPILE_OPTIONS -F/Developer/Library/Frameworks LINK_OPTIONS @@ -133,7 +133,7 @@ qt_extend_target(Test CONDITION ((APPLE) AND (OFF AND NOT lessThan(QMAKE_XCODE_V #### Keys ignored in scope 12:.:.:testlib.pro:NOT TARGET Qt::Network: # HEADERSCLEAN_EXCLUDE = "qtest_network.h" -qt_add_docs(Test +qt_internal_add_docs(Test doc/qttestlib.qdocconf ) diff --git a/src/testlib/CMakeLists.txt b/src/testlib/CMakeLists.txt index 226bf079b84..53005d6402d 100644 --- a/src/testlib/CMakeLists.txt +++ b/src/testlib/CMakeLists.txt @@ -8,7 +8,7 @@ include(selfcover.cmake) ## Test Module: ##################################################################### -qt_add_module(Test +qt_internal_add_module(Test CONFIG_MODULE_NAME testlib # special case EXCEPTIONS SOURCES @@ -77,29 +77,29 @@ qt_add_module(Test #### Keys ignored in scope 2:.:.:testlib.pro:UNIX AND NOT embedded: # QMAKE_PKGCONFIG_DESCRIPTION = "Qt" "Unit" "Testing" "Library" -qt_extend_target(Test CONDITION QT_FEATURE_itemmodeltester +qt_internal_extend_target(Test CONDITION QT_FEATURE_itemmodeltester SOURCES qabstractitemmodeltester.cpp qabstractitemmodeltester.h ) -qt_extend_target(Test CONDITION QT_FEATURE_valgrind +qt_internal_extend_target(Test CONDITION QT_FEATURE_valgrind SOURCES qbenchmarkvalgrind.cpp qbenchmarkvalgrind_p.h ) -qt_extend_target(Test CONDITION embedded +qt_internal_extend_target(Test CONDITION embedded COMPILE_OPTIONS -fno-rtti ) -qt_extend_target(Test CONDITION APPLE +qt_internal_extend_target(Test CONDITION APPLE SOURCES qappletestlogger.cpp qappletestlogger_p.h PUBLIC_LIBRARIES ${FWSecurity} ) -qt_extend_target(Test CONDITION MACOS +qt_internal_extend_target(Test CONDITION MACOS SOURCES qtestutil_macos.mm qtestutil_macos_p.h PUBLIC_LIBRARIES @@ -111,8 +111,8 @@ qt_extend_target(Test CONDITION MACOS # special case begin # Do not bother with disabled stuff: -# extend_target(Test CONDITION (MACOS) AND (OFF AND NOT lessThan(QMAKE_XCODE_VERSION, "6.0")) ... -# extend_target(Test CONDITION ((MACOS) AND (OFF AND NOT lessThan(QMAKE_XCODE_VERSION, "6.0"))) AND (NOT QMAKE_MAC_SDK_PLATFORM_PATH_ISEMPTY) ... +# qt_internal_extend_target(Test CONDITION (MACOS) AND (OFF AND NOT lessThan(QMAKE_XCODE_VERSION, "6.0")) ... +# qt_internal_extend_target(Test CONDITION ((MACOS) AND (OFF AND NOT lessThan(QMAKE_XCODE_VERSION, "6.0"))) AND (NOT QMAKE_MAC_SDK_PLATFORM_PATH_ISEMPTY) ... # special case end #### Keys ignored in scope 9:.:.:testlib.pro:NOT QMAKE_MAC_SDK_PLATFORM_PATH_ISEMPTY: @@ -126,12 +126,12 @@ qt_extend_target(Test CONDITION MACOS #### Keys ignored in scope 12:.:.:testlib.pro:NOT TARGET Qt::Network: # HEADERSCLEAN_EXCLUDE = "qtest_network.h" -qt_add_docs(Test +qt_internal_add_docs(Test doc/qttestlib.qdocconf ) # special case begin -qt_apply_testlib_coverage_options(Test) +qt_internal_apply_testlib_coverage_options(Test) # Allow blacklisting tests depending on whether testlib was built as part of a CMake build. target_compile_definitions(Test PRIVATE QT_CMAKE_BUILD) diff --git a/src/testlib/selfcover.cmake b/src/testlib/selfcover.cmake index c04ffa7b018..83af0419517 100644 --- a/src/testlib/selfcover.cmake +++ b/src/testlib/selfcover.cmake @@ -17,7 +17,7 @@ endif() # This enables verification that testlib itself is adequately tested, # as a grounds for trusting that testing with it is useful. -function(qt_apply_testlib_coverage_options target) +function(qt_internal_apply_testlib_coverage_options target) if (NOT FEATURE_testlib_selfcover) return() endif() diff --git a/src/tools/androiddeployqt/.prev_CMakeLists.txt b/src/tools/androiddeployqt/.prev_CMakeLists.txt index bb644c6fc1c..3989e2f506d 100644 --- a/src/tools/androiddeployqt/.prev_CMakeLists.txt +++ b/src/tools/androiddeployqt/.prev_CMakeLists.txt @@ -24,7 +24,7 @@ set_target_properties(androiddeployqt PROPERTIES ## Scopes: ##################################################################### -qt_extend_target(androiddeployqt CONDITION windows +qt_internal_extend_target(androiddeployqt CONDITION windows COMPILE_OPTIONS -U__STRICT_ANSI__ ) diff --git a/src/tools/androiddeployqt/CMakeLists.txt b/src/tools/androiddeployqt/CMakeLists.txt index 0a0886fc752..4eec7b81649 100644 --- a/src/tools/androiddeployqt/CMakeLists.txt +++ b/src/tools/androiddeployqt/CMakeLists.txt @@ -24,7 +24,7 @@ set_target_properties(androiddeployqt PROPERTIES ## Scopes: ##################################################################### -qt_extend_target(androiddeployqt CONDITION windows +qt_internal_extend_target(androiddeployqt CONDITION windows COMPILE_OPTIONS -U__STRICT_ANSI__ ) diff --git a/src/tools/androidtestrunner/CMakeLists.txt b/src/tools/androidtestrunner/CMakeLists.txt index 17cf8258697..9f6eb600bc3 100644 --- a/src/tools/androidtestrunner/CMakeLists.txt +++ b/src/tools/androidtestrunner/CMakeLists.txt @@ -24,7 +24,7 @@ set_target_properties(androidtestrunner PROPERTIES ## Scopes: ##################################################################### -qt_extend_target(androidtestrunner CONDITION windows +qt_internal_extend_target(androidtestrunner CONDITION windows COMPILE_OPTIONS -U__STRICT_ANSI__ ) diff --git a/src/tools/bootstrap/.prev_CMakeLists.txt b/src/tools/bootstrap/.prev_CMakeLists.txt index b42582efd84..bf93a3958dd 100644 --- a/src/tools/bootstrap/.prev_CMakeLists.txt +++ b/src/tools/bootstrap/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## Bootstrap Module: ##################################################################### -qt_add_module(Bootstrap +qt_internal_add_module(Bootstrap STATIC INTERNAL_MODULE NO_SYNC_QT @@ -164,7 +164,7 @@ qt_add_module(Bootstrap ## Scopes: ##################################################################### -qt_extend_target(Bootstrap CONDITION UNIX +qt_internal_extend_target(Bootstrap CONDITION UNIX SOURCES ../../corelib/io/qfilesystemengine_unix.cpp ../../corelib/io/qfilesystemiterator_unix.cpp @@ -178,7 +178,7 @@ qt_extend_target(Bootstrap CONDITION UNIX ../../corelib/kernel/qsystemsemaphore_unix.cpp ) -qt_extend_target(Bootstrap CONDITION WIN32 +qt_internal_extend_target(Bootstrap CONDITION WIN32 SOURCES ../../corelib/global/qoperatingsystemversion_win.cpp ../../corelib/io/qfilesystemengine_win.cpp @@ -200,7 +200,7 @@ qt_extend_target(Bootstrap CONDITION WIN32 user32 ) -qt_extend_target(Bootstrap CONDITION APPLE +qt_internal_extend_target(Bootstrap CONDITION APPLE SOURCES ../../corelib/global/qoperatingsystemversion_darwin.mm ../../corelib/kernel/qcore_foundation.mm @@ -210,24 +210,24 @@ qt_extend_target(Bootstrap CONDITION APPLE ${FWFoundation} ) -qt_extend_target(Bootstrap CONDITION MACOS +qt_internal_extend_target(Bootstrap CONDITION MACOS SOURCES ../../corelib/io/qstandardpaths_mac.mm LIBRARIES ${FWCoreServices} ) -qt_extend_target(Bootstrap CONDITION UIKIT +qt_internal_extend_target(Bootstrap CONDITION UIKIT LIBRARIES ${FWUIKit} ) -qt_extend_target(Bootstrap CONDITION UNIX AND NOT MACOS +qt_internal_extend_target(Bootstrap CONDITION UNIX AND NOT MACOS SOURCES ../../corelib/io/qstandardpaths_unix.cpp ) -qt_extend_target(Bootstrap CONDITION CMAKE_CROSSCOMPILING OR NOT QT_FEATURE_system_zlib +qt_internal_extend_target(Bootstrap CONDITION CMAKE_CROSSCOMPILING OR NOT QT_FEATURE_system_zlib SOURCES ../../3rdparty/zlib/src/adler32.c ../../3rdparty/zlib/src/compress.c @@ -248,12 +248,12 @@ qt_extend_target(Bootstrap CONDITION CMAKE_CROSSCOMPILING OR NOT QT_FEATURE_syst ../../3rdparty/zlib/src ) -qt_extend_target(Bootstrap CONDITION QT_FEATURE_system_zlib AND NOT CMAKE_CROSSCOMPILING +qt_internal_extend_target(Bootstrap CONDITION QT_FEATURE_system_zlib AND NOT CMAKE_CROSSCOMPILING LIBRARIES ZLIB::ZLIB ) -qt_extend_target(Bootstrap CONDITION MINGW AND WIN32 +qt_internal_extend_target(Bootstrap CONDITION MINGW AND WIN32 PUBLIC_LIBRARIES uuid ) diff --git a/src/tools/bootstrap/CMakeLists.txt b/src/tools/bootstrap/CMakeLists.txt index fe69c371cbd..7669207fddc 100644 --- a/src/tools/bootstrap/CMakeLists.txt +++ b/src/tools/bootstrap/CMakeLists.txt @@ -9,7 +9,7 @@ # libraries. add_library(Bootstrap STATIC) # special case end -qt_extend_target(Bootstrap +qt_internal_extend_target(Bootstrap SOURCES ../../3rdparty/pcre2/src/config.h ../../3rdparty/pcre2/src/pcre2.h @@ -163,7 +163,7 @@ qt_extend_target(Bootstrap ## Scopes: ##################################################################### -qt_extend_target(Bootstrap CONDITION UNIX +qt_internal_extend_target(Bootstrap CONDITION UNIX SOURCES ../../corelib/io/qfilesystemengine_unix.cpp ../../corelib/io/qfilesystemiterator_unix.cpp @@ -177,7 +177,7 @@ qt_extend_target(Bootstrap CONDITION UNIX ../../corelib/kernel/qsystemsemaphore_unix.cpp ) -qt_extend_target(Bootstrap CONDITION WIN32 +qt_internal_extend_target(Bootstrap CONDITION WIN32 SOURCES ../../corelib/global/qoperatingsystemversion_win.cpp ../../corelib/io/qfilesystemengine_win.cpp @@ -199,7 +199,7 @@ qt_extend_target(Bootstrap CONDITION WIN32 user32 ) -qt_extend_target(Bootstrap CONDITION APPLE +qt_internal_extend_target(Bootstrap CONDITION APPLE SOURCES ../../corelib/global/qoperatingsystemversion_darwin.mm ../../corelib/kernel/qcore_foundation.mm @@ -209,24 +209,24 @@ qt_extend_target(Bootstrap CONDITION APPLE ${FWFoundation} ) -qt_extend_target(Bootstrap CONDITION MACOS +qt_internal_extend_target(Bootstrap CONDITION MACOS SOURCES ../../corelib/io/qstandardpaths_mac.mm LIBRARIES ${FWCoreServices} ) -qt_extend_target(Bootstrap CONDITION UIKIT +qt_internal_extend_target(Bootstrap CONDITION UIKIT LIBRARIES ${FWUIKit} ) -qt_extend_target(Bootstrap CONDITION UNIX AND NOT MACOS +qt_internal_extend_target(Bootstrap CONDITION UNIX AND NOT MACOS SOURCES ../../corelib/io/qstandardpaths_unix.cpp ) -qt_extend_target(Bootstrap CONDITION CMAKE_CROSSCOMPILING OR NOT QT_FEATURE_system_zlib +qt_internal_extend_target(Bootstrap CONDITION CMAKE_CROSSCOMPILING OR NOT QT_FEATURE_system_zlib SOURCES ../../3rdparty/zlib/src/adler32.c ../../3rdparty/zlib/src/compress.c @@ -247,12 +247,12 @@ qt_extend_target(Bootstrap CONDITION CMAKE_CROSSCOMPILING OR NOT QT_FEATURE_syst ../../3rdparty/zlib/src ) -qt_extend_target(Bootstrap CONDITION QT_FEATURE_system_zlib AND NOT CMAKE_CROSSCOMPILING +qt_internal_extend_target(Bootstrap CONDITION QT_FEATURE_system_zlib AND NOT CMAKE_CROSSCOMPILING LIBRARIES ZLIB::ZLIB ) -qt_extend_target(Bootstrap CONDITION MINGW AND WIN32 +qt_internal_extend_target(Bootstrap CONDITION MINGW AND WIN32 PUBLIC_LIBRARIES uuid ) diff --git a/src/tools/cmake_automoc_parser/CMakeLists.txt b/src/tools/cmake_automoc_parser/CMakeLists.txt index 39683d57e4f..31bef236e82 100644 --- a/src/tools/cmake_automoc_parser/CMakeLists.txt +++ b/src/tools/cmake_automoc_parser/CMakeLists.txt @@ -3,7 +3,7 @@ ##################################################################### qt_get_tool_target_name(target_name cmake_automoc_parser) -qt_add_tool(${target_name} +qt_internal_add_tool(${target_name} BOOTSTRAP TOOLS_TARGET Core # special case SOURCES diff --git a/src/tools/moc/.prev_CMakeLists.txt b/src/tools/moc/.prev_CMakeLists.txt index f3688020f6d..572acc4f36d 100644 --- a/src/tools/moc/.prev_CMakeLists.txt +++ b/src/tools/moc/.prev_CMakeLists.txt @@ -5,7 +5,7 @@ ##################################################################### qt_get_tool_target_name(target_name moc) -qt_add_tool(${target_name} +qt_internal_add_tool(${target_name} BOOTSTRAP TARGET_DESCRIPTION "Qt Meta Object Compiler" SOURCES @@ -39,7 +39,7 @@ qt_add_tool(${target_name} ## Scopes: ##################################################################### -qt_extend_target(${target_name} CONDITION MSVC +qt_internal_extend_target(${target_name} CONDITION MSVC DEFINES _CRT_SECURE_NO_WARNINGS ) diff --git a/src/tools/moc/CMakeLists.txt b/src/tools/moc/CMakeLists.txt index 91c9d89cea2..53fc4ff73bb 100644 --- a/src/tools/moc/CMakeLists.txt +++ b/src/tools/moc/CMakeLists.txt @@ -5,7 +5,7 @@ ##################################################################### qt_get_tool_target_name(target_name moc) -qt_add_tool(${target_name} +qt_internal_add_tool(${target_name} BOOTSTRAP TARGET_DESCRIPTION "Qt Meta Object Compiler" TOOLS_TARGET Core # special case @@ -40,7 +40,7 @@ qt_add_tool(${target_name} ## Scopes: ##################################################################### -qt_extend_target(${target_name} CONDITION MSVC +qt_internal_extend_target(${target_name} CONDITION MSVC DEFINES _CRT_SECURE_NO_WARNINGS ) diff --git a/src/tools/qdbuscpp2xml/.prev_CMakeLists.txt b/src/tools/qdbuscpp2xml/.prev_CMakeLists.txt index fa02b5753c5..2b1def9f56c 100644 --- a/src/tools/qdbuscpp2xml/.prev_CMakeLists.txt +++ b/src/tools/qdbuscpp2xml/.prev_CMakeLists.txt @@ -5,7 +5,7 @@ ##################################################################### qt_get_tool_target_name(target_name qdbuscpp2xml) -qt_add_tool(${target_name} +qt_internal_add_tool(${target_name} TARGET_DESCRIPTION "Qt D-Bus C++ to XML Compiler" SOURCES ../moc/cbordevice.h @@ -36,12 +36,12 @@ qt_add_tool(${target_name} ## Scopes: ##################################################################### -qt_extend_target(${target_name} CONDITION force_bootstrap +qt_internal_extend_target(${target_name} CONDITION force_bootstrap PUBLIC_LIBRARIES bootstrap_dbusPrivate ) -qt_extend_target(${target_name} CONDITION NOT force_bootstrap +qt_internal_extend_target(${target_name} CONDITION NOT force_bootstrap PUBLIC_LIBRARIES Qt::DBusPrivate ) diff --git a/src/tools/qdbuscpp2xml/CMakeLists.txt b/src/tools/qdbuscpp2xml/CMakeLists.txt index e831d5f392b..865995755bb 100644 --- a/src/tools/qdbuscpp2xml/CMakeLists.txt +++ b/src/tools/qdbuscpp2xml/CMakeLists.txt @@ -5,7 +5,7 @@ ##################################################################### qt_get_tool_target_name(target_name qdbuscpp2xml) -qt_add_tool(${target_name} +qt_internal_add_tool(${target_name} TARGET_DESCRIPTION "Qt D-Bus C++ to XML Compiler" TOOLS_TARGET DBus # special case SOURCES @@ -44,6 +44,6 @@ qt_add_tool(${target_name} ##################################################################### # special case begin -# extend_target(qdbuscpp2xml CONDITION force_bootstrap [...]) -# extend_target(qdbuscpp2xml CONDITION NOT force_bootstrap [...]) +# qt_internal_extend_target(qdbuscpp2xml CONDITION force_bootstrap [...]) +# qt_internal_extend_target(qdbuscpp2xml CONDITION NOT force_bootstrap [...]) # special case end diff --git a/src/tools/qdbusxml2cpp/.prev_CMakeLists.txt b/src/tools/qdbusxml2cpp/.prev_CMakeLists.txt index 603c21ac1e7..ad04ca2d3f9 100644 --- a/src/tools/qdbusxml2cpp/.prev_CMakeLists.txt +++ b/src/tools/qdbusxml2cpp/.prev_CMakeLists.txt @@ -5,7 +5,7 @@ ##################################################################### qt_get_tool_target_name(target_name qdbusxml2cpp) -qt_add_tool(${target_name} +qt_internal_add_tool(${target_name} TARGET_DESCRIPTION "Qt D-Bus XML to C++ Compiler" SOURCES qdbusxml2cpp.cpp @@ -23,12 +23,12 @@ qt_add_tool(${target_name} ## Scopes: ##################################################################### -qt_extend_target(${target_name} CONDITION NOT force_bootstrap +qt_internal_extend_target(${target_name} CONDITION NOT force_bootstrap PUBLIC_LIBRARIES Qt::DBusPrivate ) -qt_extend_target(${target_name} CONDITION force_bootstrap +qt_internal_extend_target(${target_name} CONDITION force_bootstrap PUBLIC_LIBRARIES bootstrap_dbusPrivate ) diff --git a/src/tools/qdbusxml2cpp/CMakeLists.txt b/src/tools/qdbusxml2cpp/CMakeLists.txt index 5b58975afee..37327b34dbc 100644 --- a/src/tools/qdbusxml2cpp/CMakeLists.txt +++ b/src/tools/qdbusxml2cpp/CMakeLists.txt @@ -5,7 +5,7 @@ ##################################################################### qt_get_tool_target_name(target_name qdbusxml2cpp) -qt_add_tool(${target_name} +qt_internal_add_tool(${target_name} TARGET_DESCRIPTION "Qt D-Bus XML to C++ Compiler" TOOLS_TARGET DBus # special case SOURCES @@ -31,7 +31,7 @@ qt_add_tool(${target_name} ##################################################################### # special case begin -# extend_target(qdbusxml2cpp CONDITION NOT force_bootstrap [...]) -# extend_target(qdbusxml2cpp CONDITION NOT QT_FEATURE_commandlineparser AND NOT force_bootstrap [...]) -# extend_target(qdbusxml2cpp CONDITION force_bootstrap [...]) +# qt_internal_extend_target(qdbusxml2cpp CONDITION NOT force_bootstrap [...]) +# qt_internal_extend_target(qdbusxml2cpp CONDITION NOT QT_FEATURE_commandlineparser AND NOT force_bootstrap [...]) +# qt_internal_extend_target(qdbusxml2cpp CONDITION force_bootstrap [...]) # special case end diff --git a/src/tools/qlalr/.prev_CMakeLists.txt b/src/tools/qlalr/.prev_CMakeLists.txt index 00c4abc0cdf..fecc4317318 100644 --- a/src/tools/qlalr/.prev_CMakeLists.txt +++ b/src/tools/qlalr/.prev_CMakeLists.txt @@ -5,7 +5,7 @@ ##################################################################### qt_get_tool_target_name(target_name qlalr) -qt_add_tool(${target_name} +qt_internal_add_tool(${target_name} TARGET_DESCRIPTION "Qt Look Ahead LR Parser Generator" SOURCES compress.cpp compress.h diff --git a/src/tools/qlalr/CMakeLists.txt b/src/tools/qlalr/CMakeLists.txt index b0137d4918f..b3dd7c28b7b 100644 --- a/src/tools/qlalr/CMakeLists.txt +++ b/src/tools/qlalr/CMakeLists.txt @@ -5,7 +5,7 @@ ##################################################################### qt_get_tool_target_name(target_name qlalr) -qt_add_tool(${target_name} +qt_internal_add_tool(${target_name} TARGET_DESCRIPTION "Qt Look Ahead LR Parser Generator" TOOLS_TARGET Core # special case SOURCES diff --git a/src/tools/qvkgen/.prev_CMakeLists.txt b/src/tools/qvkgen/.prev_CMakeLists.txt index ed8c028686e..a735b31a05c 100644 --- a/src/tools/qvkgen/.prev_CMakeLists.txt +++ b/src/tools/qvkgen/.prev_CMakeLists.txt @@ -5,7 +5,7 @@ ##################################################################### qt_get_tool_target_name(target_name qvkgen) -qt_add_tool(${target_name} +qt_internal_add_tool(${target_name} TARGET_DESCRIPTION "Qt Vulkan Header Generator" SOURCES qvkgen.cpp diff --git a/src/tools/qvkgen/CMakeLists.txt b/src/tools/qvkgen/CMakeLists.txt index 003b407fdcc..a6d264d53ee 100644 --- a/src/tools/qvkgen/CMakeLists.txt +++ b/src/tools/qvkgen/CMakeLists.txt @@ -5,7 +5,7 @@ ##################################################################### qt_get_tool_target_name(target_name qvkgen) -qt_add_tool(${target_name} +qt_internal_add_tool(${target_name} TARGET_DESCRIPTION "Qt Vulkan Header Generator" TOOLS_TARGET Gui # special case SOURCES diff --git a/src/tools/rcc/.prev_CMakeLists.txt b/src/tools/rcc/.prev_CMakeLists.txt index 7b2eff21c30..cd10a9b50c5 100644 --- a/src/tools/rcc/.prev_CMakeLists.txt +++ b/src/tools/rcc/.prev_CMakeLists.txt @@ -5,7 +5,7 @@ ##################################################################### qt_get_tool_target_name(target_name rcc) -qt_add_tool(${target_name} +qt_internal_add_tool(${target_name} BOOTSTRAP TARGET_DESCRIPTION "Qt Resource Compiler" SOURCES @@ -26,14 +26,14 @@ qt_add_tool(${target_name} ## Scopes: ##################################################################### -qt_extend_target(${target_name} CONDITION QT_FEATURE_zstd AND NOT CMAKE_CROSSCOMPILING +qt_internal_extend_target(${target_name} CONDITION QT_FEATURE_zstd AND NOT CMAKE_CROSSCOMPILING DEFINES QT_FEATURE_zstd=1 LIBRARIES ZSTD::ZSTD ) -qt_extend_target(${target_name} CONDITION CMAKE_CROSSCOMPILING OR NOT QT_FEATURE_zstd +qt_internal_extend_target(${target_name} CONDITION CMAKE_CROSSCOMPILING OR NOT QT_FEATURE_zstd DEFINES QT_FEATURE_zstd=-1 ) diff --git a/src/tools/rcc/CMakeLists.txt b/src/tools/rcc/CMakeLists.txt index 4b71695d470..f9bb7025a2c 100644 --- a/src/tools/rcc/CMakeLists.txt +++ b/src/tools/rcc/CMakeLists.txt @@ -5,7 +5,7 @@ ##################################################################### qt_get_tool_target_name(target_name rcc) -qt_add_tool(${target_name} +qt_internal_add_tool(${target_name} BOOTSTRAP TARGET_DESCRIPTION "Qt Resource Compiler" TOOLS_TARGET Core # special case @@ -27,14 +27,14 @@ qt_add_tool(${target_name} ## Scopes: ##################################################################### -qt_extend_target(${target_name} CONDITION QT_FEATURE_zstd AND NOT CMAKE_CROSSCOMPILING +qt_internal_extend_target(${target_name} CONDITION QT_FEATURE_zstd AND NOT CMAKE_CROSSCOMPILING DEFINES QT_FEATURE_zstd=1 LIBRARIES ZSTD::ZSTD ) -qt_extend_target(${target_name} CONDITION CMAKE_CROSSCOMPILING OR NOT QT_FEATURE_zstd +qt_internal_extend_target(${target_name} CONDITION CMAKE_CROSSCOMPILING OR NOT QT_FEATURE_zstd DEFINES QT_FEATURE_zstd=-1 ) diff --git a/src/tools/tracegen/.prev_CMakeLists.txt b/src/tools/tracegen/.prev_CMakeLists.txt index dbb673216f8..51dde9f7ccf 100644 --- a/src/tools/tracegen/.prev_CMakeLists.txt +++ b/src/tools/tracegen/.prev_CMakeLists.txt @@ -5,7 +5,7 @@ ##################################################################### qt_get_tool_target_name(target_name tracegen) -qt_add_tool(${target_name} +qt_internal_add_tool(${target_name} BOOTSTRAP SOURCES etw.cpp etw.h diff --git a/src/tools/tracegen/CMakeLists.txt b/src/tools/tracegen/CMakeLists.txt index 678b46cb210..ac1e11c974c 100644 --- a/src/tools/tracegen/CMakeLists.txt +++ b/src/tools/tracegen/CMakeLists.txt @@ -5,7 +5,7 @@ ##################################################################### qt_get_tool_target_name(target_name tracegen) -qt_add_tool(${target_name} +qt_internal_add_tool(${target_name} BOOTSTRAP TOOLS_TARGET Core # special case SOURCES diff --git a/src/tools/uic/.prev_CMakeLists.txt b/src/tools/uic/.prev_CMakeLists.txt index eb5a82572ea..20c5e1a7c6b 100644 --- a/src/tools/uic/.prev_CMakeLists.txt +++ b/src/tools/uic/.prev_CMakeLists.txt @@ -5,7 +5,7 @@ ##################################################################### qt_get_tool_target_name(target_name uic) -qt_add_tool(${target_name} +qt_internal_add_tool(${target_name} TARGET_DESCRIPTION "Qt User Interface Compiler" SOURCES cpp/cppwritedeclaration.cpp cpp/cppwritedeclaration.h diff --git a/src/tools/uic/CMakeLists.txt b/src/tools/uic/CMakeLists.txt index c25b53f7d30..afda54d179a 100644 --- a/src/tools/uic/CMakeLists.txt +++ b/src/tools/uic/CMakeLists.txt @@ -5,7 +5,7 @@ ##################################################################### qt_get_tool_target_name(target_name uic) -qt_add_tool(${target_name} +qt_internal_add_tool(${target_name} TARGET_DESCRIPTION "Qt User Interface Compiler" TOOLS_TARGET Widgets # special case SOURCES diff --git a/src/widgets/.prev_CMakeLists.txt b/src/widgets/.prev_CMakeLists.txt index 277ad0b469a..f2d3448e0d5 100644 --- a/src/widgets/.prev_CMakeLists.txt +++ b/src/widgets/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## Widgets Module: ##################################################################### -qt_add_module(Widgets +qt_internal_add_module(Widgets GENERATE_METATYPES QMAKE_MODULE_CONFIG uic PLUGIN_TYPES styles @@ -236,7 +236,7 @@ set(qstyle_resource_files "images/viewlist-32.png" ) -qt_add_resource(Widgets "qstyle" +qt_internal_add_resource(Widgets "qstyle" PREFIX "/qt-project.org/styles/commonstyle" BASE @@ -271,7 +271,7 @@ set(qstyle1_resource_files "images/[email protected]" ) -qt_add_resource(Widgets "qstyle1" +qt_internal_add_resource(Widgets "qstyle1" PREFIX "/qt-project.org/styles/macstyle" BASE @@ -292,12 +292,12 @@ endif() ## Scopes: ##################################################################### -qt_extend_target(Widgets CONDITION MSVC AND (TEST_architecture_arch STREQUAL "i386") +qt_internal_extend_target(Widgets CONDITION MSVC AND (TEST_architecture_arch STREQUAL "i386") LINK_OPTIONS "/BASE:0x65000000" ) -qt_extend_target(Widgets CONDITION MACOS +qt_internal_extend_target(Widgets CONDITION MACOS SOURCES kernel/qmacgesturerecognizer.cpp kernel/qmacgesturerecognizer_p.h LIBRARIES @@ -305,269 +305,269 @@ qt_extend_target(Widgets CONDITION MACOS z ) -qt_extend_target(Widgets CONDITION WIN32 +qt_internal_extend_target(Widgets CONDITION WIN32 LIBRARIES dwmapi shell32 uxtheme ) -qt_extend_target(Widgets CONDITION QT_FEATURE_graphicseffect +qt_internal_extend_target(Widgets CONDITION QT_FEATURE_graphicseffect SOURCES effects/qgraphicseffect.cpp effects/qgraphicseffect.h effects/qgraphicseffect_p.h effects/qpixmapfilter.cpp effects/qpixmapfilter_p.h ) -qt_extend_target(Widgets CONDITION QT_FEATURE_action +qt_internal_extend_target(Widgets CONDITION QT_FEATURE_action SOURCES kernel/qaction_widgets.cpp kernel/qaction_widgets_p.h kernel/qwidgetaction.cpp kernel/qwidgetaction.h kernel/qwidgetaction_p.h ) -qt_extend_target(Widgets CONDITION QT_FEATURE_formlayout +qt_internal_extend_target(Widgets CONDITION QT_FEATURE_formlayout SOURCES kernel/qformlayout.cpp kernel/qformlayout.h ) -qt_extend_target(Widgets CONDITION QT_FEATURE_shortcut +qt_internal_extend_target(Widgets CONDITION QT_FEATURE_shortcut SOURCES kernel/qshortcut_widgets.cpp ) -qt_extend_target(Widgets CONDITION QT_FEATURE_tooltip +qt_internal_extend_target(Widgets CONDITION QT_FEATURE_tooltip SOURCES kernel/qtooltip.cpp kernel/qtooltip.h ) -qt_extend_target(Widgets CONDITION QT_FEATURE_whatsthis +qt_internal_extend_target(Widgets CONDITION QT_FEATURE_whatsthis SOURCES kernel/qwhatsthis.cpp kernel/qwhatsthis.h ) -qt_extend_target(Widgets CONDITION QT_FEATURE_animation +qt_internal_extend_target(Widgets CONDITION QT_FEATURE_animation SOURCES styles/qstyleanimation.cpp styles/qstyleanimation_p.h ) -qt_extend_target(Widgets CONDITION QT_FEATURE_style_windows +qt_internal_extend_target(Widgets CONDITION QT_FEATURE_style_windows SOURCES styles/qwindowsstyle.cpp styles/qwindowsstyle_p.h styles/qwindowsstyle_p_p.h ) -qt_extend_target(Widgets CONDITION QT_FEATURE_style_fusion +qt_internal_extend_target(Widgets CONDITION QT_FEATURE_style_fusion SOURCES styles/qfusionstyle.cpp styles/qfusionstyle_p.h styles/qfusionstyle_p_p.h ) -qt_extend_target(Widgets CONDITION QT_FEATURE_abstractbutton +qt_internal_extend_target(Widgets CONDITION QT_FEATURE_abstractbutton SOURCES widgets/qabstractbutton.cpp widgets/qabstractbutton.h widgets/qabstractbutton_p.h ) -qt_extend_target(Widgets CONDITION QT_FEATURE_abstractslider +qt_internal_extend_target(Widgets CONDITION QT_FEATURE_abstractslider SOURCES widgets/qabstractslider.cpp widgets/qabstractslider.h widgets/qabstractslider_p.h ) -qt_extend_target(Widgets CONDITION QT_FEATURE_buttongroup +qt_internal_extend_target(Widgets CONDITION QT_FEATURE_buttongroup SOURCES widgets/qbuttongroup.cpp widgets/qbuttongroup.h widgets/qbuttongroup_p.h ) -qt_extend_target(Widgets CONDITION QT_FEATURE_calendarwidget +qt_internal_extend_target(Widgets CONDITION QT_FEATURE_calendarwidget SOURCES widgets/qcalendarwidget.cpp widgets/qcalendarwidget.h ) -qt_extend_target(Widgets CONDITION QT_FEATURE_checkbox +qt_internal_extend_target(Widgets CONDITION QT_FEATURE_checkbox SOURCES widgets/qcheckbox.cpp widgets/qcheckbox.h ) -qt_extend_target(Widgets CONDITION QT_FEATURE_combobox +qt_internal_extend_target(Widgets CONDITION QT_FEATURE_combobox SOURCES widgets/qcombobox.cpp widgets/qcombobox.h widgets/qcombobox_p.h ) -qt_extend_target(Widgets CONDITION QT_FEATURE_commandlinkbutton +qt_internal_extend_target(Widgets CONDITION QT_FEATURE_commandlinkbutton SOURCES widgets/qcommandlinkbutton.cpp widgets/qcommandlinkbutton.h ) -qt_extend_target(Widgets CONDITION QT_FEATURE_datetimeedit +qt_internal_extend_target(Widgets CONDITION QT_FEATURE_datetimeedit SOURCES widgets/qdatetimeedit.cpp widgets/qdatetimeedit.h widgets/qdatetimeedit_p.h ) -qt_extend_target(Widgets CONDITION QT_FEATURE_dial +qt_internal_extend_target(Widgets CONDITION QT_FEATURE_dial SOURCES widgets/qdial.cpp widgets/qdial.h ) -qt_extend_target(Widgets CONDITION QT_FEATURE_dockwidget +qt_internal_extend_target(Widgets CONDITION QT_FEATURE_dockwidget SOURCES widgets/qdockarealayout.cpp widgets/qdockarealayout_p.h widgets/qdockwidget.cpp widgets/qdockwidget.h widgets/qdockwidget_p.h ) -qt_extend_target(Widgets CONDITION QT_FEATURE_effects +qt_internal_extend_target(Widgets CONDITION QT_FEATURE_effects SOURCES widgets/qeffects.cpp widgets/qeffects_p.h ) -qt_extend_target(Widgets CONDITION QT_FEATURE_fontcombobox +qt_internal_extend_target(Widgets CONDITION QT_FEATURE_fontcombobox SOURCES widgets/qfontcombobox.cpp widgets/qfontcombobox.h ) -qt_extend_target(Widgets CONDITION QT_FEATURE_groupbox +qt_internal_extend_target(Widgets CONDITION QT_FEATURE_groupbox SOURCES widgets/qgroupbox.cpp widgets/qgroupbox.h ) -qt_extend_target(Widgets CONDITION QT_FEATURE_keysequenceedit +qt_internal_extend_target(Widgets CONDITION QT_FEATURE_keysequenceedit SOURCES widgets/qkeysequenceedit.cpp widgets/qkeysequenceedit.h widgets/qkeysequenceedit_p.h ) -qt_extend_target(Widgets CONDITION QT_FEATURE_label +qt_internal_extend_target(Widgets CONDITION QT_FEATURE_label SOURCES widgets/qlabel.cpp widgets/qlabel.h widgets/qlabel_p.h ) -qt_extend_target(Widgets CONDITION QT_FEATURE_lcdnumber +qt_internal_extend_target(Widgets CONDITION QT_FEATURE_lcdnumber SOURCES widgets/qlcdnumber.cpp widgets/qlcdnumber.h ) -qt_extend_target(Widgets CONDITION QT_FEATURE_lineedit +qt_internal_extend_target(Widgets CONDITION QT_FEATURE_lineedit SOURCES widgets/qlineedit.cpp widgets/qlineedit.h widgets/qlineedit_p.cpp widgets/qlineedit_p.h widgets/qwidgetlinecontrol.cpp widgets/qwidgetlinecontrol_p.h ) -qt_extend_target(Widgets CONDITION QT_FEATURE_mainwindow +qt_internal_extend_target(Widgets CONDITION QT_FEATURE_mainwindow SOURCES widgets/qmainwindow.cpp widgets/qmainwindow.h widgets/qmainwindowlayout.cpp widgets/qmainwindowlayout_p.h ) -qt_extend_target(Widgets CONDITION QT_FEATURE_mdiarea +qt_internal_extend_target(Widgets CONDITION QT_FEATURE_mdiarea SOURCES widgets/qmdiarea.cpp widgets/qmdiarea.h widgets/qmdiarea_p.h widgets/qmdisubwindow.cpp widgets/qmdisubwindow.h widgets/qmdisubwindow_p.h ) -qt_extend_target(Widgets CONDITION QT_FEATURE_menu +qt_internal_extend_target(Widgets CONDITION QT_FEATURE_menu SOURCES widgets/qmenu.cpp widgets/qmenu.h widgets/qmenu_p.h ) -qt_extend_target(Widgets CONDITION QT_FEATURE_menubar +qt_internal_extend_target(Widgets CONDITION QT_FEATURE_menubar SOURCES widgets/qmenubar.cpp widgets/qmenubar.h widgets/qmenubar_p.h ) -qt_extend_target(Widgets CONDITION QT_FEATURE_progressbar +qt_internal_extend_target(Widgets CONDITION QT_FEATURE_progressbar SOURCES widgets/qprogressbar.cpp widgets/qprogressbar.h ) -qt_extend_target(Widgets CONDITION QT_FEATURE_pushbutton +qt_internal_extend_target(Widgets CONDITION QT_FEATURE_pushbutton SOURCES widgets/qpushbutton.cpp widgets/qpushbutton.h widgets/qpushbutton_p.h ) -qt_extend_target(Widgets CONDITION QT_FEATURE_radiobutton +qt_internal_extend_target(Widgets CONDITION QT_FEATURE_radiobutton SOURCES widgets/qradiobutton.cpp widgets/qradiobutton.h ) -qt_extend_target(Widgets CONDITION QT_FEATURE_resizehandler +qt_internal_extend_target(Widgets CONDITION QT_FEATURE_resizehandler SOURCES widgets/qwidgetresizehandler.cpp widgets/qwidgetresizehandler_p.h ) -qt_extend_target(Widgets CONDITION QT_FEATURE_dialogbuttonbox +qt_internal_extend_target(Widgets CONDITION QT_FEATURE_dialogbuttonbox SOURCES widgets/qdialogbuttonbox.cpp widgets/qdialogbuttonbox.h ) -qt_extend_target(Widgets CONDITION QT_FEATURE_rubberband +qt_internal_extend_target(Widgets CONDITION QT_FEATURE_rubberband SOURCES widgets/qrubberband.cpp widgets/qrubberband.h ) -qt_extend_target(Widgets CONDITION QT_FEATURE_scrollarea +qt_internal_extend_target(Widgets CONDITION QT_FEATURE_scrollarea SOURCES widgets/qscrollarea.cpp widgets/qscrollarea.h widgets/qscrollarea_p.h ) -qt_extend_target(Widgets CONDITION QT_FEATURE_scrollbar +qt_internal_extend_target(Widgets CONDITION QT_FEATURE_scrollbar SOURCES widgets/qscrollbar.cpp widgets/qscrollbar.h widgets/qscrollbar_p.h ) -qt_extend_target(Widgets CONDITION QT_FEATURE_sizegrip +qt_internal_extend_target(Widgets CONDITION QT_FEATURE_sizegrip SOURCES widgets/qsizegrip.cpp widgets/qsizegrip.h ) -qt_extend_target(Widgets CONDITION QT_FEATURE_slider +qt_internal_extend_target(Widgets CONDITION QT_FEATURE_slider SOURCES widgets/qslider.cpp widgets/qslider.h ) -qt_extend_target(Widgets CONDITION QT_FEATURE_spinbox +qt_internal_extend_target(Widgets CONDITION QT_FEATURE_spinbox SOURCES widgets/qabstractspinbox.cpp widgets/qabstractspinbox.h widgets/qabstractspinbox_p.h widgets/qspinbox.cpp widgets/qspinbox.h ) -qt_extend_target(Widgets CONDITION QT_FEATURE_splashscreen +qt_internal_extend_target(Widgets CONDITION QT_FEATURE_splashscreen SOURCES widgets/qsplashscreen.cpp widgets/qsplashscreen.h ) -qt_extend_target(Widgets CONDITION QT_FEATURE_splitter +qt_internal_extend_target(Widgets CONDITION QT_FEATURE_splitter SOURCES widgets/qsplitter.cpp widgets/qsplitter.h widgets/qsplitter_p.h ) -qt_extend_target(Widgets CONDITION QT_FEATURE_stackedwidget +qt_internal_extend_target(Widgets CONDITION QT_FEATURE_stackedwidget SOURCES widgets/qstackedwidget.cpp widgets/qstackedwidget.h ) -qt_extend_target(Widgets CONDITION QT_FEATURE_statusbar +qt_internal_extend_target(Widgets CONDITION QT_FEATURE_statusbar SOURCES widgets/qstatusbar.cpp widgets/qstatusbar.h ) -qt_extend_target(Widgets CONDITION QT_FEATURE_tabbar +qt_internal_extend_target(Widgets CONDITION QT_FEATURE_tabbar SOURCES widgets/qtabbar.cpp widgets/qtabbar.h widgets/qtabbar_p.h ) -qt_extend_target(Widgets CONDITION QT_FEATURE_textedit +qt_internal_extend_target(Widgets CONDITION QT_FEATURE_textedit SOURCES widgets/qplaintextedit.cpp widgets/qplaintextedit.h widgets/qplaintextedit_p.h widgets/qtextedit.cpp widgets/qtextedit.h widgets/qtextedit_p.h ) -qt_extend_target(Widgets CONDITION QT_FEATURE_textbrowser +qt_internal_extend_target(Widgets CONDITION QT_FEATURE_textbrowser SOURCES widgets/qtextbrowser.cpp widgets/qtextbrowser.h ) -qt_extend_target(Widgets CONDITION QT_FEATURE_tabwidget +qt_internal_extend_target(Widgets CONDITION QT_FEATURE_tabwidget SOURCES widgets/qtabwidget.cpp widgets/qtabwidget.h ) -qt_extend_target(Widgets CONDITION QT_FEATURE_toolbar +qt_internal_extend_target(Widgets CONDITION QT_FEATURE_toolbar SOURCES widgets/qtoolbar.cpp widgets/qtoolbar.h widgets/qtoolbar_p.h widgets/qtoolbararealayout.cpp widgets/qtoolbararealayout_p.h @@ -575,44 +575,44 @@ qt_extend_target(Widgets CONDITION QT_FEATURE_toolbar widgets/qtoolbarseparator.cpp widgets/qtoolbarseparator_p.h ) -qt_extend_target(Widgets CONDITION QT_FEATURE_toolbox +qt_internal_extend_target(Widgets CONDITION QT_FEATURE_toolbox SOURCES widgets/qtoolbox.cpp widgets/qtoolbox.h ) -qt_extend_target(Widgets CONDITION QT_FEATURE_toolbutton +qt_internal_extend_target(Widgets CONDITION QT_FEATURE_toolbutton SOURCES widgets/qtoolbarextension.cpp widgets/qtoolbarextension_p.h widgets/qtoolbutton.cpp widgets/qtoolbutton.h ) -qt_extend_target(Widgets CONDITION QT_FEATURE_widgettextcontrol +qt_internal_extend_target(Widgets CONDITION QT_FEATURE_widgettextcontrol SOURCES widgets/qwidgettextcontrol.cpp widgets/qwidgettextcontrol_p.h widgets/qwidgettextcontrol_p_p.h ) -qt_extend_target(Widgets CONDITION MACOS AND (QT_FEATURE_menu OR QT_FEATURE_menubar) +qt_internal_extend_target(Widgets CONDITION MACOS AND (QT_FEATURE_menu OR QT_FEATURE_menubar) SOURCES widgets/qmenu_mac.mm ) -qt_extend_target(Widgets CONDITION QT_FEATURE_colordialog +qt_internal_extend_target(Widgets CONDITION QT_FEATURE_colordialog SOURCES dialogs/qcolordialog.cpp dialogs/qcolordialog.h ) -qt_extend_target(Widgets CONDITION QT_FEATURE_dialog +qt_internal_extend_target(Widgets CONDITION QT_FEATURE_dialog SOURCES dialogs/qdialog.cpp dialogs/qdialog.h dialogs/qdialog_p.h ) -qt_extend_target(Widgets CONDITION QT_FEATURE_errormessage +qt_internal_extend_target(Widgets CONDITION QT_FEATURE_errormessage SOURCES dialogs/qerrormessage.cpp dialogs/qerrormessage.h ) -qt_extend_target(Widgets CONDITION QT_FEATURE_filedialog +qt_internal_extend_target(Widgets CONDITION QT_FEATURE_filedialog SOURCES dialogs/qfiledialog.cpp dialogs/qfiledialog.h dialogs/qfiledialog.ui dialogs/qfiledialog_p.h dialogs/qsidebar.cpp dialogs/qsidebar_p.h @@ -620,22 +620,22 @@ qt_extend_target(Widgets CONDITION QT_FEATURE_filedialog uic ) -qt_extend_target(Widgets CONDITION QT_FEATURE_fontdialog +qt_internal_extend_target(Widgets CONDITION QT_FEATURE_fontdialog SOURCES dialogs/qfontdialog.cpp dialogs/qfontdialog.h dialogs/qfontdialog_p.h ) -qt_extend_target(Widgets CONDITION QT_FEATURE_fscompleter +qt_internal_extend_target(Widgets CONDITION QT_FEATURE_fscompleter SOURCES dialogs/qfscompleter_p.h ) -qt_extend_target(Widgets CONDITION QT_FEATURE_inputdialog +qt_internal_extend_target(Widgets CONDITION QT_FEATURE_inputdialog SOURCES dialogs/qinputdialog.cpp dialogs/qinputdialog.h ) -qt_extend_target(Widgets CONDITION QT_FEATURE_messagebox +qt_internal_extend_target(Widgets CONDITION QT_FEATURE_messagebox SOURCES dialogs/qmessagebox.cpp dialogs/qmessagebox.h ) @@ -646,7 +646,7 @@ if(QT_FEATURE_messagebox) "images/qtlogo-64.png" ) - qt_add_resource(Widgets "qmessagebox" + qt_internal_add_resource(Widgets "qmessagebox" PREFIX "/qt-project.org/qmessagebox" BASE @@ -656,22 +656,22 @@ if(QT_FEATURE_messagebox) ) endif() -qt_extend_target(Widgets CONDITION QT_FEATURE_progressdialog +qt_internal_extend_target(Widgets CONDITION QT_FEATURE_progressdialog SOURCES dialogs/qprogressdialog.cpp dialogs/qprogressdialog.h ) -qt_extend_target(Widgets CONDITION QT_FEATURE_wizard +qt_internal_extend_target(Widgets CONDITION QT_FEATURE_wizard SOURCES dialogs/qwizard.cpp dialogs/qwizard.h ) -qt_extend_target(Widgets CONDITION QT_FEATURE_wizard AND WIN32 +qt_internal_extend_target(Widgets CONDITION QT_FEATURE_wizard AND WIN32 SOURCES dialogs/qwizard_win.cpp dialogs/qwizard_win_p.h ) -qt_extend_target(Widgets CONDITION QT_FEATURE_accessibility +qt_internal_extend_target(Widgets CONDITION QT_FEATURE_accessibility SOURCES accessible/complexwidgets.cpp accessible/complexwidgets_p.h accessible/qaccessiblemenu.cpp accessible/qaccessiblemenu_p.h @@ -682,12 +682,12 @@ qt_extend_target(Widgets CONDITION QT_FEATURE_accessibility accessible/simplewidgets.cpp accessible/simplewidgets_p.h ) -qt_extend_target(Widgets CONDITION QT_FEATURE_accessibility AND QT_FEATURE_itemviews +qt_internal_extend_target(Widgets CONDITION QT_FEATURE_accessibility AND QT_FEATURE_itemviews SOURCES accessible/itemviews.cpp accessible/itemviews_p.h ) -qt_extend_target(Widgets CONDITION QT_FEATURE_itemviews +qt_internal_extend_target(Widgets CONDITION QT_FEATURE_itemviews SOURCES itemviews/qabstractitemdelegate.cpp itemviews/qabstractitemdelegate.h itemviews/qabstractitemdelegate_p.h itemviews/qabstractitemview.cpp itemviews/qabstractitemview.h itemviews/qabstractitemview_p.h @@ -699,49 +699,49 @@ qt_extend_target(Widgets CONDITION QT_FEATURE_itemviews itemviews/qwidgetitemdata_p.h ) -qt_extend_target(Widgets CONDITION QT_FEATURE_columnview +qt_internal_extend_target(Widgets CONDITION QT_FEATURE_columnview SOURCES itemviews/qcolumnview.cpp itemviews/qcolumnview.h itemviews/qcolumnview_p.h itemviews/qcolumnviewgrip.cpp itemviews/qcolumnviewgrip_p.h ) -qt_extend_target(Widgets CONDITION QT_FEATURE_datawidgetmapper +qt_internal_extend_target(Widgets CONDITION QT_FEATURE_datawidgetmapper SOURCES itemviews/qdatawidgetmapper.cpp itemviews/qdatawidgetmapper.h ) -qt_extend_target(Widgets CONDITION QT_FEATURE_listview +qt_internal_extend_target(Widgets CONDITION QT_FEATURE_listview SOURCES itemviews/qlistview.cpp itemviews/qlistview.h itemviews/qlistview_p.h ) -qt_extend_target(Widgets CONDITION QT_FEATURE_listwidget +qt_internal_extend_target(Widgets CONDITION QT_FEATURE_listwidget SOURCES itemviews/qlistwidget.cpp itemviews/qlistwidget.h itemviews/qlistwidget_p.h ) -qt_extend_target(Widgets CONDITION QT_FEATURE_tableview +qt_internal_extend_target(Widgets CONDITION QT_FEATURE_tableview SOURCES itemviews/qtableview.cpp itemviews/qtableview.h itemviews/qtableview_p.h ) -qt_extend_target(Widgets CONDITION QT_FEATURE_tablewidget +qt_internal_extend_target(Widgets CONDITION QT_FEATURE_tablewidget SOURCES itemviews/qtablewidget.cpp itemviews/qtablewidget.h itemviews/qtablewidget_p.h ) -qt_extend_target(Widgets CONDITION QT_FEATURE_treeview +qt_internal_extend_target(Widgets CONDITION QT_FEATURE_treeview SOURCES itemviews/qtreeview.cpp itemviews/qtreeview.h itemviews/qtreeview_p.h ) -qt_extend_target(Widgets CONDITION QT_FEATURE_treewidget +qt_internal_extend_target(Widgets CONDITION QT_FEATURE_treewidget SOURCES itemviews/qtreewidget.cpp itemviews/qtreewidget.h itemviews/qtreewidget_p.h itemviews/qtreewidgetitemiterator.cpp itemviews/qtreewidgetitemiterator.h ) -qt_extend_target(Widgets CONDITION QT_FEATURE_graphicsview +qt_internal_extend_target(Widgets CONDITION QT_FEATURE_graphicsview SOURCES graphicsview/qgraph_p.h graphicsview/qgraphicsanchorlayout.cpp graphicsview/qgraphicsanchorlayout.h graphicsview/qgraphicsanchorlayout_p.cpp graphicsview/qgraphicsanchorlayout_p.h @@ -765,41 +765,41 @@ qt_extend_target(Widgets CONDITION QT_FEATURE_graphicsview graphicsview/qsimplex_p.cpp graphicsview/qsimplex_p.h ) -qt_extend_target(Widgets CONDITION QT_FEATURE_easingcurve AND QT_FEATURE_graphicsview +qt_internal_extend_target(Widgets CONDITION QT_FEATURE_easingcurve AND QT_FEATURE_graphicsview SOURCES graphicsview/qgraphicsitemanimation.cpp graphicsview/qgraphicsitemanimation.h ) -qt_extend_target(Widgets CONDITION QT_FEATURE_completer +qt_internal_extend_target(Widgets CONDITION QT_FEATURE_completer SOURCES util/qcompleter.cpp util/qcompleter.h util/qcompleter_p.h ) -qt_extend_target(Widgets CONDITION QT_FEATURE_scroller +qt_internal_extend_target(Widgets CONDITION QT_FEATURE_scroller SOURCES util/qflickgesture.cpp util/qflickgesture_p.h util/qscroller.cpp util/qscroller.h util/qscroller_p.h util/qscrollerproperties.cpp util/qscrollerproperties.h util/qscrollerproperties_p.h ) -qt_extend_target(Widgets CONDITION QT_FEATURE_undoview +qt_internal_extend_target(Widgets CONDITION QT_FEATURE_undoview SOURCES util/qundoview.cpp util/qundoview.h ) -qt_extend_target(Widgets CONDITION QT_FEATURE_xcb +qt_internal_extend_target(Widgets CONDITION QT_FEATURE_xcb SOURCES util/qsystemtrayicon_x11.cpp ) -qt_extend_target(Widgets CONDITION NOT QT_FEATURE_xcb +qt_internal_extend_target(Widgets CONDITION NOT QT_FEATURE_xcb SOURCES util/qsystemtrayicon_qpa.cpp ) -qt_create_tracepoints(Widgets qtwidgets.tracepoints) -qt_add_docs(Widgets +qt_internal_create_tracepoints(Widgets qtwidgets.tracepoints) +qt_internal_add_docs(Widgets doc/qtwidgets.qdocconf ) diff --git a/src/widgets/CMakeLists.txt b/src/widgets/CMakeLists.txt index 2fb5f649671..1e181910144 100644 --- a/src/widgets/CMakeLists.txt +++ b/src/widgets/CMakeLists.txt @@ -4,7 +4,7 @@ ## Widgets Module: ##################################################################### -qt_add_module(Widgets +qt_internal_add_module(Widgets GENERATE_METATYPES QMAKE_MODULE_CONFIG uic PLUGIN_TYPES styles @@ -238,7 +238,7 @@ set(qstyle_resource_files "images/viewlist-32.png" ) -qt_add_resource(Widgets "qstyle" +qt_internal_add_resource(Widgets "qstyle" PREFIX "/qt-project.org/styles/commonstyle" BASE @@ -273,7 +273,7 @@ set(qstyle1_resource_files "images/[email protected]" ) -qt_add_resource(Widgets "qstyle1" +qt_internal_add_resource(Widgets "qstyle1" PREFIX "/qt-project.org/styles/macstyle" BASE @@ -294,12 +294,12 @@ endif() ## Scopes: ##################################################################### -qt_extend_target(Widgets CONDITION MSVC AND (TEST_architecture_arch STREQUAL "i386") +qt_internal_extend_target(Widgets CONDITION MSVC AND (TEST_architecture_arch STREQUAL "i386") LINK_OPTIONS "/BASE:0x65000000" ) -qt_extend_target(Widgets CONDITION MACOS +qt_internal_extend_target(Widgets CONDITION MACOS SOURCES kernel/qmacgesturerecognizer.cpp kernel/qmacgesturerecognizer_p.h LIBRARIES @@ -307,269 +307,269 @@ qt_extend_target(Widgets CONDITION MACOS z ) -qt_extend_target(Widgets CONDITION WIN32 +qt_internal_extend_target(Widgets CONDITION WIN32 LIBRARIES dwmapi shell32 uxtheme ) -qt_extend_target(Widgets CONDITION QT_FEATURE_graphicseffect +qt_internal_extend_target(Widgets CONDITION QT_FEATURE_graphicseffect SOURCES effects/qgraphicseffect.cpp effects/qgraphicseffect.h effects/qgraphicseffect_p.h effects/qpixmapfilter.cpp effects/qpixmapfilter_p.h ) -qt_extend_target(Widgets CONDITION QT_FEATURE_action +qt_internal_extend_target(Widgets CONDITION QT_FEATURE_action SOURCES kernel/qaction_widgets.cpp kernel/qaction_widgets_p.h kernel/qwidgetaction.cpp kernel/qwidgetaction.h kernel/qwidgetaction_p.h ) -qt_extend_target(Widgets CONDITION QT_FEATURE_formlayout +qt_internal_extend_target(Widgets CONDITION QT_FEATURE_formlayout SOURCES kernel/qformlayout.cpp kernel/qformlayout.h ) -qt_extend_target(Widgets CONDITION QT_FEATURE_shortcut +qt_internal_extend_target(Widgets CONDITION QT_FEATURE_shortcut SOURCES kernel/qshortcut_widgets.cpp ) -qt_extend_target(Widgets CONDITION QT_FEATURE_tooltip +qt_internal_extend_target(Widgets CONDITION QT_FEATURE_tooltip SOURCES kernel/qtooltip.cpp kernel/qtooltip.h ) -qt_extend_target(Widgets CONDITION QT_FEATURE_whatsthis +qt_internal_extend_target(Widgets CONDITION QT_FEATURE_whatsthis SOURCES kernel/qwhatsthis.cpp kernel/qwhatsthis.h ) -qt_extend_target(Widgets CONDITION QT_FEATURE_animation +qt_internal_extend_target(Widgets CONDITION QT_FEATURE_animation SOURCES styles/qstyleanimation.cpp styles/qstyleanimation_p.h ) -qt_extend_target(Widgets CONDITION QT_FEATURE_style_windows +qt_internal_extend_target(Widgets CONDITION QT_FEATURE_style_windows SOURCES styles/qwindowsstyle.cpp styles/qwindowsstyle_p.h styles/qwindowsstyle_p_p.h ) -qt_extend_target(Widgets CONDITION QT_FEATURE_style_fusion +qt_internal_extend_target(Widgets CONDITION QT_FEATURE_style_fusion SOURCES styles/qfusionstyle.cpp styles/qfusionstyle_p.h styles/qfusionstyle_p_p.h ) -qt_extend_target(Widgets CONDITION QT_FEATURE_abstractbutton +qt_internal_extend_target(Widgets CONDITION QT_FEATURE_abstractbutton SOURCES widgets/qabstractbutton.cpp widgets/qabstractbutton.h widgets/qabstractbutton_p.h ) -qt_extend_target(Widgets CONDITION QT_FEATURE_abstractslider +qt_internal_extend_target(Widgets CONDITION QT_FEATURE_abstractslider SOURCES widgets/qabstractslider.cpp widgets/qabstractslider.h widgets/qabstractslider_p.h ) -qt_extend_target(Widgets CONDITION QT_FEATURE_buttongroup +qt_internal_extend_target(Widgets CONDITION QT_FEATURE_buttongroup SOURCES widgets/qbuttongroup.cpp widgets/qbuttongroup.h widgets/qbuttongroup_p.h ) -qt_extend_target(Widgets CONDITION QT_FEATURE_calendarwidget +qt_internal_extend_target(Widgets CONDITION QT_FEATURE_calendarwidget SOURCES widgets/qcalendarwidget.cpp widgets/qcalendarwidget.h ) -qt_extend_target(Widgets CONDITION QT_FEATURE_checkbox +qt_internal_extend_target(Widgets CONDITION QT_FEATURE_checkbox SOURCES widgets/qcheckbox.cpp widgets/qcheckbox.h ) -qt_extend_target(Widgets CONDITION QT_FEATURE_combobox +qt_internal_extend_target(Widgets CONDITION QT_FEATURE_combobox SOURCES widgets/qcombobox.cpp widgets/qcombobox.h widgets/qcombobox_p.h ) -qt_extend_target(Widgets CONDITION QT_FEATURE_commandlinkbutton +qt_internal_extend_target(Widgets CONDITION QT_FEATURE_commandlinkbutton SOURCES widgets/qcommandlinkbutton.cpp widgets/qcommandlinkbutton.h ) -qt_extend_target(Widgets CONDITION QT_FEATURE_datetimeedit +qt_internal_extend_target(Widgets CONDITION QT_FEATURE_datetimeedit SOURCES widgets/qdatetimeedit.cpp widgets/qdatetimeedit.h widgets/qdatetimeedit_p.h ) -qt_extend_target(Widgets CONDITION QT_FEATURE_dial +qt_internal_extend_target(Widgets CONDITION QT_FEATURE_dial SOURCES widgets/qdial.cpp widgets/qdial.h ) -qt_extend_target(Widgets CONDITION QT_FEATURE_dockwidget +qt_internal_extend_target(Widgets CONDITION QT_FEATURE_dockwidget SOURCES widgets/qdockarealayout.cpp widgets/qdockarealayout_p.h widgets/qdockwidget.cpp widgets/qdockwidget.h widgets/qdockwidget_p.h ) -qt_extend_target(Widgets CONDITION QT_FEATURE_effects +qt_internal_extend_target(Widgets CONDITION QT_FEATURE_effects SOURCES widgets/qeffects.cpp widgets/qeffects_p.h ) -qt_extend_target(Widgets CONDITION QT_FEATURE_fontcombobox +qt_internal_extend_target(Widgets CONDITION QT_FEATURE_fontcombobox SOURCES widgets/qfontcombobox.cpp widgets/qfontcombobox.h ) -qt_extend_target(Widgets CONDITION QT_FEATURE_groupbox +qt_internal_extend_target(Widgets CONDITION QT_FEATURE_groupbox SOURCES widgets/qgroupbox.cpp widgets/qgroupbox.h ) -qt_extend_target(Widgets CONDITION QT_FEATURE_keysequenceedit +qt_internal_extend_target(Widgets CONDITION QT_FEATURE_keysequenceedit SOURCES widgets/qkeysequenceedit.cpp widgets/qkeysequenceedit.h widgets/qkeysequenceedit_p.h ) -qt_extend_target(Widgets CONDITION QT_FEATURE_label +qt_internal_extend_target(Widgets CONDITION QT_FEATURE_label SOURCES widgets/qlabel.cpp widgets/qlabel.h widgets/qlabel_p.h ) -qt_extend_target(Widgets CONDITION QT_FEATURE_lcdnumber +qt_internal_extend_target(Widgets CONDITION QT_FEATURE_lcdnumber SOURCES widgets/qlcdnumber.cpp widgets/qlcdnumber.h ) -qt_extend_target(Widgets CONDITION QT_FEATURE_lineedit +qt_internal_extend_target(Widgets CONDITION QT_FEATURE_lineedit SOURCES widgets/qlineedit.cpp widgets/qlineedit.h widgets/qlineedit_p.cpp widgets/qlineedit_p.h widgets/qwidgetlinecontrol.cpp widgets/qwidgetlinecontrol_p.h ) -qt_extend_target(Widgets CONDITION QT_FEATURE_mainwindow +qt_internal_extend_target(Widgets CONDITION QT_FEATURE_mainwindow SOURCES widgets/qmainwindow.cpp widgets/qmainwindow.h widgets/qmainwindowlayout.cpp widgets/qmainwindowlayout_p.h ) -qt_extend_target(Widgets CONDITION QT_FEATURE_mdiarea +qt_internal_extend_target(Widgets CONDITION QT_FEATURE_mdiarea SOURCES widgets/qmdiarea.cpp widgets/qmdiarea.h widgets/qmdiarea_p.h widgets/qmdisubwindow.cpp widgets/qmdisubwindow.h widgets/qmdisubwindow_p.h ) -qt_extend_target(Widgets CONDITION QT_FEATURE_menu +qt_internal_extend_target(Widgets CONDITION QT_FEATURE_menu SOURCES widgets/qmenu.cpp widgets/qmenu.h widgets/qmenu_p.h ) -qt_extend_target(Widgets CONDITION QT_FEATURE_menubar +qt_internal_extend_target(Widgets CONDITION QT_FEATURE_menubar SOURCES widgets/qmenubar.cpp widgets/qmenubar.h widgets/qmenubar_p.h ) -qt_extend_target(Widgets CONDITION QT_FEATURE_progressbar +qt_internal_extend_target(Widgets CONDITION QT_FEATURE_progressbar SOURCES widgets/qprogressbar.cpp widgets/qprogressbar.h ) -qt_extend_target(Widgets CONDITION QT_FEATURE_pushbutton +qt_internal_extend_target(Widgets CONDITION QT_FEATURE_pushbutton SOURCES widgets/qpushbutton.cpp widgets/qpushbutton.h widgets/qpushbutton_p.h ) -qt_extend_target(Widgets CONDITION QT_FEATURE_radiobutton +qt_internal_extend_target(Widgets CONDITION QT_FEATURE_radiobutton SOURCES widgets/qradiobutton.cpp widgets/qradiobutton.h ) -qt_extend_target(Widgets CONDITION QT_FEATURE_resizehandler +qt_internal_extend_target(Widgets CONDITION QT_FEATURE_resizehandler SOURCES widgets/qwidgetresizehandler.cpp widgets/qwidgetresizehandler_p.h ) -qt_extend_target(Widgets CONDITION QT_FEATURE_dialogbuttonbox +qt_internal_extend_target(Widgets CONDITION QT_FEATURE_dialogbuttonbox SOURCES widgets/qdialogbuttonbox.cpp widgets/qdialogbuttonbox.h ) -qt_extend_target(Widgets CONDITION QT_FEATURE_rubberband +qt_internal_extend_target(Widgets CONDITION QT_FEATURE_rubberband SOURCES widgets/qrubberband.cpp widgets/qrubberband.h ) -qt_extend_target(Widgets CONDITION QT_FEATURE_scrollarea +qt_internal_extend_target(Widgets CONDITION QT_FEATURE_scrollarea SOURCES widgets/qscrollarea.cpp widgets/qscrollarea.h widgets/qscrollarea_p.h ) -qt_extend_target(Widgets CONDITION QT_FEATURE_scrollbar +qt_internal_extend_target(Widgets CONDITION QT_FEATURE_scrollbar SOURCES widgets/qscrollbar.cpp widgets/qscrollbar.h widgets/qscrollbar_p.h ) -qt_extend_target(Widgets CONDITION QT_FEATURE_sizegrip +qt_internal_extend_target(Widgets CONDITION QT_FEATURE_sizegrip SOURCES widgets/qsizegrip.cpp widgets/qsizegrip.h ) -qt_extend_target(Widgets CONDITION QT_FEATURE_slider +qt_internal_extend_target(Widgets CONDITION QT_FEATURE_slider SOURCES widgets/qslider.cpp widgets/qslider.h ) -qt_extend_target(Widgets CONDITION QT_FEATURE_spinbox +qt_internal_extend_target(Widgets CONDITION QT_FEATURE_spinbox SOURCES widgets/qabstractspinbox.cpp widgets/qabstractspinbox.h widgets/qabstractspinbox_p.h widgets/qspinbox.cpp widgets/qspinbox.h ) -qt_extend_target(Widgets CONDITION QT_FEATURE_splashscreen +qt_internal_extend_target(Widgets CONDITION QT_FEATURE_splashscreen SOURCES widgets/qsplashscreen.cpp widgets/qsplashscreen.h ) -qt_extend_target(Widgets CONDITION QT_FEATURE_splitter +qt_internal_extend_target(Widgets CONDITION QT_FEATURE_splitter SOURCES widgets/qsplitter.cpp widgets/qsplitter.h widgets/qsplitter_p.h ) -qt_extend_target(Widgets CONDITION QT_FEATURE_stackedwidget +qt_internal_extend_target(Widgets CONDITION QT_FEATURE_stackedwidget SOURCES widgets/qstackedwidget.cpp widgets/qstackedwidget.h ) -qt_extend_target(Widgets CONDITION QT_FEATURE_statusbar +qt_internal_extend_target(Widgets CONDITION QT_FEATURE_statusbar SOURCES widgets/qstatusbar.cpp widgets/qstatusbar.h ) -qt_extend_target(Widgets CONDITION QT_FEATURE_tabbar +qt_internal_extend_target(Widgets CONDITION QT_FEATURE_tabbar SOURCES widgets/qtabbar.cpp widgets/qtabbar.h widgets/qtabbar_p.h ) -qt_extend_target(Widgets CONDITION QT_FEATURE_textedit +qt_internal_extend_target(Widgets CONDITION QT_FEATURE_textedit SOURCES widgets/qplaintextedit.cpp widgets/qplaintextedit.h widgets/qplaintextedit_p.h widgets/qtextedit.cpp widgets/qtextedit.h widgets/qtextedit_p.h ) -qt_extend_target(Widgets CONDITION QT_FEATURE_textbrowser +qt_internal_extend_target(Widgets CONDITION QT_FEATURE_textbrowser SOURCES widgets/qtextbrowser.cpp widgets/qtextbrowser.h ) -qt_extend_target(Widgets CONDITION QT_FEATURE_tabwidget +qt_internal_extend_target(Widgets CONDITION QT_FEATURE_tabwidget SOURCES widgets/qtabwidget.cpp widgets/qtabwidget.h ) -qt_extend_target(Widgets CONDITION QT_FEATURE_toolbar +qt_internal_extend_target(Widgets CONDITION QT_FEATURE_toolbar SOURCES widgets/qtoolbar.cpp widgets/qtoolbar.h widgets/qtoolbar_p.h widgets/qtoolbararealayout.cpp widgets/qtoolbararealayout_p.h @@ -577,44 +577,44 @@ qt_extend_target(Widgets CONDITION QT_FEATURE_toolbar widgets/qtoolbarseparator.cpp widgets/qtoolbarseparator_p.h ) -qt_extend_target(Widgets CONDITION QT_FEATURE_toolbox +qt_internal_extend_target(Widgets CONDITION QT_FEATURE_toolbox SOURCES widgets/qtoolbox.cpp widgets/qtoolbox.h ) -qt_extend_target(Widgets CONDITION QT_FEATURE_toolbutton +qt_internal_extend_target(Widgets CONDITION QT_FEATURE_toolbutton SOURCES widgets/qtoolbarextension.cpp widgets/qtoolbarextension_p.h widgets/qtoolbutton.cpp widgets/qtoolbutton.h ) -qt_extend_target(Widgets CONDITION QT_FEATURE_widgettextcontrol +qt_internal_extend_target(Widgets CONDITION QT_FEATURE_widgettextcontrol SOURCES widgets/qwidgettextcontrol.cpp widgets/qwidgettextcontrol_p.h widgets/qwidgettextcontrol_p_p.h ) -qt_extend_target(Widgets CONDITION MACOS AND (QT_FEATURE_menu OR QT_FEATURE_menubar) +qt_internal_extend_target(Widgets CONDITION MACOS AND (QT_FEATURE_menu OR QT_FEATURE_menubar) SOURCES widgets/qmenu_mac.mm ) -qt_extend_target(Widgets CONDITION QT_FEATURE_colordialog +qt_internal_extend_target(Widgets CONDITION QT_FEATURE_colordialog SOURCES dialogs/qcolordialog.cpp dialogs/qcolordialog.h ) -qt_extend_target(Widgets CONDITION QT_FEATURE_dialog +qt_internal_extend_target(Widgets CONDITION QT_FEATURE_dialog SOURCES dialogs/qdialog.cpp dialogs/qdialog.h dialogs/qdialog_p.h ) -qt_extend_target(Widgets CONDITION QT_FEATURE_errormessage +qt_internal_extend_target(Widgets CONDITION QT_FEATURE_errormessage SOURCES dialogs/qerrormessage.cpp dialogs/qerrormessage.h ) -qt_extend_target(Widgets CONDITION QT_FEATURE_filedialog +qt_internal_extend_target(Widgets CONDITION QT_FEATURE_filedialog SOURCES dialogs/qfiledialog.cpp dialogs/qfiledialog.h dialogs/qfiledialog.ui dialogs/qfiledialog_p.h dialogs/qsidebar.cpp dialogs/qsidebar_p.h @@ -622,22 +622,22 @@ qt_extend_target(Widgets CONDITION QT_FEATURE_filedialog uic ) -qt_extend_target(Widgets CONDITION QT_FEATURE_fontdialog +qt_internal_extend_target(Widgets CONDITION QT_FEATURE_fontdialog SOURCES dialogs/qfontdialog.cpp dialogs/qfontdialog.h dialogs/qfontdialog_p.h ) -qt_extend_target(Widgets CONDITION QT_FEATURE_fscompleter +qt_internal_extend_target(Widgets CONDITION QT_FEATURE_fscompleter SOURCES dialogs/qfscompleter_p.h ) -qt_extend_target(Widgets CONDITION QT_FEATURE_inputdialog +qt_internal_extend_target(Widgets CONDITION QT_FEATURE_inputdialog SOURCES dialogs/qinputdialog.cpp dialogs/qinputdialog.h ) -qt_extend_target(Widgets CONDITION QT_FEATURE_messagebox +qt_internal_extend_target(Widgets CONDITION QT_FEATURE_messagebox SOURCES dialogs/qmessagebox.cpp dialogs/qmessagebox.h ) @@ -648,7 +648,7 @@ if(QT_FEATURE_messagebox) "images/qtlogo-64.png" ) - qt_add_resource(Widgets "qmessagebox" + qt_internal_add_resource(Widgets "qmessagebox" PREFIX "/qt-project.org/qmessagebox" BASE @@ -658,22 +658,22 @@ if(QT_FEATURE_messagebox) ) endif() -qt_extend_target(Widgets CONDITION QT_FEATURE_progressdialog +qt_internal_extend_target(Widgets CONDITION QT_FEATURE_progressdialog SOURCES dialogs/qprogressdialog.cpp dialogs/qprogressdialog.h ) -qt_extend_target(Widgets CONDITION QT_FEATURE_wizard +qt_internal_extend_target(Widgets CONDITION QT_FEATURE_wizard SOURCES dialogs/qwizard.cpp dialogs/qwizard.h ) -qt_extend_target(Widgets CONDITION QT_FEATURE_wizard AND WIN32 +qt_internal_extend_target(Widgets CONDITION QT_FEATURE_wizard AND WIN32 SOURCES dialogs/qwizard_win.cpp dialogs/qwizard_win_p.h ) -qt_extend_target(Widgets CONDITION QT_FEATURE_accessibility +qt_internal_extend_target(Widgets CONDITION QT_FEATURE_accessibility SOURCES accessible/complexwidgets.cpp accessible/complexwidgets_p.h accessible/qaccessiblemenu.cpp accessible/qaccessiblemenu_p.h @@ -684,12 +684,12 @@ qt_extend_target(Widgets CONDITION QT_FEATURE_accessibility accessible/simplewidgets.cpp accessible/simplewidgets_p.h ) -qt_extend_target(Widgets CONDITION QT_FEATURE_accessibility AND QT_FEATURE_itemviews +qt_internal_extend_target(Widgets CONDITION QT_FEATURE_accessibility AND QT_FEATURE_itemviews SOURCES accessible/itemviews.cpp accessible/itemviews_p.h ) -qt_extend_target(Widgets CONDITION QT_FEATURE_itemviews +qt_internal_extend_target(Widgets CONDITION QT_FEATURE_itemviews SOURCES itemviews/qabstractitemdelegate.cpp itemviews/qabstractitemdelegate.h itemviews/qabstractitemdelegate_p.h itemviews/qabstractitemview.cpp itemviews/qabstractitemview.h itemviews/qabstractitemview_p.h @@ -701,49 +701,49 @@ qt_extend_target(Widgets CONDITION QT_FEATURE_itemviews itemviews/qwidgetitemdata_p.h ) -qt_extend_target(Widgets CONDITION QT_FEATURE_columnview +qt_internal_extend_target(Widgets CONDITION QT_FEATURE_columnview SOURCES itemviews/qcolumnview.cpp itemviews/qcolumnview.h itemviews/qcolumnview_p.h itemviews/qcolumnviewgrip.cpp itemviews/qcolumnviewgrip_p.h ) -qt_extend_target(Widgets CONDITION QT_FEATURE_datawidgetmapper +qt_internal_extend_target(Widgets CONDITION QT_FEATURE_datawidgetmapper SOURCES itemviews/qdatawidgetmapper.cpp itemviews/qdatawidgetmapper.h ) -qt_extend_target(Widgets CONDITION QT_FEATURE_listview +qt_internal_extend_target(Widgets CONDITION QT_FEATURE_listview SOURCES itemviews/qlistview.cpp itemviews/qlistview.h itemviews/qlistview_p.h ) -qt_extend_target(Widgets CONDITION QT_FEATURE_listwidget +qt_internal_extend_target(Widgets CONDITION QT_FEATURE_listwidget SOURCES itemviews/qlistwidget.cpp itemviews/qlistwidget.h itemviews/qlistwidget_p.h ) -qt_extend_target(Widgets CONDITION QT_FEATURE_tableview +qt_internal_extend_target(Widgets CONDITION QT_FEATURE_tableview SOURCES itemviews/qtableview.cpp itemviews/qtableview.h itemviews/qtableview_p.h ) -qt_extend_target(Widgets CONDITION QT_FEATURE_tablewidget +qt_internal_extend_target(Widgets CONDITION QT_FEATURE_tablewidget SOURCES itemviews/qtablewidget.cpp itemviews/qtablewidget.h itemviews/qtablewidget_p.h ) -qt_extend_target(Widgets CONDITION QT_FEATURE_treeview +qt_internal_extend_target(Widgets CONDITION QT_FEATURE_treeview SOURCES itemviews/qtreeview.cpp itemviews/qtreeview.h itemviews/qtreeview_p.h ) -qt_extend_target(Widgets CONDITION QT_FEATURE_treewidget +qt_internal_extend_target(Widgets CONDITION QT_FEATURE_treewidget SOURCES itemviews/qtreewidget.cpp itemviews/qtreewidget.h itemviews/qtreewidget_p.h itemviews/qtreewidgetitemiterator.cpp itemviews/qtreewidgetitemiterator.h ) -qt_extend_target(Widgets CONDITION QT_FEATURE_graphicsview +qt_internal_extend_target(Widgets CONDITION QT_FEATURE_graphicsview SOURCES graphicsview/qgraph_p.h graphicsview/qgraphicsanchorlayout.cpp graphicsview/qgraphicsanchorlayout.h graphicsview/qgraphicsanchorlayout_p.cpp graphicsview/qgraphicsanchorlayout_p.h @@ -767,41 +767,41 @@ qt_extend_target(Widgets CONDITION QT_FEATURE_graphicsview graphicsview/qsimplex_p.cpp graphicsview/qsimplex_p.h ) -qt_extend_target(Widgets CONDITION QT_FEATURE_easingcurve AND QT_FEATURE_graphicsview +qt_internal_extend_target(Widgets CONDITION QT_FEATURE_easingcurve AND QT_FEATURE_graphicsview SOURCES graphicsview/qgraphicsitemanimation.cpp graphicsview/qgraphicsitemanimation.h ) -qt_extend_target(Widgets CONDITION QT_FEATURE_completer +qt_internal_extend_target(Widgets CONDITION QT_FEATURE_completer SOURCES util/qcompleter.cpp util/qcompleter.h util/qcompleter_p.h ) -qt_extend_target(Widgets CONDITION QT_FEATURE_scroller +qt_internal_extend_target(Widgets CONDITION QT_FEATURE_scroller SOURCES util/qflickgesture.cpp util/qflickgesture_p.h util/qscroller.cpp util/qscroller.h util/qscroller_p.h util/qscrollerproperties.cpp util/qscrollerproperties.h util/qscrollerproperties_p.h ) -qt_extend_target(Widgets CONDITION QT_FEATURE_undoview +qt_internal_extend_target(Widgets CONDITION QT_FEATURE_undoview SOURCES util/qundoview.cpp util/qundoview.h ) -qt_extend_target(Widgets CONDITION QT_FEATURE_xcb +qt_internal_extend_target(Widgets CONDITION QT_FEATURE_xcb SOURCES util/qsystemtrayicon_x11.cpp ) -qt_extend_target(Widgets CONDITION NOT QT_FEATURE_xcb +qt_internal_extend_target(Widgets CONDITION NOT QT_FEATURE_xcb SOURCES util/qsystemtrayicon_qpa.cpp ) -qt_create_tracepoints(Widgets qtwidgets.tracepoints) -qt_add_docs(Widgets +qt_internal_create_tracepoints(Widgets qtwidgets.tracepoints) +qt_internal_add_docs(Widgets doc/qtwidgets.qdocconf ) diff --git a/src/winmain/.prev_CMakeLists.txt b/src/winmain/.prev_CMakeLists.txt deleted file mode 100644 index 5b08a0e863b..00000000000 --- a/src/winmain/.prev_CMakeLists.txt +++ /dev/null @@ -1,43 +0,0 @@ -# Generated from winmain.pro. - -##################################################################### -## qtLibraryTarget$$TARGET$$QT_LIBINFIX Module: -##################################################################### - -add_qt_module(qtLibraryTarget$$TARGET$$QT_LIBINFIX - STATIC - DEFINES - QT_NO_FOREACH - PUBLIC_LIBRARIES - Qt::Core -) - -#### Keys ignored in scope 1:.:.:winmain.pro:<TRUE>: -# CONFIG = "static" -# DESTDIR = "$$QT.core.libs" -# TEMPLATE = "lib" -# _LOADED = "qt_installs" "qt_targets" "qt_build_paths" "qt_common" - -## Scopes: -##################################################################### - -#### Keys ignored in scope 3:.:.:winmain.pro:QT_FEATURE_debug_and_release: -# CONFIG = "build_all" - -#### Keys ignored in scope 4:.:.:winmain.pro:MSVC: -# QMAKE_CFLAGS_DEBUG = "--Zi" "-Z7" - -extend_target(qtLibraryTarget$$TARGET$$QT_LIBINFIX CONDITION mingw - DEFINES - QT_NEEDS_QMAIN -) - -extend_target(qtLibraryTarget$$TARGET$$QT_LIBINFIX - SOURCES - qtmain_win.cpp - LIBRARIES - shell32 -) - -#### Keys ignored in scope 10:.:.:winmain.pro:else: -# CONFIG = "-qt" diff --git a/src/winmain/CMakeLists.txt b/src/winmain/CMakeLists.txt index fca26090826..1a74a1e3ae5 100644 --- a/src/winmain/CMakeLists.txt +++ b/src/winmain/CMakeLists.txt @@ -4,7 +4,7 @@ if (NOT WIN32) return() endif() -qt_add_module(WinMain +qt_internal_add_module(WinMain STATIC NO_SYNC_QT NO_MODULE_HEADERS @@ -22,12 +22,12 @@ endif() set_property(TARGET WinMain PROPERTY OUTPUT_NAME qtmain) -qt_extend_target(WinMain CONDITION +qt_internal_extend_target(WinMain CONDITION SOURCES qtmain_win.cpp LIBRARIES shell32 ) -qt_extend_target(WinMain CONDITION MINGW +qt_internal_extend_target(WinMain CONDITION MINGW DEFINES QT_NEEDS_QMAIN ) # special case end diff --git a/src/xml/CMakeLists.txt b/src/xml/CMakeLists.txt index 53cbeeaddc8..b2db149f8d6 100644 --- a/src/xml/CMakeLists.txt +++ b/src/xml/CMakeLists.txt @@ -4,7 +4,7 @@ ## Xml Module: ##################################################################### -qt_add_module(Xml +qt_internal_add_module(Xml SOURCES dom/qdom.cpp dom/qdom.h dom/qdom_p.h dom/qdomhelpers.cpp dom/qdomhelpers_p.h @@ -23,11 +23,11 @@ qt_add_module(Xml ## Scopes: ##################################################################### -qt_extend_target(Xml CONDITION MSVC AND (TEST_architecture_arch STREQUAL "i386") +qt_internal_extend_target(Xml CONDITION MSVC AND (TEST_architecture_arch STREQUAL "i386") LINK_OPTIONS "/BASE:0x61000000" ) -qt_add_docs(Xml +qt_internal_add_docs(Xml doc/qtxml.qdocconf ) diff --git a/tests/auto/concurrent/qtconcurrentfilter/.prev_CMakeLists.txt b/tests/auto/concurrent/qtconcurrentfilter/.prev_CMakeLists.txt index be8c936c481..f81bed27d6e 100644 --- a/tests/auto/concurrent/qtconcurrentfilter/.prev_CMakeLists.txt +++ b/tests/auto/concurrent/qtconcurrentfilter/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qtconcurrentfilter Test: ##################################################################### -add_qt_test(tst_qtconcurrentfilter +qt_internal_add_test(tst_qtconcurrentfilter SOURCES tst_qtconcurrentfilter.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/concurrent/qtconcurrentfilter/CMakeLists.txt b/tests/auto/concurrent/qtconcurrentfilter/CMakeLists.txt index 78689061789..f81bed27d6e 100644 --- a/tests/auto/concurrent/qtconcurrentfilter/CMakeLists.txt +++ b/tests/auto/concurrent/qtconcurrentfilter/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qtconcurrentfilter Test: ##################################################################### -qt_add_test(tst_qtconcurrentfilter +qt_internal_add_test(tst_qtconcurrentfilter SOURCES tst_qtconcurrentfilter.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/concurrent/qtconcurrentiteratekernel/CMakeLists.txt b/tests/auto/concurrent/qtconcurrentiteratekernel/CMakeLists.txt index e73d574fcbc..2c74f6542e9 100644 --- a/tests/auto/concurrent/qtconcurrentiteratekernel/CMakeLists.txt +++ b/tests/auto/concurrent/qtconcurrentiteratekernel/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qtconcurrentiteratekernel Test: ##################################################################### -qt_add_test(tst_qtconcurrentiteratekernel +qt_internal_add_test(tst_qtconcurrentiteratekernel SOURCES tst_qtconcurrentiteratekernel.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/concurrent/qtconcurrentmap/.prev_CMakeLists.txt b/tests/auto/concurrent/qtconcurrentmap/.prev_CMakeLists.txt index be51bf09bd8..20ccbdf3746 100644 --- a/tests/auto/concurrent/qtconcurrentmap/.prev_CMakeLists.txt +++ b/tests/auto/concurrent/qtconcurrentmap/.prev_CMakeLists.txt @@ -4,11 +4,9 @@ ## tst_qtconcurrentmap Test: ##################################################################### -add_qt_test(tst_qtconcurrentmap +qt_internal_add_test(tst_qtconcurrentmap SOURCES tst_qtconcurrentmap.cpp - DEFINES - -QT_NO_LINKED_LIST PUBLIC_LIBRARIES Qt::Concurrent ) diff --git a/tests/auto/concurrent/qtconcurrentmap/CMakeLists.txt b/tests/auto/concurrent/qtconcurrentmap/CMakeLists.txt index c14780e0de1..20ccbdf3746 100644 --- a/tests/auto/concurrent/qtconcurrentmap/CMakeLists.txt +++ b/tests/auto/concurrent/qtconcurrentmap/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qtconcurrentmap Test: ##################################################################### -qt_add_test(tst_qtconcurrentmap +qt_internal_add_test(tst_qtconcurrentmap SOURCES tst_qtconcurrentmap.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/concurrent/qtconcurrentmedian/CMakeLists.txt b/tests/auto/concurrent/qtconcurrentmedian/CMakeLists.txt index 5d7e95049ff..cbae4d1fb1a 100644 --- a/tests/auto/concurrent/qtconcurrentmedian/CMakeLists.txt +++ b/tests/auto/concurrent/qtconcurrentmedian/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qtconcurrentmedian Test: ##################################################################### -qt_add_test(tst_qtconcurrentmedian +qt_internal_add_test(tst_qtconcurrentmedian SOURCES tst_qtconcurrentmedian.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/concurrent/qtconcurrentrun/CMakeLists.txt b/tests/auto/concurrent/qtconcurrentrun/CMakeLists.txt index 07cb4d360f4..9f3b60481d2 100644 --- a/tests/auto/concurrent/qtconcurrentrun/CMakeLists.txt +++ b/tests/auto/concurrent/qtconcurrentrun/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qtconcurrentrun Test: ##################################################################### -qt_add_test(tst_qtconcurrentrun +qt_internal_add_test(tst_qtconcurrentrun SOURCES tst_qtconcurrentrun.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/concurrent/qtconcurrenttask/CMakeLists.txt b/tests/auto/concurrent/qtconcurrenttask/CMakeLists.txt index 23a0d45e837..60f5cb47e30 100644 --- a/tests/auto/concurrent/qtconcurrenttask/CMakeLists.txt +++ b/tests/auto/concurrent/qtconcurrenttask/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qtconcurrenttask Test: ##################################################################### -qt_add_test(tst_qtconcurrenttask +qt_internal_add_test(tst_qtconcurrenttask SOURCES tst_qtconcurrenttask.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/concurrent/qtconcurrentthreadengine/CMakeLists.txt b/tests/auto/concurrent/qtconcurrentthreadengine/CMakeLists.txt index 9c24dd16624..8a7f006674a 100644 --- a/tests/auto/concurrent/qtconcurrentthreadengine/CMakeLists.txt +++ b/tests/auto/concurrent/qtconcurrentthreadengine/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qtconcurrentthreadengine Test: ##################################################################### -qt_add_test(tst_qtconcurrentthreadengine +qt_internal_add_test(tst_qtconcurrentthreadengine SOURCES tst_qtconcurrentthreadengine.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/corelib/animation/qabstractanimation/CMakeLists.txt b/tests/auto/corelib/animation/qabstractanimation/CMakeLists.txt index 4e9759faaec..7db3ef9462a 100644 --- a/tests/auto/corelib/animation/qabstractanimation/CMakeLists.txt +++ b/tests/auto/corelib/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 ) diff --git a/tests/auto/corelib/animation/qanimationgroup/CMakeLists.txt b/tests/auto/corelib/animation/qanimationgroup/CMakeLists.txt index d25e437ea59..5dcdf49836f 100644 --- a/tests/auto/corelib/animation/qanimationgroup/CMakeLists.txt +++ b/tests/auto/corelib/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 ) diff --git a/tests/auto/corelib/animation/qparallelanimationgroup/CMakeLists.txt b/tests/auto/corelib/animation/qparallelanimationgroup/CMakeLists.txt index 182bee1cbff..9a6c9f45db4 100644 --- a/tests/auto/corelib/animation/qparallelanimationgroup/CMakeLists.txt +++ b/tests/auto/corelib/animation/qparallelanimationgroup/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qparallelanimationgroup Test: ##################################################################### -qt_add_test(tst_qparallelanimationgroup +qt_internal_add_test(tst_qparallelanimationgroup SOURCES tst_qparallelanimationgroup.cpp ) diff --git a/tests/auto/corelib/animation/qpauseanimation/CMakeLists.txt b/tests/auto/corelib/animation/qpauseanimation/CMakeLists.txt index 7fd1132c336..bc846d33e7b 100644 --- a/tests/auto/corelib/animation/qpauseanimation/CMakeLists.txt +++ b/tests/auto/corelib/animation/qpauseanimation/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qpauseanimation Test: ##################################################################### -qt_add_test(tst_qpauseanimation +qt_internal_add_test(tst_qpauseanimation SOURCES tst_qpauseanimation.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/corelib/animation/qpropertyanimation/CMakeLists.txt b/tests/auto/corelib/animation/qpropertyanimation/CMakeLists.txt index be27578dae2..5233616115b 100644 --- a/tests/auto/corelib/animation/qpropertyanimation/CMakeLists.txt +++ b/tests/auto/corelib/animation/qpropertyanimation/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qpropertyanimation Test: ##################################################################### -qt_add_test(tst_qpropertyanimation +qt_internal_add_test(tst_qpropertyanimation SOURCES tst_qpropertyanimation.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/corelib/animation/qsequentialanimationgroup/CMakeLists.txt b/tests/auto/corelib/animation/qsequentialanimationgroup/CMakeLists.txt index 5418f1e1989..e56f9f6ff87 100644 --- a/tests/auto/corelib/animation/qsequentialanimationgroup/CMakeLists.txt +++ b/tests/auto/corelib/animation/qsequentialanimationgroup/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qsequentialanimationgroup Test: ##################################################################### -qt_add_test(tst_qsequentialanimationgroup +qt_internal_add_test(tst_qsequentialanimationgroup SOURCES tst_qsequentialanimationgroup.cpp ) diff --git a/tests/auto/corelib/animation/qvariantanimation/CMakeLists.txt b/tests/auto/corelib/animation/qvariantanimation/CMakeLists.txt index caebb13342b..aa85e1fb5c3 100644 --- a/tests/auto/corelib/animation/qvariantanimation/CMakeLists.txt +++ b/tests/auto/corelib/animation/qvariantanimation/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qvariantanimation Test: ##################################################################### -qt_add_test(tst_qvariantanimation +qt_internal_add_test(tst_qvariantanimation SOURCES tst_qvariantanimation.cpp ) diff --git a/tests/auto/corelib/global/q_func_info/CMakeLists.txt b/tests/auto/corelib/global/q_func_info/CMakeLists.txt index 57ae4369a27..93257c31de2 100644 --- a/tests/auto/corelib/global/q_func_info/CMakeLists.txt +++ b/tests/auto/corelib/global/q_func_info/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_q_func_info Test: ##################################################################### -qt_add_test(tst_q_func_info +qt_internal_add_test(tst_q_func_info SOURCES tst_q_func_info.cpp ) diff --git a/tests/auto/corelib/global/qflags/CMakeLists.txt b/tests/auto/corelib/global/qflags/CMakeLists.txt index 8ba1cb6d48b..998834d6198 100644 --- a/tests/auto/corelib/global/qflags/CMakeLists.txt +++ b/tests/auto/corelib/global/qflags/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qflags Test: ##################################################################### -qt_add_test(tst_qflags +qt_internal_add_test(tst_qflags SOURCES tst_qflags.cpp ) diff --git a/tests/auto/corelib/global/qfloat16/CMakeLists.txt b/tests/auto/corelib/global/qfloat16/CMakeLists.txt index a9c3f2dd7f6..b2848846faf 100644 --- a/tests/auto/corelib/global/qfloat16/CMakeLists.txt +++ b/tests/auto/corelib/global/qfloat16/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qfloat16 Test: ##################################################################### -qt_add_test(tst_qfloat16 +qt_internal_add_test(tst_qfloat16 SOURCES tst_qfloat16.cpp ) diff --git a/tests/auto/corelib/global/qgetputenv/CMakeLists.txt b/tests/auto/corelib/global/qgetputenv/CMakeLists.txt index a2cc20c3787..79d45c58b0e 100644 --- a/tests/auto/corelib/global/qgetputenv/CMakeLists.txt +++ b/tests/auto/corelib/global/qgetputenv/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qgetputenv Test: ##################################################################### -qt_add_test(tst_qgetputenv +qt_internal_add_test(tst_qgetputenv SOURCES tst_qgetputenv.cpp ) diff --git a/tests/auto/corelib/global/qglobal/CMakeLists.txt b/tests/auto/corelib/global/qglobal/CMakeLists.txt index c292b65cf94..de9a94629a3 100644 --- a/tests/auto/corelib/global/qglobal/CMakeLists.txt +++ b/tests/auto/corelib/global/qglobal/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qglobal Test: ##################################################################### -qt_add_test(tst_qglobal +qt_internal_add_test(tst_qglobal SOURCES qglobal.c tst_qglobal.cpp diff --git a/tests/auto/corelib/global/qglobalstatic/CMakeLists.txt b/tests/auto/corelib/global/qglobalstatic/CMakeLists.txt index cadc627fa7e..959b2b25b05 100644 --- a/tests/auto/corelib/global/qglobalstatic/CMakeLists.txt +++ b/tests/auto/corelib/global/qglobalstatic/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qglobalstatic Test: ##################################################################### -qt_add_test(tst_qglobalstatic +qt_internal_add_test(tst_qglobalstatic EXCEPTIONS SOURCES tst_qglobalstatic.cpp diff --git a/tests/auto/corelib/global/qhooks/CMakeLists.txt b/tests/auto/corelib/global/qhooks/CMakeLists.txt index 0aaefaf96ee..c8d6f1a7698 100644 --- a/tests/auto/corelib/global/qhooks/CMakeLists.txt +++ b/tests/auto/corelib/global/qhooks/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qhooks Test: ##################################################################### -qt_add_test(tst_qhooks +qt_internal_add_test(tst_qhooks SOURCES tst_qhooks.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/corelib/global/qkeycombination/CMakeLists.txt b/tests/auto/corelib/global/qkeycombination/CMakeLists.txt index 894e1e973f1..9553a35dead 100644 --- a/tests/auto/corelib/global/qkeycombination/CMakeLists.txt +++ b/tests/auto/corelib/global/qkeycombination/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qkeycombination Test: ##################################################################### -qt_add_test(tst_qkeycombination +qt_internal_add_test(tst_qkeycombination SOURCES tst_qkeycombination.cpp ) diff --git a/tests/auto/corelib/global/qlogging/CMakeLists.txt b/tests/auto/corelib/global/qlogging/CMakeLists.txt index e47f62776dd..06f24a675f9 100644 --- a/tests/auto/corelib/global/qlogging/CMakeLists.txt +++ b/tests/auto/corelib/global/qlogging/CMakeLists.txt @@ -1,7 +1,7 @@ # Generated from qlogging.pro. # This file is almost completely custom written # special case -qt_add_executable(qlogging_helper +qt_internal_add_executable(qlogging_helper NO_INSTALL # special case OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case SOURCES app/main.cpp @@ -16,7 +16,7 @@ endif() set_target_properties(qlogging_helper PROPERTIES CXX_VISIBILITY_PRESET default) # special case end -qt_add_test(tst_qlogging SOURCES tst_qlogging.cpp +qt_internal_add_test(tst_qlogging SOURCES tst_qlogging.cpp DEFINES QT_MESSAGELOGCONTEXT QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/corelib/global/qnumeric/CMakeLists.txt b/tests/auto/corelib/global/qnumeric/CMakeLists.txt index 7ca7b92f707..0359af03aeb 100644 --- a/tests/auto/corelib/global/qnumeric/CMakeLists.txt +++ b/tests/auto/corelib/global/qnumeric/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qnumeric Test: ##################################################################### -qt_add_test(tst_qnumeric +qt_internal_add_test(tst_qnumeric SOURCES tst_qnumeric.cpp PUBLIC_LIBRARIES @@ -14,13 +14,13 @@ qt_add_test(tst_qnumeric ## Scopes: ##################################################################### -qt_extend_target(tst_qnumeric CONDITION ICC +qt_internal_extend_target(tst_qnumeric CONDITION ICC COMPILE_OPTIONS -fp-model strict ) -qt_extend_target(tst_qnumeric CONDITION intel_icl +qt_internal_extend_target(tst_qnumeric CONDITION intel_icl COMPILE_OPTIONS /fp:strict ) diff --git a/tests/auto/corelib/global/qrandomgenerator/CMakeLists.txt b/tests/auto/corelib/global/qrandomgenerator/CMakeLists.txt index 4e162e8fa4c..54fa36b5dfc 100644 --- a/tests/auto/corelib/global/qrandomgenerator/CMakeLists.txt +++ b/tests/auto/corelib/global/qrandomgenerator/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qrandomgenerator Test: ##################################################################### -qt_add_test(tst_qrandomgenerator +qt_internal_add_test(tst_qrandomgenerator SOURCES tst_qrandomgenerator.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/corelib/global/qtendian/CMakeLists.txt b/tests/auto/corelib/global/qtendian/CMakeLists.txt index 77c3c433cdc..acd09819918 100644 --- a/tests/auto/corelib/global/qtendian/CMakeLists.txt +++ b/tests/auto/corelib/global/qtendian/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qtendian Test: ##################################################################### -qt_add_test(tst_qtendian +qt_internal_add_test(tst_qtendian SOURCES tst_qtendian.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/corelib/global/qwinregistry/CMakeLists.txt b/tests/auto/corelib/global/qwinregistry/CMakeLists.txt index fc88750c9c5..95d591a1252 100644 --- a/tests/auto/corelib/global/qwinregistry/CMakeLists.txt +++ b/tests/auto/corelib/global/qwinregistry/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qwinregistry Test: ##################################################################### -qt_add_test(tst_qwinregistry +qt_internal_add_test(tst_qwinregistry SOURCES tst_qwinregistry.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/corelib/io/largefile/CMakeLists.txt b/tests/auto/corelib/io/largefile/CMakeLists.txt index 6e9a3cbae83..be4b21033f9 100644 --- a/tests/auto/corelib/io/largefile/CMakeLists.txt +++ b/tests/auto/corelib/io/largefile/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_largefile Test: ##################################################################### -qt_add_test(tst_largefile +qt_internal_add_test(tst_largefile SOURCES ../../../../shared/emulationdetector.h tst_largefile.cpp diff --git a/tests/auto/corelib/io/qabstractfileengine/CMakeLists.txt b/tests/auto/corelib/io/qabstractfileengine/CMakeLists.txt index 8267c7241c6..7e3b79403dc 100644 --- a/tests/auto/corelib/io/qabstractfileengine/CMakeLists.txt +++ b/tests/auto/corelib/io/qabstractfileengine/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qabstractfileengine Test: ##################################################################### -qt_add_test(tst_qabstractfileengine +qt_internal_add_test(tst_qabstractfileengine SOURCES tst_qabstractfileengine.cpp PUBLIC_LIBRARIES @@ -16,7 +16,7 @@ set(qabstractfileengine_resource_files "resources/" ) -qt_add_resource(tst_qabstractfileengine "qabstractfileengine" +qt_internal_add_resource(tst_qabstractfileengine "qabstractfileengine" PREFIX "/tst_qabstractfileengine/" FILES diff --git a/tests/auto/corelib/io/qbuffer/CMakeLists.txt b/tests/auto/corelib/io/qbuffer/CMakeLists.txt index 5a374173efa..7d57d78b3f0 100644 --- a/tests/auto/corelib/io/qbuffer/CMakeLists.txt +++ b/tests/auto/corelib/io/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 ) diff --git a/tests/auto/corelib/io/qdataurl/CMakeLists.txt b/tests/auto/corelib/io/qdataurl/CMakeLists.txt index 8020879311e..b13a235d3bb 100644 --- a/tests/auto/corelib/io/qdataurl/CMakeLists.txt +++ b/tests/auto/corelib/io/qdataurl/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qdataurl Test: ##################################################################### -qt_add_test(tst_qdataurl +qt_internal_add_test(tst_qdataurl SOURCES tst_qdataurl.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/corelib/io/qdebug/CMakeLists.txt b/tests/auto/corelib/io/qdebug/CMakeLists.txt index 6656b6089bf..39b92b9d2fd 100644 --- a/tests/auto/corelib/io/qdebug/CMakeLists.txt +++ b/tests/auto/corelib/io/qdebug/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qdebug Test: ##################################################################### -qt_add_test(tst_qdebug +qt_internal_add_test(tst_qdebug SOURCES tst_qdebug.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/corelib/io/qdir/CMakeLists.txt b/tests/auto/corelib/io/qdir/CMakeLists.txt index 49711da0872..4c26780f992 100644 --- a/tests/auto/corelib/io/qdir/CMakeLists.txt +++ b/tests/auto/corelib/io/qdir/CMakeLists.txt @@ -13,7 +13,7 @@ list(APPEND test_data "entrylist") list(APPEND test_data "types") list(APPEND test_data "tst_qdir.cpp") -qt_add_test(tst_qdir +qt_internal_add_test(tst_qdir SOURCES tst_qdir.cpp PUBLIC_LIBRARIES @@ -26,7 +26,7 @@ set(qdir_resource_files "resources/entryList/" ) -qt_add_resource(tst_qdir "qdir" +qt_internal_add_resource(tst_qdir "qdir" PREFIX "/tst_qdir/" FILES @@ -40,7 +40,7 @@ qt_add_resource(tst_qdir "qdir" #### Keys ignored in scope 2:.:.:qdir.pro:IOS: # QMAKE_INFO_PLIST = "Info.plist" -qt_extend_target(tst_qdir CONDITION CONFIG___contains___builtin_testdata +qt_internal_extend_target(tst_qdir CONDITION CONFIG___contains___builtin_testdata DEFINES BUILTIN_TESTDATA ) @@ -90,7 +90,7 @@ if(ANDROID AND NOT ANDROID_EMBEDDED) "types/f/dummy" ) - qt_add_resource(tst_qdir "android_testdata" + qt_internal_add_resource(tst_qdir "android_testdata" PREFIX "/android_testdata" FILES diff --git a/tests/auto/corelib/io/qdir/testdir/dir/CMakeLists.txt b/tests/auto/corelib/io/qdir/testdir/dir/CMakeLists.txt index 19e64e037cf..92ce7b4e89f 100644 --- a/tests/auto/corelib/io/qdir/testdir/dir/CMakeLists.txt +++ b/tests/auto/corelib/io/qdir/testdir/dir/CMakeLists.txt @@ -4,7 +4,7 @@ ## qdir Binary: ##################################################################### -qt_add_executable(qdir +qt_internal_add_executable(qdir GUI DEFINES QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/corelib/io/qdiriterator/CMakeLists.txt b/tests/auto/corelib/io/qdiriterator/CMakeLists.txt index 39703e8c835..feb742396d3 100644 --- a/tests/auto/corelib/io/qdiriterator/CMakeLists.txt +++ b/tests/auto/corelib/io/qdiriterator/CMakeLists.txt @@ -7,7 +7,7 @@ # Collect test data list(APPEND test_data "entrylist") -qt_add_test(tst_qdiriterator +qt_internal_add_test(tst_qdiriterator SOURCES tst_qdiriterator.cpp PUBLIC_LIBRARIES @@ -21,7 +21,7 @@ set(qdiriterator_resource_files "entrylist/file" ) -qt_add_resource(tst_qdiriterator "qdiriterator" +qt_internal_add_resource(tst_qdiriterator "qdiriterator" PREFIX "/testdata/" FILES @@ -32,7 +32,7 @@ qt_add_resource(tst_qdiriterator "qdiriterator" ## Scopes: ##################################################################### -qt_extend_target(tst_qdiriterator CONDITION CONFIG___contains___builtin_testdata +qt_internal_extend_target(tst_qdiriterator CONDITION CONFIG___contains___builtin_testdata DEFINES BUILTIN_TESTDATA ) diff --git a/tests/auto/corelib/io/qfile/.prev_CMakeLists.txt b/tests/auto/corelib/io/qfile/.prev_CMakeLists.txt index 8e72a89649e..e32930f55ab 100644 --- a/tests/auto/corelib/io/qfile/.prev_CMakeLists.txt +++ b/tests/auto/corelib/io/qfile/.prev_CMakeLists.txt @@ -17,7 +17,7 @@ list(APPEND test_data "forCopying.txt") list(APPEND test_data "forRenaming.txt") list(APPEND test_data "resources/file1.ext1") -qt_add_test(tst_qfile +qt_internal_add_test(tst_qfile SOURCES ../../../../shared/emulationdetector.h tst_qfile.cpp @@ -33,7 +33,7 @@ set(qfile_resource_files "resources/" ) -qt_add_resource(tst_qfile "qfile" +qt_internal_add_resource(tst_qfile "qfile" PREFIX "/tst_qfileinfo/" FILES @@ -43,7 +43,7 @@ set(rename-fallback_resource_files "rename-fallback.qrc" ) -qt_add_resource(tst_qfile "rename-fallback" +qt_internal_add_resource(tst_qfile "rename-fallback" PREFIX "/" FILES @@ -53,7 +53,7 @@ set(copy-fallback_resource_files "copy-fallback.qrc" ) -qt_add_resource(tst_qfile "copy-fallback" +qt_internal_add_resource(tst_qfile "copy-fallback" PREFIX "/" FILES @@ -64,22 +64,22 @@ qt_add_resource(tst_qfile "copy-fallback" ## Scopes: ##################################################################### -qt_extend_target(tst_qfile CONDITION TARGET Qt::Network +qt_internal_extend_target(tst_qfile CONDITION TARGET Qt::Network PUBLIC_LIBRARIES Qt::Network ) -qt_extend_target(tst_qfile CONDITION NOT TARGET Qt::Network +qt_internal_extend_target(tst_qfile CONDITION NOT TARGET Qt::Network DEFINES QT_NO_NETWORK ) -qt_extend_target(tst_qfile CONDITION CONFIG___contains___builtin_testdata +qt_internal_extend_target(tst_qfile CONDITION CONFIG___contains___builtin_testdata DEFINES BUILTIN_TESTDATA ) -qt_extend_target(tst_qfile CONDITION WIN32 +qt_internal_extend_target(tst_qfile CONDITION WIN32 PUBLIC_LIBRARIES ole32 uuid diff --git a/tests/auto/corelib/io/qfile/CMakeLists.txt b/tests/auto/corelib/io/qfile/CMakeLists.txt index 916b291f548..7a0102bfd99 100644 --- a/tests/auto/corelib/io/qfile/CMakeLists.txt +++ b/tests/auto/corelib/io/qfile/CMakeLists.txt @@ -17,7 +17,7 @@ list(APPEND test_data "forCopying.txt") list(APPEND test_data "forRenaming.txt") list(APPEND test_data "resources/file1.ext1") -qt_add_test(tst_qfile +qt_internal_add_test(tst_qfile SOURCES ../../../../shared/emulationdetector.h tst_qfile.cpp @@ -33,7 +33,7 @@ set(qfile_resource_files "resources/" ) -qt_add_resource(tst_qfile "qfile" +qt_internal_add_resource(tst_qfile "qfile" PREFIX "/tst_qfileinfo/" FILES @@ -43,7 +43,7 @@ set(rename-fallback_resource_files "rename-fallback.qrc" ) -qt_add_resource(tst_qfile "rename-fallback" +qt_internal_add_resource(tst_qfile "rename-fallback" PREFIX "/" FILES @@ -53,7 +53,7 @@ set(copy-fallback_resource_files "copy-fallback.qrc" ) -qt_add_resource(tst_qfile "copy-fallback" +qt_internal_add_resource(tst_qfile "copy-fallback" PREFIX "/" FILES @@ -64,22 +64,22 @@ qt_add_resource(tst_qfile "copy-fallback" ## Scopes: ##################################################################### -qt_extend_target(tst_qfile CONDITION TARGET Qt::Network +qt_internal_extend_target(tst_qfile CONDITION TARGET Qt::Network PUBLIC_LIBRARIES Qt::Network ) -qt_extend_target(tst_qfile CONDITION NOT TARGET Qt::Network +qt_internal_extend_target(tst_qfile CONDITION NOT TARGET Qt::Network DEFINES QT_NO_NETWORK ) -qt_extend_target(tst_qfile CONDITION CONFIG___contains___builtin_testdata +qt_internal_extend_target(tst_qfile CONDITION CONFIG___contains___builtin_testdata DEFINES BUILTIN_TESTDATA ) -qt_extend_target(tst_qfile CONDITION WIN32 +qt_internal_extend_target(tst_qfile CONDITION WIN32 PUBLIC_LIBRARIES ole32 uuid diff --git a/tests/auto/corelib/io/qfile/stdinprocess/CMakeLists.txt b/tests/auto/corelib/io/qfile/stdinprocess/CMakeLists.txt index eb1f6a0ff0a..e034e0502c2 100644 --- a/tests/auto/corelib/io/qfile/stdinprocess/CMakeLists.txt +++ b/tests/auto/corelib/io/qfile/stdinprocess/CMakeLists.txt @@ -4,7 +4,7 @@ ## stdinprocess_helper Binary: ##################################################################### -qt_add_test_helper(stdinprocess_helper +qt_internal_add_test_helper(stdinprocess_helper SOURCES main.cpp ) diff --git a/tests/auto/corelib/io/qfileinfo/CMakeLists.txt b/tests/auto/corelib/io/qfileinfo/CMakeLists.txt index a7ccda9c588..da955ff6a6e 100644 --- a/tests/auto/corelib/io/qfileinfo/CMakeLists.txt +++ b/tests/auto/corelib/io/qfileinfo/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qfileinfo Test: ##################################################################### -qt_add_test(tst_qfileinfo +qt_internal_add_test(tst_qfileinfo SOURCES tst_qfileinfo.cpp PUBLIC_LIBRARIES @@ -16,7 +16,7 @@ set(qfileinfo_resource_files "resources/" ) -qt_add_resource(tst_qfileinfo "qfileinfo" +qt_internal_add_resource(tst_qfileinfo "qfileinfo" PREFIX "/tst_qfileinfo/" FILES @@ -29,7 +29,7 @@ set(testdata_resource_files "tst_qfileinfo.cpp" ) -qt_add_resource(tst_qfileinfo "testdata" +qt_internal_add_resource(tst_qfileinfo "testdata" PREFIX "/testdata" FILES @@ -40,7 +40,7 @@ qt_add_resource(tst_qfileinfo "testdata" ## Scopes: ##################################################################### -qt_extend_target(tst_qfileinfo CONDITION WIN32 +qt_internal_extend_target(tst_qfileinfo CONDITION WIN32 PUBLIC_LIBRARIES advapi32 netapi32 diff --git a/tests/auto/corelib/io/qfileselector/CMakeLists.txt b/tests/auto/corelib/io/qfileselector/CMakeLists.txt index 67840c8112c..5f254044dff 100644 --- a/tests/auto/corelib/io/qfileselector/CMakeLists.txt +++ b/tests/auto/corelib/io/qfileselector/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qfileselectors Test: ##################################################################### -qt_add_test(tst_qfileselectors +qt_internal_add_test(tst_qfileselectors SOURCES tst_qfileselector.cpp PUBLIC_LIBRARIES @@ -62,7 +62,7 @@ set(qfileselector_resource_files "platforms/test5" ) -qt_add_resource(tst_qfileselectors "qfileselector" +qt_internal_add_resource(tst_qfileselectors "qfileselector" PREFIX "/" FILES diff --git a/tests/auto/corelib/io/qfilesystementry/CMakeLists.txt b/tests/auto/corelib/io/qfilesystementry/CMakeLists.txt index a99884b6178..574ba0efc82 100644 --- a/tests/auto/corelib/io/qfilesystementry/CMakeLists.txt +++ b/tests/auto/corelib/io/qfilesystementry/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qfilesystementry Test: ##################################################################### -qt_add_test(tst_qfilesystementry +qt_internal_add_test(tst_qfilesystementry SOURCES ${QT_SOURCE_TREE}/src/corelib/io/qfilesystementry.cpp ${QT_SOURCE_TREE}/src/corelib/io/qfilesystementry_p.h tst_qfilesystementry.cpp diff --git a/tests/auto/corelib/io/qfilesystemmetadata/CMakeLists.txt b/tests/auto/corelib/io/qfilesystemmetadata/CMakeLists.txt index 4970e5a4269..9b1705f0729 100644 --- a/tests/auto/corelib/io/qfilesystemmetadata/CMakeLists.txt +++ b/tests/auto/corelib/io/qfilesystemmetadata/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qfilesystemmetadata Test: ##################################################################### -qt_add_test(tst_qfilesystemmetadata +qt_internal_add_test(tst_qfilesystemmetadata SOURCES tst_qfilesystemmetadata.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/corelib/io/qfilesystemwatcher/CMakeLists.txt b/tests/auto/corelib/io/qfilesystemwatcher/CMakeLists.txt index ac724700195..75231229077 100644 --- a/tests/auto/corelib/io/qfilesystemwatcher/CMakeLists.txt +++ b/tests/auto/corelib/io/qfilesystemwatcher/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qfilesystemwatcher Test: ##################################################################### -qt_add_test(tst_qfilesystemwatcher +qt_internal_add_test(tst_qfilesystemwatcher SOURCES tst_qfilesystemwatcher.cpp ) diff --git a/tests/auto/corelib/io/qiodevice/CMakeLists.txt b/tests/auto/corelib/io/qiodevice/CMakeLists.txt index fdc896e45d6..3fa19d9f30c 100644 --- a/tests/auto/corelib/io/qiodevice/CMakeLists.txt +++ b/tests/auto/corelib/io/qiodevice/CMakeLists.txt @@ -7,7 +7,7 @@ # Collect test data list(APPEND test_data "tst_qiodevice.cpp") -qt_add_test(tst_qiodevice +qt_internal_add_test(tst_qiodevice SOURCES tst_qiodevice.cpp PUBLIC_LIBRARIES @@ -27,7 +27,7 @@ if(ANDROID AND NOT ANDROID_EMBEDDED) "tst_qiodevice.cpp" ) - qt_add_resource(tst_qiodevice "android_testdata" + qt_internal_add_resource(tst_qiodevice "android_testdata" PREFIX "/" FILES diff --git a/tests/auto/corelib/io/qipaddress/CMakeLists.txt b/tests/auto/corelib/io/qipaddress/CMakeLists.txt index da7f5a90610..b4801c2ab2d 100644 --- a/tests/auto/corelib/io/qipaddress/CMakeLists.txt +++ b/tests/auto/corelib/io/qipaddress/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qipaddress Test: ##################################################################### -qt_add_test(tst_qipaddress +qt_internal_add_test(tst_qipaddress SOURCES tst_qipaddress.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/corelib/io/qlockfile/CMakeLists.txt b/tests/auto/corelib/io/qlockfile/CMakeLists.txt index baab320b8c8..828aea049e5 100644 --- a/tests/auto/corelib/io/qlockfile/CMakeLists.txt +++ b/tests/auto/corelib/io/qlockfile/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qlockfile Test: ##################################################################### -qt_add_test(tst_qlockfile +qt_internal_add_test(tst_qlockfile SOURCES tst_qlockfile.cpp PUBLIC_LIBRARIES @@ -15,7 +15,7 @@ qt_add_test(tst_qlockfile ## Scopes: ##################################################################### -qt_extend_target(tst_qlockfile CONDITION WIN32 +qt_internal_extend_target(tst_qlockfile CONDITION WIN32 PUBLIC_LIBRARIES advapi32 ) diff --git a/tests/auto/corelib/io/qlockfile/qlockfiletesthelper/.prev_CMakeLists.txt b/tests/auto/corelib/io/qlockfile/qlockfiletesthelper/.prev_CMakeLists.txt index e0f500f8ae5..6526d690f90 100644 --- a/tests/auto/corelib/io/qlockfile/qlockfiletesthelper/.prev_CMakeLists.txt +++ b/tests/auto/corelib/io/qlockfile/qlockfiletesthelper/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## qlockfile_test_helper Binary: ##################################################################### -qt_add_executable(qlockfile_test_helper +qt_internal_add_executable(qlockfile_test_helper OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" SOURCES qlockfile_test_helper.cpp diff --git a/tests/auto/corelib/io/qlockfile/qlockfiletesthelper/CMakeLists.txt b/tests/auto/corelib/io/qlockfile/qlockfiletesthelper/CMakeLists.txt index 957d60ca1b2..8917f2aa346 100644 --- a/tests/auto/corelib/io/qlockfile/qlockfiletesthelper/CMakeLists.txt +++ b/tests/auto/corelib/io/qlockfile/qlockfiletesthelper/CMakeLists.txt @@ -4,7 +4,7 @@ ## qlockfile_test_helper Binary: ##################################################################### -qt_add_test_helper(qlockfile_test_helper # special case +qt_internal_add_test_helper(qlockfile_test_helper # special case OVERRIDE_OUTPUT_DIRECTORY # special case OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" SOURCES diff --git a/tests/auto/corelib/io/qloggingcategory/CMakeLists.txt b/tests/auto/corelib/io/qloggingcategory/CMakeLists.txt index 778315db5be..13ee5866966 100644 --- a/tests/auto/corelib/io/qloggingcategory/CMakeLists.txt +++ b/tests/auto/corelib/io/qloggingcategory/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qloggingcategory Test: ##################################################################### -qt_add_test(tst_qloggingcategory +qt_internal_add_test(tst_qloggingcategory SOURCES tst_qloggingcategory.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/corelib/io/qloggingregistry/CMakeLists.txt b/tests/auto/corelib/io/qloggingregistry/CMakeLists.txt index e4d1cf4aaf0..4c903de17fd 100644 --- a/tests/auto/corelib/io/qloggingregistry/CMakeLists.txt +++ b/tests/auto/corelib/io/qloggingregistry/CMakeLists.txt @@ -7,7 +7,7 @@ # Collect test data list(APPEND test_data "qtlogging.ini") -qt_add_test(tst_qloggingregistry +qt_internal_add_test(tst_qloggingregistry SOURCES tst_qloggingregistry.cpp PUBLIC_LIBRARIES @@ -27,7 +27,7 @@ if(ANDROID AND NOT ANDROID_EMBEDDED) "qtlogging.ini" ) - qt_add_resource(tst_qloggingregistry "android_testdata" + qt_internal_add_resource(tst_qloggingregistry "android_testdata" PREFIX "/" FILES diff --git a/tests/auto/corelib/io/qnodebug/CMakeLists.txt b/tests/auto/corelib/io/qnodebug/CMakeLists.txt index fe410643fc0..5fd4a3738cf 100644 --- a/tests/auto/corelib/io/qnodebug/CMakeLists.txt +++ b/tests/auto/corelib/io/qnodebug/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qnodebug Test: ##################################################################### -qt_add_test(tst_qnodebug +qt_internal_add_test(tst_qnodebug SOURCES tst_qnodebug.cpp ) diff --git a/tests/auto/corelib/io/qprocess-noapplication/CMakeLists.txt b/tests/auto/corelib/io/qprocess-noapplication/CMakeLists.txt index ae7910e3027..0118d46ae8f 100644 --- a/tests/auto/corelib/io/qprocess-noapplication/CMakeLists.txt +++ b/tests/auto/corelib/io/qprocess-noapplication/CMakeLists.txt @@ -4,7 +4,7 @@ ## qprocess-noapplication Test: ##################################################################### -qt_add_test(qprocess-noapplication +qt_internal_add_test(qprocess-noapplication SOURCES tst_qprocessnoapplication.cpp ) diff --git a/tests/auto/corelib/io/qprocess/fileWriterProcess/CMakeLists.txt b/tests/auto/corelib/io/qprocess/fileWriterProcess/CMakeLists.txt index 92b4c258dd3..ce4519ce996 100644 --- a/tests/auto/corelib/io/qprocess/fileWriterProcess/CMakeLists.txt +++ b/tests/auto/corelib/io/qprocess/fileWriterProcess/CMakeLists.txt @@ -4,7 +4,7 @@ ## fileWriterProcess Binary: ##################################################################### -qt_add_executable(fileWriterProcess +qt_internal_add_executable(fileWriterProcess OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" SOURCES main.cpp diff --git a/tests/auto/corelib/io/qprocess/test/CMakeLists.txt b/tests/auto/corelib/io/qprocess/test/CMakeLists.txt index 0541b4258a2..249cb089cf3 100644 --- a/tests/auto/corelib/io/qprocess/test/CMakeLists.txt +++ b/tests/auto/corelib/io/qprocess/test/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qprocess Test: ##################################################################### -qt_add_test(tst_qprocess +qt_internal_add_test(tst_qprocess OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../" SOURCES ../../../../../shared/emulationdetector.h diff --git a/tests/auto/corelib/io/qprocess/testDetached/CMakeLists.txt b/tests/auto/corelib/io/qprocess/testDetached/CMakeLists.txt index a7f9b9412d9..368ca92f099 100644 --- a/tests/auto/corelib/io/qprocess/testDetached/CMakeLists.txt +++ b/tests/auto/corelib/io/qprocess/testDetached/CMakeLists.txt @@ -4,7 +4,7 @@ ## testDetached Binary: ##################################################################### -qt_add_executable(testDetached +qt_internal_add_executable(testDetached OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" SOURCES main.cpp diff --git a/tests/auto/corelib/io/qprocess/testExitCodes/.prev_CMakeLists.txt b/tests/auto/corelib/io/qprocess/testExitCodes/.prev_CMakeLists.txt index cf3f6f4e640..26973bfc2de 100644 --- a/tests/auto/corelib/io/qprocess/testExitCodes/.prev_CMakeLists.txt +++ b/tests/auto/corelib/io/qprocess/testExitCodes/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## testExitCodes Binary: ##################################################################### -qt_add_executable(testExitCodes +qt_internal_add_executable(testExitCodes OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" SOURCES main.cpp diff --git a/tests/auto/corelib/io/qprocess/testExitCodes/CMakeLists.txt b/tests/auto/corelib/io/qprocess/testExitCodes/CMakeLists.txt index 5ad0ab05df5..24f231982ef 100644 --- a/tests/auto/corelib/io/qprocess/testExitCodes/CMakeLists.txt +++ b/tests/auto/corelib/io/qprocess/testExitCodes/CMakeLists.txt @@ -4,7 +4,7 @@ ## testExitCodes Binary: ##################################################################### -qt_add_executable(testExitCodes +qt_internal_add_executable(testExitCodes OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" SOURCES main.cpp diff --git a/tests/auto/corelib/io/qprocess/testForwarding/CMakeLists.txt b/tests/auto/corelib/io/qprocess/testForwarding/CMakeLists.txt index 83658e4b7ac..914785178c3 100644 --- a/tests/auto/corelib/io/qprocess/testForwarding/CMakeLists.txt +++ b/tests/auto/corelib/io/qprocess/testForwarding/CMakeLists.txt @@ -4,7 +4,7 @@ ## testForwarding Binary: ##################################################################### -qt_add_executable(testForwarding +qt_internal_add_executable(testForwarding OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" SOURCES main.cpp diff --git a/tests/auto/corelib/io/qprocess/testForwardingHelper/.prev_CMakeLists.txt b/tests/auto/corelib/io/qprocess/testForwardingHelper/.prev_CMakeLists.txt index 9197f96e10c..3fd1385f71e 100644 --- a/tests/auto/corelib/io/qprocess/testForwardingHelper/.prev_CMakeLists.txt +++ b/tests/auto/corelib/io/qprocess/testForwardingHelper/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## testForwardingHelper Binary: ##################################################################### -qt_add_executable(testForwardingHelper +qt_internal_add_executable(testForwardingHelper OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" SOURCES main.cpp diff --git a/tests/auto/corelib/io/qprocess/testForwardingHelper/CMakeLists.txt b/tests/auto/corelib/io/qprocess/testForwardingHelper/CMakeLists.txt index 0024b006ed2..f13f2f6b034 100644 --- a/tests/auto/corelib/io/qprocess/testForwardingHelper/CMakeLists.txt +++ b/tests/auto/corelib/io/qprocess/testForwardingHelper/CMakeLists.txt @@ -4,7 +4,7 @@ ## testForwardingHelper Binary: ##################################################################### -qt_add_executable(testForwardingHelper +qt_internal_add_executable(testForwardingHelper OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" SOURCES main.cpp diff --git a/tests/auto/corelib/io/qprocess/testGuiProcess/CMakeLists.txt b/tests/auto/corelib/io/qprocess/testGuiProcess/CMakeLists.txt index bd6853c438b..e36a33bfa48 100644 --- a/tests/auto/corelib/io/qprocess/testGuiProcess/CMakeLists.txt +++ b/tests/auto/corelib/io/qprocess/testGuiProcess/CMakeLists.txt @@ -4,7 +4,7 @@ ## testGuiProcess Binary: ##################################################################### -qt_add_executable(testGuiProcess +qt_internal_add_executable(testGuiProcess OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" SOURCES main.cpp diff --git a/tests/auto/corelib/io/qprocess/testProcessCrash/.prev_CMakeLists.txt b/tests/auto/corelib/io/qprocess/testProcessCrash/.prev_CMakeLists.txt index d09e1364fb7..c40b850a564 100644 --- a/tests/auto/corelib/io/qprocess/testProcessCrash/.prev_CMakeLists.txt +++ b/tests/auto/corelib/io/qprocess/testProcessCrash/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## testProcessCrash Binary: ##################################################################### -qt_add_executable(testProcessCrash +qt_internal_add_executable(testProcessCrash OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" SOURCES main.cpp diff --git a/tests/auto/corelib/io/qprocess/testProcessCrash/CMakeLists.txt b/tests/auto/corelib/io/qprocess/testProcessCrash/CMakeLists.txt index 1b2ab3eac55..1afc662a2cf 100644 --- a/tests/auto/corelib/io/qprocess/testProcessCrash/CMakeLists.txt +++ b/tests/auto/corelib/io/qprocess/testProcessCrash/CMakeLists.txt @@ -4,7 +4,7 @@ ## testProcessCrash Binary: ##################################################################### -qt_add_executable(testProcessCrash +qt_internal_add_executable(testProcessCrash OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" SOURCES main.cpp diff --git a/tests/auto/corelib/io/qprocess/testProcessDeadWhileReading/.prev_CMakeLists.txt b/tests/auto/corelib/io/qprocess/testProcessDeadWhileReading/.prev_CMakeLists.txt index aade19fa913..9416580e047 100644 --- a/tests/auto/corelib/io/qprocess/testProcessDeadWhileReading/.prev_CMakeLists.txt +++ b/tests/auto/corelib/io/qprocess/testProcessDeadWhileReading/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## testProcessDeadWhileReading Binary: ##################################################################### -qt_add_executable(testProcessDeadWhileReading +qt_internal_add_executable(testProcessDeadWhileReading OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" SOURCES main.cpp diff --git a/tests/auto/corelib/io/qprocess/testProcessDeadWhileReading/CMakeLists.txt b/tests/auto/corelib/io/qprocess/testProcessDeadWhileReading/CMakeLists.txt index 50407cbc7aa..55dce67f8af 100644 --- a/tests/auto/corelib/io/qprocess/testProcessDeadWhileReading/CMakeLists.txt +++ b/tests/auto/corelib/io/qprocess/testProcessDeadWhileReading/CMakeLists.txt @@ -4,7 +4,7 @@ ## testProcessDeadWhileReading Binary: ##################################################################### -qt_add_executable(testProcessDeadWhileReading +qt_internal_add_executable(testProcessDeadWhileReading OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" SOURCES main.cpp diff --git a/tests/auto/corelib/io/qprocess/testProcessEOF/.prev_CMakeLists.txt b/tests/auto/corelib/io/qprocess/testProcessEOF/.prev_CMakeLists.txt index 7fe205c5d44..b4f2679976a 100644 --- a/tests/auto/corelib/io/qprocess/testProcessEOF/.prev_CMakeLists.txt +++ b/tests/auto/corelib/io/qprocess/testProcessEOF/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## testProcessEOF Binary: ##################################################################### -qt_add_executable(testProcessEOF +qt_internal_add_executable(testProcessEOF OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" SOURCES main.cpp diff --git a/tests/auto/corelib/io/qprocess/testProcessEOF/CMakeLists.txt b/tests/auto/corelib/io/qprocess/testProcessEOF/CMakeLists.txt index b30249caa90..c3cc35db60d 100644 --- a/tests/auto/corelib/io/qprocess/testProcessEOF/CMakeLists.txt +++ b/tests/auto/corelib/io/qprocess/testProcessEOF/CMakeLists.txt @@ -4,7 +4,7 @@ ## testProcessEOF Binary: ##################################################################### -qt_add_executable(testProcessEOF +qt_internal_add_executable(testProcessEOF OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" SOURCES main.cpp diff --git a/tests/auto/corelib/io/qprocess/testProcessEcho/.prev_CMakeLists.txt b/tests/auto/corelib/io/qprocess/testProcessEcho/.prev_CMakeLists.txt index 0db956d16c7..c739335d04d 100644 --- a/tests/auto/corelib/io/qprocess/testProcessEcho/.prev_CMakeLists.txt +++ b/tests/auto/corelib/io/qprocess/testProcessEcho/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## testProcessEcho Binary: ##################################################################### -qt_add_executable(testProcessEcho +qt_internal_add_executable(testProcessEcho OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" SOURCES main.cpp diff --git a/tests/auto/corelib/io/qprocess/testProcessEcho/CMakeLists.txt b/tests/auto/corelib/io/qprocess/testProcessEcho/CMakeLists.txt index db46ca06cb8..128f35538b6 100644 --- a/tests/auto/corelib/io/qprocess/testProcessEcho/CMakeLists.txt +++ b/tests/auto/corelib/io/qprocess/testProcessEcho/CMakeLists.txt @@ -4,7 +4,7 @@ ## testProcessEcho Binary: ##################################################################### -qt_add_executable(testProcessEcho +qt_internal_add_executable(testProcessEcho OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" SOURCES main.cpp diff --git a/tests/auto/corelib/io/qprocess/testProcessEcho2/.prev_CMakeLists.txt b/tests/auto/corelib/io/qprocess/testProcessEcho2/.prev_CMakeLists.txt index abe80a3cff5..b861f2619cc 100644 --- a/tests/auto/corelib/io/qprocess/testProcessEcho2/.prev_CMakeLists.txt +++ b/tests/auto/corelib/io/qprocess/testProcessEcho2/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## testProcessEcho2 Binary: ##################################################################### -qt_add_executable(testProcessEcho2 +qt_internal_add_executable(testProcessEcho2 OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" SOURCES main.cpp diff --git a/tests/auto/corelib/io/qprocess/testProcessEcho2/CMakeLists.txt b/tests/auto/corelib/io/qprocess/testProcessEcho2/CMakeLists.txt index 87acd13c16f..4b3fb585f41 100644 --- a/tests/auto/corelib/io/qprocess/testProcessEcho2/CMakeLists.txt +++ b/tests/auto/corelib/io/qprocess/testProcessEcho2/CMakeLists.txt @@ -4,7 +4,7 @@ ## testProcessEcho2 Binary: ##################################################################### -qt_add_executable(testProcessEcho2 +qt_internal_add_executable(testProcessEcho2 OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" SOURCES main.cpp diff --git a/tests/auto/corelib/io/qprocess/testProcessEcho3/.prev_CMakeLists.txt b/tests/auto/corelib/io/qprocess/testProcessEcho3/.prev_CMakeLists.txt index 8b7a8b3a517..40e992a947e 100644 --- a/tests/auto/corelib/io/qprocess/testProcessEcho3/.prev_CMakeLists.txt +++ b/tests/auto/corelib/io/qprocess/testProcessEcho3/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## testProcessEcho3 Binary: ##################################################################### -qt_add_executable(testProcessEcho3 +qt_internal_add_executable(testProcessEcho3 OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" SOURCES main.cpp diff --git a/tests/auto/corelib/io/qprocess/testProcessEcho3/CMakeLists.txt b/tests/auto/corelib/io/qprocess/testProcessEcho3/CMakeLists.txt index f0905360f49..0b852a90ce6 100644 --- a/tests/auto/corelib/io/qprocess/testProcessEcho3/CMakeLists.txt +++ b/tests/auto/corelib/io/qprocess/testProcessEcho3/CMakeLists.txt @@ -4,7 +4,7 @@ ## testProcessEcho3 Binary: ##################################################################### -qt_add_executable(testProcessEcho3 +qt_internal_add_executable(testProcessEcho3 OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" SOURCES main.cpp diff --git a/tests/auto/corelib/io/qprocess/testProcessEchoGui/.prev_CMakeLists.txt b/tests/auto/corelib/io/qprocess/testProcessEchoGui/.prev_CMakeLists.txt index a2e3c6a0a9b..2c482b2cf86 100644 --- a/tests/auto/corelib/io/qprocess/testProcessEchoGui/.prev_CMakeLists.txt +++ b/tests/auto/corelib/io/qprocess/testProcessEchoGui/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## testProcessEchoGui Binary: ##################################################################### -qt_add_executable(testProcessEchoGui +qt_internal_add_executable(testProcessEchoGui OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" DEFINES QT_DISABLE_DEPRECATED_BEFORE=0 @@ -15,7 +15,7 @@ qt_add_executable(testProcessEchoGui ## Scopes: ##################################################################### -qt_extend_target(testProcessEchoGui CONDITION WIN32 +qt_internal_extend_target(testProcessEchoGui CONDITION WIN32 SOURCES main_win.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/corelib/io/qprocess/testProcessEchoGui/CMakeLists.txt b/tests/auto/corelib/io/qprocess/testProcessEchoGui/CMakeLists.txt index ca529c0c84a..f96c8a4fa51 100644 --- a/tests/auto/corelib/io/qprocess/testProcessEchoGui/CMakeLists.txt +++ b/tests/auto/corelib/io/qprocess/testProcessEchoGui/CMakeLists.txt @@ -4,7 +4,7 @@ ## testProcessEchoGui Binary: ##################################################################### -qt_add_executable(testProcessEchoGui +qt_internal_add_executable(testProcessEchoGui GUI # special case OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" DEFINES @@ -16,7 +16,7 @@ qt_add_executable(testProcessEchoGui ## Scopes: ##################################################################### -qt_extend_target(testProcessEchoGui CONDITION WIN32 +qt_internal_extend_target(testProcessEchoGui CONDITION WIN32 SOURCES main_win.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/corelib/io/qprocess/testProcessEnvironment/.prev_CMakeLists.txt b/tests/auto/corelib/io/qprocess/testProcessEnvironment/.prev_CMakeLists.txt index 63d7767b606..6a0546b1aac 100644 --- a/tests/auto/corelib/io/qprocess/testProcessEnvironment/.prev_CMakeLists.txt +++ b/tests/auto/corelib/io/qprocess/testProcessEnvironment/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## testProcessEnvironment Binary: ##################################################################### -qt_add_executable(testProcessEnvironment +qt_internal_add_executable(testProcessEnvironment OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" SOURCES main.cpp diff --git a/tests/auto/corelib/io/qprocess/testProcessEnvironment/CMakeLists.txt b/tests/auto/corelib/io/qprocess/testProcessEnvironment/CMakeLists.txt index 89c41b6446b..fe48627b7c9 100644 --- a/tests/auto/corelib/io/qprocess/testProcessEnvironment/CMakeLists.txt +++ b/tests/auto/corelib/io/qprocess/testProcessEnvironment/CMakeLists.txt @@ -4,7 +4,7 @@ ## testProcessEnvironment Binary: ##################################################################### -qt_add_executable(testProcessEnvironment +qt_internal_add_executable(testProcessEnvironment OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" SOURCES main.cpp diff --git a/tests/auto/corelib/io/qprocess/testProcessHang/.prev_CMakeLists.txt b/tests/auto/corelib/io/qprocess/testProcessHang/.prev_CMakeLists.txt index 77e39937b0b..63989dd8e0a 100644 --- a/tests/auto/corelib/io/qprocess/testProcessHang/.prev_CMakeLists.txt +++ b/tests/auto/corelib/io/qprocess/testProcessHang/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## testProcessHang Binary: ##################################################################### -qt_add_executable(testProcessHang +qt_internal_add_executable(testProcessHang OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" SOURCES main.cpp diff --git a/tests/auto/corelib/io/qprocess/testProcessHang/CMakeLists.txt b/tests/auto/corelib/io/qprocess/testProcessHang/CMakeLists.txt index c3f48572255..3e8443c2a56 100644 --- a/tests/auto/corelib/io/qprocess/testProcessHang/CMakeLists.txt +++ b/tests/auto/corelib/io/qprocess/testProcessHang/CMakeLists.txt @@ -4,7 +4,7 @@ ## testProcessHang Binary: ##################################################################### -qt_add_executable(testProcessHang +qt_internal_add_executable(testProcessHang OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" SOURCES main.cpp diff --git a/tests/auto/corelib/io/qprocess/testProcessNormal/CMakeLists.txt b/tests/auto/corelib/io/qprocess/testProcessNormal/CMakeLists.txt index 2348a4b002c..1726e1861b5 100644 --- a/tests/auto/corelib/io/qprocess/testProcessNormal/CMakeLists.txt +++ b/tests/auto/corelib/io/qprocess/testProcessNormal/CMakeLists.txt @@ -4,7 +4,7 @@ ## testProcessNormal Binary: ##################################################################### -qt_add_executable(testProcessNormal +qt_internal_add_executable(testProcessNormal OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" SOURCES main.cpp diff --git a/tests/auto/corelib/io/qprocess/testProcessOutput/CMakeLists.txt b/tests/auto/corelib/io/qprocess/testProcessOutput/CMakeLists.txt index 4e0b835aa1a..2a6d016f48f 100644 --- a/tests/auto/corelib/io/qprocess/testProcessOutput/CMakeLists.txt +++ b/tests/auto/corelib/io/qprocess/testProcessOutput/CMakeLists.txt @@ -4,7 +4,7 @@ ## testProcessOutput Binary: ##################################################################### -qt_add_executable(testProcessOutput +qt_internal_add_executable(testProcessOutput OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" SOURCES main.cpp diff --git a/tests/auto/corelib/io/qprocess/testProcessSpacesArgs/.prev_CMakeLists.txt b/tests/auto/corelib/io/qprocess/testProcessSpacesArgs/.prev_CMakeLists.txt index f8a21c990d0..5d5a049012f 100644 --- a/tests/auto/corelib/io/qprocess/testProcessSpacesArgs/.prev_CMakeLists.txt +++ b/tests/auto/corelib/io/qprocess/testProcessSpacesArgs/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## nospace Binary: ##################################################################### -qt_add_executable(nospace +qt_internal_add_executable(nospace OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" SOURCES main.cpp diff --git a/tests/auto/corelib/io/qprocess/testProcessSpacesArgs/CMakeLists.txt b/tests/auto/corelib/io/qprocess/testProcessSpacesArgs/CMakeLists.txt index 3c0033a01f5..fd2b38ef2ff 100644 --- a/tests/auto/corelib/io/qprocess/testProcessSpacesArgs/CMakeLists.txt +++ b/tests/auto/corelib/io/qprocess/testProcessSpacesArgs/CMakeLists.txt @@ -4,7 +4,7 @@ ## nospace Binary: ##################################################################### -qt_add_executable(nospace +qt_internal_add_executable(nospace OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" SOURCES main.cpp @@ -15,7 +15,7 @@ qt_add_executable(nospace ) # special case begin -qt_add_executable(onespace +qt_internal_add_executable(onespace OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" SOURCES main.cpp @@ -26,7 +26,7 @@ qt_add_executable(onespace ) set_target_properties(onespace PROPERTIES OUTPUT_NAME "one space") -qt_add_executable(twospaces +qt_internal_add_executable(twospaces OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" SOURCES main.cpp diff --git a/tests/auto/corelib/io/qprocess/testSetNamedPipeHandleState/CMakeLists.txt b/tests/auto/corelib/io/qprocess/testSetNamedPipeHandleState/CMakeLists.txt index 9fc7528b2e0..6b55c40f949 100644 --- a/tests/auto/corelib/io/qprocess/testSetNamedPipeHandleState/CMakeLists.txt +++ b/tests/auto/corelib/io/qprocess/testSetNamedPipeHandleState/CMakeLists.txt @@ -4,7 +4,7 @@ ## testSetNamedPipeHandleState Binary: ##################################################################### -qt_add_executable(testSetNamedPipeHandleState +qt_internal_add_executable(testSetNamedPipeHandleState OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" SOURCES main.cpp diff --git a/tests/auto/corelib/io/qprocess/testSetWorkingDirectory/CMakeLists.txt b/tests/auto/corelib/io/qprocess/testSetWorkingDirectory/CMakeLists.txt index 54a8b1b4d13..97410c1b49a 100644 --- a/tests/auto/corelib/io/qprocess/testSetWorkingDirectory/CMakeLists.txt +++ b/tests/auto/corelib/io/qprocess/testSetWorkingDirectory/CMakeLists.txt @@ -4,7 +4,7 @@ ## testSetWorkingDirectory Binary: ##################################################################### -qt_add_executable(testSetWorkingDirectory +qt_internal_add_executable(testSetWorkingDirectory OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" SOURCES main.cpp diff --git a/tests/auto/corelib/io/qprocess/testSoftExit/CMakeLists.txt b/tests/auto/corelib/io/qprocess/testSoftExit/CMakeLists.txt index ec2d9433b28..ab78f9acdb4 100644 --- a/tests/auto/corelib/io/qprocess/testSoftExit/CMakeLists.txt +++ b/tests/auto/corelib/io/qprocess/testSoftExit/CMakeLists.txt @@ -4,21 +4,21 @@ ## testSoftExit Binary: ##################################################################### -qt_add_executable(testSoftExit +qt_internal_add_executable(testSoftExit OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" ) ## Scopes: ##################################################################### -qt_extend_target(testSoftExit CONDITION WIN32 +qt_internal_extend_target(testSoftExit CONDITION WIN32 SOURCES main_win.cpp PUBLIC_LIBRARIES user32 ) -qt_extend_target(testSoftExit CONDITION UNIX +qt_internal_extend_target(testSoftExit CONDITION UNIX SOURCES main_unix.cpp ) diff --git a/tests/auto/corelib/io/qprocess/testSpaceInName/CMakeLists.txt b/tests/auto/corelib/io/qprocess/testSpaceInName/CMakeLists.txt index 1ca31c59df9..e59ad51d6ed 100644 --- a/tests/auto/corelib/io/qprocess/testSpaceInName/CMakeLists.txt +++ b/tests/auto/corelib/io/qprocess/testSpaceInName/CMakeLists.txt @@ -4,7 +4,7 @@ ## testSpaceInName Binary: ##################################################################### -qt_add_executable(testSpaceInName +qt_internal_add_executable(testSpaceInName OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../test Space In Name" SOURCES main.cpp diff --git a/tests/auto/corelib/io/qprocessenvironment/CMakeLists.txt b/tests/auto/corelib/io/qprocessenvironment/CMakeLists.txt index ba935455af1..d612a323747 100644 --- a/tests/auto/corelib/io/qprocessenvironment/CMakeLists.txt +++ b/tests/auto/corelib/io/qprocessenvironment/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qprocessenvironment Test: ##################################################################### -qt_add_test(tst_qprocessenvironment +qt_internal_add_test(tst_qprocessenvironment SOURCES tst_qprocessenvironment.cpp ) diff --git a/tests/auto/corelib/io/qsavefile/CMakeLists.txt b/tests/auto/corelib/io/qsavefile/CMakeLists.txt index f2c8cf0a569..0b413402797 100644 --- a/tests/auto/corelib/io/qsavefile/CMakeLists.txt +++ b/tests/auto/corelib/io/qsavefile/CMakeLists.txt @@ -7,7 +7,7 @@ # Collect test data list(APPEND test_data "tst_qsavefile.cpp") -qt_add_test(tst_qsavefile +qt_internal_add_test(tst_qsavefile SOURCES tst_qsavefile.cpp TESTDATA ${test_data} diff --git a/tests/auto/corelib/io/qsettings/CMakeLists.txt b/tests/auto/corelib/io/qsettings/CMakeLists.txt index 3cc9547d3c9..c12f94cf36c 100644 --- a/tests/auto/corelib/io/qsettings/CMakeLists.txt +++ b/tests/auto/corelib/io/qsettings/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qsettings Test: ##################################################################### -qt_add_test(tst_qsettings +qt_internal_add_test(tst_qsettings SOURCES tst_qsettings.cpp DEFINES @@ -28,7 +28,7 @@ set(qsettings_resource_files "withcomments.ini" ) -qt_add_resource(tst_qsettings "qsettings" +qt_internal_add_resource(tst_qsettings "qsettings" PREFIX "/" FILES @@ -39,12 +39,12 @@ qt_add_resource(tst_qsettings "qsettings" ## Scopes: ##################################################################### -qt_extend_target(tst_qsettings CONDITION MSVC +qt_internal_extend_target(tst_qsettings CONDITION MSVC PUBLIC_LIBRARIES advapi32 ) -qt_extend_target(tst_qsettings CONDITION APPLE +qt_internal_extend_target(tst_qsettings CONDITION APPLE PUBLIC_LIBRARIES ${FWCoreFoundation} ) diff --git a/tests/auto/corelib/io/qstandardpaths/CMakeLists.txt b/tests/auto/corelib/io/qstandardpaths/CMakeLists.txt index 74ec2cd8552..0a6f45c8fda 100644 --- a/tests/auto/corelib/io/qstandardpaths/CMakeLists.txt +++ b/tests/auto/corelib/io/qstandardpaths/CMakeLists.txt @@ -8,7 +8,7 @@ list(APPEND test_data "tst_qstandardpaths.cpp") list(APPEND test_data "qstandardpaths.pro") -qt_add_test(tst_qstandardpaths +qt_internal_add_test(tst_qstandardpaths SOURCES tst_qstandardpaths.cpp TESTDATA ${test_data} @@ -17,7 +17,7 @@ qt_add_test(tst_qstandardpaths ## Scopes: ##################################################################### -qt_extend_target(tst_qstandardpaths CONDITION boot2qt +qt_internal_extend_target(tst_qstandardpaths CONDITION boot2qt DEFINES SKIP_FINDEXECUTABLE ) diff --git a/tests/auto/corelib/io/qstorageinfo/CMakeLists.txt b/tests/auto/corelib/io/qstorageinfo/CMakeLists.txt index e2a47a2832b..be3a8c3afe5 100644 --- a/tests/auto/corelib/io/qstorageinfo/CMakeLists.txt +++ b/tests/auto/corelib/io/qstorageinfo/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qstorageinfo Test: ##################################################################### -qt_add_test(tst_qstorageinfo +qt_internal_add_test(tst_qstorageinfo SOURCES tst_qstorageinfo.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/corelib/io/qtemporarydir/CMakeLists.txt b/tests/auto/corelib/io/qtemporarydir/CMakeLists.txt index f1c3db54d0c..58eb49dff81 100644 --- a/tests/auto/corelib/io/qtemporarydir/CMakeLists.txt +++ b/tests/auto/corelib/io/qtemporarydir/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qtemporarydir Test: ##################################################################### -qt_add_test(tst_qtemporarydir +qt_internal_add_test(tst_qtemporarydir SOURCES ../../../../shared/emulationdetector.h tst_qtemporarydir.cpp diff --git a/tests/auto/corelib/io/qtemporaryfile/CMakeLists.txt b/tests/auto/corelib/io/qtemporaryfile/CMakeLists.txt index 9b35f72a694..11d4b991cef 100644 --- a/tests/auto/corelib/io/qtemporaryfile/CMakeLists.txt +++ b/tests/auto/corelib/io/qtemporaryfile/CMakeLists.txt @@ -7,7 +7,7 @@ # Collect test data list(APPEND test_data "tst_qtemporaryfile.cpp") -qt_add_test(tst_qtemporaryfile +qt_internal_add_test(tst_qtemporaryfile SOURCES tst_qtemporaryfile.cpp PUBLIC_LIBRARIES @@ -20,7 +20,7 @@ set(qtemporaryfile_resource_files "resources/test.txt" ) -qt_add_resource(tst_qtemporaryfile "qtemporaryfile" +qt_internal_add_resource(tst_qtemporaryfile "qtemporaryfile" PREFIX "/" FILES @@ -38,7 +38,7 @@ if(ANDROID AND NOT ANDROID_EMBEDDED) "tst_qtemporaryfile.cpp" ) - qt_add_resource(tst_qtemporaryfile "android_testdata" + qt_internal_add_resource(tst_qtemporaryfile "android_testdata" PREFIX "/android_testdata" FILES diff --git a/tests/auto/corelib/io/qurl/CMakeLists.txt b/tests/auto/corelib/io/qurl/CMakeLists.txt index 2ea06f62d7f..ce386c142c6 100644 --- a/tests/auto/corelib/io/qurl/CMakeLists.txt +++ b/tests/auto/corelib/io/qurl/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qurl Test: ##################################################################### -qt_add_test(tst_qurl +qt_internal_add_test(tst_qurl SOURCES tst_qurl.cpp PUBLIC_LIBRARIES @@ -14,7 +14,7 @@ qt_add_test(tst_qurl ## Scopes: ##################################################################### -qt_extend_target(tst_qurl CONDITION APPLE +qt_internal_extend_target(tst_qurl CONDITION APPLE SOURCES tst_qurl_mac.mm ) diff --git a/tests/auto/corelib/io/qurlinternal/CMakeLists.txt b/tests/auto/corelib/io/qurlinternal/CMakeLists.txt index 80f8e0d128b..492ac0a4d66 100644 --- a/tests/auto/corelib/io/qurlinternal/CMakeLists.txt +++ b/tests/auto/corelib/io/qurlinternal/CMakeLists.txt @@ -8,7 +8,7 @@ endif() ## tst_qurlinternal Test: ##################################################################### -qt_add_test(tst_qurlinternal +qt_internal_add_test(tst_qurlinternal SOURCES tst_qurlinternal.cpp utf8data.cpp diff --git a/tests/auto/corelib/io/qurlquery/CMakeLists.txt b/tests/auto/corelib/io/qurlquery/CMakeLists.txt index b85e688b454..1d68c013259 100644 --- a/tests/auto/corelib/io/qurlquery/CMakeLists.txt +++ b/tests/auto/corelib/io/qurlquery/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qurlquery Test: ##################################################################### -qt_add_test(tst_qurlquery +qt_internal_add_test(tst_qurlquery SOURCES tst_qurlquery.cpp DEFINES diff --git a/tests/auto/corelib/itemmodels/qabstractitemmodel/CMakeLists.txt b/tests/auto/corelib/itemmodels/qabstractitemmodel/CMakeLists.txt index 33d790ddc58..2f91f7d41a9 100644 --- a/tests/auto/corelib/itemmodels/qabstractitemmodel/CMakeLists.txt +++ b/tests/auto/corelib/itemmodels/qabstractitemmodel/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qabstractitemmodel Test: ##################################################################### -qt_add_test(tst_qabstractitemmodel +qt_internal_add_test(tst_qabstractitemmodel SOURCES ../../../other/qabstractitemmodelutils/dynamictreemodel.cpp ../../../other/qabstractitemmodelutils/dynamictreemodel.h tst_qabstractitemmodel.cpp diff --git a/tests/auto/corelib/itemmodels/qabstractproxymodel/CMakeLists.txt b/tests/auto/corelib/itemmodels/qabstractproxymodel/CMakeLists.txt index f3915f98bb0..277556b915d 100644 --- a/tests/auto/corelib/itemmodels/qabstractproxymodel/CMakeLists.txt +++ b/tests/auto/corelib/itemmodels/qabstractproxymodel/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qabstractproxymodel Test: ##################################################################### -qt_add_test(tst_qabstractproxymodel +qt_internal_add_test(tst_qabstractproxymodel SOURCES tst_qabstractproxymodel.cpp DEFINES diff --git a/tests/auto/corelib/itemmodels/qconcatenatetablesproxymodel/CMakeLists.txt b/tests/auto/corelib/itemmodels/qconcatenatetablesproxymodel/CMakeLists.txt index d20abd36555..40dd512489c 100644 --- a/tests/auto/corelib/itemmodels/qconcatenatetablesproxymodel/CMakeLists.txt +++ b/tests/auto/corelib/itemmodels/qconcatenatetablesproxymodel/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qconcatenatetablesproxymodel Test: ##################################################################### -qt_add_test(tst_qconcatenatetablesproxymodel +qt_internal_add_test(tst_qconcatenatetablesproxymodel SOURCES tst_qconcatenatetablesproxymodel.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/corelib/itemmodels/qidentityproxymodel/CMakeLists.txt b/tests/auto/corelib/itemmodels/qidentityproxymodel/CMakeLists.txt index cd8b2843b5c..fb2ae55215b 100644 --- a/tests/auto/corelib/itemmodels/qidentityproxymodel/CMakeLists.txt +++ b/tests/auto/corelib/itemmodels/qidentityproxymodel/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qidentityproxymodel Test: ##################################################################### -qt_add_test(tst_qidentityproxymodel +qt_internal_add_test(tst_qidentityproxymodel SOURCES ../../../other/qabstractitemmodelutils/dynamictreemodel.cpp ../../../other/qabstractitemmodelutils/dynamictreemodel.h tst_qidentityproxymodel.cpp diff --git a/tests/auto/corelib/itemmodels/qitemmodel/CMakeLists.txt b/tests/auto/corelib/itemmodels/qitemmodel/CMakeLists.txt index c3174fe77dc..7dda1a3964b 100644 --- a/tests/auto/corelib/itemmodels/qitemmodel/CMakeLists.txt +++ b/tests/auto/corelib/itemmodels/qitemmodel/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qitemmodel Test: ##################################################################### -qt_add_test(tst_qitemmodel +qt_internal_add_test(tst_qitemmodel SOURCES tst_qitemmodel.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/corelib/itemmodels/qitemselectionmodel/CMakeLists.txt b/tests/auto/corelib/itemmodels/qitemselectionmodel/CMakeLists.txt index 308a5263079..2dfa6f98f8f 100644 --- a/tests/auto/corelib/itemmodels/qitemselectionmodel/CMakeLists.txt +++ b/tests/auto/corelib/itemmodels/qitemselectionmodel/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qitemselectionmodel Test: ##################################################################### -qt_add_test(tst_qitemselectionmodel +qt_internal_add_test(tst_qitemselectionmodel SOURCES tst_qitemselectionmodel.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/corelib/itemmodels/qsortfilterproxymodel_recursive/CMakeLists.txt b/tests/auto/corelib/itemmodels/qsortfilterproxymodel_recursive/CMakeLists.txt index 1849ffff4f5..815b68e5820 100644 --- a/tests/auto/corelib/itemmodels/qsortfilterproxymodel_recursive/CMakeLists.txt +++ b/tests/auto/corelib/itemmodels/qsortfilterproxymodel_recursive/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qsortfilterproxymodel_recursive Test: ##################################################################### -qt_add_test(tst_qsortfilterproxymodel_recursive +qt_internal_add_test(tst_qsortfilterproxymodel_recursive SOURCES tst_qsortfilterproxymodel_recursive.cpp DEFINES diff --git a/tests/auto/corelib/itemmodels/qsortfilterproxymodel_regularexpression/CMakeLists.txt b/tests/auto/corelib/itemmodels/qsortfilterproxymodel_regularexpression/CMakeLists.txt index 47cb6aab34d..7c4f60dab46 100644 --- a/tests/auto/corelib/itemmodels/qsortfilterproxymodel_regularexpression/CMakeLists.txt +++ b/tests/auto/corelib/itemmodels/qsortfilterproxymodel_regularexpression/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qsortfilterproxymodel_regularexpression Test: ##################################################################### -qt_add_test(tst_qsortfilterproxymodel_regularexpression +qt_internal_add_test(tst_qsortfilterproxymodel_regularexpression SOURCES ../../../other/qabstractitemmodelutils/dynamictreemodel.cpp ../../../other/qabstractitemmodelutils/dynamictreemodel.h ../qsortfilterproxymodel_common/tst_qsortfilterproxymodel.cpp ../qsortfilterproxymodel_common/tst_qsortfilterproxymodel.h diff --git a/tests/auto/corelib/itemmodels/qstringlistmodel/CMakeLists.txt b/tests/auto/corelib/itemmodels/qstringlistmodel/CMakeLists.txt index 18d34f89514..c6123bb1e32 100644 --- a/tests/auto/corelib/itemmodels/qstringlistmodel/CMakeLists.txt +++ b/tests/auto/corelib/itemmodels/qstringlistmodel/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qstringlistmodel Test: ##################################################################### -qt_add_test(tst_qstringlistmodel +qt_internal_add_test(tst_qstringlistmodel SOURCES qmodellistener.h tst_qstringlistmodel.cpp diff --git a/tests/auto/corelib/itemmodels/qtransposeproxymodel/CMakeLists.txt b/tests/auto/corelib/itemmodels/qtransposeproxymodel/CMakeLists.txt index 57c8309d057..7cc675d7fda 100644 --- a/tests/auto/corelib/itemmodels/qtransposeproxymodel/CMakeLists.txt +++ b/tests/auto/corelib/itemmodels/qtransposeproxymodel/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qtransposeproxymodel Test: ##################################################################### -qt_add_test(tst_qtransposeproxymodel +qt_internal_add_test(tst_qtransposeproxymodel SOURCES tst_qtransposeproxymodel.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/corelib/kernel/qcoreapplication/.prev_CMakeLists.txt b/tests/auto/corelib/kernel/qcoreapplication/.prev_CMakeLists.txt index 08d1338d025..9d5d5bfc1ca 100644 --- a/tests/auto/corelib/kernel/qcoreapplication/.prev_CMakeLists.txt +++ b/tests/auto/corelib/kernel/qcoreapplication/.prev_CMakeLists.txt @@ -8,7 +8,7 @@ endif() ## tst_qcoreapplication Test: ##################################################################### -qt_add_test(tst_qcoreapplication +qt_internal_add_test(tst_qcoreapplication SOURCES tst_qcoreapplication.cpp tst_qcoreapplication.h PUBLIC_LIBRARIES diff --git a/tests/auto/corelib/kernel/qcoreapplication/CMakeLists.txt b/tests/auto/corelib/kernel/qcoreapplication/CMakeLists.txt index e552860688a..24be474f90d 100644 --- a/tests/auto/corelib/kernel/qcoreapplication/CMakeLists.txt +++ b/tests/auto/corelib/kernel/qcoreapplication/CMakeLists.txt @@ -16,7 +16,7 @@ else() endif() # special case end -qt_add_test(tst_qcoreapplication +qt_internal_add_test(tst_qcoreapplication VERSION ${target_version} # special case SOURCES tst_qcoreapplication.cpp tst_qcoreapplication.h diff --git a/tests/auto/corelib/kernel/qdeadlinetimer/CMakeLists.txt b/tests/auto/corelib/kernel/qdeadlinetimer/CMakeLists.txt index 933f8e937e5..8c8721abf51 100644 --- a/tests/auto/corelib/kernel/qdeadlinetimer/CMakeLists.txt +++ b/tests/auto/corelib/kernel/qdeadlinetimer/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qdeadlinetimer Test: ##################################################################### -qt_add_test(tst_qdeadlinetimer +qt_internal_add_test(tst_qdeadlinetimer SOURCES tst_qdeadlinetimer.cpp ) diff --git a/tests/auto/corelib/kernel/qelapsedtimer/CMakeLists.txt b/tests/auto/corelib/kernel/qelapsedtimer/CMakeLists.txt index e88fb72becc..1592303ae33 100644 --- a/tests/auto/corelib/kernel/qelapsedtimer/CMakeLists.txt +++ b/tests/auto/corelib/kernel/qelapsedtimer/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qelapsedtimer Test: ##################################################################### -qt_add_test(tst_qelapsedtimer +qt_internal_add_test(tst_qelapsedtimer SOURCES tst_qelapsedtimer.cpp ) diff --git a/tests/auto/corelib/kernel/qeventdispatcher/CMakeLists.txt b/tests/auto/corelib/kernel/qeventdispatcher/CMakeLists.txt index 1893dedc302..409764a2c72 100644 --- a/tests/auto/corelib/kernel/qeventdispatcher/CMakeLists.txt +++ b/tests/auto/corelib/kernel/qeventdispatcher/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qeventdispatcher Test: ##################################################################### -qt_add_test(tst_qeventdispatcher +qt_internal_add_test(tst_qeventdispatcher SOURCES tst_qeventdispatcher.cpp ) diff --git a/tests/auto/corelib/kernel/qeventloop/CMakeLists.txt b/tests/auto/corelib/kernel/qeventloop/CMakeLists.txt index b09f6715e1b..d3b817598ed 100644 --- a/tests/auto/corelib/kernel/qeventloop/CMakeLists.txt +++ b/tests/auto/corelib/kernel/qeventloop/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qeventloop Test: ##################################################################### -qt_add_test(tst_qeventloop +qt_internal_add_test(tst_qeventloop SOURCES tst_qeventloop.cpp PUBLIC_LIBRARIES @@ -15,12 +15,12 @@ qt_add_test(tst_qeventloop ## Scopes: ##################################################################### -qt_extend_target(tst_qeventloop CONDITION WIN32 +qt_internal_extend_target(tst_qeventloop CONDITION WIN32 PUBLIC_LIBRARIES user32 ) -qt_extend_target(tst_qeventloop CONDITION QT_FEATURE_glib +qt_internal_extend_target(tst_qeventloop CONDITION QT_FEATURE_glib DEFINES HAVE_GLIB ) diff --git a/tests/auto/corelib/kernel/qmath/CMakeLists.txt b/tests/auto/corelib/kernel/qmath/CMakeLists.txt index 41741441416..7a6d4bd6889 100644 --- a/tests/auto/corelib/kernel/qmath/CMakeLists.txt +++ b/tests/auto/corelib/kernel/qmath/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qmath Test: ##################################################################### -qt_add_test(tst_qmath +qt_internal_add_test(tst_qmath SOURCES tst_qmath.cpp ) diff --git a/tests/auto/corelib/kernel/qmetacontainer/CMakeLists.txt b/tests/auto/corelib/kernel/qmetacontainer/CMakeLists.txt index 6f0192155da..1e2ca884845 100644 --- a/tests/auto/corelib/kernel/qmetacontainer/CMakeLists.txt +++ b/tests/auto/corelib/kernel/qmetacontainer/CMakeLists.txt @@ -7,7 +7,7 @@ # Collect test data list(APPEND test_data "./typeFlags.bin") -qt_add_test(tst_qmetacontainer +qt_internal_add_test(tst_qmetacontainer SOURCES tst_qmetacontainer.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/corelib/kernel/qmetaenum/CMakeLists.txt b/tests/auto/corelib/kernel/qmetaenum/CMakeLists.txt index eba96be7dba..daee210588d 100644 --- a/tests/auto/corelib/kernel/qmetaenum/CMakeLists.txt +++ b/tests/auto/corelib/kernel/qmetaenum/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qmetaenum Test: ##################################################################### -qt_add_test(tst_qmetaenum +qt_internal_add_test(tst_qmetaenum SOURCES tst_qmetaenum.cpp ) diff --git a/tests/auto/corelib/kernel/qmetamethod/CMakeLists.txt b/tests/auto/corelib/kernel/qmetamethod/CMakeLists.txt index 5062dc7a3f8..6ab3f143acb 100644 --- a/tests/auto/corelib/kernel/qmetamethod/CMakeLists.txt +++ b/tests/auto/corelib/kernel/qmetamethod/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qmetamethod Test: ##################################################################### -qt_add_test(tst_qmetamethod +qt_internal_add_test(tst_qmetamethod SOURCES tst_qmetamethod.cpp ) diff --git a/tests/auto/corelib/kernel/qmetaobject/CMakeLists.txt b/tests/auto/corelib/kernel/qmetaobject/CMakeLists.txt index 0a9a839505b..d0736f418d5 100644 --- a/tests/auto/corelib/kernel/qmetaobject/CMakeLists.txt +++ b/tests/auto/corelib/kernel/qmetaobject/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qmetaobject Test: ##################################################################### -qt_add_test(tst_qmetaobject +qt_internal_add_test(tst_qmetaobject SOURCES tst_qmetaobject.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/corelib/kernel/qmetaobjectbuilder/CMakeLists.txt b/tests/auto/corelib/kernel/qmetaobjectbuilder/CMakeLists.txt index bae83c137f0..2171b18b2f8 100644 --- a/tests/auto/corelib/kernel/qmetaobjectbuilder/CMakeLists.txt +++ b/tests/auto/corelib/kernel/qmetaobjectbuilder/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qmetaobjectbuilder Test: ##################################################################### -qt_add_test(tst_qmetaobjectbuilder +qt_internal_add_test(tst_qmetaobjectbuilder SOURCES tst_qmetaobjectbuilder.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/corelib/kernel/qmetaproperty/CMakeLists.txt b/tests/auto/corelib/kernel/qmetaproperty/CMakeLists.txt index 0c9c0a810ca..b69be31b1e3 100644 --- a/tests/auto/corelib/kernel/qmetaproperty/CMakeLists.txt +++ b/tests/auto/corelib/kernel/qmetaproperty/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qmetaproperty Test: ##################################################################### -qt_add_test(tst_qmetaproperty +qt_internal_add_test(tst_qmetaproperty SOURCES tst_qmetaproperty.cpp ) diff --git a/tests/auto/corelib/kernel/qmetatype/.prev_CMakeLists.txt b/tests/auto/corelib/kernel/qmetatype/.prev_CMakeLists.txt deleted file mode 100644 index 16188d2d334..00000000000 --- a/tests/auto/corelib/kernel/qmetatype/.prev_CMakeLists.txt +++ /dev/null @@ -1,38 +0,0 @@ -# Generated from qmetatype.pro. - -##################################################################### -## tst_qmetatype Test: -##################################################################### - -# Collect test data -list(APPEND test_data "./typeFlags.bin") - -qt_add_test(tst_qmetatype - SOURCES - tst_qmetatype.cpp - DEFINES - QT_DISABLE_DEPRECATED_BEFORE=0 - INCLUDE_DIRECTORIES - ../../../other/qvariant_common - PUBLIC_LIBRARIES - Qt::CorePrivate - Qt::Gui - TESTDATA ${test_data} -) - -## Scopes: -##################################################################### - -qt_extend_target(tst_qmetatype CONDITION MSVC - COMPILE_OPTIONS - /bigobj -) - -#### Keys ignored in scope 3:.:.:qmetatype.pro:CLANG: -# QMAKE_CFLAGS_RELEASE = "--O2" "--g" -# QMAKE_CXXFLAGS_RELEASE = "--O2" "--g" - -qt_extend_target(tst_qmetatype CONDITION CLANG AND (TEST_architecture_arch STREQUAL "arm") - DEFINES - TST_QMETATYPE_BROKEN_COMPILER -) diff --git a/tests/auto/corelib/kernel/qmetatype/CMakeLists.txt b/tests/auto/corelib/kernel/qmetatype/CMakeLists.txt index 16188d2d334..d3e576127ff 100644 --- a/tests/auto/corelib/kernel/qmetatype/CMakeLists.txt +++ b/tests/auto/corelib/kernel/qmetatype/CMakeLists.txt @@ -7,7 +7,7 @@ # Collect test data list(APPEND test_data "./typeFlags.bin") -qt_add_test(tst_qmetatype +qt_internal_add_test(tst_qmetatype SOURCES tst_qmetatype.cpp DEFINES @@ -23,7 +23,7 @@ qt_add_test(tst_qmetatype ## Scopes: ##################################################################### -qt_extend_target(tst_qmetatype CONDITION MSVC +qt_internal_extend_target(tst_qmetatype CONDITION MSVC COMPILE_OPTIONS /bigobj ) @@ -32,7 +32,7 @@ qt_extend_target(tst_qmetatype CONDITION MSVC # QMAKE_CFLAGS_RELEASE = "--O2" "--g" # QMAKE_CXXFLAGS_RELEASE = "--O2" "--g" -qt_extend_target(tst_qmetatype CONDITION CLANG AND (TEST_architecture_arch STREQUAL "arm") +qt_internal_extend_target(tst_qmetatype CONDITION CLANG AND (TEST_architecture_arch STREQUAL "arm") DEFINES TST_QMETATYPE_BROKEN_COMPILER ) diff --git a/tests/auto/corelib/kernel/qmimedata/CMakeLists.txt b/tests/auto/corelib/kernel/qmimedata/CMakeLists.txt index 4400dfd46e4..ec5505d3e00 100644 --- a/tests/auto/corelib/kernel/qmimedata/CMakeLists.txt +++ b/tests/auto/corelib/kernel/qmimedata/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qmimedata Test: ##################################################################### -qt_add_test(tst_qmimedata +qt_internal_add_test(tst_qmimedata SOURCES tst_qmimedata.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/corelib/kernel/qobject/.prev_CMakeLists.txt b/tests/auto/corelib/kernel/qobject/.prev_CMakeLists.txt index ea894ff3d3f..67ec3b7631f 100644 --- a/tests/auto/corelib/kernel/qobject/.prev_CMakeLists.txt +++ b/tests/auto/corelib/kernel/qobject/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qobject Test: ##################################################################### -qt_add_test(tst_qobject +qt_internal_add_test(tst_qobject SOURCES tst_qobject.cpp DEFINES diff --git a/tests/auto/corelib/kernel/qobject/CMakeLists.txt b/tests/auto/corelib/kernel/qobject/CMakeLists.txt index 47179410b09..7ff42f7212f 100644 --- a/tests/auto/corelib/kernel/qobject/CMakeLists.txt +++ b/tests/auto/corelib/kernel/qobject/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qobject Test: ##################################################################### -qt_add_test(tst_qobject +qt_internal_add_test(tst_qobject SOURCES tst_qobject.cpp DEFINES diff --git a/tests/auto/corelib/kernel/qobject/signalbug/CMakeLists.txt b/tests/auto/corelib/kernel/qobject/signalbug/CMakeLists.txt index 9dadd94f047..b479ada78e5 100644 --- a/tests/auto/corelib/kernel/qobject/signalbug/CMakeLists.txt +++ b/tests/auto/corelib/kernel/qobject/signalbug/CMakeLists.txt @@ -4,7 +4,7 @@ ## signalbug_helper Binary: ##################################################################### -qt_add_test_helper(signalbug_helper +qt_internal_add_test_helper(signalbug_helper SOURCES signalbug.cpp signalbug.h ) diff --git a/tests/auto/corelib/kernel/qpointer/CMakeLists.txt b/tests/auto/corelib/kernel/qpointer/CMakeLists.txt index a24f25b0872..cfafc1eb110 100644 --- a/tests/auto/corelib/kernel/qpointer/CMakeLists.txt +++ b/tests/auto/corelib/kernel/qpointer/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qpointer Test: ##################################################################### -qt_add_test(tst_qpointer +qt_internal_add_test(tst_qpointer SOURCES tst_qpointer.cpp ) @@ -12,7 +12,7 @@ qt_add_test(tst_qpointer ## Scopes: ##################################################################### -qt_extend_target(tst_qpointer CONDITION TARGET Qt::Widgets +qt_internal_extend_target(tst_qpointer CONDITION TARGET Qt::Widgets PUBLIC_LIBRARIES Qt::Widgets ) diff --git a/tests/auto/corelib/kernel/qproperty/CMakeLists.txt b/tests/auto/corelib/kernel/qproperty/CMakeLists.txt index 5521111ef81..55a5d71752f 100644 --- a/tests/auto/corelib/kernel/qproperty/CMakeLists.txt +++ b/tests/auto/corelib/kernel/qproperty/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qproperty Test: ##################################################################### -qt_add_test(tst_qproperty +qt_internal_add_test(tst_qproperty SOURCES tst_qproperty.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/corelib/kernel/qsharedmemory/.prev_CMakeLists.txt b/tests/auto/corelib/kernel/qsharedmemory/.prev_CMakeLists.txt index 90a9c9e17c0..0f654b0691e 100644 --- a/tests/auto/corelib/kernel/qsharedmemory/.prev_CMakeLists.txt +++ b/tests/auto/corelib/kernel/qsharedmemory/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qsharedmemory Test: ##################################################################### - qt_add_test(tst_qsharedmemory + qt_internal_add_test(tst_qsharedmemory SOURCES tst_qsharedmemory.cpp PUBLIC_LIBRARIES @@ -14,7 +14,7 @@ ## Scopes: ##################################################################### - qt_extend_target(tst_qsharedmemory CONDITION LINUX + qt_internal_extend_target(tst_qsharedmemory CONDITION LINUX PUBLIC_LIBRARIES rt ) diff --git a/tests/auto/corelib/kernel/qsharedmemory/CMakeLists.txt b/tests/auto/corelib/kernel/qsharedmemory/CMakeLists.txt index 8fb89d9af9e..f853f004402 100644 --- a/tests/auto/corelib/kernel/qsharedmemory/CMakeLists.txt +++ b/tests/auto/corelib/kernel/qsharedmemory/CMakeLists.txt @@ -5,7 +5,7 @@ if(QT_FEATURE_sharedmemory) # special case ## tst_qsharedmemory Test: ##################################################################### - qt_add_test(tst_qsharedmemory + qt_internal_add_test(tst_qsharedmemory SOURCES tst_qsharedmemory.cpp PUBLIC_LIBRARIES @@ -15,7 +15,7 @@ if(QT_FEATURE_sharedmemory) # special case ## Scopes: ##################################################################### - qt_extend_target(tst_qsharedmemory CONDITION LINUX + qt_internal_extend_target(tst_qsharedmemory CONDITION LINUX PUBLIC_LIBRARIES rt ) diff --git a/tests/auto/corelib/kernel/qsharedmemory/producerconsumer/CMakeLists.txt b/tests/auto/corelib/kernel/qsharedmemory/producerconsumer/CMakeLists.txt index 31d7f0386e3..610e2d507f2 100644 --- a/tests/auto/corelib/kernel/qsharedmemory/producerconsumer/CMakeLists.txt +++ b/tests/auto/corelib/kernel/qsharedmemory/producerconsumer/CMakeLists.txt @@ -4,7 +4,7 @@ ## producerconsumer_helper Binary: ##################################################################### -qt_add_test_helper(producerconsumer_helper +qt_internal_add_test_helper(producerconsumer_helper SOURCES main.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/corelib/kernel/qsignalblocker/CMakeLists.txt b/tests/auto/corelib/kernel/qsignalblocker/CMakeLists.txt index a7a6306bfcf..ff5a20bcad6 100644 --- a/tests/auto/corelib/kernel/qsignalblocker/CMakeLists.txt +++ b/tests/auto/corelib/kernel/qsignalblocker/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qsignalblocker Test: ##################################################################### -qt_add_test(tst_qsignalblocker +qt_internal_add_test(tst_qsignalblocker SOURCES tst_qsignalblocker.cpp ) diff --git a/tests/auto/corelib/kernel/qsignalmapper/CMakeLists.txt b/tests/auto/corelib/kernel/qsignalmapper/CMakeLists.txt index 9ce292c2422..064b6722f86 100644 --- a/tests/auto/corelib/kernel/qsignalmapper/CMakeLists.txt +++ b/tests/auto/corelib/kernel/qsignalmapper/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qsignalmapper Test: ##################################################################### -qt_add_test(tst_qsignalmapper +qt_internal_add_test(tst_qsignalmapper SOURCES tst_qsignalmapper.cpp ) diff --git a/tests/auto/corelib/kernel/qsocketnotifier/CMakeLists.txt b/tests/auto/corelib/kernel/qsocketnotifier/CMakeLists.txt index 2367a8a54e4..d5b00ae69f8 100644 --- a/tests/auto/corelib/kernel/qsocketnotifier/CMakeLists.txt +++ b/tests/auto/corelib/kernel/qsocketnotifier/CMakeLists.txt @@ -8,7 +8,7 @@ endif() ## tst_qsocketnotifier Test: ##################################################################### -qt_add_test(tst_qsocketnotifier +qt_internal_add_test(tst_qsocketnotifier SOURCES tst_qsocketnotifier.cpp INCLUDE_DIRECTORIES @@ -25,7 +25,7 @@ qt_add_test(tst_qsocketnotifier ## Scopes: ##################################################################### -qt_extend_target(tst_qsocketnotifier CONDITION WIN32 +qt_internal_extend_target(tst_qsocketnotifier CONDITION WIN32 PUBLIC_LIBRARIES ws2_32 ) diff --git a/tests/auto/corelib/kernel/qsystemsemaphore/CMakeLists.txt b/tests/auto/corelib/kernel/qsystemsemaphore/CMakeLists.txt index 0024c522e4a..1c091bd9798 100644 --- a/tests/auto/corelib/kernel/qsystemsemaphore/CMakeLists.txt +++ b/tests/auto/corelib/kernel/qsystemsemaphore/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qsystemsemaphore Test: ##################################################################### -qt_add_test(tst_qsystemsemaphore +qt_internal_add_test(tst_qsystemsemaphore SOURCES tst_qsystemsemaphore.cpp ) diff --git a/tests/auto/corelib/kernel/qsystemsemaphore/acquirerelease/CMakeLists.txt b/tests/auto/corelib/kernel/qsystemsemaphore/acquirerelease/CMakeLists.txt index 74f7bf3f616..f34076350e9 100644 --- a/tests/auto/corelib/kernel/qsystemsemaphore/acquirerelease/CMakeLists.txt +++ b/tests/auto/corelib/kernel/qsystemsemaphore/acquirerelease/CMakeLists.txt @@ -4,7 +4,7 @@ ## acquirerelease_helper Binary: ##################################################################### -qt_add_test_helper(acquirerelease_helper +qt_internal_add_test_helper(acquirerelease_helper SOURCES main.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/corelib/kernel/qtimer/CMakeLists.txt b/tests/auto/corelib/kernel/qtimer/CMakeLists.txt index d6e41f63449..39a40b69834 100644 --- a/tests/auto/corelib/kernel/qtimer/CMakeLists.txt +++ b/tests/auto/corelib/kernel/qtimer/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qtimer Test: ##################################################################### -qt_add_test(tst_qtimer +qt_internal_add_test(tst_qtimer SOURCES tst_qtimer.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/corelib/kernel/qtranslator/CMakeLists.txt b/tests/auto/corelib/kernel/qtranslator/CMakeLists.txt index e1cefa33259..e6dc1454724 100644 --- a/tests/auto/corelib/kernel/qtranslator/CMakeLists.txt +++ b/tests/auto/corelib/kernel/qtranslator/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qtranslator Test: ##################################################################### -qt_add_test(tst_qtranslator +qt_internal_add_test(tst_qtranslator SOURCES tst_qtranslator.cpp ) @@ -15,7 +15,7 @@ set(qtranslator_resource_files "hellotr_la.qm" ) -qt_add_resource(tst_qtranslator "qtranslator" +qt_internal_add_resource(tst_qtranslator "qtranslator" PREFIX "/tst_qtranslator" FILES @@ -35,7 +35,7 @@ if(ANDROID AND NOT ANDROID_EMBEDDED) "msgfmt_from_po.qm" ) - qt_add_resource(tst_qtranslator "android_testdata" + qt_internal_add_resource(tst_qtranslator "android_testdata" PREFIX "/android_testdata" FILES diff --git a/tests/auto/corelib/kernel/qvariant/.prev_CMakeLists.txt b/tests/auto/corelib/kernel/qvariant/.prev_CMakeLists.txt deleted file mode 100644 index 9534e22368a..00000000000 --- a/tests/auto/corelib/kernel/qvariant/.prev_CMakeLists.txt +++ /dev/null @@ -1,44 +0,0 @@ -# Generated from qvariant.pro. - -##################################################################### -## tst_qvariant Test: -##################################################################### - -qt_add_test(tst_qvariant - SOURCES - tst_qvariant.cpp - DEFINES - QT_DISABLE_DEPRECATED_BEFORE=0 - INCLUDE_DIRECTORIES - ../../../other/qvariant_common - PUBLIC_LIBRARIES - Qt::CorePrivate - Qt::Gui -) - -# Resources: -set(qvariant_resource_files - "stream/qt4.9/" - "stream/qt5.0/" -) - -qt_add_resource(tst_qvariant "qvariant" - PREFIX - "/" - FILES - ${qvariant_resource_files} -) - - -## Scopes: -##################################################################### - -qt_extend_target(tst_qvariant CONDITION MSVC - COMPILE_OPTIONS - /bigobj -) - -qt_extend_target(tst_qvariant CONDITION NOT QT_FEATURE_doubleconversion AND NOT QT_FEATURE_system_doubleconversion - DEFINES - QT_NO_DOUBLECONVERSION -) diff --git a/tests/auto/corelib/kernel/qvariant/CMakeLists.txt b/tests/auto/corelib/kernel/qvariant/CMakeLists.txt index 9534e22368a..45bfa4e4806 100644 --- a/tests/auto/corelib/kernel/qvariant/CMakeLists.txt +++ b/tests/auto/corelib/kernel/qvariant/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qvariant Test: ##################################################################### -qt_add_test(tst_qvariant +qt_internal_add_test(tst_qvariant SOURCES tst_qvariant.cpp DEFINES @@ -22,7 +22,7 @@ set(qvariant_resource_files "stream/qt5.0/" ) -qt_add_resource(tst_qvariant "qvariant" +qt_internal_add_resource(tst_qvariant "qvariant" PREFIX "/" FILES @@ -33,12 +33,12 @@ qt_add_resource(tst_qvariant "qvariant" ## Scopes: ##################################################################### -qt_extend_target(tst_qvariant CONDITION MSVC +qt_internal_extend_target(tst_qvariant CONDITION MSVC COMPILE_OPTIONS /bigobj ) -qt_extend_target(tst_qvariant CONDITION NOT QT_FEATURE_doubleconversion AND NOT QT_FEATURE_system_doubleconversion +qt_internal_extend_target(tst_qvariant CONDITION NOT QT_FEATURE_doubleconversion AND NOT QT_FEATURE_system_doubleconversion DEFINES QT_NO_DOUBLECONVERSION ) diff --git a/tests/auto/corelib/kernel/qwineventnotifier/CMakeLists.txt b/tests/auto/corelib/kernel/qwineventnotifier/CMakeLists.txt index 7974c3765ba..b9bcb367716 100644 --- a/tests/auto/corelib/kernel/qwineventnotifier/CMakeLists.txt +++ b/tests/auto/corelib/kernel/qwineventnotifier/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qwineventnotifier Test: ##################################################################### -qt_add_test(tst_qwineventnotifier +qt_internal_add_test(tst_qwineventnotifier SOURCES tst_qwineventnotifier.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-cache/.prev_CMakeLists.txt b/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-cache/.prev_CMakeLists.txt index 592ef6e5139..b3c08796055 100644 --- a/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-cache/.prev_CMakeLists.txt +++ b/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-cache/.prev_CMakeLists.txt @@ -8,7 +8,7 @@ endif() ## tst_qmimedatabase-cache Test: ##################################################################### -qt_add_test(tst_qmimedatabase-cache +qt_internal_add_test(tst_qmimedatabase-cache SOURCES ../tst_qmimedatabase.h tst_qmimedatabase-cache.cpp @@ -24,7 +24,7 @@ set(mimetypes_resource_files "mime/packages/freedesktop.org.xml" ) -qt_add_resource(tst_qmimedatabase-cache "mimetypes" +qt_internal_add_resource(tst_qmimedatabase-cache "mimetypes" PREFIX "/qt-project.org/qmime/packages" BASE @@ -75,7 +75,7 @@ set(testdata_resource_files "yast2-metapackage-handler-mimetypes.xml" ) -qt_add_resource(tst_qmimedatabase-cache "testdata" +qt_internal_add_resource(tst_qmimedatabase-cache "testdata" PREFIX "/qt-project.org/qmime" BASE @@ -91,7 +91,7 @@ qt_add_resource(tst_qmimedatabase-cache "testdata" ## Scopes: ##################################################################### -qt_extend_target(tst_qmimedatabase-cache CONDITION GCC +qt_internal_extend_target(tst_qmimedatabase-cache CONDITION GCC COMPILE_OPTIONS -W -Wall @@ -101,7 +101,7 @@ qt_extend_target(tst_qmimedatabase-cache CONDITION GCC -Wshadow ) -qt_extend_target(tst_qmimedatabase-cache CONDITION UNIX AND NOT APPLE AND NOT QNX +qt_internal_extend_target(tst_qmimedatabase-cache CONDITION UNIX AND NOT APPLE AND NOT QNX DEFINES USE_XDG_DATA_DIRS ) diff --git a/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-cache/CMakeLists.txt b/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-cache/CMakeLists.txt index e47d721f549..b9ce8209f79 100644 --- a/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-cache/CMakeLists.txt +++ b/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-cache/CMakeLists.txt @@ -8,7 +8,7 @@ endif() ## tst_qmimedatabase-cache Test: ##################################################################### -qt_add_test(tst_qmimedatabase-cache +qt_internal_add_test(tst_qmimedatabase-cache SOURCES ../tst_qmimedatabase.h tst_qmimedatabase-cache.cpp @@ -66,7 +66,7 @@ set(testdata_resource_files "yast2-metapackage-handler-mimetypes.xml" ) -qt_add_resource(tst_qmimedatabase-cache "testdata" +qt_internal_add_resource(tst_qmimedatabase-cache "testdata" PREFIX "/qt-project.org/qmime" BASE @@ -87,7 +87,7 @@ corelib_add_mimetypes_resources(tst_qmimedatabase-cache) ## Scopes: ##################################################################### -qt_extend_target(tst_qmimedatabase-cache CONDITION GCC +qt_internal_extend_target(tst_qmimedatabase-cache CONDITION GCC COMPILE_OPTIONS -W -Wall @@ -97,7 +97,7 @@ qt_extend_target(tst_qmimedatabase-cache CONDITION GCC -Wshadow ) -qt_extend_target(tst_qmimedatabase-cache CONDITION UNIX AND NOT APPLE AND NOT QNX +qt_internal_extend_target(tst_qmimedatabase-cache CONDITION UNIX AND NOT APPLE AND NOT QNX DEFINES USE_XDG_DATA_DIRS ) diff --git a/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-xml/.prev_CMakeLists.txt b/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-xml/.prev_CMakeLists.txt index d449343e56a..b1cabd0b7e3 100644 --- a/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-xml/.prev_CMakeLists.txt +++ b/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-xml/.prev_CMakeLists.txt @@ -8,7 +8,7 @@ endif() ## tst_qmimedatabase-xml Test: ##################################################################### -qt_add_test(tst_qmimedatabase-xml +qt_internal_add_test(tst_qmimedatabase-xml SOURCES ../tst_qmimedatabase.h tst_qmimedatabase-xml.cpp @@ -24,7 +24,7 @@ set(mimetypes_resource_files "mime/packages/freedesktop.org.xml" ) -qt_add_resource(tst_qmimedatabase-xml "mimetypes" +qt_internal_add_resource(tst_qmimedatabase-xml "mimetypes" PREFIX "/qt-project.org/qmime/packages" BASE @@ -75,7 +75,7 @@ set(testdata_resource_files "yast2-metapackage-handler-mimetypes.xml" ) -qt_add_resource(tst_qmimedatabase-xml "testdata" +qt_internal_add_resource(tst_qmimedatabase-xml "testdata" PREFIX "/qt-project.org/qmime" BASE @@ -91,7 +91,7 @@ qt_add_resource(tst_qmimedatabase-xml "testdata" ## Scopes: ##################################################################### -qt_extend_target(tst_qmimedatabase-xml CONDITION GCC +qt_internal_extend_target(tst_qmimedatabase-xml CONDITION GCC COMPILE_OPTIONS -W -Wall @@ -101,7 +101,7 @@ qt_extend_target(tst_qmimedatabase-xml CONDITION GCC -Wshadow ) -qt_extend_target(tst_qmimedatabase-xml CONDITION UNIX AND NOT APPLE AND NOT QNX +qt_internal_extend_target(tst_qmimedatabase-xml CONDITION UNIX AND NOT APPLE AND NOT QNX DEFINES USE_XDG_DATA_DIRS ) diff --git a/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-xml/CMakeLists.txt b/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-xml/CMakeLists.txt index 45770cf247f..ddc5b99baa2 100644 --- a/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-xml/CMakeLists.txt +++ b/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-xml/CMakeLists.txt @@ -8,7 +8,7 @@ endif() ## tst_qmimedatabase-xml Test: ##################################################################### -qt_add_test(tst_qmimedatabase-xml +qt_internal_add_test(tst_qmimedatabase-xml SOURCES ../tst_qmimedatabase.h tst_qmimedatabase-xml.cpp @@ -66,7 +66,7 @@ set(testdata_resource_files "yast2-metapackage-handler-mimetypes.xml" ) -qt_add_resource(tst_qmimedatabase-xml "testdata" +qt_internal_add_resource(tst_qmimedatabase-xml "testdata" PREFIX "/qt-project.org/qmime" BASE @@ -87,7 +87,7 @@ corelib_add_mimetypes_resources(tst_qmimedatabase-xml) ## Scopes: ##################################################################### -qt_extend_target(tst_qmimedatabase-xml CONDITION GCC +qt_internal_extend_target(tst_qmimedatabase-xml CONDITION GCC COMPILE_OPTIONS -W -Wall @@ -97,7 +97,7 @@ qt_extend_target(tst_qmimedatabase-xml CONDITION GCC -Wshadow ) -qt_extend_target(tst_qmimedatabase-xml CONDITION UNIX AND NOT APPLE AND NOT QNX +qt_internal_extend_target(tst_qmimedatabase-xml CONDITION UNIX AND NOT APPLE AND NOT QNX DEFINES USE_XDG_DATA_DIRS ) diff --git a/tests/auto/corelib/mimetypes/qmimetype/CMakeLists.txt b/tests/auto/corelib/mimetypes/qmimetype/CMakeLists.txt index 7637ef5d2dd..bb84fce94fc 100644 --- a/tests/auto/corelib/mimetypes/qmimetype/CMakeLists.txt +++ b/tests/auto/corelib/mimetypes/qmimetype/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qmimetype Test: ##################################################################### -qt_add_test(tst_qmimetype +qt_internal_add_test(tst_qmimetype SOURCES tst_qmimetype.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/corelib/plugin/qfactoryloader/plugin1/CMakeLists.txt b/tests/auto/corelib/plugin/qfactoryloader/plugin1/CMakeLists.txt index 2eaac944080..247c905d9ee 100644 --- a/tests/auto/corelib/plugin/qfactoryloader/plugin1/CMakeLists.txt +++ b/tests/auto/corelib/plugin/qfactoryloader/plugin1/CMakeLists.txt @@ -4,7 +4,7 @@ ## plugin1 Generic Library: ##################################################################### -qt_add_cmake_library(plugin1 +qt_internal_add_cmake_library(plugin1 MODULE INSTALL_DIRECTORY "${INSTALL_TESTSDIR}/tst_qfactoryloader/bin" OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../bin" @@ -22,7 +22,7 @@ qt_add_cmake_library(plugin1 ## Scopes: ##################################################################### -qt_extend_target(plugin1 CONDITION NOT QT_FEATURE_library +qt_internal_extend_target(plugin1 CONDITION NOT QT_FEATURE_library DEFINES QT_STATICPLUGIN ) diff --git a/tests/auto/corelib/plugin/qfactoryloader/plugin2/CMakeLists.txt b/tests/auto/corelib/plugin/qfactoryloader/plugin2/CMakeLists.txt index 0e0c589fc1f..a384a404122 100644 --- a/tests/auto/corelib/plugin/qfactoryloader/plugin2/CMakeLists.txt +++ b/tests/auto/corelib/plugin/qfactoryloader/plugin2/CMakeLists.txt @@ -4,7 +4,7 @@ ## plugin2 Generic Library: ##################################################################### -qt_add_cmake_library(plugin2 +qt_internal_add_cmake_library(plugin2 MODULE INSTALL_DIRECTORY "${INSTALL_TESTSDIR}/tst_qfactoryloader/bin" OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../bin" @@ -22,7 +22,7 @@ qt_add_cmake_library(plugin2 ## Scopes: ##################################################################### -qt_extend_target(plugin2 CONDITION NOT QT_FEATURE_library +qt_internal_extend_target(plugin2 CONDITION NOT QT_FEATURE_library DEFINES QT_STATICPLUGIN ) diff --git a/tests/auto/corelib/plugin/qfactoryloader/test/.prev_CMakeLists.txt b/tests/auto/corelib/plugin/qfactoryloader/test/.prev_CMakeLists.txt index 9e3a6863400..8b781536a44 100644 --- a/tests/auto/corelib/plugin/qfactoryloader/test/.prev_CMakeLists.txt +++ b/tests/auto/corelib/plugin/qfactoryloader/test/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qfactoryloader Test: ##################################################################### -qt_add_test(tst_qfactoryloader +qt_internal_add_test(tst_qfactoryloader OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../" SOURCES ../plugin1/plugininterface1.h @@ -17,7 +17,7 @@ qt_add_test(tst_qfactoryloader ## Scopes: ##################################################################### -qt_extend_target(tst_qfactoryloader CONDITION NOT QT_FEATURE_library +qt_internal_extend_target(tst_qfactoryloader CONDITION NOT QT_FEATURE_library PUBLIC_LIBRARIES # Remove: L ../bin/ @@ -31,7 +31,7 @@ if(ANDROID) ${CMAKE_CURRENT_BINARY_DIR}/../bin ) - qt_add_resource(tst_qfactoryloader "qmake_libs" + qt_internal_add_resource(tst_qfactoryloader "qmake_libs" PREFIX "android_test_data" BASE diff --git a/tests/auto/corelib/plugin/qfactoryloader/test/CMakeLists.txt b/tests/auto/corelib/plugin/qfactoryloader/test/CMakeLists.txt index 7d102943994..8515af2beb9 100644 --- a/tests/auto/corelib/plugin/qfactoryloader/test/CMakeLists.txt +++ b/tests/auto/corelib/plugin/qfactoryloader/test/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qfactoryloader Test: ##################################################################### -qt_add_test(tst_qfactoryloader +qt_internal_add_test(tst_qfactoryloader OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../" SOURCES ../plugin1/plugininterface1.h @@ -23,7 +23,7 @@ if (NOT QT_FEATURE_library) endif() # special case end -qt_extend_target(tst_qfactoryloader CONDITION NOT QT_FEATURE_library +qt_internal_extend_target(tst_qfactoryloader CONDITION NOT QT_FEATURE_library PUBLIC_LIBRARIES # Remove: L # special case begin @@ -57,7 +57,7 @@ if(ANDROID) endif() # special case end - qt_add_resource(tst_qfactoryloader "qmake_libs" + qt_internal_add_resource(tst_qfactoryloader "qmake_libs" PREFIX "android_test_data" BASE diff --git a/tests/auto/corelib/plugin/qlibrary/lib/.prev_CMakeLists.txt b/tests/auto/corelib/plugin/qlibrary/lib/.prev_CMakeLists.txt index b1435b77d38..93a2b1a455f 100644 --- a/tests/auto/corelib/plugin/qlibrary/lib/.prev_CMakeLists.txt +++ b/tests/auto/corelib/plugin/qlibrary/lib/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## mylib Generic Library: ##################################################################### -qt_add_cmake_library(mylib +qt_internal_add_cmake_library(mylib SHARED INSTALL_DIRECTORY "${INSTALL_TESTSDIR}/tst_qlibrary" OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../" @@ -22,7 +22,7 @@ qt_add_cmake_library(mylib ## Scopes: ##################################################################### -qt_extend_target(mylib CONDITION MSVC +qt_internal_extend_target(mylib CONDITION MSVC DEFINES WIN32_MSVC ) diff --git a/tests/auto/corelib/plugin/qlibrary/lib/CMakeLists.txt b/tests/auto/corelib/plugin/qlibrary/lib/CMakeLists.txt index 41bd6bf2522..4b2e01d9975 100644 --- a/tests/auto/corelib/plugin/qlibrary/lib/CMakeLists.txt +++ b/tests/auto/corelib/plugin/qlibrary/lib/CMakeLists.txt @@ -4,7 +4,7 @@ ## mylib Generic Library: ##################################################################### -qt_add_cmake_library(mylib +qt_internal_add_cmake_library(mylib SHARED INSTALL_DIRECTORY "${INSTALL_TESTSDIR}/tst_qlibrary" OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../" @@ -37,7 +37,7 @@ endif() ## Scopes: ##################################################################### -qt_extend_target(mylib CONDITION MSVC +qt_internal_extend_target(mylib CONDITION MSVC DEFINES WIN32_MSVC ) diff --git a/tests/auto/corelib/plugin/qlibrary/lib2/CMakeLists.txt b/tests/auto/corelib/plugin/qlibrary/lib2/CMakeLists.txt index a91b99f1c23..f92cec8fb1e 100644 --- a/tests/auto/corelib/plugin/qlibrary/lib2/CMakeLists.txt +++ b/tests/auto/corelib/plugin/qlibrary/lib2/CMakeLists.txt @@ -4,7 +4,7 @@ ## mylib Generic Library: ##################################################################### -add_cmake_library(mylib2 # special case +qt_internal_add_cmake_library(mylib2 # special case SHARED INSTALL_DIRECTORY "${INSTALL_TESTSDIR}tst_qlibrary" #OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../" # special case @@ -84,7 +84,7 @@ endif() ## Scopes: ##################################################################### -extend_target(mylib2 CONDITION MSVC # special case +qt_internal_extend_target(mylib2 CONDITION MSVC # special case DEFINES WIN32_MSVC ) diff --git a/tests/auto/corelib/plugin/qlibrary/tst/.prev_CMakeLists.txt b/tests/auto/corelib/plugin/qlibrary/tst/.prev_CMakeLists.txt index c3af98df13c..6e4ce15f444 100644 --- a/tests/auto/corelib/plugin/qlibrary/tst/.prev_CMakeLists.txt +++ b/tests/auto/corelib/plugin/qlibrary/tst/.prev_CMakeLists.txt @@ -7,7 +7,7 @@ # Collect test data list(APPEND test_data "../library_path/invalid.so") -qt_add_test(tst_qlibrary +qt_internal_add_test(tst_qlibrary OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../" SOURCES ../tst_qlibrary.cpp @@ -26,7 +26,7 @@ if(ANDROID) ${CMAKE_CURRENT_BINARY_DIR}/../system.qt.test.mylib.so ) - qt_add_resource(tst_qlibrary "qmake_libs" + qt_internal_add_resource(tst_qlibrary "qmake_libs" PREFIX "android_test_data" BASE diff --git a/tests/auto/corelib/plugin/qlibrary/tst/CMakeLists.txt b/tests/auto/corelib/plugin/qlibrary/tst/CMakeLists.txt index a99b96c8065..0f18c8dccc4 100644 --- a/tests/auto/corelib/plugin/qlibrary/tst/CMakeLists.txt +++ b/tests/auto/corelib/plugin/qlibrary/tst/CMakeLists.txt @@ -7,7 +7,7 @@ # Collect test data list(APPEND test_data "../library_path/invalid.so") -qt_add_test(tst_qlibrary +qt_internal_add_test(tst_qlibrary OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../" SOURCES ../tst_qlibrary.cpp @@ -39,7 +39,7 @@ if(ANDROID) # special case end ) - qt_add_resource(tst_qlibrary "qmake_libs" + qt_internal_add_resource(tst_qlibrary "qmake_libs" PREFIX "android_test_data" BASE diff --git a/tests/auto/corelib/plugin/qplugin/CMakeLists.txt b/tests/auto/corelib/plugin/qplugin/CMakeLists.txt index b2829099aa2..2c901eff44c 100644 --- a/tests/auto/corelib/plugin/qplugin/CMakeLists.txt +++ b/tests/auto/corelib/plugin/qplugin/CMakeLists.txt @@ -13,7 +13,7 @@ file(GLOB_RECURSE test_data_glob plugins/*) list(APPEND test_data ${test_data_glob}) -add_qt_test(tst_qplugin +qt_internal_add_test(tst_qplugin SOURCES tst_qplugin.cpp LIBRARIES diff --git a/tests/auto/corelib/plugin/qplugin/debugplugin/CMakeLists.txt b/tests/auto/corelib/plugin/qplugin/debugplugin/CMakeLists.txt index 379faad9812..ee4c0cf33ca 100644 --- a/tests/auto/corelib/plugin/qplugin/debugplugin/CMakeLists.txt +++ b/tests/auto/corelib/plugin/qplugin/debugplugin/CMakeLists.txt @@ -4,7 +4,7 @@ ## debugplugin Generic Library: ##################################################################### -qt_add_cmake_library(debugplugin +qt_internal_add_cmake_library(debugplugin MODULE OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../plugins" SOURCES diff --git a/tests/auto/corelib/plugin/qplugin/invalidplugin/CMakeLists.txt b/tests/auto/corelib/plugin/qplugin/invalidplugin/CMakeLists.txt index 0dc5a28edb4..b9cdf2af05f 100644 --- a/tests/auto/corelib/plugin/qplugin/invalidplugin/CMakeLists.txt +++ b/tests/auto/corelib/plugin/qplugin/invalidplugin/CMakeLists.txt @@ -4,7 +4,7 @@ ## invalidplugin Generic Library: ##################################################################### -qt_add_cmake_library(invalidplugin +qt_internal_add_cmake_library(invalidplugin MODULE OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../plugins" SOURCES diff --git a/tests/auto/corelib/plugin/qplugin/releaseplugin/CMakeLists.txt b/tests/auto/corelib/plugin/qplugin/releaseplugin/CMakeLists.txt index 0332bcc15bb..abf3ae2a4d0 100644 --- a/tests/auto/corelib/plugin/qplugin/releaseplugin/CMakeLists.txt +++ b/tests/auto/corelib/plugin/qplugin/releaseplugin/CMakeLists.txt @@ -4,7 +4,7 @@ ## releaseplugin Generic Library: ##################################################################### -qt_add_cmake_library(releaseplugin +qt_internal_add_cmake_library(releaseplugin MODULE OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../plugins" SOURCES diff --git a/tests/auto/corelib/plugin/qpluginloader/almostplugin/.prev_CMakeLists.txt b/tests/auto/corelib/plugin/qpluginloader/almostplugin/.prev_CMakeLists.txt index 64b1db677d1..899ad6ca397 100644 --- a/tests/auto/corelib/plugin/qpluginloader/almostplugin/.prev_CMakeLists.txt +++ b/tests/auto/corelib/plugin/qpluginloader/almostplugin/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## almostplugin Generic Library: ##################################################################### -qt_add_cmake_library(almostplugin +qt_internal_add_cmake_library(almostplugin MODULE INSTALL_DIRECTORY "${INSTALL_TESTSDIR}/tst_qpluginloader/bin" OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../bin" @@ -22,7 +22,7 @@ qt_add_cmake_library(almostplugin ## Scopes: ##################################################################### -qt_extend_target(almostplugin CONDITION GCC +qt_internal_extend_target(almostplugin CONDITION GCC LINK_OPTIONS "--Wl,--no-undefined" ) diff --git a/tests/auto/corelib/plugin/qpluginloader/almostplugin/CMakeLists.txt b/tests/auto/corelib/plugin/qpluginloader/almostplugin/CMakeLists.txt index c8a320d2cfb..fe5d6295aaf 100644 --- a/tests/auto/corelib/plugin/qpluginloader/almostplugin/CMakeLists.txt +++ b/tests/auto/corelib/plugin/qpluginloader/almostplugin/CMakeLists.txt @@ -4,7 +4,7 @@ ## almostplugin Generic Library: ##################################################################### -qt_add_cmake_library(almostplugin +qt_internal_add_cmake_library(almostplugin MODULE INSTALL_DIRECTORY "${INSTALL_TESTSDIR}/tst_qpluginloader/bin" OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../bin" @@ -25,7 +25,7 @@ qt_add_cmake_library(almostplugin qt_autogen_tools_initial_setup(almostplugin) # special case begin # We want the opposite of this -#qt_extend_target(almostplugin CONDITION GCC +#qt_internal_extend_target(almostplugin CONDITION GCC # LINK_OPTIONS # "--Wl,--no-undefined" #) diff --git a/tests/auto/corelib/plugin/qpluginloader/lib/.prev_CMakeLists.txt b/tests/auto/corelib/plugin/qpluginloader/lib/.prev_CMakeLists.txt index b5ae34e9dfc..61de9dd4799 100644 --- a/tests/auto/corelib/plugin/qpluginloader/lib/.prev_CMakeLists.txt +++ b/tests/auto/corelib/plugin/qpluginloader/lib/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qpluginloaderlib Generic Library: ##################################################################### -qt_add_cmake_library(tst_qpluginloaderlib +qt_internal_add_cmake_library(tst_qpluginloaderlib SHARED INSTALL_DIRECTORY "${INSTALL_TESTSDIR}/tst_qpluginloader/bin" OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../bin" @@ -22,7 +22,7 @@ qt_add_cmake_library(tst_qpluginloaderlib ## Scopes: ##################################################################### -qt_extend_target(tst_qpluginloaderlib CONDITION MSVC +qt_internal_extend_target(tst_qpluginloaderlib CONDITION MSVC DEFINES WIN32_MSVC ) diff --git a/tests/auto/corelib/plugin/qpluginloader/lib/CMakeLists.txt b/tests/auto/corelib/plugin/qpluginloader/lib/CMakeLists.txt index f760ce99358..7914f07c0db 100644 --- a/tests/auto/corelib/plugin/qpluginloader/lib/CMakeLists.txt +++ b/tests/auto/corelib/plugin/qpluginloader/lib/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qpluginloaderlib Generic Library: ##################################################################### -qt_add_cmake_library(tst_qpluginloaderlib +qt_internal_add_cmake_library(tst_qpluginloaderlib SHARED INSTALL_DIRECTORY "${INSTALL_TESTSDIR}/tst_qpluginloader/bin" OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../bin" @@ -29,7 +29,7 @@ endif() ## Scopes: ##################################################################### -qt_extend_target(tst_qpluginloaderlib CONDITION MSVC +qt_internal_extend_target(tst_qpluginloaderlib CONDITION MSVC DEFINES WIN32_MSVC ) diff --git a/tests/auto/corelib/plugin/qpluginloader/staticplugin/.prev_CMakeLists.txt b/tests/auto/corelib/plugin/qpluginloader/staticplugin/.prev_CMakeLists.txt index bfc30d7c1d6..1448ff39338 100644 --- a/tests/auto/corelib/plugin/qpluginloader/staticplugin/.prev_CMakeLists.txt +++ b/tests/auto/corelib/plugin/qpluginloader/staticplugin/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## staticplugin Generic Library: ##################################################################### -add_cmake_library(staticplugin +qt_internal_add_cmake_library(staticplugin STATIC SOURCES main.cpp @@ -21,3 +21,5 @@ add_cmake_library(staticplugin # TEMPLATE = "lib" qt_autogen_tools_initial_setup(staticplugin) + +target_compile_definitions(staticplugin PRIVATE QT_STATICPLUGIN) diff --git a/tests/auto/corelib/plugin/qpluginloader/staticplugin/CMakeLists.txt b/tests/auto/corelib/plugin/qpluginloader/staticplugin/CMakeLists.txt index 0eb42728f4a..1448ff39338 100644 --- a/tests/auto/corelib/plugin/qpluginloader/staticplugin/CMakeLists.txt +++ b/tests/auto/corelib/plugin/qpluginloader/staticplugin/CMakeLists.txt @@ -4,7 +4,7 @@ ## staticplugin Generic Library: ##################################################################### -qt_add_cmake_library(staticplugin +qt_internal_add_cmake_library(staticplugin STATIC SOURCES main.cpp diff --git a/tests/auto/corelib/plugin/qpluginloader/theplugin/CMakeLists.txt b/tests/auto/corelib/plugin/qpluginloader/theplugin/CMakeLists.txt index ef39d6cc0f5..5a8bf518c5a 100644 --- a/tests/auto/corelib/plugin/qpluginloader/theplugin/CMakeLists.txt +++ b/tests/auto/corelib/plugin/qpluginloader/theplugin/CMakeLists.txt @@ -4,7 +4,7 @@ ## theplugin Generic Library: ##################################################################### -qt_add_cmake_library(theplugin +qt_internal_add_cmake_library(theplugin MODULE INSTALL_DIRECTORY "${INSTALL_TESTSDIR}/tst_qpluginloader/bin" OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../bin" diff --git a/tests/auto/corelib/plugin/qpluginloader/tst/.prev_CMakeLists.txt b/tests/auto/corelib/plugin/qpluginloader/tst/.prev_CMakeLists.txt deleted file mode 100644 index 0b0d76bbc47..00000000000 --- a/tests/auto/corelib/plugin/qpluginloader/tst/.prev_CMakeLists.txt +++ /dev/null @@ -1,43 +0,0 @@ -# Generated from tst.pro. - -##################################################################### -## tst_qpluginloader Test: -##################################################################### - -# Collect test data -list(APPEND test_data "../elftest") -list(APPEND test_data "../machtest") - -qt_add_test(tst_qpluginloader - OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../" - SOURCES - ../fakeplugin.cpp - ../theplugin/plugininterface.h - ../tst_qpluginloader.cpp - PUBLIC_LIBRARIES - staticplugin - TESTDATA ${test_data} -) - -## Scopes: -##################################################################### - -qt_extend_target(tst_qpluginloader CONDITION QT_FEATURE_private_tests - PUBLIC_LIBRARIES - Qt::CorePrivate -) - -qt_extend_target(tst_qpluginloader CONDITION CMAKE_BUILD_TYPE STREQUAL Debug AND WIN32 AND debug_and_release - PUBLIC_LIBRARIES - # Remove: L../staticplugin/debug -) - -qt_extend_target(tst_qpluginloader CONDITION WIN32 AND debug_and_release AND NOT CMAKE_BUILD_TYPE STREQUAL Debug - PUBLIC_LIBRARIES - # Remove: L../staticplugin/release -) - -qt_extend_target(tst_qpluginloader CONDITION UNIX OR NOT debug_and_release - PUBLIC_LIBRARIES - # Remove: L../staticplugin -) diff --git a/tests/auto/corelib/plugin/qpluginloader/tst/CMakeLists.txt b/tests/auto/corelib/plugin/qpluginloader/tst/CMakeLists.txt index 0b0d76bbc47..1193a9d731f 100644 --- a/tests/auto/corelib/plugin/qpluginloader/tst/CMakeLists.txt +++ b/tests/auto/corelib/plugin/qpluginloader/tst/CMakeLists.txt @@ -8,7 +8,7 @@ list(APPEND test_data "../elftest") list(APPEND test_data "../machtest") -qt_add_test(tst_qpluginloader +qt_internal_add_test(tst_qpluginloader OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../" SOURCES ../fakeplugin.cpp @@ -22,22 +22,22 @@ qt_add_test(tst_qpluginloader ## Scopes: ##################################################################### -qt_extend_target(tst_qpluginloader CONDITION QT_FEATURE_private_tests +qt_internal_extend_target(tst_qpluginloader CONDITION QT_FEATURE_private_tests PUBLIC_LIBRARIES Qt::CorePrivate ) -qt_extend_target(tst_qpluginloader CONDITION CMAKE_BUILD_TYPE STREQUAL Debug AND WIN32 AND debug_and_release +qt_internal_extend_target(tst_qpluginloader CONDITION CMAKE_BUILD_TYPE STREQUAL Debug AND WIN32 AND debug_and_release PUBLIC_LIBRARIES # Remove: L../staticplugin/debug ) -qt_extend_target(tst_qpluginloader CONDITION WIN32 AND debug_and_release AND NOT CMAKE_BUILD_TYPE STREQUAL Debug +qt_internal_extend_target(tst_qpluginloader CONDITION WIN32 AND debug_and_release AND NOT CMAKE_BUILD_TYPE STREQUAL Debug PUBLIC_LIBRARIES # Remove: L../staticplugin/release ) -qt_extend_target(tst_qpluginloader CONDITION UNIX OR NOT debug_and_release +qt_internal_extend_target(tst_qpluginloader CONDITION UNIX OR NOT debug_and_release PUBLIC_LIBRARIES # Remove: L../staticplugin ) diff --git a/tests/auto/corelib/plugin/quuid/test/.prev_CMakeLists.txt b/tests/auto/corelib/plugin/quuid/test/.prev_CMakeLists.txt index 05ed8f84ac2..5e0aec0f339 100644 --- a/tests/auto/corelib/plugin/quuid/test/.prev_CMakeLists.txt +++ b/tests/auto/corelib/plugin/quuid/test/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_quuid Test: ##################################################################### -qt_add_test(tst_quuid +qt_internal_add_test(tst_quuid SOURCES ../tst_quuid.cpp ) @@ -12,7 +12,7 @@ qt_add_test(tst_quuid ## Scopes: ##################################################################### -qt_extend_target(tst_quuid CONDITION APPLE +qt_internal_extend_target(tst_quuid CONDITION APPLE SOURCES ../tst_quuid_darwin.mm PUBLIC_LIBRARIES diff --git a/tests/auto/corelib/plugin/quuid/test/CMakeLists.txt b/tests/auto/corelib/plugin/quuid/test/CMakeLists.txt index 1ba9de95caf..51712cfc056 100644 --- a/tests/auto/corelib/plugin/quuid/test/CMakeLists.txt +++ b/tests/auto/corelib/plugin/quuid/test/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_quuid Test: ##################################################################### -qt_add_test(tst_quuid +qt_internal_add_test(tst_quuid OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../" # special case SOURCES ../tst_quuid.cpp @@ -13,7 +13,7 @@ qt_add_test(tst_quuid ## Scopes: ##################################################################### -qt_extend_target(tst_quuid CONDITION APPLE +qt_internal_extend_target(tst_quuid CONDITION APPLE SOURCES ../tst_quuid_darwin.mm PUBLIC_LIBRARIES diff --git a/tests/auto/corelib/plugin/quuid/testProcessUniqueness/.prev_CMakeLists.txt b/tests/auto/corelib/plugin/quuid/testProcessUniqueness/.prev_CMakeLists.txt index eaa9d4e2817..e1b5814f41b 100644 --- a/tests/auto/corelib/plugin/quuid/testProcessUniqueness/.prev_CMakeLists.txt +++ b/tests/auto/corelib/plugin/quuid/testProcessUniqueness/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## testProcessUniqueness Binary: ##################################################################### -qt_add_executable(testProcessUniqueness +qt_internal_add_executable(testProcessUniqueness INSTALL_DIRECTORY "${INSTALL_TESTSDIR}/tst_quuid/testProcessUniqueness" OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" SOURCES diff --git a/tests/auto/corelib/plugin/quuid/testProcessUniqueness/CMakeLists.txt b/tests/auto/corelib/plugin/quuid/testProcessUniqueness/CMakeLists.txt index ad5192261d9..0bdf32a2072 100644 --- a/tests/auto/corelib/plugin/quuid/testProcessUniqueness/CMakeLists.txt +++ b/tests/auto/corelib/plugin/quuid/testProcessUniqueness/CMakeLists.txt @@ -4,7 +4,7 @@ ## testProcessUniqueness Binary: ##################################################################### -qt_add_executable(testProcessUniqueness +qt_internal_add_executable(testProcessUniqueness INSTALL_DIRECTORY "${INSTALL_TESTSDIR}/tst_quuid/testProcessUniqueness" OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" SOURCES diff --git a/tests/auto/corelib/serialization/json/CMakeLists.txt b/tests/auto/corelib/serialization/json/CMakeLists.txt index f2d0d9d54cd..f8e209e620e 100644 --- a/tests/auto/corelib/serialization/json/CMakeLists.txt +++ b/tests/auto/corelib/serialization/json/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_json Test: ##################################################################### -qt_add_test(tst_json +qt_internal_add_test(tst_json SOURCES tst_qtjson.cpp PUBLIC_LIBRARIES @@ -26,7 +26,7 @@ if(ANDROID) "test3.json" ) - qt_add_resource(tst_json "json" + qt_internal_add_resource(tst_json "json" PREFIX "/" FILES @@ -34,7 +34,7 @@ if(ANDROID) ) endif() -qt_extend_target(tst_json CONDITION NOT QT_FEATURE_doubleconversion AND NOT QT_FEATURE_system_doubleconversion +qt_internal_extend_target(tst_json CONDITION NOT QT_FEATURE_doubleconversion AND NOT QT_FEATURE_system_doubleconversion DEFINES QT_NO_DOUBLECONVERSION ) diff --git a/tests/auto/corelib/serialization/qcborstreamreader/CMakeLists.txt b/tests/auto/corelib/serialization/qcborstreamreader/CMakeLists.txt index 74d4e692df6..eb5061652ea 100644 --- a/tests/auto/corelib/serialization/qcborstreamreader/CMakeLists.txt +++ b/tests/auto/corelib/serialization/qcborstreamreader/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qcborstreamreader Test: ##################################################################### -qt_add_test(tst_qcborstreamreader +qt_internal_add_test(tst_qcborstreamreader SOURCES tst_qcborstreamreader.cpp DEFINES diff --git a/tests/auto/corelib/serialization/qcborstreamwriter/CMakeLists.txt b/tests/auto/corelib/serialization/qcborstreamwriter/CMakeLists.txt index 33707ff24fa..b39e1b79172 100644 --- a/tests/auto/corelib/serialization/qcborstreamwriter/CMakeLists.txt +++ b/tests/auto/corelib/serialization/qcborstreamwriter/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qcborstreamwriter Test: ##################################################################### -qt_add_test(tst_qcborstreamwriter +qt_internal_add_test(tst_qcborstreamwriter SOURCES tst_qcborstreamwriter.cpp DEFINES diff --git a/tests/auto/corelib/serialization/qcborvalue/CMakeLists.txt b/tests/auto/corelib/serialization/qcborvalue/CMakeLists.txt index 3877e565cde..0a8464c7567 100644 --- a/tests/auto/corelib/serialization/qcborvalue/CMakeLists.txt +++ b/tests/auto/corelib/serialization/qcborvalue/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qcborvalue Test: ##################################################################### -qt_add_test(tst_qcborvalue +qt_internal_add_test(tst_qcborvalue SOURCES tst_qcborvalue.cpp DEFINES diff --git a/tests/auto/corelib/serialization/qcborvalue_json/CMakeLists.txt b/tests/auto/corelib/serialization/qcborvalue_json/CMakeLists.txt index 8801d677835..d27ae466770 100644 --- a/tests/auto/corelib/serialization/qcborvalue_json/CMakeLists.txt +++ b/tests/auto/corelib/serialization/qcborvalue_json/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qcborvalue_json Test: ##################################################################### -qt_add_test(tst_qcborvalue_json +qt_internal_add_test(tst_qcborvalue_json SOURCES tst_qcborvalue_json.cpp DEFINES diff --git a/tests/auto/corelib/serialization/qdatastream/.prev_CMakeLists.txt b/tests/auto/corelib/serialization/qdatastream/.prev_CMakeLists.txt index a293f87155a..91e4e317835 100644 --- a/tests/auto/corelib/serialization/qdatastream/.prev_CMakeLists.txt +++ b/tests/auto/corelib/serialization/qdatastream/.prev_CMakeLists.txt @@ -7,7 +7,7 @@ # Collect test data list(APPEND test_data "datastream.q42") -add_qt_test(tst_qdatastream +qt_internal_add_test(tst_qdatastream SOURCES tst_qdatastream.cpp PUBLIC_LIBRARIES @@ -24,7 +24,7 @@ if(ANDROID AND NOT ANDROID_EMBEDDED) "datastream.q42" ) - add_qt_resource(tst_qdatastream "testdata" + qt_internal_add_resource(tst_qdatastream "testdata" PREFIX "/" FILES diff --git a/tests/auto/corelib/serialization/qdatastream/CMakeLists.txt b/tests/auto/corelib/serialization/qdatastream/CMakeLists.txt index 35a62fe00c4..91e4e317835 100644 --- a/tests/auto/corelib/serialization/qdatastream/CMakeLists.txt +++ b/tests/auto/corelib/serialization/qdatastream/CMakeLists.txt @@ -7,7 +7,7 @@ # Collect test data list(APPEND test_data "datastream.q42") -qt_add_test(tst_qdatastream +qt_internal_add_test(tst_qdatastream SOURCES tst_qdatastream.cpp PUBLIC_LIBRARIES @@ -24,7 +24,7 @@ if(ANDROID AND NOT ANDROID_EMBEDDED) "datastream.q42" ) - qt_add_resource(tst_qdatastream "testdata" + qt_internal_add_resource(tst_qdatastream "testdata" PREFIX "/" FILES diff --git a/tests/auto/corelib/serialization/qdatastream_core_pixmap/CMakeLists.txt b/tests/auto/corelib/serialization/qdatastream_core_pixmap/CMakeLists.txt index 91280c79b3f..b77b8212fb8 100644 --- a/tests/auto/corelib/serialization/qdatastream_core_pixmap/CMakeLists.txt +++ b/tests/auto/corelib/serialization/qdatastream_core_pixmap/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qdatastream_core_pixmap Test: ##################################################################### -qt_add_test(tst_qdatastream_core_pixmap +qt_internal_add_test(tst_qdatastream_core_pixmap SOURCES tst_qdatastream_core_pixmap.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/corelib/serialization/qtextstream/readAllStdinProcess/CMakeLists.txt b/tests/auto/corelib/serialization/qtextstream/readAllStdinProcess/CMakeLists.txt index 160b63f809d..785785d43af 100644 --- a/tests/auto/corelib/serialization/qtextstream/readAllStdinProcess/CMakeLists.txt +++ b/tests/auto/corelib/serialization/qtextstream/readAllStdinProcess/CMakeLists.txt @@ -4,7 +4,7 @@ ## readAllStdinProcess Binary: ##################################################################### -qt_add_executable(readAllStdinProcess +qt_internal_add_executable(readAllStdinProcess INSTALL_DIRECTORY "${INSTALL_TESTSDIR}/tst_qtextstream/readAllStdinProcess" OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" SOURCES diff --git a/tests/auto/corelib/serialization/qtextstream/readLineStdinProcess/CMakeLists.txt b/tests/auto/corelib/serialization/qtextstream/readLineStdinProcess/CMakeLists.txt index 399e9f44a5f..897444c9afe 100644 --- a/tests/auto/corelib/serialization/qtextstream/readLineStdinProcess/CMakeLists.txt +++ b/tests/auto/corelib/serialization/qtextstream/readLineStdinProcess/CMakeLists.txt @@ -4,7 +4,7 @@ ## readLineStdinProcess Binary: ##################################################################### -qt_add_executable(readLineStdinProcess +qt_internal_add_executable(readLineStdinProcess INSTALL_DIRECTORY "${INSTALL_TESTSDIR}/tst_qtextstream/readLineStdinProcess" OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" SOURCES diff --git a/tests/auto/corelib/serialization/qtextstream/stdinProcess/CMakeLists.txt b/tests/auto/corelib/serialization/qtextstream/stdinProcess/CMakeLists.txt index 3e5383fdc16..73eccd1ed8c 100644 --- a/tests/auto/corelib/serialization/qtextstream/stdinProcess/CMakeLists.txt +++ b/tests/auto/corelib/serialization/qtextstream/stdinProcess/CMakeLists.txt @@ -4,7 +4,7 @@ ## stdinProcess Binary: ##################################################################### -qt_add_executable(stdinProcess +qt_internal_add_executable(stdinProcess INSTALL_DIRECTORY "${INSTALL_TESTSDIR}/tst_qtextstream/stdinProcess" OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" SOURCES diff --git a/tests/auto/corelib/serialization/qtextstream/test/CMakeLists.txt b/tests/auto/corelib/serialization/qtextstream/test/CMakeLists.txt index 4471335770c..61d594900f5 100644 --- a/tests/auto/corelib/serialization/qtextstream/test/CMakeLists.txt +++ b/tests/auto/corelib/serialization/qtextstream/test/CMakeLists.txt @@ -12,7 +12,7 @@ list(APPEND test_data "../tst_qtextstream.cpp") list(APPEND test_data "../resources") list(APPEND test_data "../BLACKLIST") -qt_add_test(tst_qtextstream +qt_internal_add_test(tst_qtextstream OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../" SOURCES ../../../../../shared/emulationdetector.h @@ -36,7 +36,7 @@ set(qtextstream_resource_files "resources/little_endian/" ) -qt_add_resource(tst_qtextstream "qtextstream" +qt_internal_add_resource(tst_qtextstream "qtextstream" PREFIX "/tst_textstream/" BASE @@ -49,7 +49,7 @@ qt_add_resource(tst_qtextstream "qtextstream" ## Scopes: ##################################################################### -qt_extend_target(tst_qtextstream CONDITION builtin_testdata +qt_internal_extend_target(tst_qtextstream CONDITION builtin_testdata DEFINES BUILTIN_TESTDATA ) diff --git a/tests/auto/corelib/serialization/qxmlstream/CMakeLists.txt b/tests/auto/corelib/serialization/qxmlstream/CMakeLists.txt index 0039214d6bb..aae8b9f1e9f 100644 --- a/tests/auto/corelib/serialization/qxmlstream/CMakeLists.txt +++ b/tests/auto/corelib/serialization/qxmlstream/CMakeLists.txt @@ -8,7 +8,7 @@ list(APPEND test_data "data") list(APPEND test_data "XML-Test-Suite") -qt_add_test(tst_qxmlstream +qt_internal_add_test(tst_qxmlstream SOURCES tst_qxmlstream.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/corelib/text/qbytearray/CMakeLists.txt b/tests/auto/corelib/text/qbytearray/CMakeLists.txt index f2fd281f90c..bc07b2e1afd 100644 --- a/tests/auto/corelib/text/qbytearray/CMakeLists.txt +++ b/tests/auto/corelib/text/qbytearray/CMakeLists.txt @@ -7,7 +7,7 @@ # Collect test data list(APPEND test_data "rfc3252.txt") -qt_add_test(tst_qbytearray +qt_internal_add_test(tst_qbytearray SOURCES tst_qbytearray.cpp PUBLIC_LIBRARIES @@ -18,7 +18,7 @@ qt_add_test(tst_qbytearray ## Scopes: ##################################################################### -qt_extend_target(tst_qbytearray CONDITION APPLE +qt_internal_extend_target(tst_qbytearray CONDITION APPLE SOURCES tst_qbytearray_mac.mm PUBLIC_LIBRARIES @@ -31,7 +31,7 @@ if(ANDROID AND NOT ANDROID_EMBEDDED) "rfc3252.txt" ) - qt_add_resource(tst_qbytearray "android_testdata" + qt_internal_add_resource(tst_qbytearray "android_testdata" PREFIX "/" FILES diff --git a/tests/auto/corelib/text/qbytearrayapisymmetry/CMakeLists.txt b/tests/auto/corelib/text/qbytearrayapisymmetry/CMakeLists.txt index bc49aabc5b1..68689a4b790 100644 --- a/tests/auto/corelib/text/qbytearrayapisymmetry/CMakeLists.txt +++ b/tests/auto/corelib/text/qbytearrayapisymmetry/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qbytearrayapisymmetry Test: ##################################################################### -qt_add_test(tst_qbytearrayapisymmetry +qt_internal_add_test(tst_qbytearrayapisymmetry SOURCES tst_qbytearrayapisymmetry.cpp ) diff --git a/tests/auto/corelib/text/qbytearraylist/CMakeLists.txt b/tests/auto/corelib/text/qbytearraylist/CMakeLists.txt index a7b9578d5f3..4add3dabe4a 100644 --- a/tests/auto/corelib/text/qbytearraylist/CMakeLists.txt +++ b/tests/auto/corelib/text/qbytearraylist/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qbytearraylist Test: ##################################################################### -qt_add_test(tst_qbytearraylist +qt_internal_add_test(tst_qbytearraylist SOURCES tst_qbytearraylist.cpp ) diff --git a/tests/auto/corelib/text/qbytearraymatcher/CMakeLists.txt b/tests/auto/corelib/text/qbytearraymatcher/CMakeLists.txt index 75da499064a..a70d8d91b63 100644 --- a/tests/auto/corelib/text/qbytearraymatcher/CMakeLists.txt +++ b/tests/auto/corelib/text/qbytearraymatcher/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qbytearraymatcher Test: ##################################################################### -qt_add_test(tst_qbytearraymatcher +qt_internal_add_test(tst_qbytearraymatcher SOURCES tst_qbytearraymatcher.cpp ) diff --git a/tests/auto/corelib/text/qbytearrayview/CMakeLists.txt b/tests/auto/corelib/text/qbytearrayview/CMakeLists.txt index 34476b8246e..43a0e09ce3c 100644 --- a/tests/auto/corelib/text/qbytearrayview/CMakeLists.txt +++ b/tests/auto/corelib/text/qbytearrayview/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qbytearrayview Test: ##################################################################### -qt_add_test(tst_qbytearrayview +qt_internal_add_test(tst_qbytearrayview SOURCES tst_qbytearrayview.cpp ) diff --git a/tests/auto/corelib/text/qbytedatabuffer/CMakeLists.txt b/tests/auto/corelib/text/qbytedatabuffer/CMakeLists.txt index 5262e009cd4..3d4010c3f3a 100644 --- a/tests/auto/corelib/text/qbytedatabuffer/CMakeLists.txt +++ b/tests/auto/corelib/text/qbytedatabuffer/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qbytedatabuffer Test: ##################################################################### -qt_add_test(tst_qbytedatabuffer +qt_internal_add_test(tst_qbytedatabuffer SOURCES tst_qbytedatabuffer.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/corelib/text/qchar/CMakeLists.txt b/tests/auto/corelib/text/qchar/CMakeLists.txt index ae4bc1f23d4..529fa39bd96 100644 --- a/tests/auto/corelib/text/qchar/CMakeLists.txt +++ b/tests/auto/corelib/text/qchar/CMakeLists.txt @@ -7,7 +7,7 @@ # Collect test data list(APPEND test_data "data/NormalizationTest.txt") -qt_add_test(tst_qchar +qt_internal_add_test(tst_qchar SOURCES tst_qchar.cpp PUBLIC_LIBRARIES @@ -24,7 +24,7 @@ if(ANDROID AND NOT ANDROID_EMBEDDED) "data/NormalizationTest.txt" ) - qt_add_resource(tst_qchar "testdata" + qt_internal_add_resource(tst_qchar "testdata" PREFIX "/" FILES diff --git a/tests/auto/corelib/text/qcollator/CMakeLists.txt b/tests/auto/corelib/text/qcollator/CMakeLists.txt index 105a65310ec..8112ecb8872 100644 --- a/tests/auto/corelib/text/qcollator/CMakeLists.txt +++ b/tests/auto/corelib/text/qcollator/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qcollator Test: ##################################################################### -qt_add_test(tst_qcollator +qt_internal_add_test(tst_qcollator SOURCES tst_qcollator.cpp DEFINES diff --git a/tests/auto/corelib/text/qlatin1string/CMakeLists.txt b/tests/auto/corelib/text/qlatin1string/CMakeLists.txt index 9c929b38931..4d37ebb04c5 100644 --- a/tests/auto/corelib/text/qlatin1string/CMakeLists.txt +++ b/tests/auto/corelib/text/qlatin1string/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qlatin1string Test: ##################################################################### -qt_add_test(tst_qlatin1string +qt_internal_add_test(tst_qlatin1string SOURCES tst_qlatin1string.cpp DEFINES diff --git a/tests/auto/corelib/text/qlocale/syslocaleapp/CMakeLists.txt b/tests/auto/corelib/text/qlocale/syslocaleapp/CMakeLists.txt index 68c6c5e3b61..3b7df027d47 100644 --- a/tests/auto/corelib/text/qlocale/syslocaleapp/CMakeLists.txt +++ b/tests/auto/corelib/text/qlocale/syslocaleapp/CMakeLists.txt @@ -4,7 +4,7 @@ ## syslocaleapp Binary: ##################################################################### -qt_add_executable(syslocaleapp +qt_internal_add_executable(syslocaleapp OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" SOURCES syslocaleapp.cpp diff --git a/tests/auto/corelib/text/qlocale/test/CMakeLists.txt b/tests/auto/corelib/text/qlocale/test/CMakeLists.txt index 399b22327e3..863252cf77f 100644 --- a/tests/auto/corelib/text/qlocale/test/CMakeLists.txt +++ b/tests/auto/corelib/text/qlocale/test/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qlocale Test: ##################################################################### -qt_add_test(tst_qlocale +qt_internal_add_test(tst_qlocale OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../" SOURCES ../tst_qlocale.cpp @@ -15,12 +15,12 @@ qt_add_test(tst_qlocale ## Scopes: ##################################################################### -qt_extend_target(tst_qlocale CONDITION embedded +qt_internal_extend_target(tst_qlocale CONDITION embedded PUBLIC_LIBRARIES Qt::Gui ) -qt_extend_target(tst_qlocale CONDITION NOT QT_FEATURE_doubleconversion AND NOT QT_FEATURE_system_doubleconversion +qt_internal_extend_target(tst_qlocale CONDITION NOT QT_FEATURE_doubleconversion AND NOT QT_FEATURE_system_doubleconversion DEFINES QT_NO_DOUBLECONVERSION ) diff --git a/tests/auto/corelib/text/qregularexpression/CMakeLists.txt b/tests/auto/corelib/text/qregularexpression/CMakeLists.txt index 2ea0cfad7df..78e842b658c 100644 --- a/tests/auto/corelib/text/qregularexpression/CMakeLists.txt +++ b/tests/auto/corelib/text/qregularexpression/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qregularexpression Test: ##################################################################### -qt_add_test(tst_qregularexpression +qt_internal_add_test(tst_qregularexpression SOURCES tst_qregularexpression.cpp ) diff --git a/tests/auto/corelib/text/qstring/CMakeLists.txt b/tests/auto/corelib/text/qstring/CMakeLists.txt index 8451e0fcb47..e5f64742a2c 100644 --- a/tests/auto/corelib/text/qstring/CMakeLists.txt +++ b/tests/auto/corelib/text/qstring/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qstring Test: ##################################################################### -qt_add_test(tst_qstring +qt_internal_add_test(tst_qstring SOURCES tst_qstring.cpp DEFINES @@ -16,12 +16,12 @@ qt_add_test(tst_qstring ## Scopes: ##################################################################### -qt_extend_target(tst_qstring CONDITION NOT QT_FEATURE_doubleconversion AND NOT QT_FEATURE_system_doubleconversion +qt_internal_extend_target(tst_qstring CONDITION NOT QT_FEATURE_doubleconversion AND NOT QT_FEATURE_system_doubleconversion DEFINES QT_NO_DOUBLECONVERSION ) -qt_extend_target(tst_qstring CONDITION APPLE +qt_internal_extend_target(tst_qstring CONDITION APPLE SOURCES tst_qstring_mac.mm PUBLIC_LIBRARIES diff --git a/tests/auto/corelib/text/qstring_no_cast_from_bytearray/CMakeLists.txt b/tests/auto/corelib/text/qstring_no_cast_from_bytearray/CMakeLists.txt index 030d678e94e..10771fc04a7 100644 --- a/tests/auto/corelib/text/qstring_no_cast_from_bytearray/CMakeLists.txt +++ b/tests/auto/corelib/text/qstring_no_cast_from_bytearray/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qstring_no_cast_from_bytearray Test: ##################################################################### -qt_add_test(tst_qstring_no_cast_from_bytearray +qt_internal_add_test(tst_qstring_no_cast_from_bytearray SOURCES tst_qstring_no_cast_from_bytearray.cpp DEFINES diff --git a/tests/auto/corelib/text/qstringapisymmetry/CMakeLists.txt b/tests/auto/corelib/text/qstringapisymmetry/CMakeLists.txt index 48042fc32e9..2d82e361fbd 100644 --- a/tests/auto/corelib/text/qstringapisymmetry/CMakeLists.txt +++ b/tests/auto/corelib/text/qstringapisymmetry/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qstringapisymmetry Test: ##################################################################### -qt_add_test(tst_qstringapisymmetry +qt_internal_add_test(tst_qstringapisymmetry SOURCES tst_qstringapisymmetry.cpp ) diff --git a/tests/auto/corelib/text/qstringbuilder/qstringbuilder1/CMakeLists.txt b/tests/auto/corelib/text/qstringbuilder/qstringbuilder1/CMakeLists.txt index 2c897ddcd3c..2b28032657c 100644 --- a/tests/auto/corelib/text/qstringbuilder/qstringbuilder1/CMakeLists.txt +++ b/tests/auto/corelib/text/qstringbuilder/qstringbuilder1/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qstringbuilder1 Test: ##################################################################### -qt_add_test(tst_qstringbuilder1 +qt_internal_add_test(tst_qstringbuilder1 SOURCES tst_qstringbuilder1.cpp ) diff --git a/tests/auto/corelib/text/qstringbuilder/qstringbuilder2/CMakeLists.txt b/tests/auto/corelib/text/qstringbuilder/qstringbuilder2/CMakeLists.txt index 7b5b96aef32..274be115d98 100644 --- a/tests/auto/corelib/text/qstringbuilder/qstringbuilder2/CMakeLists.txt +++ b/tests/auto/corelib/text/qstringbuilder/qstringbuilder2/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qstringbuilder2 Test: ##################################################################### -qt_add_test(tst_qstringbuilder2 +qt_internal_add_test(tst_qstringbuilder2 SOURCES tst_qstringbuilder2.cpp ) diff --git a/tests/auto/corelib/text/qstringbuilder/qstringbuilder3/CMakeLists.txt b/tests/auto/corelib/text/qstringbuilder/qstringbuilder3/CMakeLists.txt index 3293f26e5c8..a1c4298f993 100644 --- a/tests/auto/corelib/text/qstringbuilder/qstringbuilder3/CMakeLists.txt +++ b/tests/auto/corelib/text/qstringbuilder/qstringbuilder3/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qstringbuilder3 Test: ##################################################################### -qt_add_test(tst_qstringbuilder3 +qt_internal_add_test(tst_qstringbuilder3 SOURCES tst_qstringbuilder3.cpp ) diff --git a/tests/auto/corelib/text/qstringbuilder/qstringbuilder4/CMakeLists.txt b/tests/auto/corelib/text/qstringbuilder/qstringbuilder4/CMakeLists.txt index 55c4400acf7..b0dbcbf83a8 100644 --- a/tests/auto/corelib/text/qstringbuilder/qstringbuilder4/CMakeLists.txt +++ b/tests/auto/corelib/text/qstringbuilder/qstringbuilder4/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qstringbuilder4 Test: ##################################################################### -qt_add_test(tst_qstringbuilder4 +qt_internal_add_test(tst_qstringbuilder4 SOURCES tst_qstringbuilder4.cpp ) diff --git a/tests/auto/corelib/text/qstringconverter/CMakeLists.txt b/tests/auto/corelib/text/qstringconverter/CMakeLists.txt index 582e4fcf931..5b5eee953e0 100644 --- a/tests/auto/corelib/text/qstringconverter/CMakeLists.txt +++ b/tests/auto/corelib/text/qstringconverter/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qstringconverter Test: ##################################################################### -qt_add_test(tst_qstringconverter +qt_internal_add_test(tst_qstringconverter SOURCES tst_qstringconverter.cpp ) diff --git a/tests/auto/corelib/text/qstringiterator/CMakeLists.txt b/tests/auto/corelib/text/qstringiterator/CMakeLists.txt index 96b34e9d234..36b62a248b4 100644 --- a/tests/auto/corelib/text/qstringiterator/CMakeLists.txt +++ b/tests/auto/corelib/text/qstringiterator/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qstringiterator Test: ##################################################################### -qt_add_test(tst_qstringiterator +qt_internal_add_test(tst_qstringiterator SOURCES tst_qstringiterator.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/corelib/text/qstringlist/CMakeLists.txt b/tests/auto/corelib/text/qstringlist/CMakeLists.txt index c41403227b6..e9272aa0b6c 100644 --- a/tests/auto/corelib/text/qstringlist/CMakeLists.txt +++ b/tests/auto/corelib/text/qstringlist/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qstringlist Test: ##################################################################### -qt_add_test(tst_qstringlist +qt_internal_add_test(tst_qstringlist SOURCES tst_qstringlist.cpp ) diff --git a/tests/auto/corelib/text/qstringmatcher/CMakeLists.txt b/tests/auto/corelib/text/qstringmatcher/CMakeLists.txt index 1cce5690ce9..ae055089a86 100644 --- a/tests/auto/corelib/text/qstringmatcher/CMakeLists.txt +++ b/tests/auto/corelib/text/qstringmatcher/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qstringmatcher Test: ##################################################################### -qt_add_test(tst_qstringmatcher +qt_internal_add_test(tst_qstringmatcher SOURCES tst_qstringmatcher.cpp DEFINES diff --git a/tests/auto/corelib/text/qstringtokenizer/CMakeLists.txt b/tests/auto/corelib/text/qstringtokenizer/CMakeLists.txt index 5928e5b99ae..67b044e445f 100644 --- a/tests/auto/corelib/text/qstringtokenizer/CMakeLists.txt +++ b/tests/auto/corelib/text/qstringtokenizer/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qstringtokenizer Test: ##################################################################### -qt_add_test(tst_qstringtokenizer +qt_internal_add_test(tst_qstringtokenizer SOURCES tst_qstringtokenizer.cpp ) diff --git a/tests/auto/corelib/text/qstringview/CMakeLists.txt b/tests/auto/corelib/text/qstringview/CMakeLists.txt index aefcf6a1ee1..34c145a4989 100644 --- a/tests/auto/corelib/text/qstringview/CMakeLists.txt +++ b/tests/auto/corelib/text/qstringview/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qstringview Test: ##################################################################### -qt_add_test(tst_qstringview +qt_internal_add_test(tst_qstringview SOURCES tst_qstringview.cpp ) diff --git a/tests/auto/corelib/text/qtextboundaryfinder/CMakeLists.txt b/tests/auto/corelib/text/qtextboundaryfinder/CMakeLists.txt index 93d858a96aa..e9b0da83a6a 100644 --- a/tests/auto/corelib/text/qtextboundaryfinder/CMakeLists.txt +++ b/tests/auto/corelib/text/qtextboundaryfinder/CMakeLists.txt @@ -7,7 +7,7 @@ # Collect test data list(APPEND test_data "data") -qt_add_test(tst_qtextboundaryfinder +qt_internal_add_test(tst_qtextboundaryfinder SOURCES tst_qtextboundaryfinder.cpp TESTDATA ${test_data} @@ -25,7 +25,7 @@ if(ANDROID AND NOT ANDROID_EMBEDDED) "data/WordBreakTest.txt" ) - qt_add_resource(tst_qtextboundaryfinder "testdata" + qt_internal_add_resource(tst_qtextboundaryfinder "testdata" PREFIX "/" FILES diff --git a/tests/auto/corelib/thread/qatomicint/CMakeLists.txt b/tests/auto/corelib/thread/qatomicint/CMakeLists.txt index d3d30f5928e..867388cfbf8 100644 --- a/tests/auto/corelib/thread/qatomicint/CMakeLists.txt +++ b/tests/auto/corelib/thread/qatomicint/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qatomicint Test: ##################################################################### -qt_add_test(tst_qatomicint +qt_internal_add_test(tst_qatomicint SOURCES tst_qatomicint.cpp ) diff --git a/tests/auto/corelib/thread/qatomicinteger/char/CMakeLists.txt b/tests/auto/corelib/thread/qatomicinteger/char/CMakeLists.txt index 527302cdd47..57601dc0e4b 100644 --- a/tests/auto/corelib/thread/qatomicinteger/char/CMakeLists.txt +++ b/tests/auto/corelib/thread/qatomicinteger/char/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qatomicinteger_char Test: ##################################################################### -qt_add_test(tst_qatomicinteger_char +qt_internal_add_test(tst_qatomicinteger_char SOURCES ../tst_qatomicinteger.cpp DEFINES diff --git a/tests/auto/corelib/thread/qatomicinteger/char16_t/CMakeLists.txt b/tests/auto/corelib/thread/qatomicinteger/char16_t/CMakeLists.txt index 6fb1c8e9751..6ac58c91360 100644 --- a/tests/auto/corelib/thread/qatomicinteger/char16_t/CMakeLists.txt +++ b/tests/auto/corelib/thread/qatomicinteger/char16_t/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qatomicinteger_char16_t Test: ##################################################################### -qt_add_test(tst_qatomicinteger_char16_t +qt_internal_add_test(tst_qatomicinteger_char16_t SOURCES ../tst_qatomicinteger.cpp DEFINES diff --git a/tests/auto/corelib/thread/qatomicinteger/char32_t/CMakeLists.txt b/tests/auto/corelib/thread/qatomicinteger/char32_t/CMakeLists.txt index 9a42a2ef096..911e9f50676 100644 --- a/tests/auto/corelib/thread/qatomicinteger/char32_t/CMakeLists.txt +++ b/tests/auto/corelib/thread/qatomicinteger/char32_t/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qatomicinteger_char32_t Test: ##################################################################### -qt_add_test(tst_qatomicinteger_char32_t +qt_internal_add_test(tst_qatomicinteger_char32_t SOURCES ../tst_qatomicinteger.cpp DEFINES diff --git a/tests/auto/corelib/thread/qatomicinteger/int/CMakeLists.txt b/tests/auto/corelib/thread/qatomicinteger/int/CMakeLists.txt index 32a529ea601..be59e2dc988 100644 --- a/tests/auto/corelib/thread/qatomicinteger/int/CMakeLists.txt +++ b/tests/auto/corelib/thread/qatomicinteger/int/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qatomicinteger_int Test: ##################################################################### -qt_add_test(tst_qatomicinteger_int +qt_internal_add_test(tst_qatomicinteger_int SOURCES ../tst_qatomicinteger.cpp DEFINES diff --git a/tests/auto/corelib/thread/qatomicinteger/long/CMakeLists.txt b/tests/auto/corelib/thread/qatomicinteger/long/CMakeLists.txt index 974cb2bb9de..3f632ff212a 100644 --- a/tests/auto/corelib/thread/qatomicinteger/long/CMakeLists.txt +++ b/tests/auto/corelib/thread/qatomicinteger/long/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qatomicinteger_long Test: ##################################################################### -qt_add_test(tst_qatomicinteger_long +qt_internal_add_test(tst_qatomicinteger_long SOURCES ../tst_qatomicinteger.cpp DEFINES diff --git a/tests/auto/corelib/thread/qatomicinteger/qlonglong/CMakeLists.txt b/tests/auto/corelib/thread/qatomicinteger/qlonglong/CMakeLists.txt index bbee7fcb85e..3de9227bb15 100644 --- a/tests/auto/corelib/thread/qatomicinteger/qlonglong/CMakeLists.txt +++ b/tests/auto/corelib/thread/qatomicinteger/qlonglong/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qatomicinteger_qlonglong Test: ##################################################################### -qt_add_test(tst_qatomicinteger_qlonglong +qt_internal_add_test(tst_qatomicinteger_qlonglong SOURCES ../tst_qatomicinteger.cpp DEFINES diff --git a/tests/auto/corelib/thread/qatomicinteger/qptrdiff/CMakeLists.txt b/tests/auto/corelib/thread/qatomicinteger/qptrdiff/CMakeLists.txt index 9dbff182287..cc6b5126d90 100644 --- a/tests/auto/corelib/thread/qatomicinteger/qptrdiff/CMakeLists.txt +++ b/tests/auto/corelib/thread/qatomicinteger/qptrdiff/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qatomicinteger_qptrdiff Test: ##################################################################### -qt_add_test(tst_qatomicinteger_qptrdiff +qt_internal_add_test(tst_qatomicinteger_qptrdiff SOURCES ../tst_qatomicinteger.cpp DEFINES diff --git a/tests/auto/corelib/thread/qatomicinteger/quintptr/CMakeLists.txt b/tests/auto/corelib/thread/qatomicinteger/quintptr/CMakeLists.txt index f5ef36f4079..44cf39f06de 100644 --- a/tests/auto/corelib/thread/qatomicinteger/quintptr/CMakeLists.txt +++ b/tests/auto/corelib/thread/qatomicinteger/quintptr/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qatomicinteger_quintptr Test: ##################################################################### -qt_add_test(tst_qatomicinteger_quintptr +qt_internal_add_test(tst_qatomicinteger_quintptr SOURCES ../tst_qatomicinteger.cpp DEFINES diff --git a/tests/auto/corelib/thread/qatomicinteger/qulonglong/CMakeLists.txt b/tests/auto/corelib/thread/qatomicinteger/qulonglong/CMakeLists.txt index 5a783b941ed..18d3e384b90 100644 --- a/tests/auto/corelib/thread/qatomicinteger/qulonglong/CMakeLists.txt +++ b/tests/auto/corelib/thread/qatomicinteger/qulonglong/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qatomicinteger_qulonglong Test: ##################################################################### -qt_add_test(tst_qatomicinteger_qulonglong +qt_internal_add_test(tst_qatomicinteger_qulonglong SOURCES ../tst_qatomicinteger.cpp DEFINES diff --git a/tests/auto/corelib/thread/qatomicinteger/schar/CMakeLists.txt b/tests/auto/corelib/thread/qatomicinteger/schar/CMakeLists.txt index 869473d0c9e..760967532a3 100644 --- a/tests/auto/corelib/thread/qatomicinteger/schar/CMakeLists.txt +++ b/tests/auto/corelib/thread/qatomicinteger/schar/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qatomicinteger_schar Test: ##################################################################### -qt_add_test(tst_qatomicinteger_schar +qt_internal_add_test(tst_qatomicinteger_schar SOURCES ../tst_qatomicinteger.cpp DEFINES diff --git a/tests/auto/corelib/thread/qatomicinteger/short/CMakeLists.txt b/tests/auto/corelib/thread/qatomicinteger/short/CMakeLists.txt index a90621584e2..3f762e34ab2 100644 --- a/tests/auto/corelib/thread/qatomicinteger/short/CMakeLists.txt +++ b/tests/auto/corelib/thread/qatomicinteger/short/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qatomicinteger_short Test: ##################################################################### -qt_add_test(tst_qatomicinteger_short +qt_internal_add_test(tst_qatomicinteger_short SOURCES ../tst_qatomicinteger.cpp DEFINES diff --git a/tests/auto/corelib/thread/qatomicinteger/uchar/CMakeLists.txt b/tests/auto/corelib/thread/qatomicinteger/uchar/CMakeLists.txt index a2ee999970b..912365a6e96 100644 --- a/tests/auto/corelib/thread/qatomicinteger/uchar/CMakeLists.txt +++ b/tests/auto/corelib/thread/qatomicinteger/uchar/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qatomicinteger_uchar Test: ##################################################################### -qt_add_test(tst_qatomicinteger_uchar +qt_internal_add_test(tst_qatomicinteger_uchar SOURCES ../tst_qatomicinteger.cpp DEFINES diff --git a/tests/auto/corelib/thread/qatomicinteger/uint/CMakeLists.txt b/tests/auto/corelib/thread/qatomicinteger/uint/CMakeLists.txt index f1eec6140f0..725fa917049 100644 --- a/tests/auto/corelib/thread/qatomicinteger/uint/CMakeLists.txt +++ b/tests/auto/corelib/thread/qatomicinteger/uint/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qatomicinteger_uint Test: ##################################################################### -qt_add_test(tst_qatomicinteger_uint +qt_internal_add_test(tst_qatomicinteger_uint SOURCES ../tst_qatomicinteger.cpp DEFINES diff --git a/tests/auto/corelib/thread/qatomicinteger/ulong/CMakeLists.txt b/tests/auto/corelib/thread/qatomicinteger/ulong/CMakeLists.txt index eba2944e44e..d5d35f587d6 100644 --- a/tests/auto/corelib/thread/qatomicinteger/ulong/CMakeLists.txt +++ b/tests/auto/corelib/thread/qatomicinteger/ulong/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qatomicinteger_ulong Test: ##################################################################### -qt_add_test(tst_qatomicinteger_ulong +qt_internal_add_test(tst_qatomicinteger_ulong SOURCES ../tst_qatomicinteger.cpp DEFINES diff --git a/tests/auto/corelib/thread/qatomicinteger/ushort/CMakeLists.txt b/tests/auto/corelib/thread/qatomicinteger/ushort/CMakeLists.txt index fe19fc42fc9..fd7c0023452 100644 --- a/tests/auto/corelib/thread/qatomicinteger/ushort/CMakeLists.txt +++ b/tests/auto/corelib/thread/qatomicinteger/ushort/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qatomicinteger_ushort Test: ##################################################################### -qt_add_test(tst_qatomicinteger_ushort +qt_internal_add_test(tst_qatomicinteger_ushort SOURCES ../tst_qatomicinteger.cpp DEFINES diff --git a/tests/auto/corelib/thread/qatomicinteger/wchar_t/CMakeLists.txt b/tests/auto/corelib/thread/qatomicinteger/wchar_t/CMakeLists.txt index dfc4e6ee372..aecb81005cd 100644 --- a/tests/auto/corelib/thread/qatomicinteger/wchar_t/CMakeLists.txt +++ b/tests/auto/corelib/thread/qatomicinteger/wchar_t/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qatomicinteger_wchar_t Test: ##################################################################### -qt_add_test(tst_qatomicinteger_wchar_t +qt_internal_add_test(tst_qatomicinteger_wchar_t SOURCES ../tst_qatomicinteger.cpp DEFINES diff --git a/tests/auto/corelib/thread/qatomicpointer/CMakeLists.txt b/tests/auto/corelib/thread/qatomicpointer/CMakeLists.txt index 09c8c448dfb..2c3f32d7e30 100644 --- a/tests/auto/corelib/thread/qatomicpointer/CMakeLists.txt +++ b/tests/auto/corelib/thread/qatomicpointer/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qatomicpointer Test: ##################################################################### -qt_add_test(tst_qatomicpointer +qt_internal_add_test(tst_qatomicpointer SOURCES tst_qatomicpointer.cpp ) diff --git a/tests/auto/corelib/thread/qfuture/.prev_CMakeLists.txt b/tests/auto/corelib/thread/qfuture/.prev_CMakeLists.txt index 6908bd678c3..8869f1ba84f 100644 --- a/tests/auto/corelib/thread/qfuture/.prev_CMakeLists.txt +++ b/tests/auto/corelib/thread/qfuture/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qfuture Test: ##################################################################### -qt_add_test(tst_qfuture +qt_internal_add_test(tst_qfuture SOURCES tst_qfuture.cpp DEFINES diff --git a/tests/auto/corelib/thread/qfuture/CMakeLists.txt b/tests/auto/corelib/thread/qfuture/CMakeLists.txt index 6fdfc977e9d..dcf7846fd23 100644 --- a/tests/auto/corelib/thread/qfuture/CMakeLists.txt +++ b/tests/auto/corelib/thread/qfuture/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qfuture Test: ##################################################################### -qt_add_test(tst_qfuture +qt_internal_add_test(tst_qfuture SOURCES tst_qfuture.cpp # DEFINES diff --git a/tests/auto/corelib/thread/qfuturesynchronizer/CMakeLists.txt b/tests/auto/corelib/thread/qfuturesynchronizer/CMakeLists.txt index 3ebd2660849..e41b8e70c63 100644 --- a/tests/auto/corelib/thread/qfuturesynchronizer/CMakeLists.txt +++ b/tests/auto/corelib/thread/qfuturesynchronizer/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qfuturesynchronizer Test: ##################################################################### -qt_add_test(tst_qfuturesynchronizer +qt_internal_add_test(tst_qfuturesynchronizer SOURCES tst_qfuturesynchronizer.cpp ) diff --git a/tests/auto/corelib/thread/qfuturewatcher/CMakeLists.txt b/tests/auto/corelib/thread/qfuturewatcher/CMakeLists.txt index a6771e538e0..93ac2dd8703 100644 --- a/tests/auto/corelib/thread/qfuturewatcher/CMakeLists.txt +++ b/tests/auto/corelib/thread/qfuturewatcher/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qfuturewatcher Test: ##################################################################### -qt_add_test(tst_qfuturewatcher +qt_internal_add_test(tst_qfuturewatcher SOURCES tst_qfuturewatcher.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/corelib/thread/qmutex/CMakeLists.txt b/tests/auto/corelib/thread/qmutex/CMakeLists.txt index ee7bcde85f5..41b7b1da684 100644 --- a/tests/auto/corelib/thread/qmutex/CMakeLists.txt +++ b/tests/auto/corelib/thread/qmutex/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qmutex Test: ##################################################################### -qt_add_test(tst_qmutex +qt_internal_add_test(tst_qmutex SOURCES tst_qmutex.cpp ) @@ -12,7 +12,7 @@ qt_add_test(tst_qmutex ## Scopes: ##################################################################### -qt_extend_target(tst_qmutex CONDITION WIN32 +qt_internal_extend_target(tst_qmutex CONDITION WIN32 PUBLIC_LIBRARIES Qt::CorePrivate ) diff --git a/tests/auto/corelib/thread/qmutexlocker/CMakeLists.txt b/tests/auto/corelib/thread/qmutexlocker/CMakeLists.txt index 2f85dd512fd..b73d0d073d2 100644 --- a/tests/auto/corelib/thread/qmutexlocker/CMakeLists.txt +++ b/tests/auto/corelib/thread/qmutexlocker/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qmutexlocker Test: ##################################################################### -qt_add_test(tst_qmutexlocker +qt_internal_add_test(tst_qmutexlocker SOURCES tst_qmutexlocker.cpp ) diff --git a/tests/auto/corelib/thread/qpromise/.prev_CMakeLists.txt b/tests/auto/corelib/thread/qpromise/.prev_CMakeLists.txt deleted file mode 100644 index dc25a38fea5..00000000000 --- a/tests/auto/corelib/thread/qpromise/.prev_CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ -# Generated from qpromise.pro. - -##################################################################### -## tst_qpromise Test: -##################################################################### - -qt_add_test(tst_qpromise - SOURCES - tst_qpromise.cpp - PUBLIC_LIBRARIES - Qt::CorePrivate -) diff --git a/tests/auto/corelib/thread/qpromise/CMakeLists.txt b/tests/auto/corelib/thread/qpromise/CMakeLists.txt index dc25a38fea5..b841c7812b2 100644 --- a/tests/auto/corelib/thread/qpromise/CMakeLists.txt +++ b/tests/auto/corelib/thread/qpromise/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qpromise Test: ##################################################################### -qt_add_test(tst_qpromise +qt_internal_add_test(tst_qpromise SOURCES tst_qpromise.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/corelib/thread/qreadlocker/CMakeLists.txt b/tests/auto/corelib/thread/qreadlocker/CMakeLists.txt index 245fb52dfcb..da6091d588c 100644 --- a/tests/auto/corelib/thread/qreadlocker/CMakeLists.txt +++ b/tests/auto/corelib/thread/qreadlocker/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qreadlocker Test: ##################################################################### -qt_add_test(tst_qreadlocker +qt_internal_add_test(tst_qreadlocker SOURCES tst_qreadlocker.cpp ) diff --git a/tests/auto/corelib/thread/qreadwritelock/CMakeLists.txt b/tests/auto/corelib/thread/qreadwritelock/CMakeLists.txt index fbd8ebf4087..4b81229024b 100644 --- a/tests/auto/corelib/thread/qreadwritelock/CMakeLists.txt +++ b/tests/auto/corelib/thread/qreadwritelock/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qreadwritelock Test: ##################################################################### -qt_add_test(tst_qreadwritelock +qt_internal_add_test(tst_qreadwritelock SOURCES tst_qreadwritelock.cpp ) diff --git a/tests/auto/corelib/thread/qresultstore/CMakeLists.txt b/tests/auto/corelib/thread/qresultstore/CMakeLists.txt index c75794cb256..ca30061d152 100644 --- a/tests/auto/corelib/thread/qresultstore/CMakeLists.txt +++ b/tests/auto/corelib/thread/qresultstore/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qresultstore Test: ##################################################################### -qt_add_test(tst_qresultstore +qt_internal_add_test(tst_qresultstore SOURCES tst_qresultstore.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/corelib/thread/qsemaphore/CMakeLists.txt b/tests/auto/corelib/thread/qsemaphore/CMakeLists.txt index d83e088004f..18603474481 100644 --- a/tests/auto/corelib/thread/qsemaphore/CMakeLists.txt +++ b/tests/auto/corelib/thread/qsemaphore/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qsemaphore Test: ##################################################################### -qt_add_test(tst_qsemaphore +qt_internal_add_test(tst_qsemaphore SOURCES tst_qsemaphore.cpp ) diff --git a/tests/auto/corelib/thread/qthread/.prev_CMakeLists.txt b/tests/auto/corelib/thread/qthread/.prev_CMakeLists.txt deleted file mode 100644 index 2c92a710b34..00000000000 --- a/tests/auto/corelib/thread/qthread/.prev_CMakeLists.txt +++ /dev/null @@ -1,16 +0,0 @@ -# Generated from qthread.pro. - -##################################################################### -## tst_qthread Test: -##################################################################### - -qt_add_test(tst_qthread - SOURCES - ../../../../shared/emulationdetector.h - tst_qthread.cpp - INCLUDE_DIRECTORIES - ../../../../shared -) - -## Scopes: -##################################################################### diff --git a/tests/auto/corelib/thread/qthread/CMakeLists.txt b/tests/auto/corelib/thread/qthread/CMakeLists.txt index 2c92a710b34..b3662f31da1 100644 --- a/tests/auto/corelib/thread/qthread/CMakeLists.txt +++ b/tests/auto/corelib/thread/qthread/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qthread Test: ##################################################################### -qt_add_test(tst_qthread +qt_internal_add_test(tst_qthread SOURCES ../../../../shared/emulationdetector.h tst_qthread.cpp diff --git a/tests/auto/corelib/thread/qthreadonce/CMakeLists.txt b/tests/auto/corelib/thread/qthreadonce/CMakeLists.txt index 1b5b77cfd8c..cd4aaa5d721 100644 --- a/tests/auto/corelib/thread/qthreadonce/CMakeLists.txt +++ b/tests/auto/corelib/thread/qthreadonce/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qthreadonce Test: ##################################################################### -qt_add_test(tst_qthreadonce +qt_internal_add_test(tst_qthreadonce SOURCES qthreadonce.cpp tst_qthreadonce.cpp diff --git a/tests/auto/corelib/thread/qthreadpool/CMakeLists.txt b/tests/auto/corelib/thread/qthreadpool/CMakeLists.txt index 8d2c3719c6f..ebf9fc104ff 100644 --- a/tests/auto/corelib/thread/qthreadpool/CMakeLists.txt +++ b/tests/auto/corelib/thread/qthreadpool/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qthreadpool Test: ##################################################################### -qt_add_test(tst_qthreadpool +qt_internal_add_test(tst_qthreadpool SOURCES tst_qthreadpool.cpp ) diff --git a/tests/auto/corelib/thread/qthreadstorage/CMakeLists.txt b/tests/auto/corelib/thread/qthreadstorage/CMakeLists.txt index e57f0c71acd..1340b303888 100644 --- a/tests/auto/corelib/thread/qthreadstorage/CMakeLists.txt +++ b/tests/auto/corelib/thread/qthreadstorage/CMakeLists.txt @@ -5,7 +5,7 @@ ## tst_qthreadstorage Test: ##################################################################### -add_qt_test(tst_qthreadstorage +qt_internal_add_test(tst_qthreadstorage SOURCES tst_qthreadstorage.cpp ) diff --git a/tests/auto/corelib/thread/qthreadstorage/crashonexit/.prev_CMakeLists.txt b/tests/auto/corelib/thread/qthreadstorage/crashonexit/.prev_CMakeLists.txt index 8a8e24587d0..eaf743ab865 100644 --- a/tests/auto/corelib/thread/qthreadstorage/crashonexit/.prev_CMakeLists.txt +++ b/tests/auto/corelib/thread/qthreadstorage/crashonexit/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## crashonexit Binary: ##################################################################### -qt_add_executable(crashonexit +qt_internal_add_executable(crashonexit OUTPUT_DIRECTORY "${INSTALL_TESTSDIR}/tst_qthreadstorage/crashonexit" INSTALL_DIRECTORY "${INSTALL_TESTSDIR}/tst_qthreadstorage/crashonexit" SOURCES diff --git a/tests/auto/corelib/thread/qthreadstorage/crashonexit/CMakeLists.txt b/tests/auto/corelib/thread/qthreadstorage/crashonexit/CMakeLists.txt index 0951c7df53c..a6de9678c0a 100644 --- a/tests/auto/corelib/thread/qthreadstorage/crashonexit/CMakeLists.txt +++ b/tests/auto/corelib/thread/qthreadstorage/crashonexit/CMakeLists.txt @@ -4,7 +4,7 @@ ## crashonexit Binary: ##################################################################### -qt_add_executable(crashOnExit_helper # special case +qt_internal_add_executable(crashOnExit_helper # special case OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/.." # special case INSTALL_DIRECTORY "${INSTALL_TESTSDIR}/tst_qthreadstorage/crashOnExit_helper" # special case SOURCES diff --git a/tests/auto/corelib/thread/qwaitcondition/CMakeLists.txt b/tests/auto/corelib/thread/qwaitcondition/CMakeLists.txt index 91db59c3912..e600ff3a42d 100644 --- a/tests/auto/corelib/thread/qwaitcondition/CMakeLists.txt +++ b/tests/auto/corelib/thread/qwaitcondition/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qwaitcondition Test: ##################################################################### -qt_add_test(tst_qwaitcondition +qt_internal_add_test(tst_qwaitcondition SOURCES tst_qwaitcondition.cpp ) diff --git a/tests/auto/corelib/thread/qwritelocker/CMakeLists.txt b/tests/auto/corelib/thread/qwritelocker/CMakeLists.txt index 5db1124951f..200fa2ee3c9 100644 --- a/tests/auto/corelib/thread/qwritelocker/CMakeLists.txt +++ b/tests/auto/corelib/thread/qwritelocker/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qwritelocker Test: ##################################################################### -qt_add_test(tst_qwritelocker +qt_internal_add_test(tst_qwritelocker SOURCES tst_qwritelocker.cpp ) diff --git a/tests/auto/corelib/time/qcalendar/CMakeLists.txt b/tests/auto/corelib/time/qcalendar/CMakeLists.txt index 12365467fb0..4a8ab7f846b 100644 --- a/tests/auto/corelib/time/qcalendar/CMakeLists.txt +++ b/tests/auto/corelib/time/qcalendar/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qcalendar Test: ##################################################################### -qt_add_test(tst_qcalendar +qt_internal_add_test(tst_qcalendar SOURCES tst_qcalendar.cpp ) diff --git a/tests/auto/corelib/time/qdate/CMakeLists.txt b/tests/auto/corelib/time/qdate/CMakeLists.txt index 484ea08a7a4..647be9a6f8b 100644 --- a/tests/auto/corelib/time/qdate/CMakeLists.txt +++ b/tests/auto/corelib/time/qdate/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qdate Test: ##################################################################### -qt_add_test(tst_qdate +qt_internal_add_test(tst_qdate SOURCES tst_qdate.cpp DEFINES diff --git a/tests/auto/corelib/time/qdatetime/CMakeLists.txt b/tests/auto/corelib/time/qdatetime/CMakeLists.txt index e27559c401c..c5b8d2bb6e6 100644 --- a/tests/auto/corelib/time/qdatetime/CMakeLists.txt +++ b/tests/auto/corelib/time/qdatetime/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qdatetime Test: ##################################################################### -qt_add_test(tst_qdatetime +qt_internal_add_test(tst_qdatetime SOURCES tst_qdatetime.cpp DEFINES @@ -21,7 +21,7 @@ qt_add_test(tst_qdatetime # QMAKE_CFLAGS_RELEASE = "--O1" # QMAKE_CXXFLAGS_RELEASE = "--O1" -qt_extend_target(tst_qdatetime CONDITION APPLE +qt_internal_extend_target(tst_qdatetime CONDITION APPLE SOURCES tst_qdatetime_mac.mm PUBLIC_LIBRARIES diff --git a/tests/auto/corelib/time/qtime/CMakeLists.txt b/tests/auto/corelib/time/qtime/CMakeLists.txt index df3adf3649c..6d3034c595d 100644 --- a/tests/auto/corelib/time/qtime/CMakeLists.txt +++ b/tests/auto/corelib/time/qtime/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qtime Test: ##################################################################### -qt_add_test(tst_qtime +qt_internal_add_test(tst_qtime SOURCES tst_qtime.cpp DEFINES diff --git a/tests/auto/corelib/time/qtimezone/CMakeLists.txt b/tests/auto/corelib/time/qtimezone/CMakeLists.txt index b97b2f9fd19..160ade2afd1 100644 --- a/tests/auto/corelib/time/qtimezone/CMakeLists.txt +++ b/tests/auto/corelib/time/qtimezone/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qtimezone Test: ##################################################################### -qt_add_test(tst_qtimezone +qt_internal_add_test(tst_qtimezone SOURCES tst_qtimezone.cpp DEFINES @@ -17,12 +17,12 @@ qt_add_test(tst_qtimezone ## Scopes: ##################################################################### -qt_extend_target(tst_qtimezone CONDITION QT_FEATURE_icu +qt_internal_extend_target(tst_qtimezone CONDITION QT_FEATURE_icu LIBRARIES ICU::i18n ICU::uc ICU::data ) -qt_extend_target(tst_qtimezone CONDITION APPLE +qt_internal_extend_target(tst_qtimezone CONDITION APPLE SOURCES tst_qtimezone_darwin.mm PUBLIC_LIBRARIES diff --git a/tests/auto/corelib/tools/collections/.prev_CMakeLists.txt b/tests/auto/corelib/tools/collections/.prev_CMakeLists.txt index 37c3a21d785..0b0d8e062aa 100644 --- a/tests/auto/corelib/tools/collections/.prev_CMakeLists.txt +++ b/tests/auto/corelib/tools/collections/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_collections Test: ##################################################################### -qt_add_test(tst_collections +qt_internal_add_test(tst_collections SOURCES tst_collections.cpp DEFINES diff --git a/tests/auto/corelib/tools/collections/CMakeLists.txt b/tests/auto/corelib/tools/collections/CMakeLists.txt index 4575d27d209..32ef8d7506e 100644 --- a/tests/auto/corelib/tools/collections/CMakeLists.txt +++ b/tests/auto/corelib/tools/collections/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_collections Test: ##################################################################### -qt_add_test(tst_collections +qt_internal_add_test(tst_collections SOURCES tst_collections.cpp DEFINES diff --git a/tests/auto/corelib/tools/containerapisymmetry/CMakeLists.txt b/tests/auto/corelib/tools/containerapisymmetry/CMakeLists.txt index 8d160af9af5..f640996a536 100644 --- a/tests/auto/corelib/tools/containerapisymmetry/CMakeLists.txt +++ b/tests/auto/corelib/tools/containerapisymmetry/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_containerapisymmetry Test: ##################################################################### -qt_add_test(tst_containerapisymmetry +qt_internal_add_test(tst_containerapisymmetry SOURCES tst_containerapisymmetry.cpp ) diff --git a/tests/auto/corelib/tools/qalgorithms/CMakeLists.txt b/tests/auto/corelib/tools/qalgorithms/CMakeLists.txt index 2ddc47b5c0b..d793c81ce65 100644 --- a/tests/auto/corelib/tools/qalgorithms/CMakeLists.txt +++ b/tests/auto/corelib/tools/qalgorithms/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qalgorithms Test: ##################################################################### -qt_add_test(tst_qalgorithms +qt_internal_add_test(tst_qalgorithms SOURCES tst_qalgorithms.cpp ) diff --git a/tests/auto/corelib/tools/qarraydata/CMakeLists.txt b/tests/auto/corelib/tools/qarraydata/CMakeLists.txt index fac007f3b52..4a2f9d0d6a6 100644 --- a/tests/auto/corelib/tools/qarraydata/CMakeLists.txt +++ b/tests/auto/corelib/tools/qarraydata/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qarraydata Test: ##################################################################### -qt_add_test(tst_qarraydata +qt_internal_add_test(tst_qarraydata EXCEPTIONS SOURCES simplevector.h diff --git a/tests/auto/corelib/tools/qbitarray/CMakeLists.txt b/tests/auto/corelib/tools/qbitarray/CMakeLists.txt index 439aa4af6c1..37e7a873e86 100644 --- a/tests/auto/corelib/tools/qbitarray/CMakeLists.txt +++ b/tests/auto/corelib/tools/qbitarray/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qbitarray Test: ##################################################################### -qt_add_test(tst_qbitarray +qt_internal_add_test(tst_qbitarray SOURCES tst_qbitarray.cpp ) diff --git a/tests/auto/corelib/tools/qcache/CMakeLists.txt b/tests/auto/corelib/tools/qcache/CMakeLists.txt index 509056c06b6..5ed12a7973e 100644 --- a/tests/auto/corelib/tools/qcache/CMakeLists.txt +++ b/tests/auto/corelib/tools/qcache/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qcache Test: ##################################################################### -qt_add_test(tst_qcache +qt_internal_add_test(tst_qcache SOURCES tst_qcache.cpp ) diff --git a/tests/auto/corelib/tools/qcommandlineparser/CMakeLists.txt b/tests/auto/corelib/tools/qcommandlineparser/CMakeLists.txt index 75e9ebfc948..128b8cfd73b 100644 --- a/tests/auto/corelib/tools/qcommandlineparser/CMakeLists.txt +++ b/tests/auto/corelib/tools/qcommandlineparser/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qcommandlineparser Test: ##################################################################### -qt_add_test(tst_qcommandlineparser +qt_internal_add_test(tst_qcommandlineparser SOURCES tst_qcommandlineparser.cpp ) diff --git a/tests/auto/corelib/tools/qcommandlineparser/testhelper/CMakeLists.txt b/tests/auto/corelib/tools/qcommandlineparser/testhelper/CMakeLists.txt index 688c685ade6..2068f988dda 100644 --- a/tests/auto/corelib/tools/qcommandlineparser/testhelper/CMakeLists.txt +++ b/tests/auto/corelib/tools/qcommandlineparser/testhelper/CMakeLists.txt @@ -4,7 +4,7 @@ ## qcommandlineparser_test_helper Binary: ##################################################################### -qt_add_executable(qcommandlineparser_test_helper +qt_internal_add_executable(qcommandlineparser_test_helper OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" SOURCES qcommandlineparser_test_helper.cpp diff --git a/tests/auto/corelib/tools/qcontiguouscache/CMakeLists.txt b/tests/auto/corelib/tools/qcontiguouscache/CMakeLists.txt index 77549544572..dc9722ccc7a 100644 --- a/tests/auto/corelib/tools/qcontiguouscache/CMakeLists.txt +++ b/tests/auto/corelib/tools/qcontiguouscache/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qcontiguouscache Test: ##################################################################### -qt_add_test(tst_qcontiguouscache +qt_internal_add_test(tst_qcontiguouscache SOURCES tst_qcontiguouscache.cpp ) diff --git a/tests/auto/corelib/tools/qcryptographichash/CMakeLists.txt b/tests/auto/corelib/tools/qcryptographichash/CMakeLists.txt index 4984606509f..a4b3106856b 100644 --- a/tests/auto/corelib/tools/qcryptographichash/CMakeLists.txt +++ b/tests/auto/corelib/tools/qcryptographichash/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qcryptographichash +qt_internal_add_test(tst_qcryptographichash SOURCES tst_qcryptographichash.cpp TESTDATA ${test_data} @@ -26,7 +26,7 @@ if(ANDROID AND NOT ANDROID_EMBEDDED) "data/d41d8cd98f00b204e9800998ecf8427e.md5" ) - qt_add_resource(tst_qcryptographichash "testdata" + qt_internal_add_resource(tst_qcryptographichash "testdata" PREFIX "/" FILES diff --git a/tests/auto/corelib/tools/qeasingcurve/CMakeLists.txt b/tests/auto/corelib/tools/qeasingcurve/CMakeLists.txt index f93bfe6b94f..ce12cd9bfca 100644 --- a/tests/auto/corelib/tools/qeasingcurve/CMakeLists.txt +++ b/tests/auto/corelib/tools/qeasingcurve/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qeasingcurve Test: ##################################################################### -qt_add_test(tst_qeasingcurve +qt_internal_add_test(tst_qeasingcurve SOURCES tst_qeasingcurve.cpp ) diff --git a/tests/auto/corelib/tools/qexplicitlyshareddatapointer/CMakeLists.txt b/tests/auto/corelib/tools/qexplicitlyshareddatapointer/CMakeLists.txt index 9943f5200b3..92850a8c4e6 100644 --- a/tests/auto/corelib/tools/qexplicitlyshareddatapointer/CMakeLists.txt +++ b/tests/auto/corelib/tools/qexplicitlyshareddatapointer/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qexplicitlyshareddatapointer Test: ##################################################################### -qt_add_test(tst_qexplicitlyshareddatapointer +qt_internal_add_test(tst_qexplicitlyshareddatapointer SOURCES tst_qexplicitlyshareddatapointer.cpp ) diff --git a/tests/auto/corelib/tools/qflatmap/CMakeLists.txt b/tests/auto/corelib/tools/qflatmap/CMakeLists.txt index f5a5dfd5fcf..5d79b167766 100644 --- a/tests/auto/corelib/tools/qflatmap/CMakeLists.txt +++ b/tests/auto/corelib/tools/qflatmap/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qflatmap Test: ##################################################################### -qt_add_test(tst_qflatmap +qt_internal_add_test(tst_qflatmap SOURCES tst_qflatmap.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/corelib/tools/qfreelist/CMakeLists.txt b/tests/auto/corelib/tools/qfreelist/CMakeLists.txt index 39404702403..cdac17e6123 100644 --- a/tests/auto/corelib/tools/qfreelist/CMakeLists.txt +++ b/tests/auto/corelib/tools/qfreelist/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qfreelist Test: ##################################################################### -qt_add_test(tst_qfreelist +qt_internal_add_test(tst_qfreelist SOURCES tst_qfreelist.cpp PUBLIC_LIBRARIES @@ -14,7 +14,7 @@ qt_add_test(tst_qfreelist ## Scopes: ##################################################################### -qt_extend_target(tst_qfreelist CONDITION NOT QT_FEATURE_private_tests +qt_internal_extend_target(tst_qfreelist CONDITION NOT QT_FEATURE_private_tests SOURCES ${QT_SOURCE_TREE}/src/corelib/tools/qfreelist.cpp ) diff --git a/tests/auto/corelib/tools/qhash/.prev_CMakeLists.txt b/tests/auto/corelib/tools/qhash/.prev_CMakeLists.txt index cb0327c90f2..0d41a6875ea 100644 --- a/tests/auto/corelib/tools/qhash/.prev_CMakeLists.txt +++ b/tests/auto/corelib/tools/qhash/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qhash Test: ##################################################################### -qt_add_test(tst_qhash +qt_internal_add_test(tst_qhash SOURCES tst_qhash.cpp DEFINES diff --git a/tests/auto/corelib/tools/qhash/CMakeLists.txt b/tests/auto/corelib/tools/qhash/CMakeLists.txt index 39b8e25e30d..b01782aed59 100644 --- a/tests/auto/corelib/tools/qhash/CMakeLists.txt +++ b/tests/auto/corelib/tools/qhash/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qhash Test: ##################################################################### -qt_add_test(tst_qhash +qt_internal_add_test(tst_qhash SOURCES tst_qhash.cpp DEFINES diff --git a/tests/auto/corelib/tools/qhashfunctions/CMakeLists.txt b/tests/auto/corelib/tools/qhashfunctions/CMakeLists.txt index a91a7c02efb..86d4207d6e0 100644 --- a/tests/auto/corelib/tools/qhashfunctions/CMakeLists.txt +++ b/tests/auto/corelib/tools/qhashfunctions/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qhashfunctions Test: ##################################################################### -qt_add_test(tst_qhashfunctions +qt_internal_add_test(tst_qhashfunctions SOURCES tst_qhashfunctions.cpp ) diff --git a/tests/auto/corelib/tools/qline/CMakeLists.txt b/tests/auto/corelib/tools/qline/CMakeLists.txt index 24de03c81af..49253ff06c4 100644 --- a/tests/auto/corelib/tools/qline/CMakeLists.txt +++ b/tests/auto/corelib/tools/qline/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qline Test: ##################################################################### -qt_add_test(tst_qline +qt_internal_add_test(tst_qline SOURCES tst_qline.cpp ) @@ -12,7 +12,7 @@ qt_add_test(tst_qline ## Scopes: ##################################################################### -qt_extend_target(tst_qline CONDITION UNIX AND NOT APPLE AND NOT HAIKU AND NOT INTEGRITY AND NOT VXWORKS +qt_internal_extend_target(tst_qline CONDITION UNIX AND NOT APPLE AND NOT HAIKU AND NOT INTEGRITY AND NOT VXWORKS PUBLIC_LIBRARIES m ) diff --git a/tests/auto/corelib/tools/qlist/CMakeLists.txt b/tests/auto/corelib/tools/qlist/CMakeLists.txt index 6909d839673..89b92ab3051 100644 --- a/tests/auto/corelib/tools/qlist/CMakeLists.txt +++ b/tests/auto/corelib/tools/qlist/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qlist Test: ##################################################################### -qt_add_test(tst_qlist +qt_internal_add_test(tst_qlist SOURCES tst_qlist.cpp ) diff --git a/tests/auto/corelib/tools/qmacautoreleasepool/CMakeLists.txt b/tests/auto/corelib/tools/qmacautoreleasepool/CMakeLists.txt index e41a7790290..e2f1ed45ea0 100644 --- a/tests/auto/corelib/tools/qmacautoreleasepool/CMakeLists.txt +++ b/tests/auto/corelib/tools/qmacautoreleasepool/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qmacautoreleasepool Test: ##################################################################### -qt_add_test(tst_qmacautoreleasepool +qt_internal_add_test(tst_qmacautoreleasepool SOURCES tst_qmacautoreleasepool.mm PUBLIC_LIBRARIES diff --git a/tests/auto/corelib/tools/qmakearray/CMakeLists.txt b/tests/auto/corelib/tools/qmakearray/CMakeLists.txt index 1c38a99d99e..fc5be609e11 100644 --- a/tests/auto/corelib/tools/qmakearray/CMakeLists.txt +++ b/tests/auto/corelib/tools/qmakearray/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qmakearray Test: ##################################################################### -qt_add_test(tst_qmakearray +qt_internal_add_test(tst_qmakearray SOURCES tst_qmakearray.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/corelib/tools/qmap/.prev_CMakeLists.txt b/tests/auto/corelib/tools/qmap/.prev_CMakeLists.txt index 4d1425251b2..d96ed135961 100644 --- a/tests/auto/corelib/tools/qmap/.prev_CMakeLists.txt +++ b/tests/auto/corelib/tools/qmap/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qmap Test: ##################################################################### -qt_add_test(tst_qmap +qt_internal_add_test(tst_qmap SOURCES tst_qmap.cpp DEFINES diff --git a/tests/auto/corelib/tools/qmap/CMakeLists.txt b/tests/auto/corelib/tools/qmap/CMakeLists.txt index 5de85b2fc26..c0a2cb79abe 100644 --- a/tests/auto/corelib/tools/qmap/CMakeLists.txt +++ b/tests/auto/corelib/tools/qmap/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qmap Test: ##################################################################### -qt_add_test(tst_qmap +qt_internal_add_test(tst_qmap SOURCES tst_qmap.cpp DEFINES diff --git a/tests/auto/corelib/tools/qmargins/CMakeLists.txt b/tests/auto/corelib/tools/qmargins/CMakeLists.txt index fa1530b32cd..aa58ce03ab4 100644 --- a/tests/auto/corelib/tools/qmargins/CMakeLists.txt +++ b/tests/auto/corelib/tools/qmargins/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qmargins Test: ##################################################################### -qt_add_test(tst_qmargins +qt_internal_add_test(tst_qmargins SOURCES tst_qmargins.cpp ) diff --git a/tests/auto/corelib/tools/qmessageauthenticationcode/CMakeLists.txt b/tests/auto/corelib/tools/qmessageauthenticationcode/CMakeLists.txt index 75a6febf81d..dcc86fe555b 100644 --- a/tests/auto/corelib/tools/qmessageauthenticationcode/CMakeLists.txt +++ b/tests/auto/corelib/tools/qmessageauthenticationcode/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qmessageauthenticationcode Test: ##################################################################### -qt_add_test(tst_qmessageauthenticationcode +qt_internal_add_test(tst_qmessageauthenticationcode SOURCES tst_qmessageauthenticationcode.cpp ) diff --git a/tests/auto/corelib/tools/qoffsetstringarray/CMakeLists.txt b/tests/auto/corelib/tools/qoffsetstringarray/CMakeLists.txt index 1a10b0dc47e..7584d580ecb 100644 --- a/tests/auto/corelib/tools/qoffsetstringarray/CMakeLists.txt +++ b/tests/auto/corelib/tools/qoffsetstringarray/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qoffsetstringarray Test: ##################################################################### -qt_add_test(tst_qoffsetstringarray +qt_internal_add_test(tst_qoffsetstringarray SOURCES tst_qoffsetstringarray.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/corelib/tools/qpair/CMakeLists.txt b/tests/auto/corelib/tools/qpair/CMakeLists.txt index b02f4feb0b2..3d0ba82e44a 100644 --- a/tests/auto/corelib/tools/qpair/CMakeLists.txt +++ b/tests/auto/corelib/tools/qpair/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qpair Test: ##################################################################### -qt_add_test(tst_qpair +qt_internal_add_test(tst_qpair SOURCES tst_qpair.cpp ) diff --git a/tests/auto/corelib/tools/qpoint/CMakeLists.txt b/tests/auto/corelib/tools/qpoint/CMakeLists.txt index 1667c0239cd..ddc07332312 100644 --- a/tests/auto/corelib/tools/qpoint/CMakeLists.txt +++ b/tests/auto/corelib/tools/qpoint/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qpoint Test: ##################################################################### -qt_add_test(tst_qpoint +qt_internal_add_test(tst_qpoint SOURCES tst_qpoint.cpp ) diff --git a/tests/auto/corelib/tools/qpointf/CMakeLists.txt b/tests/auto/corelib/tools/qpointf/CMakeLists.txt index e7d1f1b0ff4..09f725f8e64 100644 --- a/tests/auto/corelib/tools/qpointf/CMakeLists.txt +++ b/tests/auto/corelib/tools/qpointf/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qpointf Test: ##################################################################### -qt_add_test(tst_qpointf +qt_internal_add_test(tst_qpointf SOURCES tst_qpointf.cpp ) diff --git a/tests/auto/corelib/tools/qqueue/CMakeLists.txt b/tests/auto/corelib/tools/qqueue/CMakeLists.txt index fc0517b69f6..c3528163eb3 100644 --- a/tests/auto/corelib/tools/qqueue/CMakeLists.txt +++ b/tests/auto/corelib/tools/qqueue/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qqueue Test: ##################################################################### -qt_add_test(tst_qqueue +qt_internal_add_test(tst_qqueue SOURCES tst_qqueue.cpp ) diff --git a/tests/auto/corelib/tools/qrect/CMakeLists.txt b/tests/auto/corelib/tools/qrect/CMakeLists.txt index 5acc4522b63..d48bec0c7d7 100644 --- a/tests/auto/corelib/tools/qrect/CMakeLists.txt +++ b/tests/auto/corelib/tools/qrect/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qrect Test: ##################################################################### -qt_add_test(tst_qrect +qt_internal_add_test(tst_qrect SOURCES tst_qrect.cpp ) diff --git a/tests/auto/corelib/tools/qringbuffer/CMakeLists.txt b/tests/auto/corelib/tools/qringbuffer/CMakeLists.txt index 029d032d5c5..d5d633c0bdf 100644 --- a/tests/auto/corelib/tools/qringbuffer/CMakeLists.txt +++ b/tests/auto/corelib/tools/qringbuffer/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qringbuffer Test: ##################################################################### -qt_add_test(tst_qringbuffer +qt_internal_add_test(tst_qringbuffer SOURCES tst_qringbuffer.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/corelib/tools/qscopedpointer/CMakeLists.txt b/tests/auto/corelib/tools/qscopedpointer/CMakeLists.txt index 8bc4b7e43be..df2d2aa509e 100644 --- a/tests/auto/corelib/tools/qscopedpointer/CMakeLists.txt +++ b/tests/auto/corelib/tools/qscopedpointer/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qscopedpointer Test: ##################################################################### -qt_add_test(tst_qscopedpointer +qt_internal_add_test(tst_qscopedpointer SOURCES tst_qscopedpointer.cpp ) diff --git a/tests/auto/corelib/tools/qscopedvaluerollback/CMakeLists.txt b/tests/auto/corelib/tools/qscopedvaluerollback/CMakeLists.txt index 653f0bc071b..fa3e3e3024d 100644 --- a/tests/auto/corelib/tools/qscopedvaluerollback/CMakeLists.txt +++ b/tests/auto/corelib/tools/qscopedvaluerollback/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qscopedvaluerollback Test: ##################################################################### -qt_add_test(tst_qscopedvaluerollback +qt_internal_add_test(tst_qscopedvaluerollback SOURCES tst_qscopedvaluerollback.cpp ) diff --git a/tests/auto/corelib/tools/qscopeguard/CMakeLists.txt b/tests/auto/corelib/tools/qscopeguard/CMakeLists.txt index 79efcd4d86c..d21df799ea8 100644 --- a/tests/auto/corelib/tools/qscopeguard/CMakeLists.txt +++ b/tests/auto/corelib/tools/qscopeguard/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qscopeguard Test: ##################################################################### -qt_add_test(tst_qscopeguard +qt_internal_add_test(tst_qscopeguard SOURCES tst_qscopeguard.cpp ) diff --git a/tests/auto/corelib/tools/qset/.prev_CMakeLists.txt b/tests/auto/corelib/tools/qset/.prev_CMakeLists.txt index 8e7312b7398..acf423880da 100644 --- a/tests/auto/corelib/tools/qset/.prev_CMakeLists.txt +++ b/tests/auto/corelib/tools/qset/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qset Test: ##################################################################### -qt_add_test(tst_qset +qt_internal_add_test(tst_qset SOURCES tst_qset.cpp DEFINES diff --git a/tests/auto/corelib/tools/qset/CMakeLists.txt b/tests/auto/corelib/tools/qset/CMakeLists.txt index 85845f76d2e..ed92c1e0364 100644 --- a/tests/auto/corelib/tools/qset/CMakeLists.txt +++ b/tests/auto/corelib/tools/qset/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qset Test: ##################################################################### -qt_add_test(tst_qset +qt_internal_add_test(tst_qset SOURCES tst_qset.cpp #DEFINES # special case remove diff --git a/tests/auto/corelib/tools/qsize/CMakeLists.txt b/tests/auto/corelib/tools/qsize/CMakeLists.txt index 1d3018f0666..5ecd154cd37 100644 --- a/tests/auto/corelib/tools/qsize/CMakeLists.txt +++ b/tests/auto/corelib/tools/qsize/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qsize Test: ##################################################################### -qt_add_test(tst_qsize +qt_internal_add_test(tst_qsize SOURCES tst_qsize.cpp ) diff --git a/tests/auto/corelib/tools/qsizef/CMakeLists.txt b/tests/auto/corelib/tools/qsizef/CMakeLists.txt index cb942e10ec6..eb59fc6d8e3 100644 --- a/tests/auto/corelib/tools/qsizef/CMakeLists.txt +++ b/tests/auto/corelib/tools/qsizef/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qsizef Test: ##################################################################### -qt_add_test(tst_qsizef +qt_internal_add_test(tst_qsizef SOURCES tst_qsizef.cpp ) diff --git a/tests/auto/corelib/tools/qstl/CMakeLists.txt b/tests/auto/corelib/tools/qstl/CMakeLists.txt index 65af48f1a25..49b209cffa1 100644 --- a/tests/auto/corelib/tools/qstl/CMakeLists.txt +++ b/tests/auto/corelib/tools/qstl/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qstl Test: ##################################################################### -qt_add_test(tst_qstl +qt_internal_add_test(tst_qstl SOURCES tst_qstl.cpp ) diff --git a/tests/auto/corelib/tools/qtaggedpointer/CMakeLists.txt b/tests/auto/corelib/tools/qtaggedpointer/CMakeLists.txt index 1057e5ebe5a..7f3ae750283 100644 --- a/tests/auto/corelib/tools/qtaggedpointer/CMakeLists.txt +++ b/tests/auto/corelib/tools/qtaggedpointer/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qtaggedpointer Test: ##################################################################### -qt_add_test(tst_qtaggedpointer +qt_internal_add_test(tst_qtaggedpointer SOURCES tst_qtaggedpointer.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/corelib/tools/qtimeline/CMakeLists.txt b/tests/auto/corelib/tools/qtimeline/CMakeLists.txt index abf76e4b730..de61529fd27 100644 --- a/tests/auto/corelib/tools/qtimeline/CMakeLists.txt +++ b/tests/auto/corelib/tools/qtimeline/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qtimeline Test: ##################################################################### -qt_add_test(tst_qtimeline +qt_internal_add_test(tst_qtimeline SOURCES tst_qtimeline.cpp ) diff --git a/tests/auto/corelib/tools/qvarlengtharray/CMakeLists.txt b/tests/auto/corelib/tools/qvarlengtharray/CMakeLists.txt index 63bb827ec1c..bdc927d5b68 100644 --- a/tests/auto/corelib/tools/qvarlengtharray/CMakeLists.txt +++ b/tests/auto/corelib/tools/qvarlengtharray/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qvarlengtharray Test: ##################################################################### -qt_add_test(tst_qvarlengtharray +qt_internal_add_test(tst_qvarlengtharray SOURCES tst_qvarlengtharray.cpp ) diff --git a/tests/auto/corelib/tools/qversionnumber/CMakeLists.txt b/tests/auto/corelib/tools/qversionnumber/CMakeLists.txt index 893ea914133..2ab3703121d 100644 --- a/tests/auto/corelib/tools/qversionnumber/CMakeLists.txt +++ b/tests/auto/corelib/tools/qversionnumber/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qversionnumber Test: ##################################################################### -qt_add_test(tst_qversionnumber +qt_internal_add_test(tst_qversionnumber SOURCES tst_qversionnumber.cpp ) diff --git a/tests/auto/dbus/qdbusabstractadaptor/CMakeLists.txt b/tests/auto/dbus/qdbusabstractadaptor/CMakeLists.txt index 0f6d732b09e..797c56221b5 100644 --- a/tests/auto/dbus/qdbusabstractadaptor/CMakeLists.txt +++ b/tests/auto/dbus/qdbusabstractadaptor/CMakeLists.txt @@ -3,7 +3,7 @@ add_subdirectory(qmyserver) # special case begin -qt_add_test(tst_qdbusabstractadaptor +qt_internal_add_test(tst_qdbusabstractadaptor SOURCES myobject.h tst_qdbusabstractadaptor.cpp diff --git a/tests/auto/dbus/qdbusabstractadaptor/qmyserver/.prev_CMakeLists.txt b/tests/auto/dbus/qdbusabstractadaptor/qmyserver/.prev_CMakeLists.txt index 32af66f30c7..e6675737381 100644 --- a/tests/auto/dbus/qdbusabstractadaptor/qmyserver/.prev_CMakeLists.txt +++ b/tests/auto/dbus/qdbusabstractadaptor/qmyserver/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## qmyserver Binary: ##################################################################### -qt_add_executable(qmyserver +qt_internal_add_executable(qmyserver OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" SOURCES ../myobject.h diff --git a/tests/auto/dbus/qdbusabstractadaptor/qmyserver/CMakeLists.txt b/tests/auto/dbus/qdbusabstractadaptor/qmyserver/CMakeLists.txt index d2bdb4434d8..0ce4a3e3d31 100644 --- a/tests/auto/dbus/qdbusabstractadaptor/qmyserver/CMakeLists.txt +++ b/tests/auto/dbus/qdbusabstractadaptor/qmyserver/CMakeLists.txt @@ -4,7 +4,7 @@ ## qmyserver Binary: ##################################################################### -qt_add_executable(qmyserver +qt_internal_add_executable(qmyserver OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" NO_INSTALL # special case SOURCES diff --git a/tests/auto/dbus/qdbusabstractinterface/CMakeLists.txt b/tests/auto/dbus/qdbusabstractinterface/CMakeLists.txt index ec49268777b..4530f60561b 100644 --- a/tests/auto/dbus/qdbusabstractinterface/CMakeLists.txt +++ b/tests/auto/dbus/qdbusabstractinterface/CMakeLists.txt @@ -3,7 +3,7 @@ add_subdirectory(qpinger) # special case begin -qt_add_test(tst_qdbusabstractinterface +qt_internal_add_test(tst_qdbusabstractinterface SOURCES interface.cpp tst_qdbusabstractinterface.cpp @@ -12,7 +12,7 @@ qt_add_test(tst_qdbusabstractinterface Qt::DBus ) -qt_extend_target(tst_qdbusabstractinterface +qt_internal_extend_target(tst_qdbusabstractinterface DBUS_INTERFACE_SOURCES org.qtproject.QtDBus.Pinger.xml DBUS_INTERFACE_BASENAME diff --git a/tests/auto/dbus/qdbusabstractinterface/qdbusabstractinterface/.prev_CMakeLists.txt b/tests/auto/dbus/qdbusabstractinterface/qdbusabstractinterface/.prev_CMakeLists.txt index 6db0362e592..c1558770e41 100644 --- a/tests/auto/dbus/qdbusabstractinterface/qdbusabstractinterface/.prev_CMakeLists.txt +++ b/tests/auto/dbus/qdbusabstractinterface/qdbusabstractinterface/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qdbusabstractinterface Test: ##################################################################### -qt_add_test(tst_qdbusabstractinterface +qt_internal_add_test(tst_qdbusabstractinterface OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../" SOURCES ../interface.cpp ../interface.h diff --git a/tests/auto/dbus/qdbusabstractinterface/qpinger/.prev_CMakeLists.txt b/tests/auto/dbus/qdbusabstractinterface/qpinger/.prev_CMakeLists.txt index 7f65f85afb2..528e0416b8e 100644 --- a/tests/auto/dbus/qdbusabstractinterface/qpinger/.prev_CMakeLists.txt +++ b/tests/auto/dbus/qdbusabstractinterface/qpinger/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## qpinger Binary: ##################################################################### -qt_add_executable(qpinger +qt_internal_add_executable(qpinger OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" SOURCES ../interface.cpp ../interface.h diff --git a/tests/auto/dbus/qdbusabstractinterface/qpinger/CMakeLists.txt b/tests/auto/dbus/qdbusabstractinterface/qpinger/CMakeLists.txt index 5ebb914c017..f5658b96a68 100644 --- a/tests/auto/dbus/qdbusabstractinterface/qpinger/CMakeLists.txt +++ b/tests/auto/dbus/qdbusabstractinterface/qpinger/CMakeLists.txt @@ -4,7 +4,7 @@ ## qpinger Binary: ##################################################################### -qt_add_executable(qpinger +qt_internal_add_executable(qpinger OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" NO_INSTALL # special case SOURCES diff --git a/tests/auto/dbus/qdbusconnection/CMakeLists.txt b/tests/auto/dbus/qdbusconnection/CMakeLists.txt index e40f18387e5..b50d92a64d8 100644 --- a/tests/auto/dbus/qdbusconnection/CMakeLists.txt +++ b/tests/auto/dbus/qdbusconnection/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qdbusconnection Test: ##################################################################### -qt_add_test(tst_qdbusconnection +qt_internal_add_test(tst_qdbusconnection SOURCES tst_qdbusconnection.cpp tst_qdbusconnection.h PUBLIC_LIBRARIES diff --git a/tests/auto/dbus/qdbusconnection_delayed/CMakeLists.txt b/tests/auto/dbus/qdbusconnection_delayed/CMakeLists.txt index 793c7907e5f..428b00798a9 100644 --- a/tests/auto/dbus/qdbusconnection_delayed/CMakeLists.txt +++ b/tests/auto/dbus/qdbusconnection_delayed/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qdbusconnection_delayed Test: ##################################################################### -qt_add_test(tst_qdbusconnection_delayed +qt_internal_add_test(tst_qdbusconnection_delayed SOURCES tst_qdbusconnection_delayed.cpp DEFINES diff --git a/tests/auto/dbus/qdbusconnection_no_app/CMakeLists.txt b/tests/auto/dbus/qdbusconnection_no_app/CMakeLists.txt index aad766362c0..d6b7b209359 100644 --- a/tests/auto/dbus/qdbusconnection_no_app/CMakeLists.txt +++ b/tests/auto/dbus/qdbusconnection_no_app/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qdbusconnection_no_app Test: ##################################################################### -qt_add_test(tst_qdbusconnection_no_app +qt_internal_add_test(tst_qdbusconnection_no_app SOURCES ../qdbusconnection/tst_qdbusconnection.h tst_qdbusconnection_no_app.cpp diff --git a/tests/auto/dbus/qdbusconnection_no_bus/CMakeLists.txt b/tests/auto/dbus/qdbusconnection_no_bus/CMakeLists.txt index 111f8907c82..02d3f816c8b 100644 --- a/tests/auto/dbus/qdbusconnection_no_bus/CMakeLists.txt +++ b/tests/auto/dbus/qdbusconnection_no_bus/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qdbusconnection_no_bus Test: ##################################################################### -qt_add_test(tst_qdbusconnection_no_bus +qt_internal_add_test(tst_qdbusconnection_no_bus SOURCES tst_qdbusconnection_no_bus.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/dbus/qdbusconnection_no_libdbus/CMakeLists.txt b/tests/auto/dbus/qdbusconnection_no_libdbus/CMakeLists.txt index 2a7e1dc80d6..a212065da99 100644 --- a/tests/auto/dbus/qdbusconnection_no_libdbus/CMakeLists.txt +++ b/tests/auto/dbus/qdbusconnection_no_libdbus/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qdbusconnection_no_libdbus Test: ##################################################################### -qt_add_test(tst_qdbusconnection_no_libdbus +qt_internal_add_test(tst_qdbusconnection_no_libdbus SOURCES ../qdbusconnection_no_bus/tst_qdbusconnection_no_bus.cpp DEFINES diff --git a/tests/auto/dbus/qdbusconnection_spyhook/CMakeLists.txt b/tests/auto/dbus/qdbusconnection_spyhook/CMakeLists.txt index a3b1d8d10c5..5b9ef3e4e7c 100644 --- a/tests/auto/dbus/qdbusconnection_spyhook/CMakeLists.txt +++ b/tests/auto/dbus/qdbusconnection_spyhook/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qdbusconnection_spyhook Test: ##################################################################### -qt_add_test(tst_qdbusconnection_spyhook +qt_internal_add_test(tst_qdbusconnection_spyhook SOURCES ../qdbusconnection/tst_qdbusconnection.h tst_qdbusconnection_spyhook.cpp diff --git a/tests/auto/dbus/qdbuscontext/CMakeLists.txt b/tests/auto/dbus/qdbuscontext/CMakeLists.txt index ee84e633af0..ed1bd137e16 100644 --- a/tests/auto/dbus/qdbuscontext/CMakeLists.txt +++ b/tests/auto/dbus/qdbuscontext/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qdbuscontext Test: ##################################################################### -qt_add_test(tst_qdbuscontext +qt_internal_add_test(tst_qdbuscontext SOURCES tst_qdbuscontext.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/dbus/qdbusinterface/CMakeLists.txt b/tests/auto/dbus/qdbusinterface/CMakeLists.txt index 321c61a6278..f47d8be56b9 100644 --- a/tests/auto/dbus/qdbusinterface/CMakeLists.txt +++ b/tests/auto/dbus/qdbusinterface/CMakeLists.txt @@ -7,7 +7,7 @@ add_subdirectory(qmyserver) ## ../tst_qdbusinterface Test: ##################################################################### -add_qt_test(tst_qdbusinterface +qt_internal_add_test(tst_qdbusinterface SOURCES myobject.h tst_qdbusinterface.cpp @@ -26,14 +26,14 @@ add_qt_test(tst_qdbusinterface ## Scopes: ##################################################################### -extend_target(tst_qdbusinterface CONDITION QT_FEATURE_dbus_linked +qt_internal_extend_target(tst_qdbusinterface CONDITION QT_FEATURE_dbus_linked DEFINES QT_LINKED_LIBDBUS PUBLIC_LIBRARIES dbus-1 ) -extend_target(tst_qdbusinterface CONDITION NOT QT_FEATURE_dbus_linked +qt_internal_extend_target(tst_qdbusinterface CONDITION NOT QT_FEATURE_dbus_linked SOURCES ../../../../src/dbus/qdbus_symbols.cpp ) diff --git a/tests/auto/dbus/qdbusinterface/qmyserver/.prev_CMakeLists.txt b/tests/auto/dbus/qdbusinterface/qmyserver/.prev_CMakeLists.txt index 9c898fecf69..03b4ac05e11 100644 --- a/tests/auto/dbus/qdbusinterface/qmyserver/.prev_CMakeLists.txt +++ b/tests/auto/dbus/qdbusinterface/qmyserver/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## qmyserver_qdbusinterface Binary: ##################################################################### -qt_add_executable(qmyserver_qdbusinterface +qt_internal_add_executable(qmyserver_qdbusinterface OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" SOURCES ../myobject.h diff --git a/tests/auto/dbus/qdbusinterface/qmyserver/CMakeLists.txt b/tests/auto/dbus/qdbusinterface/qmyserver/CMakeLists.txt index 916735bf599..5ee288169d7 100644 --- a/tests/auto/dbus/qdbusinterface/qmyserver/CMakeLists.txt +++ b/tests/auto/dbus/qdbusinterface/qmyserver/CMakeLists.txt @@ -4,7 +4,7 @@ ## qmyserver_qdbusinterface Binary: ##################################################################### -qt_add_executable(qmyserver_qdbusinterface +qt_internal_add_executable(qmyserver_qdbusinterface OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" NO_INSTALL # special case SOURCES diff --git a/tests/auto/dbus/qdbuslocalcalls/CMakeLists.txt b/tests/auto/dbus/qdbuslocalcalls/CMakeLists.txt index 378475dc465..1a70c4af747 100644 --- a/tests/auto/dbus/qdbuslocalcalls/CMakeLists.txt +++ b/tests/auto/dbus/qdbuslocalcalls/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qdbuslocalcalls Test: ##################################################################### -qt_add_test(tst_qdbuslocalcalls +qt_internal_add_test(tst_qdbuslocalcalls SOURCES tst_qdbuslocalcalls.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/dbus/qdbusmarshall/qdbusmarshall/.prev_CMakeLists.txt b/tests/auto/dbus/qdbusmarshall/qdbusmarshall/.prev_CMakeLists.txt index 9130f434b54..2b5d3a53987 100644 --- a/tests/auto/dbus/qdbusmarshall/qdbusmarshall/.prev_CMakeLists.txt +++ b/tests/auto/dbus/qdbusmarshall/qdbusmarshall/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qdbusmarshall Test: ##################################################################### -qt_add_test(tst_qdbusmarshall +qt_internal_add_test(tst_qdbusmarshall OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../" SOURCES ../tst_qdbusmarshall.cpp @@ -16,14 +16,14 @@ qt_add_test(tst_qdbusmarshall ## Scopes: ##################################################################### -qt_extend_target(tst_qdbusmarshall CONDITION QT_FEATURE_dbus_linked +qt_internal_extend_target(tst_qdbusmarshall CONDITION QT_FEATURE_dbus_linked DEFINES QT_LINKED_LIBDBUS PUBLIC_LIBRARIES dbus-1 ) -qt_extend_target(tst_qdbusmarshall CONDITION NOT QT_FEATURE_dbus_linked +qt_internal_extend_target(tst_qdbusmarshall CONDITION NOT QT_FEATURE_dbus_linked SOURCES ../../../../../src/dbus/qdbus_symbols.cpp ) diff --git a/tests/auto/dbus/qdbusmarshall/qdbusmarshall/CMakeLists.txt b/tests/auto/dbus/qdbusmarshall/qdbusmarshall/CMakeLists.txt index 86ef627276a..20192921843 100644 --- a/tests/auto/dbus/qdbusmarshall/qdbusmarshall/CMakeLists.txt +++ b/tests/auto/dbus/qdbusmarshall/qdbusmarshall/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qdbusmarshall Test: ##################################################################### -qt_add_test(tst_qdbusmarshall +qt_internal_add_test(tst_qdbusmarshall OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../" SOURCES ../tst_qdbusmarshall.cpp @@ -20,14 +20,14 @@ qt_add_test(tst_qdbusmarshall # This test case interacts with dbus code directly via the private # headers. The include path is also not exposed via Qt:DBus. # special case end -qt_extend_target(tst_qdbusmarshall CONDITION QT_FEATURE_dbus_linked +qt_internal_extend_target(tst_qdbusmarshall CONDITION QT_FEATURE_dbus_linked DEFINES QT_LINKED_LIBDBUS PUBLIC_LIBRARIES dbus-1 ) -qt_extend_target(tst_qdbusmarshall CONDITION NOT QT_FEATURE_dbus_linked +qt_internal_extend_target(tst_qdbusmarshall CONDITION NOT QT_FEATURE_dbus_linked SOURCES ../../../../../src/dbus/qdbus_symbols.cpp ) diff --git a/tests/auto/dbus/qdbusmarshall/qpong/CMakeLists.txt b/tests/auto/dbus/qdbusmarshall/qpong/CMakeLists.txt index 28e96caf154..527d464b741 100644 --- a/tests/auto/dbus/qdbusmarshall/qpong/CMakeLists.txt +++ b/tests/auto/dbus/qdbusmarshall/qpong/CMakeLists.txt @@ -4,7 +4,7 @@ ## qpong Binary: ##################################################################### -qt_add_executable(qpong +qt_internal_add_executable(qpong OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" SOURCES qpong.cpp diff --git a/tests/auto/dbus/qdbusmetaobject/CMakeLists.txt b/tests/auto/dbus/qdbusmetaobject/CMakeLists.txt index 9fe730c5332..dec7ce5b27e 100644 --- a/tests/auto/dbus/qdbusmetaobject/CMakeLists.txt +++ b/tests/auto/dbus/qdbusmetaobject/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qdbusmetaobject Test: ##################################################################### -qt_add_test(tst_qdbusmetaobject +qt_internal_add_test(tst_qdbusmetaobject SOURCES tst_qdbusmetaobject.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/dbus/qdbusmetatype/CMakeLists.txt b/tests/auto/dbus/qdbusmetatype/CMakeLists.txt index d4878f681cc..cd2295d8317 100644 --- a/tests/auto/dbus/qdbusmetatype/CMakeLists.txt +++ b/tests/auto/dbus/qdbusmetatype/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qdbusmetatype Test: ##################################################################### -qt_add_test(tst_qdbusmetatype +qt_internal_add_test(tst_qdbusmetatype SOURCES tst_qdbusmetatype.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/dbus/qdbuspendingcall/CMakeLists.txt b/tests/auto/dbus/qdbuspendingcall/CMakeLists.txt index 47c4261313d..0f80718a6ec 100644 --- a/tests/auto/dbus/qdbuspendingcall/CMakeLists.txt +++ b/tests/auto/dbus/qdbuspendingcall/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qdbuspendingcall Test: ##################################################################### -qt_add_test(tst_qdbuspendingcall +qt_internal_add_test(tst_qdbuspendingcall SOURCES tst_qdbuspendingcall.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/dbus/qdbuspendingreply/CMakeLists.txt b/tests/auto/dbus/qdbuspendingreply/CMakeLists.txt index 2ece3ac4bf1..aea3c185e4e 100644 --- a/tests/auto/dbus/qdbuspendingreply/CMakeLists.txt +++ b/tests/auto/dbus/qdbuspendingreply/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qdbuspendingreply Test: ##################################################################### -qt_add_test(tst_qdbuspendingreply +qt_internal_add_test(tst_qdbuspendingreply SOURCES tst_qdbuspendingreply.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/dbus/qdbusreply/CMakeLists.txt b/tests/auto/dbus/qdbusreply/CMakeLists.txt index 5f75e52d4f0..2de7d0cb217 100644 --- a/tests/auto/dbus/qdbusreply/CMakeLists.txt +++ b/tests/auto/dbus/qdbusreply/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qdbusreply Test: ##################################################################### -qt_add_test(tst_qdbusreply +qt_internal_add_test(tst_qdbusreply SOURCES tst_qdbusreply.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/dbus/qdbusservicewatcher/CMakeLists.txt b/tests/auto/dbus/qdbusservicewatcher/CMakeLists.txt index d4b16feebdb..ed1b9246e6d 100644 --- a/tests/auto/dbus/qdbusservicewatcher/CMakeLists.txt +++ b/tests/auto/dbus/qdbusservicewatcher/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qdbusservicewatcher Test: ##################################################################### -qt_add_test(tst_qdbusservicewatcher +qt_internal_add_test(tst_qdbusservicewatcher SOURCES tst_qdbusservicewatcher.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/dbus/qdbusthreading/CMakeLists.txt b/tests/auto/dbus/qdbusthreading/CMakeLists.txt index f0a0bebb20c..c4f75ab06e8 100644 --- a/tests/auto/dbus/qdbusthreading/CMakeLists.txt +++ b/tests/auto/dbus/qdbusthreading/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qdbusthreading Test: ##################################################################### -qt_add_test(tst_qdbusthreading +qt_internal_add_test(tst_qdbusthreading SOURCES tst_qdbusthreading.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/dbus/qdbustype/CMakeLists.txt b/tests/auto/dbus/qdbustype/CMakeLists.txt index a7d8104ec71..3bf0dea697b 100644 --- a/tests/auto/dbus/qdbustype/CMakeLists.txt +++ b/tests/auto/dbus/qdbustype/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qdbustype Test: ##################################################################### -qt_add_test(tst_qdbustype +qt_internal_add_test(tst_qdbustype SOURCES tst_qdbustype.cpp PUBLIC_LIBRARIES @@ -15,14 +15,14 @@ qt_add_test(tst_qdbustype ## Scopes: ##################################################################### -qt_extend_target(tst_qdbustype CONDITION QT_FEATURE_dbus_linked +qt_internal_extend_target(tst_qdbustype CONDITION QT_FEATURE_dbus_linked DEFINES QT_LINKED_LIBDBUS PUBLIC_LIBRARIES dbus-1 ) -qt_extend_target(tst_qdbustype CONDITION NOT QT_FEATURE_dbus_linked +qt_internal_extend_target(tst_qdbustype CONDITION NOT QT_FEATURE_dbus_linked SOURCES ../../../../src/dbus/qdbus_symbols.cpp ) diff --git a/tests/auto/dbus/qdbusxmlparser/CMakeLists.txt b/tests/auto/dbus/qdbusxmlparser/CMakeLists.txt index 7390c25cb49..bbb874dc610 100644 --- a/tests/auto/dbus/qdbusxmlparser/CMakeLists.txt +++ b/tests/auto/dbus/qdbusxmlparser/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qdbusxmlparser Test: ##################################################################### -qt_add_test(tst_qdbusxmlparser +qt_internal_add_test(tst_qdbusxmlparser SOURCES tst_qdbusxmlparser.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/gui/image/qicoimageformat/CMakeLists.txt b/tests/auto/gui/image/qicoimageformat/CMakeLists.txt index b97733003b9..704c51a6bee 100644 --- a/tests/auto/gui/image/qicoimageformat/CMakeLists.txt +++ b/tests/auto/gui/image/qicoimageformat/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob icons/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qicoimageformat +qt_internal_add_test(tst_qicoimageformat SOURCES tst_qicoimageformat.cpp PUBLIC_LIBRARIES @@ -40,7 +40,7 @@ if(ANDROID) "icons/valid/yellow.cur" ) - qt_add_resource(tst_qicoimageformat "qicoimageformat" + qt_internal_add_resource(tst_qicoimageformat "qicoimageformat" PREFIX "/" FILES diff --git a/tests/auto/gui/image/qicon/CMakeLists.txt b/tests/auto/gui/image/qicon/CMakeLists.txt index 48ec1c348c7..5f6b1392058 100644 --- a/tests/auto/gui/image/qicon/CMakeLists.txt +++ b/tests/auto/gui/image/qicon/CMakeLists.txt @@ -30,7 +30,7 @@ file(GLOB_RECURSE test_data_glob *.svgz) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qicon +qt_internal_add_test(tst_qicon SOURCES tst_qicon.cpp PUBLIC_LIBRARIES @@ -69,7 +69,7 @@ set(tst_qicon_resource_files "tst_qicon.cpp" ) -qt_add_resource(tst_qicon "tst_qicon" +qt_internal_add_resource(tst_qicon "tst_qicon" PREFIX "/" FILES @@ -79,7 +79,7 @@ set(qmake_immediate_resource_files "tst_qicon.cpp" ) -qt_add_resource(tst_qicon "qmake_immediate" +qt_internal_add_resource(tst_qicon "qmake_immediate" PREFIX "/" FILES @@ -90,7 +90,7 @@ qt_add_resource(tst_qicon "qmake_immediate" ## Scopes: ##################################################################### -qt_extend_target(tst_qicon CONDITION TARGET Qt::Widgets +qt_internal_extend_target(tst_qicon CONDITION TARGET Qt::Widgets PUBLIC_LIBRARIES Qt::Widgets ) diff --git a/tests/auto/gui/image/qiconhighdpi/CMakeLists.txt b/tests/auto/gui/image/qiconhighdpi/CMakeLists.txt index 8113422c1ee..989cf1f44d3 100644 --- a/tests/auto/gui/image/qiconhighdpi/CMakeLists.txt +++ b/tests/auto/gui/image/qiconhighdpi/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob icons/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qiconhighdpi +qt_internal_add_test(tst_qiconhighdpi SOURCES tst_qiconhighdpi.cpp PUBLIC_LIBRARIES @@ -28,7 +28,7 @@ set(tst_qiconhighdpi_resource_files "icons/testtheme/index.theme" ) -qt_add_resource(tst_qiconhighdpi "tst_qiconhighdpi" +qt_internal_add_resource(tst_qiconhighdpi "tst_qiconhighdpi" PREFIX "/" FILES diff --git a/tests/auto/gui/image/qimage/CMakeLists.txt b/tests/auto/gui/image/qimage/CMakeLists.txt index a9e3b783a76..85f3fd1c764 100644 --- a/tests/auto/gui/image/qimage/CMakeLists.txt +++ b/tests/auto/gui/image/qimage/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob images/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qimage +qt_internal_add_test(tst_qimage SOURCES tst_qimage.cpp PUBLIC_LIBRARIES @@ -46,7 +46,7 @@ if(ANDROID AND NOT ANDROID_EMBEDDED) "images/jpeg_exif_orientation_value_8.jpg" ) - qt_add_resource(tst_qimage "qimage" + qt_internal_add_resource(tst_qimage "qimage" PREFIX "/" FILES @@ -54,13 +54,13 @@ if(ANDROID AND NOT ANDROID_EMBEDDED) ) endif() -qt_extend_target(tst_qimage CONDITION WIN32 +qt_internal_extend_target(tst_qimage CONDITION WIN32 PUBLIC_LIBRARIES gdi32 user32 ) -qt_extend_target(tst_qimage CONDITION APPLE +qt_internal_extend_target(tst_qimage CONDITION APPLE PUBLIC_LIBRARIES ${FWCoreGraphics} ) diff --git a/tests/auto/gui/image/qimageiohandler/CMakeLists.txt b/tests/auto/gui/image/qimageiohandler/CMakeLists.txt index 53bfb384aa8..4bbf2f5b01e 100644 --- a/tests/auto/gui/image/qimageiohandler/CMakeLists.txt +++ b/tests/auto/gui/image/qimageiohandler/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qimageiohandler Test: ##################################################################### -qt_add_test(tst_qimageiohandler +qt_internal_add_test(tst_qimageiohandler SOURCES tst_qimageiohandler.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/gui/image/qimagereader/CMakeLists.txt b/tests/auto/gui/image/qimagereader/CMakeLists.txt index a477252e732..dd156183701 100644 --- a/tests/auto/gui/image/qimagereader/CMakeLists.txt +++ b/tests/auto/gui/image/qimagereader/CMakeLists.txt @@ -14,7 +14,7 @@ file(GLOB_RECURSE test_data_glob baseline/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qimagereader +qt_internal_add_test(tst_qimagereader SOURCES tst_qimagereader.cpp PUBLIC_LIBRARIES @@ -35,7 +35,7 @@ set(qmake_immediate_resource_files ${resource_glob_0} ) -qt_add_resource(tst_qimagereader "qmake_immediate" +qt_internal_add_resource(tst_qimagereader "qmake_immediate" PREFIX "/" FILES @@ -56,7 +56,7 @@ if(ANDROID AND NOT ANDROID_EMBEDDED) "images/trans.gif" ) - qt_add_resource(tst_qimagereader "android_testdata" + qt_internal_add_resource(tst_qimagereader "android_testdata" PREFIX "/" FILES diff --git a/tests/auto/gui/image/qimagewriter/CMakeLists.txt b/tests/auto/gui/image/qimagewriter/CMakeLists.txt index 9e5c7362a83..f7212eca3ec 100644 --- a/tests/auto/gui/image/qimagewriter/CMakeLists.txt +++ b/tests/auto/gui/image/qimagewriter/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob images/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qimagewriter +qt_internal_add_test(tst_qimagewriter SOURCES tst_qimagewriter.cpp PUBLIC_LIBRARIES @@ -41,7 +41,7 @@ if(ANDROID AND NOT ANDROID_EMBEDDED) "images/trolltech.gif" ) - qt_add_resource(tst_qimagewriter "qimagewriter" + qt_internal_add_resource(tst_qimagewriter "qimagewriter" PREFIX "/" FILES diff --git a/tests/auto/gui/image/qmovie/CMakeLists.txt b/tests/auto/gui/image/qmovie/CMakeLists.txt index 3e9b2ad1001..545ee481d16 100644 --- a/tests/auto/gui/image/qmovie/CMakeLists.txt +++ b/tests/auto/gui/image/qmovie/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob animations/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qmovie +qt_internal_add_test(tst_qmovie SOURCES tst_qmovie.cpp PUBLIC_LIBRARIES @@ -25,7 +25,7 @@ set(resources_resource_files "animations/trolltech.gif" ) -qt_add_resource(tst_qmovie "resources" +qt_internal_add_resource(tst_qmovie "resources" PREFIX "/" FILES @@ -40,17 +40,17 @@ qt_add_resource(tst_qmovie "resources" ## Scopes: ##################################################################### -qt_extend_target(tst_qmovie CONDITION TARGET Qt::Widgets +qt_internal_extend_target(tst_qmovie CONDITION TARGET Qt::Widgets PUBLIC_LIBRARIES Qt::Widgets ) -qt_extend_target(tst_qmovie CONDITION QT_FEATURE_gif +qt_internal_extend_target(tst_qmovie CONDITION QT_FEATURE_gif DEFINES QTEST_HAVE_GIF ) -qt_extend_target(tst_qmovie CONDITION QT_FEATURE_jpeg +qt_internal_extend_target(tst_qmovie CONDITION QT_FEATURE_jpeg DEFINES QTEST_HAVE_JPEG ) diff --git a/tests/auto/gui/image/qpicture/CMakeLists.txt b/tests/auto/gui/image/qpicture/CMakeLists.txt index f79c72974a3..29bf68fa06b 100644 --- a/tests/auto/gui/image/qpicture/CMakeLists.txt +++ b/tests/auto/gui/image/qpicture/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qpicture Test: ##################################################################### -qt_add_test(tst_qpicture +qt_internal_add_test(tst_qpicture SOURCES tst_qpicture.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/gui/image/qpixmap/CMakeLists.txt b/tests/auto/gui/image/qpixmap/CMakeLists.txt index b58609a7608..19467150478 100644 --- a/tests/auto/gui/image/qpixmap/CMakeLists.txt +++ b/tests/auto/gui/image/qpixmap/CMakeLists.txt @@ -22,7 +22,7 @@ file(GLOB_RECURSE test_data_glob images/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qpixmap +qt_internal_add_test(tst_qpixmap SOURCES tst_qpixmap.cpp PUBLIC_LIBRARIES @@ -83,7 +83,7 @@ set(qpixmap_resource_files "loadFromData/designer_rgb32.png" ) -qt_add_resource(tst_qpixmap "qpixmap" +qt_internal_add_resource(tst_qpixmap "qpixmap" PREFIX "/" FILES @@ -94,13 +94,13 @@ qt_add_resource(tst_qpixmap "qpixmap" ## Scopes: ##################################################################### -qt_extend_target(tst_qpixmap CONDITION TARGET Qt::Widgets +qt_internal_extend_target(tst_qpixmap CONDITION TARGET Qt::Widgets PUBLIC_LIBRARIES Qt::Widgets Qt::WidgetsPrivate ) -qt_extend_target(tst_qpixmap CONDITION WIN32 +qt_internal_extend_target(tst_qpixmap CONDITION WIN32 PUBLIC_LIBRARIES gdi32 user32 diff --git a/tests/auto/gui/image/qpixmapcache/CMakeLists.txt b/tests/auto/gui/image/qpixmapcache/CMakeLists.txt index 33c1faf865a..9e99842e6e5 100644 --- a/tests/auto/gui/image/qpixmapcache/CMakeLists.txt +++ b/tests/auto/gui/image/qpixmapcache/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qpixmapcache Test: ##################################################################### -qt_add_test(tst_qpixmapcache +qt_internal_add_test(tst_qpixmapcache SOURCES tst_qpixmapcache.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/gui/itemmodels/qfilesystemmodel/CMakeLists.txt b/tests/auto/gui/itemmodels/qfilesystemmodel/CMakeLists.txt index 595b30bd561..375eb5b245d 100644 --- a/tests/auto/gui/itemmodels/qfilesystemmodel/CMakeLists.txt +++ b/tests/auto/gui/itemmodels/qfilesystemmodel/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qfilesystemmodel Test: ##################################################################### -qt_add_test(tst_qfilesystemmodel +qt_internal_add_test(tst_qfilesystemmodel SOURCES ../../../../shared/emulationdetector.h tst_qfilesystemmodel.cpp diff --git a/tests/auto/gui/itemmodels/qstandarditem/CMakeLists.txt b/tests/auto/gui/itemmodels/qstandarditem/CMakeLists.txt index 65f13a10c80..e5446d596a6 100644 --- a/tests/auto/gui/itemmodels/qstandarditem/CMakeLists.txt +++ b/tests/auto/gui/itemmodels/qstandarditem/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qstandarditem Test: ##################################################################### -qt_add_test(tst_qstandarditem +qt_internal_add_test(tst_qstandarditem SOURCES tst_qstandarditem.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/gui/itemmodels/qstandarditemmodel/CMakeLists.txt b/tests/auto/gui/itemmodels/qstandarditemmodel/CMakeLists.txt index 08c97c4eac9..49cbcbfa884 100644 --- a/tests/auto/gui/itemmodels/qstandarditemmodel/CMakeLists.txt +++ b/tests/auto/gui/itemmodels/qstandarditemmodel/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qstandarditemmodel Test: ##################################################################### -qt_add_test(tst_qstandarditemmodel +qt_internal_add_test(tst_qstandarditemmodel SOURCES tst_qstandarditemmodel.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/gui/kernel/noqteventloop/CMakeLists.txt b/tests/auto/gui/kernel/noqteventloop/CMakeLists.txt index 262b2ad2f2f..9e47156addb 100644 --- a/tests/auto/gui/kernel/noqteventloop/CMakeLists.txt +++ b/tests/auto/gui/kernel/noqteventloop/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_noqteventloop Test: ##################################################################### -qt_add_test(tst_noqteventloop +qt_internal_add_test(tst_noqteventloop SOURCES tst_noqteventloop.cpp PUBLIC_LIBRARIES @@ -17,7 +17,7 @@ qt_add_test(tst_noqteventloop ## Scopes: ##################################################################### -qt_extend_target(tst_noqteventloop CONDITION QT_FEATURE_dynamicgl AND WIN32 +qt_internal_extend_target(tst_noqteventloop CONDITION QT_FEATURE_dynamicgl AND WIN32 PUBLIC_LIBRARIES user32 ) diff --git a/tests/auto/gui/kernel/qaction/CMakeLists.txt b/tests/auto/gui/kernel/qaction/CMakeLists.txt index 70065156ca9..ed0a0a8a5b5 100644 --- a/tests/auto/gui/kernel/qaction/CMakeLists.txt +++ b/tests/auto/gui/kernel/qaction/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qaction_kernel Test: ##################################################################### -qt_add_test(tst_qaction_kernel +qt_internal_add_test(tst_qaction_kernel SOURCES tst_qaction.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/gui/kernel/qactiongroup/CMakeLists.txt b/tests/auto/gui/kernel/qactiongroup/CMakeLists.txt index e313aebec5f..10354f865c5 100644 --- a/tests/auto/gui/kernel/qactiongroup/CMakeLists.txt +++ b/tests/auto/gui/kernel/qactiongroup/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qactiongroup_kernel Test: ##################################################################### -qt_add_test(tst_qactiongroup_kernel +qt_internal_add_test(tst_qactiongroup_kernel SOURCES tst_qactiongroup.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/gui/kernel/qaddpostroutine/CMakeLists.txt b/tests/auto/gui/kernel/qaddpostroutine/CMakeLists.txt index 4af9ebedd57..454196ce1b3 100644 --- a/tests/auto/gui/kernel/qaddpostroutine/CMakeLists.txt +++ b/tests/auto/gui/kernel/qaddpostroutine/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qaddpostroutine Test: ##################################################################### -qt_add_test(tst_qaddpostroutine +qt_internal_add_test(tst_qaddpostroutine SOURCES tst_qaddpostroutine.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/gui/kernel/qbackingstore/CMakeLists.txt b/tests/auto/gui/kernel/qbackingstore/CMakeLists.txt index 55d53545bbf..64ef31a0b5e 100644 --- a/tests/auto/gui/kernel/qbackingstore/CMakeLists.txt +++ b/tests/auto/gui/kernel/qbackingstore/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qbackingstore Test: ##################################################################### -qt_add_test(tst_qbackingstore +qt_internal_add_test(tst_qbackingstore SOURCES tst_qbackingstore.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/gui/kernel/qclipboard/copier/.prev_CMakeLists.txt b/tests/auto/gui/kernel/qclipboard/copier/.prev_CMakeLists.txt index 744bd3d6549..69e313b1d16 100644 --- a/tests/auto/gui/kernel/qclipboard/copier/.prev_CMakeLists.txt +++ b/tests/auto/gui/kernel/qclipboard/copier/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## copier Binary: ##################################################################### -qt_add_executable(copier +qt_internal_add_executable(copier SOURCES main.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/gui/kernel/qclipboard/copier/CMakeLists.txt b/tests/auto/gui/kernel/qclipboard/copier/CMakeLists.txt index ee3c7b1ab93..ef599b121e0 100644 --- a/tests/auto/gui/kernel/qclipboard/copier/CMakeLists.txt +++ b/tests/auto/gui/kernel/qclipboard/copier/CMakeLists.txt @@ -8,7 +8,7 @@ set(args OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}") # special case end -qt_add_executable(copier +qt_internal_add_executable(copier ${args} # special case SOURCES main.cpp diff --git a/tests/auto/gui/kernel/qclipboard/paster/.prev_CMakeLists.txt b/tests/auto/gui/kernel/qclipboard/paster/.prev_CMakeLists.txt index 0f2fbb1b9b9..fa0b9bc4a64 100644 --- a/tests/auto/gui/kernel/qclipboard/paster/.prev_CMakeLists.txt +++ b/tests/auto/gui/kernel/qclipboard/paster/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## paster Binary: ##################################################################### -qt_add_executable(paster +qt_internal_add_executable(paster SOURCES main.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/gui/kernel/qclipboard/paster/CMakeLists.txt b/tests/auto/gui/kernel/qclipboard/paster/CMakeLists.txt index 6ce4070af24..571ae4944e2 100644 --- a/tests/auto/gui/kernel/qclipboard/paster/CMakeLists.txt +++ b/tests/auto/gui/kernel/qclipboard/paster/CMakeLists.txt @@ -8,7 +8,7 @@ set(args OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}") # special case end -qt_add_executable(paster +qt_internal_add_executable(paster ${args} # special case SOURCES main.cpp diff --git a/tests/auto/gui/kernel/qclipboard/test/.prev_CMakeLists.txt b/tests/auto/gui/kernel/qclipboard/test/.prev_CMakeLists.txt index e7c1313c7b0..0e9fa8f40de 100644 --- a/tests/auto/gui/kernel/qclipboard/test/.prev_CMakeLists.txt +++ b/tests/auto/gui/kernel/qclipboard/test/.prev_CMakeLists.txt @@ -4,18 +4,19 @@ ## tst_qclipboard Test: ##################################################################### -add_qt_test(tst_qclipboard +qt_internal_add_test(tst_qclipboard OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../" SOURCES ../tst_qclipboard.cpp PUBLIC_LIBRARIES Qt::Gui + Qt::GuiPrivate ) ## Scopes: ##################################################################### -extend_target(tst_qclipboard CONDITION MACOS +qt_internal_extend_target(tst_qclipboard CONDITION MACOS PUBLIC_LIBRARIES ${FWAppKit} ) diff --git a/tests/auto/gui/kernel/qclipboard/test/CMakeLists.txt b/tests/auto/gui/kernel/qclipboard/test/CMakeLists.txt index 1e2c89e5385..0e9fa8f40de 100644 --- a/tests/auto/gui/kernel/qclipboard/test/CMakeLists.txt +++ b/tests/auto/gui/kernel/qclipboard/test/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qclipboard Test: ##################################################################### -qt_add_test(tst_qclipboard +qt_internal_add_test(tst_qclipboard OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../" SOURCES ../tst_qclipboard.cpp @@ -16,7 +16,7 @@ qt_add_test(tst_qclipboard ## Scopes: ##################################################################### -qt_extend_target(tst_qclipboard CONDITION MACOS +qt_internal_extend_target(tst_qclipboard CONDITION MACOS PUBLIC_LIBRARIES ${FWAppKit} ) diff --git a/tests/auto/gui/kernel/qcursor/CMakeLists.txt b/tests/auto/gui/kernel/qcursor/CMakeLists.txt index 2c3cf28c1a2..1304dd2ba2b 100644 --- a/tests/auto/gui/kernel/qcursor/CMakeLists.txt +++ b/tests/auto/gui/kernel/qcursor/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qcursor Test: ##################################################################### -qt_add_test(tst_qcursor +qt_internal_add_test(tst_qcursor SOURCES tst_qcursor.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/gui/kernel/qdrag/CMakeLists.txt b/tests/auto/gui/kernel/qdrag/CMakeLists.txt index 1b13df54d38..b03f82da39b 100644 --- a/tests/auto/gui/kernel/qdrag/CMakeLists.txt +++ b/tests/auto/gui/kernel/qdrag/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qdrag Test: ##################################################################### -qt_add_test(tst_qdrag +qt_internal_add_test(tst_qdrag SOURCES tst_qdrag.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/gui/kernel/qevent/CMakeLists.txt b/tests/auto/gui/kernel/qevent/CMakeLists.txt index 21a2ddad662..2bb22eb469f 100644 --- a/tests/auto/gui/kernel/qevent/CMakeLists.txt +++ b/tests/auto/gui/kernel/qevent/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qevent Test: ##################################################################### -qt_add_test(tst_qevent +qt_internal_add_test(tst_qevent SOURCES tst_qevent.cpp ) diff --git a/tests/auto/gui/kernel/qfileopenevent/qfileopeneventexternal/CMakeLists.txt b/tests/auto/gui/kernel/qfileopenevent/qfileopeneventexternal/CMakeLists.txt index 0b9cd6d4819..658a70619f1 100644 --- a/tests/auto/gui/kernel/qfileopenevent/qfileopeneventexternal/CMakeLists.txt +++ b/tests/auto/gui/kernel/qfileopenevent/qfileopeneventexternal/CMakeLists.txt @@ -4,7 +4,7 @@ ## qfileopeneventexternal Binary: ##################################################################### -qt_add_executable(qfileopeneventexternal +qt_internal_add_executable(qfileopeneventexternal GUI SOURCES qfileopeneventexternal.cpp diff --git a/tests/auto/gui/kernel/qfileopenevent/test/CMakeLists.txt b/tests/auto/gui/kernel/qfileopenevent/test/CMakeLists.txt index a306a3eae65..faa5e5acfc6 100644 --- a/tests/auto/gui/kernel/qfileopenevent/test/CMakeLists.txt +++ b/tests/auto/gui/kernel/qfileopenevent/test/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qfileopenevent Test: ##################################################################### -qt_add_test(tst_qfileopenevent +qt_internal_add_test(tst_qfileopenevent SOURCES tst_qfileopenevent.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/gui/kernel/qguiapplication/.prev_CMakeLists.txt b/tests/auto/gui/kernel/qguiapplication/.prev_CMakeLists.txt index 0da40c5aa35..933957a839a 100644 --- a/tests/auto/gui/kernel/qguiapplication/.prev_CMakeLists.txt +++ b/tests/auto/gui/kernel/qguiapplication/.prev_CMakeLists.txt @@ -8,7 +8,7 @@ endif() ## tst_qguiapplication Test: ##################################################################### -qt_add_test(tst_qguiapplication +qt_internal_add_test(tst_qguiapplication SOURCES tst_qcoreapplication.cpp tst_qcoreapplication.h tst_qguiapplication.cpp @@ -27,7 +27,7 @@ set(tst_qguiapplication_resource_files "icons/usericon.png" ) -qt_add_resource(tst_qguiapplication "tst_qguiapplication" +qt_internal_add_resource(tst_qguiapplication "tst_qguiapplication" PREFIX "/" FILES diff --git a/tests/auto/gui/kernel/qguiapplication/CMakeLists.txt b/tests/auto/gui/kernel/qguiapplication/CMakeLists.txt index 0347b3cc4ab..ffd07cad26e 100644 --- a/tests/auto/gui/kernel/qguiapplication/CMakeLists.txt +++ b/tests/auto/gui/kernel/qguiapplication/CMakeLists.txt @@ -16,7 +16,7 @@ else() endif() # special case end -qt_add_test(tst_qguiapplication +qt_internal_add_test(tst_qguiapplication VERSION ${target_version} # special case SOURCES ../../../corelib/kernel/qcoreapplication/tst_qcoreapplication.cpp ../../../corelib/kernel/qcoreapplication/tst_qcoreapplication.h # special case @@ -36,7 +36,7 @@ set(tst_qguiapplication_resource_files "icons/usericon.png" ) -qt_add_resource(tst_qguiapplication "tst_qguiapplication" +qt_internal_add_resource(tst_qguiapplication "tst_qguiapplication" PREFIX "/" FILES diff --git a/tests/auto/gui/kernel/qguieventdispatcher/CMakeLists.txt b/tests/auto/gui/kernel/qguieventdispatcher/CMakeLists.txt index 14babc165cb..b1c0508198a 100644 --- a/tests/auto/gui/kernel/qguieventdispatcher/CMakeLists.txt +++ b/tests/auto/gui/kernel/qguieventdispatcher/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qguieventdispatcher Test: ##################################################################### -qt_add_test(tst_qguieventdispatcher +qt_internal_add_test(tst_qguieventdispatcher SOURCES ../../../corelib/kernel/qeventdispatcher/tst_qeventdispatcher.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/gui/kernel/qguieventloop/.prev_CMakeLists.txt b/tests/auto/gui/kernel/qguieventloop/.prev_CMakeLists.txt index 7fb82219a99..ec9441a1dc0 100644 --- a/tests/auto/gui/kernel/qguieventloop/.prev_CMakeLists.txt +++ b/tests/auto/gui/kernel/qguieventloop/.prev_CMakeLists.txt @@ -4,12 +4,11 @@ ## tst_qguieventloop Test: ##################################################################### -add_qt_test(tst_qguieventloop +qt_internal_add_test(tst_qguieventloop SOURCES ../../../corelib/kernel/qeventloop/tst_qeventloop.cpp - LIBRARIES - Qt::CorePrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Gui Qt::Network ) @@ -17,12 +16,12 @@ add_qt_test(tst_qguieventloop ## Scopes: ##################################################################### -extend_target(tst_qguieventloop CONDITION WIN32 +qt_internal_extend_target(tst_qguieventloop CONDITION WIN32 PUBLIC_LIBRARIES user32 ) -extend_target(tst_qguieventloop CONDITION QT_FEATURE_glib +qt_internal_extend_target(tst_qguieventloop CONDITION QT_FEATURE_glib DEFINES HAVE_GLIB ) diff --git a/tests/auto/gui/kernel/qguieventloop/CMakeLists.txt b/tests/auto/gui/kernel/qguieventloop/CMakeLists.txt index 8d62d716a5e..ec9441a1dc0 100644 --- a/tests/auto/gui/kernel/qguieventloop/CMakeLists.txt +++ b/tests/auto/gui/kernel/qguieventloop/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qguieventloop Test: ##################################################################### -qt_add_test(tst_qguieventloop +qt_internal_add_test(tst_qguieventloop SOURCES ../../../corelib/kernel/qeventloop/tst_qeventloop.cpp PUBLIC_LIBRARIES @@ -16,12 +16,12 @@ qt_add_test(tst_qguieventloop ## Scopes: ##################################################################### -qt_extend_target(tst_qguieventloop CONDITION WIN32 +qt_internal_extend_target(tst_qguieventloop CONDITION WIN32 PUBLIC_LIBRARIES user32 ) -qt_extend_target(tst_qguieventloop CONDITION QT_FEATURE_glib +qt_internal_extend_target(tst_qguieventloop CONDITION QT_FEATURE_glib DEFINES HAVE_GLIB ) diff --git a/tests/auto/gui/kernel/qguimetatype/CMakeLists.txt b/tests/auto/gui/kernel/qguimetatype/CMakeLists.txt index d124b088288..0887f05fc69 100644 --- a/tests/auto/gui/kernel/qguimetatype/CMakeLists.txt +++ b/tests/auto/gui/kernel/qguimetatype/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qguimetatype Test: ##################################################################### -qt_add_test(tst_qguimetatype +qt_internal_add_test(tst_qguimetatype SOURCES tst_qguimetatype.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/gui/kernel/qguitimer/.prev_CMakeLists.txt b/tests/auto/gui/kernel/qguitimer/.prev_CMakeLists.txt deleted file mode 100644 index 8c2ec60bdf9..00000000000 --- a/tests/auto/gui/kernel/qguitimer/.prev_CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -# Generated from qguitimer.pro. - -##################################################################### -## tst_qguitimer Test: -##################################################################### - -qt_add_test(tst_qguitimer - SOURCES - ../../../corelib/kernel/qtimer/tst_qtimer.cpp - PUBLIC_LIBRARIES - Qt::CorePrivate - Qt::Gui -) diff --git a/tests/auto/gui/kernel/qguitimer/CMakeLists.txt b/tests/auto/gui/kernel/qguitimer/CMakeLists.txt index 8c2ec60bdf9..5375155a822 100644 --- a/tests/auto/gui/kernel/qguitimer/CMakeLists.txt +++ b/tests/auto/gui/kernel/qguitimer/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qguitimer Test: ##################################################################### -qt_add_test(tst_qguitimer +qt_internal_add_test(tst_qguitimer SOURCES ../../../corelib/kernel/qtimer/tst_qtimer.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/gui/kernel/qguivariant/no_application/CMakeLists.txt b/tests/auto/gui/kernel/qguivariant/no_application/CMakeLists.txt index 344b81bf6d3..2e6f548f11b 100644 --- a/tests/auto/gui/kernel/qguivariant/no_application/CMakeLists.txt +++ b/tests/auto/gui/kernel/qguivariant/no_application/CMakeLists.txt @@ -4,7 +4,7 @@ ## no_application Test: ##################################################################### -qt_add_test(no_application +qt_internal_add_test(no_application SOURCES main.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/gui/kernel/qguivariant/test/CMakeLists.txt b/tests/auto/gui/kernel/qguivariant/test/CMakeLists.txt index 40671c920cc..a3292511bd5 100644 --- a/tests/auto/gui/kernel/qguivariant/test/CMakeLists.txt +++ b/tests/auto/gui/kernel/qguivariant/test/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qguivariant Test: ##################################################################### -qt_add_test(tst_qguivariant +qt_internal_add_test(tst_qguivariant SOURCES tst_qguivariant.cpp INCLUDE_DIRECTORIES @@ -18,7 +18,7 @@ set(qguivariant_resource_files "data" ) -qt_add_resource(tst_qguivariant "qguivariant" +qt_internal_add_resource(tst_qguivariant "qguivariant" PREFIX "/" FILES diff --git a/tests/auto/gui/kernel/qhighdpiscaling/CMakeLists.txt b/tests/auto/gui/kernel/qhighdpiscaling/CMakeLists.txt index 69cff9229fa..9db351dbdac 100644 --- a/tests/auto/gui/kernel/qhighdpiscaling/CMakeLists.txt +++ b/tests/auto/gui/kernel/qhighdpiscaling/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qhighdpiscaling Test: ##################################################################### -qt_add_test(tst_qhighdpiscaling +qt_internal_add_test(tst_qhighdpiscaling SOURCES tst_qhighdpiscaling.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/gui/kernel/qinputdevice/CMakeLists.txt b/tests/auto/gui/kernel/qinputdevice/CMakeLists.txt index 5c368838ab8..aea72357dd1 100644 --- a/tests/auto/gui/kernel/qinputdevice/CMakeLists.txt +++ b/tests/auto/gui/kernel/qinputdevice/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qinputdevice Test: ##################################################################### -qt_add_test(tst_qinputdevice +qt_internal_add_test(tst_qinputdevice SOURCES tst_qinputdevice.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/gui/kernel/qinputmethod/CMakeLists.txt b/tests/auto/gui/kernel/qinputmethod/CMakeLists.txt index bdd49403925..bbe8652e992 100644 --- a/tests/auto/gui/kernel/qinputmethod/CMakeLists.txt +++ b/tests/auto/gui/kernel/qinputmethod/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qinputmethod Test: ##################################################################### -qt_add_test(tst_qinputmethod +qt_internal_add_test(tst_qinputmethod SOURCES tst_qinputmethod.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/gui/kernel/qkeyevent/CMakeLists.txt b/tests/auto/gui/kernel/qkeyevent/CMakeLists.txt index 3c48a6492b8..bd9f602e569 100644 --- a/tests/auto/gui/kernel/qkeyevent/CMakeLists.txt +++ b/tests/auto/gui/kernel/qkeyevent/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qkeyevent Test: ##################################################################### -qt_add_test(tst_qkeyevent +qt_internal_add_test(tst_qkeyevent SOURCES tst_qkeyevent.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/gui/kernel/qkeysequence/CMakeLists.txt b/tests/auto/gui/kernel/qkeysequence/CMakeLists.txt index f5a0c38fe43..9d0e25d356f 100644 --- a/tests/auto/gui/kernel/qkeysequence/CMakeLists.txt +++ b/tests/auto/gui/kernel/qkeysequence/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qkeysequence Test: ##################################################################### -qt_add_test(tst_qkeysequence +qt_internal_add_test(tst_qkeysequence SOURCES tst_qkeysequence.cpp PUBLIC_LIBRARIES @@ -19,7 +19,7 @@ set(qkeysequence_resource_files "qt_de.qm" ) -qt_add_resource(tst_qkeysequence "qkeysequence" +qt_internal_add_resource(tst_qkeysequence "qkeysequence" PREFIX "/" FILES diff --git a/tests/auto/gui/kernel/qmouseevent/CMakeLists.txt b/tests/auto/gui/kernel/qmouseevent/CMakeLists.txt index c7cc51a4658..baf9b83b55a 100644 --- a/tests/auto/gui/kernel/qmouseevent/CMakeLists.txt +++ b/tests/auto/gui/kernel/qmouseevent/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qmouseevent Test: ##################################################################### -qt_add_test(tst_qmouseevent +qt_internal_add_test(tst_qmouseevent SOURCES tst_qmouseevent.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/gui/kernel/qmouseevent_modal/CMakeLists.txt b/tests/auto/gui/kernel/qmouseevent_modal/CMakeLists.txt index afe9fe33ed3..698327736ec 100644 --- a/tests/auto/gui/kernel/qmouseevent_modal/CMakeLists.txt +++ b/tests/auto/gui/kernel/qmouseevent_modal/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qmouseevent_modal Test: ##################################################################### -qt_add_test(tst_qmouseevent_modal +qt_internal_add_test(tst_qmouseevent_modal SOURCES tst_qmouseevent_modal.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/gui/kernel/qopenglwindow/CMakeLists.txt b/tests/auto/gui/kernel/qopenglwindow/CMakeLists.txt index 1a460a567fc..d1717167767 100644 --- a/tests/auto/gui/kernel/qopenglwindow/CMakeLists.txt +++ b/tests/auto/gui/kernel/qopenglwindow/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qopenglwindow Test: ##################################################################### -qt_add_test(tst_qopenglwindow +qt_internal_add_test(tst_qopenglwindow SOURCES tst_qopenglwindow.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/gui/kernel/qpalette/CMakeLists.txt b/tests/auto/gui/kernel/qpalette/CMakeLists.txt index acb413007e1..f69ac75a417 100644 --- a/tests/auto/gui/kernel/qpalette/CMakeLists.txt +++ b/tests/auto/gui/kernel/qpalette/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qpalette Test: ##################################################################### -qt_add_test(tst_qpalette +qt_internal_add_test(tst_qpalette SOURCES tst_qpalette.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/gui/kernel/qpixelformat/CMakeLists.txt b/tests/auto/gui/kernel/qpixelformat/CMakeLists.txt index 907564dc3dd..e33600dd8c6 100644 --- a/tests/auto/gui/kernel/qpixelformat/CMakeLists.txt +++ b/tests/auto/gui/kernel/qpixelformat/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qpixelformat Test: ##################################################################### -qt_add_test(tst_qpixelformat +qt_internal_add_test(tst_qpixelformat SOURCES tst_qpixelformat.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/gui/kernel/qrasterwindow/CMakeLists.txt b/tests/auto/gui/kernel/qrasterwindow/CMakeLists.txt index 6b34b71dacf..82391cf18f6 100644 --- a/tests/auto/gui/kernel/qrasterwindow/CMakeLists.txt +++ b/tests/auto/gui/kernel/qrasterwindow/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qrasterwindow Test: ##################################################################### -qt_add_test(tst_qrasterwindow +qt_internal_add_test(tst_qrasterwindow SOURCES tst_qrasterwindow.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/gui/kernel/qscreen/CMakeLists.txt b/tests/auto/gui/kernel/qscreen/CMakeLists.txt index b0730701557..9bed97cfcb5 100644 --- a/tests/auto/gui/kernel/qscreen/CMakeLists.txt +++ b/tests/auto/gui/kernel/qscreen/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qscreen Test: ##################################################################### -qt_add_test(tst_qscreen +qt_internal_add_test(tst_qscreen SOURCES tst_qscreen.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/gui/kernel/qshortcut/CMakeLists.txt b/tests/auto/gui/kernel/qshortcut/CMakeLists.txt index 8c3c2556fe2..469ab47769a 100644 --- a/tests/auto/gui/kernel/qshortcut/CMakeLists.txt +++ b/tests/auto/gui/kernel/qshortcut/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qshortcut_kernel Test: ##################################################################### -qt_add_test(tst_qshortcut_kernel +qt_internal_add_test(tst_qshortcut_kernel SOURCES tst_qshortcut.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/gui/kernel/qsurfaceformat/CMakeLists.txt b/tests/auto/gui/kernel/qsurfaceformat/CMakeLists.txt index 1d319aadddf..f1fab57ebe3 100644 --- a/tests/auto/gui/kernel/qsurfaceformat/CMakeLists.txt +++ b/tests/auto/gui/kernel/qsurfaceformat/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qsurfaceformat Test: ##################################################################### -qt_add_test(tst_qsurfaceformat +qt_internal_add_test(tst_qsurfaceformat SOURCES tst_qsurfaceformat.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/gui/kernel/qtouchevent/CMakeLists.txt b/tests/auto/gui/kernel/qtouchevent/CMakeLists.txt index a2976c351f3..e9a6271f587 100644 --- a/tests/auto/gui/kernel/qtouchevent/CMakeLists.txt +++ b/tests/auto/gui/kernel/qtouchevent/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qtouchevent Test: ##################################################################### -qt_add_test(tst_qtouchevent +qt_internal_add_test(tst_qtouchevent SOURCES tst_qtouchevent.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/gui/kernel/qwindow/CMakeLists.txt b/tests/auto/gui/kernel/qwindow/CMakeLists.txt index 84b46b76f55..23671cc385e 100644 --- a/tests/auto/gui/kernel/qwindow/CMakeLists.txt +++ b/tests/auto/gui/kernel/qwindow/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qwindow Test: ##################################################################### -qt_add_test(tst_qwindow +qt_internal_add_test(tst_qwindow SOURCES tst_qwindow.cpp PUBLIC_LIBRARIES @@ -16,7 +16,7 @@ qt_add_test(tst_qwindow ## Scopes: ##################################################################### -qt_extend_target(tst_qwindow CONDITION QT_FEATURE_dynamicgl AND WIN32 +qt_internal_extend_target(tst_qwindow CONDITION QT_FEATURE_dynamicgl AND WIN32 PUBLIC_LIBRARIES user32 ) diff --git a/tests/auto/gui/math3d/qmatrixnxn/CMakeLists.txt b/tests/auto/gui/math3d/qmatrixnxn/CMakeLists.txt index fb2c3ef813b..5c54bd6b959 100644 --- a/tests/auto/gui/math3d/qmatrixnxn/CMakeLists.txt +++ b/tests/auto/gui/math3d/qmatrixnxn/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qmatrixnxn Test: ##################################################################### -qt_add_test(tst_qmatrixnxn +qt_internal_add_test(tst_qmatrixnxn SOURCES tst_qmatrixnxn.cpp DEFINES diff --git a/tests/auto/gui/math3d/qquaternion/CMakeLists.txt b/tests/auto/gui/math3d/qquaternion/CMakeLists.txt index dec4a3d3529..fbeb76abddf 100644 --- a/tests/auto/gui/math3d/qquaternion/CMakeLists.txt +++ b/tests/auto/gui/math3d/qquaternion/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qquaternion Test: ##################################################################### -qt_add_test(tst_qquaternion +qt_internal_add_test(tst_qquaternion SOURCES tst_qquaternion.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/gui/math3d/qvectornd/CMakeLists.txt b/tests/auto/gui/math3d/qvectornd/CMakeLists.txt index 7dd6fe0dcb4..c29550463a7 100644 --- a/tests/auto/gui/math3d/qvectornd/CMakeLists.txt +++ b/tests/auto/gui/math3d/qvectornd/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qvectornd Test: ##################################################################### -qt_add_test(tst_qvectornd +qt_internal_add_test(tst_qvectornd SOURCES tst_qvectornd.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/gui/painting/qbrush/CMakeLists.txt b/tests/auto/gui/painting/qbrush/CMakeLists.txt index 64659bb07e8..c8dad25d944 100644 --- a/tests/auto/gui/painting/qbrush/CMakeLists.txt +++ b/tests/auto/gui/painting/qbrush/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qbrush Test: ##################################################################### -qt_add_test(tst_qbrush +qt_internal_add_test(tst_qbrush SOURCES tst_qbrush.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/gui/painting/qcolor/CMakeLists.txt b/tests/auto/gui/painting/qcolor/CMakeLists.txt index 0baa27ac11a..87753803fb6 100644 --- a/tests/auto/gui/painting/qcolor/CMakeLists.txt +++ b/tests/auto/gui/painting/qcolor/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qcolor Test: ##################################################################### -qt_add_test(tst_qcolor +qt_internal_add_test(tst_qcolor SOURCES tst_qcolor.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/gui/painting/qcolorspace/CMakeLists.txt b/tests/auto/gui/painting/qcolorspace/CMakeLists.txt index ad719f3bca5..9e3460d3636 100644 --- a/tests/auto/gui/painting/qcolorspace/CMakeLists.txt +++ b/tests/auto/gui/painting/qcolorspace/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob resources/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qcolorspace +qt_internal_add_test(tst_qcolorspace SOURCES tst_qcolorspace.cpp PUBLIC_LIBRARIES @@ -30,7 +30,7 @@ set(qmake_immediate_resource_files ${resource_glob_0} ) -qt_add_resource(tst_qcolorspace "qmake_immediate" +qt_internal_add_resource(tst_qcolorspace "qmake_immediate" PREFIX "/" FILES diff --git a/tests/auto/gui/painting/qpagelayout/CMakeLists.txt b/tests/auto/gui/painting/qpagelayout/CMakeLists.txt index 15ffd4a0001..913619461e3 100644 --- a/tests/auto/gui/painting/qpagelayout/CMakeLists.txt +++ b/tests/auto/gui/painting/qpagelayout/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qpagelayout Test: ##################################################################### -qt_add_test(tst_qpagelayout +qt_internal_add_test(tst_qpagelayout SOURCES tst_qpagelayout.cpp DEFINES diff --git a/tests/auto/gui/painting/qpagesize/CMakeLists.txt b/tests/auto/gui/painting/qpagesize/CMakeLists.txt index 706fa3e4022..fc6fd931c2e 100644 --- a/tests/auto/gui/painting/qpagesize/CMakeLists.txt +++ b/tests/auto/gui/painting/qpagesize/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qpagesize Test: ##################################################################### -qt_add_test(tst_qpagesize +qt_internal_add_test(tst_qpagesize SOURCES tst_qpagesize.cpp DEFINES diff --git a/tests/auto/gui/painting/qpaintengine/CMakeLists.txt b/tests/auto/gui/painting/qpaintengine/CMakeLists.txt index 602bfe7316e..b8431356456 100644 --- a/tests/auto/gui/painting/qpaintengine/CMakeLists.txt +++ b/tests/auto/gui/painting/qpaintengine/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qpaintengine Test: ##################################################################### -qt_add_test(tst_qpaintengine +qt_internal_add_test(tst_qpaintengine SOURCES tst_qpaintengine.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/gui/painting/qpainter/CMakeLists.txt b/tests/auto/gui/painting/qpainter/CMakeLists.txt index 6b46db4385f..bfb992c7b56 100644 --- a/tests/auto/gui/painting/qpainter/CMakeLists.txt +++ b/tests/auto/gui/painting/qpainter/CMakeLists.txt @@ -23,7 +23,7 @@ file(GLOB_RECURSE test_data_glob list(APPEND test_data ${test_data_glob}) list(APPEND test_data "task217400.png") -qt_add_test(tst_qpainter +qt_internal_add_test(tst_qpainter SOURCES tst_qpainter.cpp PUBLIC_LIBRARIES @@ -36,7 +36,7 @@ qt_add_test(tst_qpainter ## Scopes: ##################################################################### -qt_extend_target(tst_qpainter CONDITION TARGET Qt::Widgets +qt_internal_extend_target(tst_qpainter CONDITION TARGET Qt::Widgets PUBLIC_LIBRARIES Qt::Widgets Qt::WidgetsPrivate @@ -229,7 +229,7 @@ if(ANDROID AND NOT ANDROID_EMBEDDED) "task217400.png" ) - qt_add_resource(tst_qpainter "testdata" + qt_internal_add_resource(tst_qpainter "testdata" PREFIX "/" FILES diff --git a/tests/auto/gui/painting/qpainterpath/CMakeLists.txt b/tests/auto/gui/painting/qpainterpath/CMakeLists.txt index edc1ab14bf6..47450c91460 100644 --- a/tests/auto/gui/painting/qpainterpath/CMakeLists.txt +++ b/tests/auto/gui/painting/qpainterpath/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qpainterpath Test: ##################################################################### -qt_add_test(tst_qpainterpath +qt_internal_add_test(tst_qpainterpath SOURCES tst_qpainterpath.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/gui/painting/qpainterpathstroker/CMakeLists.txt b/tests/auto/gui/painting/qpainterpathstroker/CMakeLists.txt index 13446829913..f4c301c42ea 100644 --- a/tests/auto/gui/painting/qpainterpathstroker/CMakeLists.txt +++ b/tests/auto/gui/painting/qpainterpathstroker/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qpainterpathstroker Test: ##################################################################### -qt_add_test(tst_qpainterpathstroker +qt_internal_add_test(tst_qpainterpathstroker SOURCES tst_qpainterpathstroker.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/gui/painting/qpathclipper/CMakeLists.txt b/tests/auto/gui/painting/qpathclipper/CMakeLists.txt index 0cfaee06ec0..191b1b8a934 100644 --- a/tests/auto/gui/painting/qpathclipper/CMakeLists.txt +++ b/tests/auto/gui/painting/qpathclipper/CMakeLists.txt @@ -8,7 +8,7 @@ endif() ## tst_qpathclipper Test: ##################################################################### -qt_add_test(tst_qpathclipper +qt_internal_add_test(tst_qpathclipper SOURCES paths.cpp paths.h tst_qpathclipper.cpp @@ -25,7 +25,7 @@ qt_add_test(tst_qpathclipper ## Scopes: ##################################################################### -qt_extend_target(tst_qpathclipper CONDITION UNIX AND NOT APPLE AND NOT HAIKU AND NOT INTEGRITY +qt_internal_extend_target(tst_qpathclipper CONDITION UNIX AND NOT APPLE AND NOT HAIKU AND NOT INTEGRITY PUBLIC_LIBRARIES m ) diff --git a/tests/auto/gui/painting/qpdfwriter/CMakeLists.txt b/tests/auto/gui/painting/qpdfwriter/CMakeLists.txt index 1f2cf3db277..c6eb5b1034e 100644 --- a/tests/auto/gui/painting/qpdfwriter/CMakeLists.txt +++ b/tests/auto/gui/painting/qpdfwriter/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qpdfwriter Test: ##################################################################### -qt_add_test(tst_qpdfwriter +qt_internal_add_test(tst_qpdfwriter SOURCES tst_qpdfwriter.cpp DEFINES diff --git a/tests/auto/gui/painting/qpen/CMakeLists.txt b/tests/auto/gui/painting/qpen/CMakeLists.txt index 076d15b1d11..321c40fa8fa 100644 --- a/tests/auto/gui/painting/qpen/CMakeLists.txt +++ b/tests/auto/gui/painting/qpen/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qpen Test: ##################################################################### -qt_add_test(tst_qpen +qt_internal_add_test(tst_qpen SOURCES tst_qpen.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/gui/painting/qpolygon/CMakeLists.txt b/tests/auto/gui/painting/qpolygon/CMakeLists.txt index 83477e0689a..a61529d397b 100644 --- a/tests/auto/gui/painting/qpolygon/CMakeLists.txt +++ b/tests/auto/gui/painting/qpolygon/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qpolygon Test: ##################################################################### -qt_add_test(tst_qpolygon +qt_internal_add_test(tst_qpolygon SOURCES tst_qpolygon.cpp PUBLIC_LIBRARIES @@ -14,7 +14,7 @@ qt_add_test(tst_qpolygon ## Scopes: ##################################################################### -qt_extend_target(tst_qpolygon CONDITION UNIX AND NOT APPLE AND NOT HAIKU AND NOT INTEGRITY +qt_internal_extend_target(tst_qpolygon CONDITION UNIX AND NOT APPLE AND NOT HAIKU AND NOT INTEGRITY PUBLIC_LIBRARIES m ) diff --git a/tests/auto/gui/painting/qrangecollection/CMakeLists.txt b/tests/auto/gui/painting/qrangecollection/CMakeLists.txt index ce25304c4a8..d4aa7986a79 100644 --- a/tests/auto/gui/painting/qrangecollection/CMakeLists.txt +++ b/tests/auto/gui/painting/qrangecollection/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qrangecollection Test: ##################################################################### -qt_add_test(tst_qrangecollection +qt_internal_add_test(tst_qrangecollection SOURCES tst_qrangecollection.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/gui/painting/qregion/CMakeLists.txt b/tests/auto/gui/painting/qregion/CMakeLists.txt index 8779fecd5eb..9564e0719ea 100644 --- a/tests/auto/gui/painting/qregion/CMakeLists.txt +++ b/tests/auto/gui/painting/qregion/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qregion Test: ##################################################################### -qt_add_test(tst_qregion +qt_internal_add_test(tst_qregion SOURCES tst_qregion.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/gui/painting/qtransform/CMakeLists.txt b/tests/auto/gui/painting/qtransform/CMakeLists.txt index 07056be3eef..4d50e2cf334 100644 --- a/tests/auto/gui/painting/qtransform/CMakeLists.txt +++ b/tests/auto/gui/painting/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 PUBLIC_LIBRARIES @@ -14,7 +14,7 @@ qt_add_test(tst_qtransform ## Scopes: ##################################################################### -qt_extend_target(tst_qtransform CONDITION UNIX AND NOT APPLE AND NOT HAIKU AND NOT INTEGRITY +qt_internal_extend_target(tst_qtransform CONDITION UNIX AND NOT APPLE AND NOT HAIKU AND NOT INTEGRITY PUBLIC_LIBRARIES m ) diff --git a/tests/auto/gui/qopengl/CMakeLists.txt b/tests/auto/gui/qopengl/CMakeLists.txt index a32730fd70c..3be29695a54 100644 --- a/tests/auto/gui/qopengl/CMakeLists.txt +++ b/tests/auto/gui/qopengl/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qopengl Test: ##################################################################### -qt_add_test(tst_qopengl +qt_internal_add_test(tst_qopengl SOURCES tst_qopengl.cpp PUBLIC_LIBRARIES @@ -17,7 +17,7 @@ qt_add_test(tst_qopengl ## Scopes: ##################################################################### -qt_extend_target(tst_qopengl CONDITION LINUX AND QT_FEATURE_xcb AND QT_FEATURE_xcb_glx_plugin +qt_internal_extend_target(tst_qopengl CONDITION LINUX AND QT_FEATURE_xcb AND QT_FEATURE_xcb_glx_plugin DEFINES USE_GLX ) diff --git a/tests/auto/gui/qopenglconfig/CMakeLists.txt b/tests/auto/gui/qopenglconfig/CMakeLists.txt index 60fcdb67df4..d193e15c2e8 100644 --- a/tests/auto/gui/qopenglconfig/CMakeLists.txt +++ b/tests/auto/gui/qopenglconfig/CMakeLists.txt @@ -7,7 +7,7 @@ # Collect test data list(APPEND test_data "buglist.json") -qt_add_test(tst_qopenglconfig +qt_internal_add_test(tst_qopenglconfig SOURCES tst_qopenglconfig.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/gui/qvulkan/CMakeLists.txt b/tests/auto/gui/qvulkan/CMakeLists.txt index e3a6643f3d9..7cca165ed29 100644 --- a/tests/auto/gui/qvulkan/CMakeLists.txt +++ b/tests/auto/gui/qvulkan/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qvulkan Test: ##################################################################### -qt_add_test(tst_qvulkan +qt_internal_add_test(tst_qvulkan SOURCES tst_qvulkan.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/gui/rhi/qrhi/CMakeLists.txt b/tests/auto/gui/rhi/qrhi/CMakeLists.txt index 8ea9bf36afc..65d072c6b91 100644 --- a/tests/auto/gui/rhi/qrhi/CMakeLists.txt +++ b/tests/auto/gui/rhi/qrhi/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qrhi Test: ##################################################################### -qt_add_test(tst_qrhi +qt_internal_add_test(tst_qrhi SOURCES tst_qrhi.cpp PUBLIC_LIBRARIES @@ -17,7 +17,7 @@ set(qrhi_resource_files "data" ) -qt_add_resource(tst_qrhi "qrhi" +qt_internal_add_resource(tst_qrhi "qrhi" PREFIX "/" FILES diff --git a/tests/auto/gui/rhi/qshader/CMakeLists.txt b/tests/auto/gui/rhi/qshader/CMakeLists.txt index ae35f7e84e3..9a0e246aa41 100644 --- a/tests/auto/gui/rhi/qshader/CMakeLists.txt +++ b/tests/auto/gui/rhi/qshader/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qshader Test: ##################################################################### -qt_add_test(tst_qshader +qt_internal_add_test(tst_qshader SOURCES tst_qshader.cpp PUBLIC_LIBRARIES @@ -17,7 +17,7 @@ set(qshader_resource_files "data" ) -qt_add_resource(tst_qshader "qshader" +qt_internal_add_resource(tst_qshader "qshader" PREFIX "/" FILES diff --git a/tests/auto/gui/text/qabstracttextdocumentlayout/CMakeLists.txt b/tests/auto/gui/text/qabstracttextdocumentlayout/CMakeLists.txt index 28df19d1956..f78e1d81c7f 100644 --- a/tests/auto/gui/text/qabstracttextdocumentlayout/CMakeLists.txt +++ b/tests/auto/gui/text/qabstracttextdocumentlayout/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qabstracttextdocumentlayout Test: ##################################################################### -qt_add_test(tst_qabstracttextdocumentlayout +qt_internal_add_test(tst_qabstracttextdocumentlayout SOURCES tst_qabstracttextdocumentlayout.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/gui/text/qcssparser/CMakeLists.txt b/tests/auto/gui/text/qcssparser/CMakeLists.txt index dc86787c458..adb3e6269c9 100644 --- a/tests/auto/gui/text/qcssparser/CMakeLists.txt +++ b/tests/auto/gui/text/qcssparser/CMakeLists.txt @@ -11,7 +11,7 @@ endif() # Collect test data list(APPEND test_data "testdata") -qt_add_test(tst_qcssparser +qt_internal_add_test(tst_qcssparser SOURCES tst_qcssparser.cpp DEFINES @@ -48,7 +48,7 @@ if(ANDROID) "testdata/scanner/unicode/output" ) - qt_add_resource(tst_qcssparser "testdata" + qt_internal_add_resource(tst_qcssparser "testdata" PREFIX "/" FILES diff --git a/tests/auto/gui/text/qfont/CMakeLists.txt b/tests/auto/gui/text/qfont/CMakeLists.txt index b7e30318fb5..eb1f9747b25 100644 --- a/tests/auto/gui/text/qfont/CMakeLists.txt +++ b/tests/auto/gui/text/qfont/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qfont Test: ##################################################################### -qt_add_test(tst_qfont +qt_internal_add_test(tst_qfont SOURCES tst_qfont.cpp PUBLIC_LIBRARIES @@ -18,7 +18,7 @@ set(testfont_resource_files "weirdfont.otf" ) -qt_add_resource(tst_qfont "testfont" +qt_internal_add_resource(tst_qfont "testfont" PREFIX "/" FILES @@ -29,7 +29,7 @@ qt_add_resource(tst_qfont "testfont" ## Scopes: ##################################################################### -qt_extend_target(tst_qfont CONDITION TARGET Qt::Widgets +qt_internal_extend_target(tst_qfont CONDITION TARGET Qt::Widgets PUBLIC_LIBRARIES Qt::Widgets ) diff --git a/tests/auto/gui/text/qfontcache/CMakeLists.txt b/tests/auto/gui/text/qfontcache/CMakeLists.txt index 374854b410b..fb93c91e0c3 100644 --- a/tests/auto/gui/text/qfontcache/CMakeLists.txt +++ b/tests/auto/gui/text/qfontcache/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qfontcache Test: ##################################################################### -qt_add_test(tst_qfontcache +qt_internal_add_test(tst_qfontcache SOURCES tst_qfontcache.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/gui/text/qfontdatabase/CMakeLists.txt b/tests/auto/gui/text/qfontdatabase/CMakeLists.txt index f6ff9e8e7d2..73ab56d49fd 100644 --- a/tests/auto/gui/text/qfontdatabase/CMakeLists.txt +++ b/tests/auto/gui/text/qfontdatabase/CMakeLists.txt @@ -7,7 +7,7 @@ # Collect test data list(APPEND test_data "LED_REAL.TTF") -qt_add_test(tst_qfontdatabase +qt_internal_add_test(tst_qfontdatabase SOURCES tst_qfontdatabase.cpp PUBLIC_LIBRARIES @@ -38,7 +38,7 @@ set(testdata_resource_files "LED_REAL.TTF" ) -qt_add_resource(tst_qfontdatabase "testdata" +qt_internal_add_resource(tst_qfontdatabase "testdata" PREFIX "/" FILES diff --git a/tests/auto/gui/text/qfontmetrics/CMakeLists.txt b/tests/auto/gui/text/qfontmetrics/CMakeLists.txt index b0b8eb3f423..d7a22671d6d 100644 --- a/tests/auto/gui/text/qfontmetrics/CMakeLists.txt +++ b/tests/auto/gui/text/qfontmetrics/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qfontmetrics Test: ##################################################################### -qt_add_test(tst_qfontmetrics +qt_internal_add_test(tst_qfontmetrics SOURCES tst_qfontmetrics.cpp PUBLIC_LIBRARIES @@ -22,7 +22,7 @@ set(testfont_resource_files "ucs4font.ttf" ) -qt_add_resource(tst_qfontmetrics "testfont" +qt_internal_add_resource(tst_qfontmetrics "testfont" PREFIX "/fonts" FILES diff --git a/tests/auto/gui/text/qglyphrun/CMakeLists.txt b/tests/auto/gui/text/qglyphrun/CMakeLists.txt index 7ea92f29244..b0585af16f1 100644 --- a/tests/auto/gui/text/qglyphrun/CMakeLists.txt +++ b/tests/auto/gui/text/qglyphrun/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qglyphrun Test: ##################################################################### -qt_add_test(tst_qglyphrun +qt_internal_add_test(tst_qglyphrun SOURCES tst_qglyphrun.cpp PUBLIC_LIBRARIES @@ -19,7 +19,7 @@ set(testdata_resource_files "../../../shared/resources/test.ttf" ) -qt_add_resource(tst_qglyphrun "testdata" +qt_internal_add_resource(tst_qglyphrun "testdata" PREFIX "/" FILES diff --git a/tests/auto/gui/text/qinputcontrol/CMakeLists.txt b/tests/auto/gui/text/qinputcontrol/CMakeLists.txt index f5cdd63ec0f..048a96ef779 100644 --- a/tests/auto/gui/text/qinputcontrol/CMakeLists.txt +++ b/tests/auto/gui/text/qinputcontrol/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qinputcontrol Test: ##################################################################### -qt_add_test(tst_qinputcontrol +qt_internal_add_test(tst_qinputcontrol SOURCES tst_qinputcontrol.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/gui/text/qrawfont/CMakeLists.txt b/tests/auto/gui/text/qrawfont/CMakeLists.txt index f51d4ec13de..04db8d87606 100644 --- a/tests/auto/gui/text/qrawfont/CMakeLists.txt +++ b/tests/auto/gui/text/qrawfont/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qrawfont Test: ##################################################################### -qt_add_test(tst_qrawfont +qt_internal_add_test(tst_qrawfont SOURCES tst_qrawfont.cpp PUBLIC_LIBRARIES @@ -23,7 +23,7 @@ set(testdata_resource_files "testfont_os2_v1.ttf" ) -qt_add_resource(tst_qrawfont "testdata" +qt_internal_add_resource(tst_qrawfont "testdata" PREFIX "/" FILES diff --git a/tests/auto/gui/text/qstatictext/CMakeLists.txt b/tests/auto/gui/text/qstatictext/CMakeLists.txt index 1c182b36592..a7ba4e392a3 100644 --- a/tests/auto/gui/text/qstatictext/CMakeLists.txt +++ b/tests/auto/gui/text/qstatictext/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qstatictext Test: ##################################################################### -qt_add_test(tst_qstatictext +qt_internal_add_test(tst_qstatictext SOURCES tst_qstatictext.cpp PUBLIC_LIBRARIES @@ -14,7 +14,7 @@ qt_add_test(tst_qstatictext ## Scopes: ##################################################################### -qt_extend_target(tst_qstatictext CONDITION QT_FEATURE_private_tests +qt_internal_extend_target(tst_qstatictext CONDITION QT_FEATURE_private_tests PUBLIC_LIBRARIES Qt::CorePrivate Qt::GuiPrivate diff --git a/tests/auto/gui/text/qsyntaxhighlighter/CMakeLists.txt b/tests/auto/gui/text/qsyntaxhighlighter/CMakeLists.txt index 4c66cf94a7d..9ac732cee07 100644 --- a/tests/auto/gui/text/qsyntaxhighlighter/CMakeLists.txt +++ b/tests/auto/gui/text/qsyntaxhighlighter/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qsyntaxhighlighter Test: ##################################################################### -qt_add_test(tst_qsyntaxhighlighter +qt_internal_add_test(tst_qsyntaxhighlighter SOURCES tst_qsyntaxhighlighter.cpp PUBLIC_LIBRARIES @@ -14,7 +14,7 @@ qt_add_test(tst_qsyntaxhighlighter ## Scopes: ##################################################################### -qt_extend_target(tst_qsyntaxhighlighter CONDITION TARGET Qt::Widgets +qt_internal_extend_target(tst_qsyntaxhighlighter CONDITION TARGET Qt::Widgets PUBLIC_LIBRARIES Qt::Widgets ) diff --git a/tests/auto/gui/text/qtextblock/CMakeLists.txt b/tests/auto/gui/text/qtextblock/CMakeLists.txt index c186fa8a75b..aedd6c27a3e 100644 --- a/tests/auto/gui/text/qtextblock/CMakeLists.txt +++ b/tests/auto/gui/text/qtextblock/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qtextblock Test: ##################################################################### -qt_add_test(tst_qtextblock +qt_internal_add_test(tst_qtextblock SOURCES tst_qtextblock.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/gui/text/qtextcursor/CMakeLists.txt b/tests/auto/gui/text/qtextcursor/CMakeLists.txt index 2a489316620..a82dc928e98 100644 --- a/tests/auto/gui/text/qtextcursor/CMakeLists.txt +++ b/tests/auto/gui/text/qtextcursor/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qtextcursor Test: ##################################################################### -qt_add_test(tst_qtextcursor +qt_internal_add_test(tst_qtextcursor SOURCES tst_qtextcursor.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/gui/text/qtextdocument/CMakeLists.txt b/tests/auto/gui/text/qtextdocument/CMakeLists.txt index e99604e32a1..bff5cabfb70 100644 --- a/tests/auto/gui/text/qtextdocument/CMakeLists.txt +++ b/tests/auto/gui/text/qtextdocument/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qtextdocument Test: ##################################################################### -qt_add_test(tst_qtextdocument +qt_internal_add_test(tst_qtextdocument SOURCES common.h tst_qtextdocument.cpp diff --git a/tests/auto/gui/text/qtextdocumentfragment/CMakeLists.txt b/tests/auto/gui/text/qtextdocumentfragment/CMakeLists.txt index 03f36c3f6a6..6f1207c49a1 100644 --- a/tests/auto/gui/text/qtextdocumentfragment/CMakeLists.txt +++ b/tests/auto/gui/text/qtextdocumentfragment/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qtextdocumentfragment Test: ##################################################################### -qt_add_test(tst_qtextdocumentfragment +qt_internal_add_test(tst_qtextdocumentfragment SOURCES tst_qtextdocumentfragment.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/gui/text/qtextdocumentlayout/CMakeLists.txt b/tests/auto/gui/text/qtextdocumentlayout/CMakeLists.txt index 11dda5929e5..da41073962a 100644 --- a/tests/auto/gui/text/qtextdocumentlayout/CMakeLists.txt +++ b/tests/auto/gui/text/qtextdocumentlayout/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qtextdocumentlayout Test: ##################################################################### -qt_add_test(tst_qtextdocumentlayout +qt_internal_add_test(tst_qtextdocumentlayout SOURCES tst_qtextdocumentlayout.cpp PUBLIC_LIBRARIES @@ -14,7 +14,7 @@ qt_add_test(tst_qtextdocumentlayout ## Scopes: ##################################################################### -qt_extend_target(tst_qtextdocumentlayout CONDITION TARGET Qt::Widgets +qt_internal_extend_target(tst_qtextdocumentlayout CONDITION TARGET Qt::Widgets PUBLIC_LIBRARIES Qt::Widgets ) diff --git a/tests/auto/gui/text/qtextformat/CMakeLists.txt b/tests/auto/gui/text/qtextformat/CMakeLists.txt index 31320cd14bf..cacd7fbd180 100644 --- a/tests/auto/gui/text/qtextformat/CMakeLists.txt +++ b/tests/auto/gui/text/qtextformat/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qtextformat Test: ##################################################################### -qt_add_test(tst_qtextformat +qt_internal_add_test(tst_qtextformat SOURCES tst_qtextformat.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/gui/text/qtextlayout/CMakeLists.txt b/tests/auto/gui/text/qtextlayout/CMakeLists.txt index a899375497f..3fb5dea8b94 100644 --- a/tests/auto/gui/text/qtextlayout/CMakeLists.txt +++ b/tests/auto/gui/text/qtextlayout/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qtextlayout Test: ##################################################################### -qt_add_test(tst_qtextlayout +qt_internal_add_test(tst_qtextlayout SOURCES tst_qtextlayout.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/gui/text/qtextlist/CMakeLists.txt b/tests/auto/gui/text/qtextlist/CMakeLists.txt index 9ba6d826606..2f325d5e17f 100644 --- a/tests/auto/gui/text/qtextlist/CMakeLists.txt +++ b/tests/auto/gui/text/qtextlist/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qtextlist Test: ##################################################################### -qt_add_test(tst_qtextlist +qt_internal_add_test(tst_qtextlist SOURCES ../qtextdocument/common.h tst_qtextlist.cpp diff --git a/tests/auto/gui/text/qtextmarkdownimporter/CMakeLists.txt b/tests/auto/gui/text/qtextmarkdownimporter/CMakeLists.txt index eb5d34cbac0..cf14f38b5f6 100644 --- a/tests/auto/gui/text/qtextmarkdownimporter/CMakeLists.txt +++ b/tests/auto/gui/text/qtextmarkdownimporter/CMakeLists.txt @@ -10,7 +10,7 @@ list(APPEND test_data "data/headingBulletsContinuations.md") list(APPEND test_data "data/fuzz20450.md") list(APPEND test_data "data/fuzz20580.md") -qt_add_test(tst_qtextmarkdownimporter +qt_internal_add_test(tst_qtextmarkdownimporter SOURCES tst_qtextmarkdownimporter.cpp DEFINES diff --git a/tests/auto/gui/text/qtextmarkdownwriter/CMakeLists.txt b/tests/auto/gui/text/qtextmarkdownwriter/CMakeLists.txt index 008f501e234..d8815c64f68 100644 --- a/tests/auto/gui/text/qtextmarkdownwriter/CMakeLists.txt +++ b/tests/auto/gui/text/qtextmarkdownwriter/CMakeLists.txt @@ -8,7 +8,7 @@ list(APPEND test_data "data/example.md") list(APPEND test_data "data/blockquotes.md") -qt_add_test(tst_qtextmarkdownwriter +qt_internal_add_test(tst_qtextmarkdownwriter SOURCES tst_qtextmarkdownwriter.cpp DEFINES diff --git a/tests/auto/gui/text/qtextobject/CMakeLists.txt b/tests/auto/gui/text/qtextobject/CMakeLists.txt index 94cd60d6a6a..07ea132de0e 100644 --- a/tests/auto/gui/text/qtextobject/CMakeLists.txt +++ b/tests/auto/gui/text/qtextobject/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qtextobject Test: ##################################################################### -qt_add_test(tst_qtextobject +qt_internal_add_test(tst_qtextobject SOURCES tst_qtextobject.cpp PUBLIC_LIBRARIES @@ -14,7 +14,7 @@ qt_add_test(tst_qtextobject ## Scopes: ##################################################################### -qt_extend_target(tst_qtextobject CONDITION TARGET Qt::Widgets +qt_internal_extend_target(tst_qtextobject CONDITION TARGET Qt::Widgets PUBLIC_LIBRARIES Qt::Widgets ) diff --git a/tests/auto/gui/text/qtextodfwriter/CMakeLists.txt b/tests/auto/gui/text/qtextodfwriter/CMakeLists.txt index 70f73f0bade..16c86c49770 100644 --- a/tests/auto/gui/text/qtextodfwriter/CMakeLists.txt +++ b/tests/auto/gui/text/qtextodfwriter/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qtextodfwriter Test: ##################################################################### -qt_add_test(tst_qtextodfwriter +qt_internal_add_test(tst_qtextodfwriter SOURCES tst_qtextodfwriter.cpp DEFINES diff --git a/tests/auto/gui/text/qtextpiecetable/CMakeLists.txt b/tests/auto/gui/text/qtextpiecetable/CMakeLists.txt index 82861b9b8c9..49cfcfab6a0 100644 --- a/tests/auto/gui/text/qtextpiecetable/CMakeLists.txt +++ b/tests/auto/gui/text/qtextpiecetable/CMakeLists.txt @@ -11,7 +11,7 @@ endif() ## tst_qtextpiecetable Test: ##################################################################### -qt_add_test(tst_qtextpiecetable +qt_internal_add_test(tst_qtextpiecetable SOURCES ../qtextdocument/common.h tst_qtextpiecetable.cpp diff --git a/tests/auto/gui/text/qtextscriptengine/CMakeLists.txt b/tests/auto/gui/text/qtextscriptengine/CMakeLists.txt index 8bd9909fe18..01d418ebd47 100644 --- a/tests/auto/gui/text/qtextscriptengine/CMakeLists.txt +++ b/tests/auto/gui/text/qtextscriptengine/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qtextscriptengine Test: ##################################################################### -qt_add_test(tst_qtextscriptengine +qt_internal_add_test(tst_qtextscriptengine SOURCES tst_qtextscriptengine.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/gui/text/qtextscriptengine/generate/CMakeLists.txt b/tests/auto/gui/text/qtextscriptengine/generate/CMakeLists.txt index 9bc97be6a38..d3b6b1dc6db 100644 --- a/tests/auto/gui/text/qtextscriptengine/generate/CMakeLists.txt +++ b/tests/auto/gui/text/qtextscriptengine/generate/CMakeLists.txt @@ -4,7 +4,7 @@ ## generate Binary: ##################################################################### -qt_add_executable(generate +qt_internal_add_executable(generate GUI SOURCES main.cpp diff --git a/tests/auto/gui/text/qtexttable/CMakeLists.txt b/tests/auto/gui/text/qtexttable/CMakeLists.txt index 036d39bbff9..94d33d35301 100644 --- a/tests/auto/gui/text/qtexttable/CMakeLists.txt +++ b/tests/auto/gui/text/qtexttable/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qtexttable Test: ##################################################################### -qt_add_test(tst_qtexttable +qt_internal_add_test(tst_qtexttable SOURCES tst_qtexttable.cpp PUBLIC_LIBRARIES @@ -15,7 +15,7 @@ qt_add_test(tst_qtexttable ## Scopes: ##################################################################### -qt_extend_target(tst_qtexttable CONDITION TARGET Qt::Widgets +qt_internal_extend_target(tst_qtexttable CONDITION TARGET Qt::Widgets PUBLIC_LIBRARIES Qt::Widgets ) diff --git a/tests/auto/gui/text/qzip/CMakeLists.txt b/tests/auto/gui/text/qzip/CMakeLists.txt index 02620d5e64f..7240a611d2a 100644 --- a/tests/auto/gui/text/qzip/CMakeLists.txt +++ b/tests/auto/gui/text/qzip/CMakeLists.txt @@ -7,7 +7,7 @@ # Collect test data list(APPEND test_data "testdata") -qt_add_test(tst_qzip +qt_internal_add_test(tst_qzip SOURCES tst_qzip.cpp PUBLIC_LIBRARIES @@ -26,7 +26,7 @@ if(ANDROID) "testdata/test.zip" ) - qt_add_resource(tst_qzip "testdata" + qt_internal_add_resource(tst_qzip "testdata" PREFIX "/" FILES diff --git a/tests/auto/gui/util/qdesktopservices/.prev_CMakeLists.txt b/tests/auto/gui/util/qdesktopservices/.prev_CMakeLists.txt index ce1db36f16f..7536251cd3d 100644 --- a/tests/auto/gui/util/qdesktopservices/.prev_CMakeLists.txt +++ b/tests/auto/gui/util/qdesktopservices/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qdesktopservices Test: ##################################################################### -qt_add_test(tst_qdesktopservices +qt_internal_add_test(tst_qdesktopservices SOURCES tst_qdesktopservices.cpp DEFINES diff --git a/tests/auto/gui/util/qdesktopservices/CMakeLists.txt b/tests/auto/gui/util/qdesktopservices/CMakeLists.txt index 433e97414a7..475a3405c09 100644 --- a/tests/auto/gui/util/qdesktopservices/CMakeLists.txt +++ b/tests/auto/gui/util/qdesktopservices/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qdesktopservices Test: ##################################################################### -qt_add_test(tst_qdesktopservices +qt_internal_add_test(tst_qdesktopservices SOURCES tst_qdesktopservices.cpp DEFINES diff --git a/tests/auto/gui/util/qdoublevalidator/CMakeLists.txt b/tests/auto/gui/util/qdoublevalidator/CMakeLists.txt index 01ed8772ea7..27996300d73 100644 --- a/tests/auto/gui/util/qdoublevalidator/CMakeLists.txt +++ b/tests/auto/gui/util/qdoublevalidator/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qdoublevalidator Test: ##################################################################### -qt_add_test(tst_qdoublevalidator +qt_internal_add_test(tst_qdoublevalidator SOURCES tst_qdoublevalidator.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/gui/util/qintvalidator/CMakeLists.txt b/tests/auto/gui/util/qintvalidator/CMakeLists.txt index 841fd02bb06..83891a3541e 100644 --- a/tests/auto/gui/util/qintvalidator/CMakeLists.txt +++ b/tests/auto/gui/util/qintvalidator/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qintvalidator Test: ##################################################################### -qt_add_test(tst_qintvalidator +qt_internal_add_test(tst_qintvalidator SOURCES tst_qintvalidator.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/gui/util/qregularexpressionvalidator/CMakeLists.txt b/tests/auto/gui/util/qregularexpressionvalidator/CMakeLists.txt index 9a1491681ee..9caf7a15965 100644 --- a/tests/auto/gui/util/qregularexpressionvalidator/CMakeLists.txt +++ b/tests/auto/gui/util/qregularexpressionvalidator/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qregularexpressionvalidator Test: ##################################################################### -qt_add_test(tst_qregularexpressionvalidator +qt_internal_add_test(tst_qregularexpressionvalidator SOURCES tst_qregularexpressionvalidator.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/gui/util/qshadergenerator/CMakeLists.txt b/tests/auto/gui/util/qshadergenerator/CMakeLists.txt index 8a6f95da57b..77cefcbd068 100644 --- a/tests/auto/gui/util/qshadergenerator/CMakeLists.txt +++ b/tests/auto/gui/util/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/gui/util/qshadergraph/CMakeLists.txt b/tests/auto/gui/util/qshadergraph/CMakeLists.txt index f59e85af6ce..e510fffb030 100644 --- a/tests/auto/gui/util/qshadergraph/CMakeLists.txt +++ b/tests/auto/gui/util/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/gui/util/qshadergraphloader/CMakeLists.txt b/tests/auto/gui/util/qshadergraphloader/CMakeLists.txt index 8e2b63213c8..70f99d92664 100644 --- a/tests/auto/gui/util/qshadergraphloader/CMakeLists.txt +++ b/tests/auto/gui/util/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/gui/util/qshadernodes/CMakeLists.txt b/tests/auto/gui/util/qshadernodes/CMakeLists.txt index 153e9fa09a6..471a203ffc7 100644 --- a/tests/auto/gui/util/qshadernodes/CMakeLists.txt +++ b/tests/auto/gui/util/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/gui/util/qshadernodesloader/CMakeLists.txt b/tests/auto/gui/util/qshadernodesloader/CMakeLists.txt index 915e8b4a580..0491e4d149c 100644 --- a/tests/auto/gui/util/qshadernodesloader/CMakeLists.txt +++ b/tests/auto/gui/util/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/gui/util/qtexturefilereader/CMakeLists.txt b/tests/auto/gui/util/qtexturefilereader/CMakeLists.txt index 23dc595d961..91083348f76 100644 --- a/tests/auto/gui/util/qtexturefilereader/CMakeLists.txt +++ b/tests/auto/gui/util/qtexturefilereader/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qtexturefilereader Test: ##################################################################### -qt_add_test(tst_qtexturefilereader +qt_internal_add_test(tst_qtexturefilereader SOURCES tst_qtexturefilereader.cpp PUBLIC_LIBRARIES @@ -21,7 +21,7 @@ set(qtexturefilereader_resource_files "texturefiles/pattern.pkm" ) -qt_add_resource(tst_qtexturefilereader "qtexturefilereader" +qt_internal_add_resource(tst_qtexturefilereader "qtexturefilereader" PREFIX "/" FILES diff --git a/tests/auto/gui/util/qundogroup/CMakeLists.txt b/tests/auto/gui/util/qundogroup/CMakeLists.txt index 9aa35ba9a74..c1396326f70 100644 --- a/tests/auto/gui/util/qundogroup/CMakeLists.txt +++ b/tests/auto/gui/util/qundogroup/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qundogroup Test: ##################################################################### -qt_add_test(tst_qundogroup +qt_internal_add_test(tst_qundogroup SOURCES tst_qundogroup.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/gui/util/qundostack/CMakeLists.txt b/tests/auto/gui/util/qundostack/CMakeLists.txt index 9e8ac65c97f..0e56171adde 100644 --- a/tests/auto/gui/util/qundostack/CMakeLists.txt +++ b/tests/auto/gui/util/qundostack/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qundostack Test: ##################################################################### -qt_add_test(tst_qundostack +qt_internal_add_test(tst_qundostack SOURCES tst_qundostack.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/network/access/hpack/CMakeLists.txt b/tests/auto/network/access/hpack/CMakeLists.txt index 08ff2a67989..421a60c17df 100644 --- a/tests/auto/network/access/hpack/CMakeLists.txt +++ b/tests/auto/network/access/hpack/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_hpack Test: ##################################################################### -qt_add_test(tst_hpack +qt_internal_add_test(tst_hpack SOURCES tst_hpack.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/network/access/hsts/CMakeLists.txt b/tests/auto/network/access/hsts/CMakeLists.txt index 323fb84bc73..ba3b110f592 100644 --- a/tests/auto/network/access/hsts/CMakeLists.txt +++ b/tests/auto/network/access/hsts/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qhsts Test: ##################################################################### -qt_add_test(tst_qhsts +qt_internal_add_test(tst_qhsts SOURCES tst_qhsts.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/network/access/http2/CMakeLists.txt b/tests/auto/network/access/http2/CMakeLists.txt index ed5f7c82759..7ac1c8001c9 100644 --- a/tests/auto/network/access/http2/CMakeLists.txt +++ b/tests/auto/network/access/http2/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_http2 Test: ##################################################################### -qt_add_test(tst_http2 +qt_internal_add_test(tst_http2 SOURCES ../../../../shared/emulationdetector.h http2srv.cpp http2srv.h diff --git a/tests/auto/network/access/qabstractnetworkcache/.prev_CMakeLists.txt b/tests/auto/network/access/qabstractnetworkcache/.prev_CMakeLists.txt index 3196ccca59b..bf163c38835 100644 --- a/tests/auto/network/access/qabstractnetworkcache/.prev_CMakeLists.txt +++ b/tests/auto/network/access/qabstractnetworkcache/.prev_CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob tests/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qabstractnetworkcache +qt_internal_add_test(tst_qabstractnetworkcache SOURCES tst_qabstractnetworkcache.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/network/access/qabstractnetworkcache/CMakeLists.txt b/tests/auto/network/access/qabstractnetworkcache/CMakeLists.txt index 9ebd765fd45..39589162325 100644 --- a/tests/auto/network/access/qabstractnetworkcache/CMakeLists.txt +++ b/tests/auto/network/access/qabstractnetworkcache/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob tests/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qabstractnetworkcache +qt_internal_add_test(tst_qabstractnetworkcache SOURCES tst_qabstractnetworkcache.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/network/access/qdecompresshelper/.prev_CMakeLists.txt b/tests/auto/network/access/qdecompresshelper/.prev_CMakeLists.txt index ce8f55646cc..8f01ee712d1 100644 --- a/tests/auto/network/access/qdecompresshelper/.prev_CMakeLists.txt +++ b/tests/auto/network/access/qdecompresshelper/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qdecompresshelper Test: ##################################################################### -qt_add_test(tst_qdecompresshelper +qt_internal_add_test(tst_qdecompresshelper SOURCES gzip.rcc.cpp inflate.rcc.cpp diff --git a/tests/auto/network/access/qdecompresshelper/CMakeLists.txt b/tests/auto/network/access/qdecompresshelper/CMakeLists.txt index 3b2f1b5e6fe..49fd91db0ab 100644 --- a/tests/auto/network/access/qdecompresshelper/CMakeLists.txt +++ b/tests/auto/network/access/qdecompresshelper/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qdecompresshelper Test: ##################################################################### -qt_add_test(tst_qdecompresshelper +qt_internal_add_test(tst_qdecompresshelper SOURCES gzip.rcc.cpp inflate.rcc.cpp diff --git a/tests/auto/network/access/qhttpnetworkconnection/.prev_CMakeLists.txt b/tests/auto/network/access/qhttpnetworkconnection/.prev_CMakeLists.txt index 621e339c1a3..4c23a4f66b6 100644 --- a/tests/auto/network/access/qhttpnetworkconnection/.prev_CMakeLists.txt +++ b/tests/auto/network/access/qhttpnetworkconnection/.prev_CMakeLists.txt @@ -8,7 +8,7 @@ endif() ## tst_qhttpnetworkconnection Test: ##################################################################### -qt_add_test(tst_qhttpnetworkconnection +qt_internal_add_test(tst_qhttpnetworkconnection SOURCES tst_qhttpnetworkconnection.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/network/access/qhttpnetworkconnection/CMakeLists.txt b/tests/auto/network/access/qhttpnetworkconnection/CMakeLists.txt index ffd9ea934e9..29b345b0dba 100644 --- a/tests/auto/network/access/qhttpnetworkconnection/CMakeLists.txt +++ b/tests/auto/network/access/qhttpnetworkconnection/CMakeLists.txt @@ -8,7 +8,7 @@ endif() ## tst_qhttpnetworkconnection Test: ##################################################################### -qt_add_test(tst_qhttpnetworkconnection +qt_internal_add_test(tst_qhttpnetworkconnection SOURCES tst_qhttpnetworkconnection.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/network/access/qhttpnetworkreply/CMakeLists.txt b/tests/auto/network/access/qhttpnetworkreply/CMakeLists.txt index f9ba96cf135..4d35cc8a2b0 100644 --- a/tests/auto/network/access/qhttpnetworkreply/CMakeLists.txt +++ b/tests/auto/network/access/qhttpnetworkreply/CMakeLists.txt @@ -8,7 +8,7 @@ endif() ## tst_qhttpnetworkreply Test: ##################################################################### -qt_add_test(tst_qhttpnetworkreply +qt_internal_add_test(tst_qhttpnetworkreply SOURCES tst_qhttpnetworkreply.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/network/access/qnetworkaccessmanager/CMakeLists.txt b/tests/auto/network/access/qnetworkaccessmanager/CMakeLists.txt index 8fc928e8cf1..1d819c37845 100644 --- a/tests/auto/network/access/qnetworkaccessmanager/CMakeLists.txt +++ b/tests/auto/network/access/qnetworkaccessmanager/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qnetworkaccessmanager Test: ##################################################################### -qt_add_test(tst_qnetworkaccessmanager +qt_internal_add_test(tst_qnetworkaccessmanager SOURCES tst_qnetworkaccessmanager.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/network/access/qnetworkcachemetadata/CMakeLists.txt b/tests/auto/network/access/qnetworkcachemetadata/CMakeLists.txt index bcd47c7bcf2..3a8bef0aa2d 100644 --- a/tests/auto/network/access/qnetworkcachemetadata/CMakeLists.txt +++ b/tests/auto/network/access/qnetworkcachemetadata/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qnetworkcachemetadata Test: ##################################################################### -qt_add_test(tst_qnetworkcachemetadata +qt_internal_add_test(tst_qnetworkcachemetadata SOURCES tst_qnetworkcachemetadata.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/network/access/qnetworkcookie/CMakeLists.txt b/tests/auto/network/access/qnetworkcookie/CMakeLists.txt index 24446c90ef2..0460ff32358 100644 --- a/tests/auto/network/access/qnetworkcookie/CMakeLists.txt +++ b/tests/auto/network/access/qnetworkcookie/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qnetworkcookie Test: ##################################################################### -qt_add_test(tst_qnetworkcookie +qt_internal_add_test(tst_qnetworkcookie SOURCES tst_qnetworkcookie.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/network/access/qnetworkcookiejar/CMakeLists.txt b/tests/auto/network/access/qnetworkcookiejar/CMakeLists.txt index f6aafcb69b8..55f30633eea 100644 --- a/tests/auto/network/access/qnetworkcookiejar/CMakeLists.txt +++ b/tests/auto/network/access/qnetworkcookiejar/CMakeLists.txt @@ -7,7 +7,7 @@ # Collect test data list(APPEND test_data "parser.json") -qt_add_test(tst_qnetworkcookiejar +qt_internal_add_test(tst_qnetworkcookiejar SOURCES tst_qnetworkcookiejar.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/network/access/qnetworkdiskcache/CMakeLists.txt b/tests/auto/network/access/qnetworkdiskcache/CMakeLists.txt index 484cb47e2b9..af58132fb34 100644 --- a/tests/auto/network/access/qnetworkdiskcache/CMakeLists.txt +++ b/tests/auto/network/access/qnetworkdiskcache/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qnetworkdiskcache Test: ##################################################################### -qt_add_test(tst_qnetworkdiskcache +qt_internal_add_test(tst_qnetworkdiskcache SOURCES tst_qnetworkdiskcache.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/network/access/qnetworkreply/echo/.prev_CMakeLists.txt b/tests/auto/network/access/qnetworkreply/echo/.prev_CMakeLists.txt index 17b6b275c9a..60fe797d50d 100644 --- a/tests/auto/network/access/qnetworkreply/echo/.prev_CMakeLists.txt +++ b/tests/auto/network/access/qnetworkreply/echo/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## echo Binary: ##################################################################### -qt_add_executable(echo +qt_internal_add_executable(echo SOURCES main.cpp ) diff --git a/tests/auto/network/access/qnetworkreply/echo/CMakeLists.txt b/tests/auto/network/access/qnetworkreply/echo/CMakeLists.txt index e06066ea4fa..664b2f2fab2 100644 --- a/tests/auto/network/access/qnetworkreply/echo/CMakeLists.txt +++ b/tests/auto/network/access/qnetworkreply/echo/CMakeLists.txt @@ -4,7 +4,7 @@ ## echo Binary: ##################################################################### -qt_add_executable(echo +qt_internal_add_executable(echo OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case SOURCES main.cpp diff --git a/tests/auto/network/access/qnetworkreply/test/.prev_CMakeLists.txt b/tests/auto/network/access/qnetworkreply/test/.prev_CMakeLists.txt index 19b430b159a..337a505a549 100644 --- a/tests/auto/network/access/qnetworkreply/test/.prev_CMakeLists.txt +++ b/tests/auto/network/access/qnetworkreply/test/.prev_CMakeLists.txt @@ -17,7 +17,7 @@ list(APPEND test_data "../certs") list(APPEND test_data "../index.html") list(APPEND test_data "../smb-file.txt") -qt_add_test(tst_qnetworkreply +qt_internal_add_test(tst_qnetworkreply SOURCES ../../../../../shared/emulationdetector.h ../tst_qnetworkreply.cpp @@ -37,7 +37,7 @@ set(qnetworkreply_resource_files "resource" ) -qt_add_resource(tst_qnetworkreply "qnetworkreply" +qt_internal_add_resource(tst_qnetworkreply "qnetworkreply" PREFIX "/" BASE diff --git a/tests/auto/network/access/qnetworkreply/test/CMakeLists.txt b/tests/auto/network/access/qnetworkreply/test/CMakeLists.txt index 24f264703ff..e60d2546513 100644 --- a/tests/auto/network/access/qnetworkreply/test/CMakeLists.txt +++ b/tests/auto/network/access/qnetworkreply/test/CMakeLists.txt @@ -17,7 +17,7 @@ list(APPEND test_data "../certs") list(APPEND test_data "../index.html") list(APPEND test_data "../smb-file.txt") -qt_add_test(tst_qnetworkreply +qt_internal_add_test(tst_qnetworkreply OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../" # special case SOURCES ../../../../../shared/emulationdetector.h @@ -39,7 +39,7 @@ set(qnetworkreply_resource_files "resource" ) -qt_add_resource(tst_qnetworkreply "qnetworkreply" +qt_internal_add_resource(tst_qnetworkreply "qnetworkreply" PREFIX "/" BASE diff --git a/tests/auto/network/access/qnetworkrequest/CMakeLists.txt b/tests/auto/network/access/qnetworkrequest/CMakeLists.txt index 2334165c3a9..1a984495493 100644 --- a/tests/auto/network/access/qnetworkrequest/CMakeLists.txt +++ b/tests/auto/network/access/qnetworkrequest/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qnetworkrequest Test: ##################################################################### -qt_add_test(tst_qnetworkrequest +qt_internal_add_test(tst_qnetworkrequest SOURCES tst_qnetworkrequest.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/network/kernel/qauthenticator/CMakeLists.txt b/tests/auto/network/kernel/qauthenticator/CMakeLists.txt index a4d5d7f277f..0e8cde7a44c 100644 --- a/tests/auto/network/kernel/qauthenticator/CMakeLists.txt +++ b/tests/auto/network/kernel/qauthenticator/CMakeLists.txt @@ -8,7 +8,7 @@ endif() ## tst_qauthenticator Test: ##################################################################### -qt_add_test(tst_qauthenticator +qt_internal_add_test(tst_qauthenticator SOURCES tst_qauthenticator.cpp DEFINES diff --git a/tests/auto/network/kernel/qdnslookup/CMakeLists.txt b/tests/auto/network/kernel/qdnslookup/CMakeLists.txt index 6736b480b22..b039b4e91b3 100644 --- a/tests/auto/network/kernel/qdnslookup/CMakeLists.txt +++ b/tests/auto/network/kernel/qdnslookup/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qdnslookup Test: ##################################################################### -qt_add_test(tst_qdnslookup +qt_internal_add_test(tst_qdnslookup SOURCES tst_qdnslookup.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/network/kernel/qdnslookup_appless/CMakeLists.txt b/tests/auto/network/kernel/qdnslookup_appless/CMakeLists.txt index 1730879bd22..1505228176a 100644 --- a/tests/auto/network/kernel/qdnslookup_appless/CMakeLists.txt +++ b/tests/auto/network/kernel/qdnslookup_appless/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qdnslookup_appless Test: ##################################################################### -qt_add_test(tst_qdnslookup_appless +qt_internal_add_test(tst_qdnslookup_appless SOURCES tst_qdnslookup_appless.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/network/kernel/qhostaddress/CMakeLists.txt b/tests/auto/network/kernel/qhostaddress/CMakeLists.txt index c1999c8db2f..a33ae6d7091 100644 --- a/tests/auto/network/kernel/qhostaddress/CMakeLists.txt +++ b/tests/auto/network/kernel/qhostaddress/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qhostaddress Test: ##################################################################### -qt_add_test(tst_qhostaddress +qt_internal_add_test(tst_qhostaddress SOURCES tst_qhostaddress.cpp PUBLIC_LIBRARIES @@ -14,7 +14,7 @@ qt_add_test(tst_qhostaddress ## Scopes: ##################################################################### -qt_extend_target(tst_qhostaddress CONDITION WIN32 +qt_internal_extend_target(tst_qhostaddress CONDITION WIN32 PUBLIC_LIBRARIES ws2_32 ) diff --git a/tests/auto/network/kernel/qhostinfo/CMakeLists.txt b/tests/auto/network/kernel/qhostinfo/CMakeLists.txt index b571718d258..40e0456d5f7 100644 --- a/tests/auto/network/kernel/qhostinfo/CMakeLists.txt +++ b/tests/auto/network/kernel/qhostinfo/CMakeLists.txt @@ -8,7 +8,7 @@ endif() ## tst_qhostinfo Test: ##################################################################### -qt_add_test(tst_qhostinfo +qt_internal_add_test(tst_qhostinfo SOURCES tst_qhostinfo.cpp PUBLIC_LIBRARIES @@ -22,7 +22,7 @@ qt_add_test(tst_qhostinfo ## Scopes: ##################################################################### -qt_extend_target(tst_qhostinfo CONDITION WIN32 +qt_internal_extend_target(tst_qhostinfo CONDITION WIN32 PUBLIC_LIBRARIES ws2_32 ) diff --git a/tests/auto/network/kernel/qnetworkaddressentry/CMakeLists.txt b/tests/auto/network/kernel/qnetworkaddressentry/CMakeLists.txt index 3dcfd2ac9b2..bc9463aa13c 100644 --- a/tests/auto/network/kernel/qnetworkaddressentry/CMakeLists.txt +++ b/tests/auto/network/kernel/qnetworkaddressentry/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qnetworkaddressentry Test: ##################################################################### -qt_add_test(tst_qnetworkaddressentry +qt_internal_add_test(tst_qnetworkaddressentry SOURCES tst_qnetworkaddressentry.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/network/kernel/qnetworkdatagram/CMakeLists.txt b/tests/auto/network/kernel/qnetworkdatagram/CMakeLists.txt index 4ae11ab146a..13dcbcb2e3f 100644 --- a/tests/auto/network/kernel/qnetworkdatagram/CMakeLists.txt +++ b/tests/auto/network/kernel/qnetworkdatagram/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qnetworkdatagram Test: ##################################################################### -qt_add_test(tst_qnetworkdatagram +qt_internal_add_test(tst_qnetworkdatagram SOURCES tst_qnetworkdatagram.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/network/kernel/qnetworkinterface/CMakeLists.txt b/tests/auto/network/kernel/qnetworkinterface/CMakeLists.txt index 7bf840881a0..ecce69cb04e 100644 --- a/tests/auto/network/kernel/qnetworkinterface/CMakeLists.txt +++ b/tests/auto/network/kernel/qnetworkinterface/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qnetworkinterface Test: ##################################################################### -qt_add_test(tst_qnetworkinterface +qt_internal_add_test(tst_qnetworkinterface SOURCES ../../../../shared/emulationdetector.h tst_qnetworkinterface.cpp diff --git a/tests/auto/network/kernel/qnetworkproxy/CMakeLists.txt b/tests/auto/network/kernel/qnetworkproxy/CMakeLists.txt index 4402ba4a72e..40650726a73 100644 --- a/tests/auto/network/kernel/qnetworkproxy/CMakeLists.txt +++ b/tests/auto/network/kernel/qnetworkproxy/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qnetworkproxy Test: ##################################################################### -qt_add_test(tst_qnetworkproxy +qt_internal_add_test(tst_qnetworkproxy SOURCES tst_qnetworkproxy.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/network/kernel/qnetworkproxyfactory/CMakeLists.txt b/tests/auto/network/kernel/qnetworkproxyfactory/CMakeLists.txt index e8bc9beefb3..e9e2d8ae0ba 100644 --- a/tests/auto/network/kernel/qnetworkproxyfactory/CMakeLists.txt +++ b/tests/auto/network/kernel/qnetworkproxyfactory/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qnetworkproxyfactory Test: ##################################################################### -qt_add_test(tst_qnetworkproxyfactory +qt_internal_add_test(tst_qnetworkproxyfactory SOURCES tst_qnetworkproxyfactory.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/network/socket/platformsocketengine/CMakeLists.txt b/tests/auto/network/socket/platformsocketengine/CMakeLists.txt index 780826f2113..21bc3e2c80b 100644 --- a/tests/auto/network/socket/platformsocketengine/CMakeLists.txt +++ b/tests/auto/network/socket/platformsocketengine/CMakeLists.txt @@ -8,7 +8,7 @@ endif() ## tst_platformsocketengine Test: ##################################################################### -qt_add_test(tst_platformsocketengine +qt_internal_add_test(tst_platformsocketengine SOURCES tst_platformsocketengine.cpp INCLUDE_DIRECTORIES @@ -25,7 +25,7 @@ qt_add_test(tst_platformsocketengine ## Scopes: ##################################################################### -qt_extend_target(tst_platformsocketengine CONDITION WIN32 +qt_internal_extend_target(tst_platformsocketengine CONDITION WIN32 PUBLIC_LIBRARIES ws2_32 ) diff --git a/tests/auto/network/socket/qabstractsocket/CMakeLists.txt b/tests/auto/network/socket/qabstractsocket/CMakeLists.txt index b5de9360c39..ee83261ab0b 100644 --- a/tests/auto/network/socket/qabstractsocket/CMakeLists.txt +++ b/tests/auto/network/socket/qabstractsocket/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qabstractsocket Test: ##################################################################### -qt_add_test(tst_qabstractsocket +qt_internal_add_test(tst_qabstractsocket SOURCES tst_qabstractsocket.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/network/socket/qhttpsocketengine/.prev_CMakeLists.txt b/tests/auto/network/socket/qhttpsocketengine/.prev_CMakeLists.txt index 8afcdc3376c..cb36b4c6e08 100644 --- a/tests/auto/network/socket/qhttpsocketengine/.prev_CMakeLists.txt +++ b/tests/auto/network/socket/qhttpsocketengine/.prev_CMakeLists.txt @@ -8,7 +8,7 @@ endif() ## tst_qhttpsocketengine Test: ##################################################################### -qt_add_test(tst_qhttpsocketengine +qt_internal_add_test(tst_qhttpsocketengine SOURCES tst_qhttpsocketengine.cpp INCLUDE_DIRECTORIES @@ -28,7 +28,7 @@ qt_add_test(tst_qhttpsocketengine #### Keys ignored in scope 2:.:.:qhttpsocketengine.pro:LINUX: # QT_TEST_SERVER_LIST = "squid" "danted" "cyrus" "apache2" -qt_extend_target(tst_qhttpsocketengine CONDITION WIN32 +qt_internal_extend_target(tst_qhttpsocketengine CONDITION WIN32 PUBLIC_LIBRARIES ws2_32 ) diff --git a/tests/auto/network/socket/qhttpsocketengine/CMakeLists.txt b/tests/auto/network/socket/qhttpsocketengine/CMakeLists.txt index 5b4a9d01953..1d8e759f26c 100644 --- a/tests/auto/network/socket/qhttpsocketengine/CMakeLists.txt +++ b/tests/auto/network/socket/qhttpsocketengine/CMakeLists.txt @@ -8,7 +8,7 @@ endif() ## tst_qhttpsocketengine Test: ##################################################################### -qt_add_test(tst_qhttpsocketengine +qt_internal_add_test(tst_qhttpsocketengine SOURCES tst_qhttpsocketengine.cpp INCLUDE_DIRECTORIES @@ -29,7 +29,7 @@ qt_add_test(tst_qhttpsocketengine #### Keys ignored in scope 2:.:.:qhttpsocketengine.pro:LINUX: # QT_TEST_SERVER_LIST = "squid" "danted" "cyrus" "apache2" -qt_extend_target(tst_qhttpsocketengine CONDITION WIN32 +qt_internal_extend_target(tst_qhttpsocketengine CONDITION WIN32 PUBLIC_LIBRARIES ws2_32 ) diff --git a/tests/auto/network/socket/qlocalsocket/socketprocess/CMakeLists.txt b/tests/auto/network/socket/qlocalsocket/socketprocess/CMakeLists.txt index 5f382b114a2..adf1752ac0b 100644 --- a/tests/auto/network/socket/qlocalsocket/socketprocess/CMakeLists.txt +++ b/tests/auto/network/socket/qlocalsocket/socketprocess/CMakeLists.txt @@ -4,7 +4,7 @@ ## socketprocess Binary: ##################################################################### -qt_add_executable(socketprocess +qt_internal_add_executable(socketprocess OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" SOURCES main.cpp diff --git a/tests/auto/network/socket/qlocalsocket/test/CMakeLists.txt b/tests/auto/network/socket/qlocalsocket/test/CMakeLists.txt index 02017adbca5..3a2899239fd 100644 --- a/tests/auto/network/socket/qlocalsocket/test/CMakeLists.txt +++ b/tests/auto/network/socket/qlocalsocket/test/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qlocalsocket Test: ##################################################################### -qt_add_test(tst_qlocalsocket +qt_internal_add_test(tst_qlocalsocket SOURCES ../tst_qlocalsocket.cpp DEFINES diff --git a/tests/auto/network/socket/qsctpsocket/CMakeLists.txt b/tests/auto/network/socket/qsctpsocket/CMakeLists.txt index d2d849aa05a..af3f8091139 100644 --- a/tests/auto/network/socket/qsctpsocket/CMakeLists.txt +++ b/tests/auto/network/socket/qsctpsocket/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qsctpsocket Test: ##################################################################### -qt_add_test(tst_qsctpsocket +qt_internal_add_test(tst_qsctpsocket SOURCES tst_qsctpsocket.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/network/socket/qsocks5socketengine/.prev_CMakeLists.txt b/tests/auto/network/socket/qsocks5socketengine/.prev_CMakeLists.txt index 0b2430c81aa..851e81a40d9 100644 --- a/tests/auto/network/socket/qsocks5socketengine/.prev_CMakeLists.txt +++ b/tests/auto/network/socket/qsocks5socketengine/.prev_CMakeLists.txt @@ -8,7 +8,7 @@ endif() ## tst_qsocks5socketengine Test: ##################################################################### -qt_add_test(tst_qsocks5socketengine +qt_internal_add_test(tst_qsocks5socketengine SOURCES tst_qsocks5socketengine.cpp INCLUDE_DIRECTORIES @@ -28,7 +28,7 @@ qt_add_test(tst_qsocks5socketengine #### Keys ignored in scope 2:.:.:qsocks5socketengine.pro:LINUX: # QT_TEST_SERVER_LIST = "danted" "apache2" "cyrus" -qt_extend_target(tst_qsocks5socketengine CONDITION WIN32 +qt_internal_extend_target(tst_qsocks5socketengine CONDITION WIN32 PUBLIC_LIBRARIES ws2_32 ) diff --git a/tests/auto/network/socket/qsocks5socketengine/CMakeLists.txt b/tests/auto/network/socket/qsocks5socketengine/CMakeLists.txt index e46257c123f..47c7698f943 100644 --- a/tests/auto/network/socket/qsocks5socketengine/CMakeLists.txt +++ b/tests/auto/network/socket/qsocks5socketengine/CMakeLists.txt @@ -8,7 +8,7 @@ endif() ## tst_qsocks5socketengine Test: ##################################################################### -qt_add_test(tst_qsocks5socketengine +qt_internal_add_test(tst_qsocks5socketengine SOURCES tst_qsocks5socketengine.cpp INCLUDE_DIRECTORIES @@ -29,7 +29,7 @@ qt_add_test(tst_qsocks5socketengine #### Keys ignored in scope 2:.:.:qsocks5socketengine.pro:LINUX: # QT_TEST_SERVER_LIST = "danted" "apache2" "cyrus" -qt_extend_target(tst_qsocks5socketengine CONDITION WIN32 +qt_internal_extend_target(tst_qsocks5socketengine CONDITION WIN32 PUBLIC_LIBRARIES ws2_32 ) diff --git a/tests/auto/network/socket/qtcpserver/crashingServer/CMakeLists.txt b/tests/auto/network/socket/qtcpserver/crashingServer/CMakeLists.txt index fab02435a60..dd309ba6058 100644 --- a/tests/auto/network/socket/qtcpserver/crashingServer/CMakeLists.txt +++ b/tests/auto/network/socket/qtcpserver/crashingServer/CMakeLists.txt @@ -4,7 +4,7 @@ ## crashingServer Binary: ##################################################################### -qt_add_executable(crashingServer +qt_internal_add_executable(crashingServer OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" SOURCES main.cpp diff --git a/tests/auto/network/socket/qtcpserver/test/.prev_CMakeLists.txt b/tests/auto/network/socket/qtcpserver/test/.prev_CMakeLists.txt index f80fdedcacf..f842fda3114 100644 --- a/tests/auto/network/socket/qtcpserver/test/.prev_CMakeLists.txt +++ b/tests/auto/network/socket/qtcpserver/test/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qtcpserver Test: ##################################################################### -qt_add_test(tst_qtcpserver +qt_internal_add_test(tst_qtcpserver SOURCES ../tst_qtcpserver.cpp PUBLIC_LIBRARIES @@ -17,7 +17,7 @@ qt_add_test(tst_qtcpserver ## Scopes: ##################################################################### -qt_extend_target(tst_qtcpserver CONDITION WIN32 +qt_internal_extend_target(tst_qtcpserver CONDITION WIN32 PUBLIC_LIBRARIES ws2_32 ) diff --git a/tests/auto/network/socket/qtcpserver/test/CMakeLists.txt b/tests/auto/network/socket/qtcpserver/test/CMakeLists.txt index 4d328ebddb2..74aed77c95b 100644 --- a/tests/auto/network/socket/qtcpserver/test/CMakeLists.txt +++ b/tests/auto/network/socket/qtcpserver/test/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qtcpserver Test: ##################################################################### -qt_add_test(tst_qtcpserver +qt_internal_add_test(tst_qtcpserver OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../" # special case SOURCES ../tst_qtcpserver.cpp @@ -19,7 +19,7 @@ qt_add_test(tst_qtcpserver ## Scopes: ##################################################################### -qt_extend_target(tst_qtcpserver CONDITION WIN32 +qt_internal_extend_target(tst_qtcpserver CONDITION WIN32 PUBLIC_LIBRARIES ws2_32 ) diff --git a/tests/auto/network/socket/qtcpsocket/stressTest/CMakeLists.txt b/tests/auto/network/socket/qtcpsocket/stressTest/CMakeLists.txt index 784cee453d1..950c4356e2a 100644 --- a/tests/auto/network/socket/qtcpsocket/stressTest/CMakeLists.txt +++ b/tests/auto/network/socket/qtcpsocket/stressTest/CMakeLists.txt @@ -4,7 +4,7 @@ ## stressTest Binary: ##################################################################### -qt_add_executable(stressTest +qt_internal_add_executable(stressTest OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" SOURCES Test.cpp Test.h diff --git a/tests/auto/network/socket/qtcpsocket/test/.prev_CMakeLists.txt b/tests/auto/network/socket/qtcpsocket/test/.prev_CMakeLists.txt index 22a105887dd..e27383cf941 100644 --- a/tests/auto/network/socket/qtcpsocket/test/.prev_CMakeLists.txt +++ b/tests/auto/network/socket/qtcpsocket/test/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qtcpsocket Test: ##################################################################### -qt_add_test(tst_qtcpsocket +qt_internal_add_test(tst_qtcpsocket SOURCES ../tst_qtcpsocket.cpp PUBLIC_LIBRARIES @@ -15,7 +15,7 @@ qt_add_test(tst_qtcpsocket ## Scopes: ##################################################################### -qt_extend_target(tst_qtcpsocket CONDITION WIN32 +qt_internal_extend_target(tst_qtcpsocket CONDITION WIN32 PUBLIC_LIBRARIES ws2_32 ) diff --git a/tests/auto/network/socket/qtcpsocket/test/CMakeLists.txt b/tests/auto/network/socket/qtcpsocket/test/CMakeLists.txt index 3b4bd856a3b..759f6554178 100644 --- a/tests/auto/network/socket/qtcpsocket/test/CMakeLists.txt +++ b/tests/auto/network/socket/qtcpsocket/test/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qtcpsocket Test: ##################################################################### -qt_add_test(tst_qtcpsocket +qt_internal_add_test(tst_qtcpsocket OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../" # special case SOURCES ../tst_qtcpsocket.cpp @@ -17,7 +17,7 @@ qt_add_test(tst_qtcpsocket ## Scopes: ##################################################################### -qt_extend_target(tst_qtcpsocket CONDITION WIN32 +qt_internal_extend_target(tst_qtcpsocket CONDITION WIN32 PUBLIC_LIBRARIES ws2_32 ) diff --git a/tests/auto/network/socket/qudpsocket/clientserver/CMakeLists.txt b/tests/auto/network/socket/qudpsocket/clientserver/CMakeLists.txt index 12fe8a453a0..7c8b924ca93 100644 --- a/tests/auto/network/socket/qudpsocket/clientserver/CMakeLists.txt +++ b/tests/auto/network/socket/qudpsocket/clientserver/CMakeLists.txt @@ -4,7 +4,7 @@ ## clientserver Binary: ##################################################################### -qt_add_executable(clientserver +qt_internal_add_executable(clientserver OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" SOURCES main.cpp diff --git a/tests/auto/network/socket/qudpsocket/test/.prev_CMakeLists.txt b/tests/auto/network/socket/qudpsocket/test/.prev_CMakeLists.txt index 4c393d67a82..2ef2d8a7967 100644 --- a/tests/auto/network/socket/qudpsocket/test/.prev_CMakeLists.txt +++ b/tests/auto/network/socket/qudpsocket/test/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qudpsocket Test: ##################################################################### -qt_add_test(tst_qudpsocket +qt_internal_add_test(tst_qudpsocket SOURCES ../tst_qudpsocket.cpp INCLUDE_DIRECTORIES diff --git a/tests/auto/network/socket/qudpsocket/test/CMakeLists.txt b/tests/auto/network/socket/qudpsocket/test/CMakeLists.txt index 3da08a0e729..7bd9bd80fba 100644 --- a/tests/auto/network/socket/qudpsocket/test/CMakeLists.txt +++ b/tests/auto/network/socket/qudpsocket/test/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qudpsocket Test: ##################################################################### -qt_add_test(tst_qudpsocket +qt_internal_add_test(tst_qudpsocket OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../" # special case SOURCES ../tst_qudpsocket.cpp diff --git a/tests/auto/network/socket/qudpsocket/udpServer/.prev_CMakeLists.txt b/tests/auto/network/socket/qudpsocket/udpServer/.prev_CMakeLists.txt index 7796fbe4768..00b7ce272e8 100644 --- a/tests/auto/network/socket/qudpsocket/udpServer/.prev_CMakeLists.txt +++ b/tests/auto/network/socket/qudpsocket/udpServer/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## udpServer Binary: ##################################################################### -qt_add_executable(udpServer +qt_internal_add_executable(udpServer SOURCES main.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/network/socket/qudpsocket/udpServer/CMakeLists.txt b/tests/auto/network/socket/qudpsocket/udpServer/CMakeLists.txt index d4909f94b21..4afeb529a71 100644 --- a/tests/auto/network/socket/qudpsocket/udpServer/CMakeLists.txt +++ b/tests/auto/network/socket/qudpsocket/udpServer/CMakeLists.txt @@ -4,7 +4,7 @@ ## udpServer Binary: ##################################################################### -qt_add_executable(udpServer +qt_internal_add_executable(udpServer OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/./" # special case SOURCES main.cpp diff --git a/tests/auto/network/ssl/qasn1element/CMakeLists.txt b/tests/auto/network/ssl/qasn1element/CMakeLists.txt index a97a2136037..4fab2f3e3e2 100644 --- a/tests/auto/network/ssl/qasn1element/CMakeLists.txt +++ b/tests/auto/network/ssl/qasn1element/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qasn1element Test: ##################################################################### -qt_add_test(tst_qasn1element +qt_internal_add_test(tst_qasn1element SOURCES tst_qasn1element.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/network/ssl/qdtls/CMakeLists.txt b/tests/auto/network/ssl/qdtls/CMakeLists.txt index 8072d8d0e08..310629370cc 100644 --- a/tests/auto/network/ssl/qdtls/CMakeLists.txt +++ b/tests/auto/network/ssl/qdtls/CMakeLists.txt @@ -7,7 +7,7 @@ # Collect test data list(APPEND test_data "certs") -qt_add_test(tst_qdtls +qt_internal_add_test(tst_qdtls SOURCES tst_qdtls.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/network/ssl/qdtlscookie/CMakeLists.txt b/tests/auto/network/ssl/qdtlscookie/CMakeLists.txt index c08bf6150af..28b1418173e 100644 --- a/tests/auto/network/ssl/qdtlscookie/CMakeLists.txt +++ b/tests/auto/network/ssl/qdtlscookie/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qdtlscookie Test: ##################################################################### -qt_add_test(tst_qdtlscookie +qt_internal_add_test(tst_qdtlscookie SOURCES tst_qdtlscookie.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/network/ssl/qocsp/CMakeLists.txt b/tests/auto/network/ssl/qocsp/CMakeLists.txt index 79974610049..827c81e9d8a 100644 --- a/tests/auto/network/ssl/qocsp/CMakeLists.txt +++ b/tests/auto/network/ssl/qocsp/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qocsp Test: ##################################################################### -qt_add_test(tst_qocsp +qt_internal_add_test(tst_qocsp SOURCES tst_qocsp.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/network/ssl/qpassworddigestor/CMakeLists.txt b/tests/auto/network/ssl/qpassworddigestor/CMakeLists.txt index 1bb8b2f29b1..29eb26e3776 100644 --- a/tests/auto/network/ssl/qpassworddigestor/CMakeLists.txt +++ b/tests/auto/network/ssl/qpassworddigestor/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qpassworddigestor Test: ##################################################################### -qt_add_test(tst_qpassworddigestor +qt_internal_add_test(tst_qpassworddigestor SOURCES tst_qpassworddigestor.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/network/ssl/qsslcertificate/.prev_CMakeLists.txt b/tests/auto/network/ssl/qsslcertificate/.prev_CMakeLists.txt index c55b2a86a3f..8136351f109 100644 --- a/tests/auto/network/ssl/qsslcertificate/.prev_CMakeLists.txt +++ b/tests/auto/network/ssl/qsslcertificate/.prev_CMakeLists.txt @@ -22,7 +22,7 @@ file(GLOB_RECURSE test_data_glob pkcs12/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qsslcertificate +qt_internal_add_test(tst_qsslcertificate SOURCES tst_qsslcertificate.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/network/ssl/qsslcertificate/CMakeLists.txt b/tests/auto/network/ssl/qsslcertificate/CMakeLists.txt index 7dd8fa00db5..caeac8d68a4 100644 --- a/tests/auto/network/ssl/qsslcertificate/CMakeLists.txt +++ b/tests/auto/network/ssl/qsslcertificate/CMakeLists.txt @@ -29,7 +29,7 @@ file(GLOB_RECURSE test_data_glob pkcs12/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qsslcertificate +qt_internal_add_test(tst_qsslcertificate SOURCES tst_qsslcertificate.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/network/ssl/qsslcipher/CMakeLists.txt b/tests/auto/network/ssl/qsslcipher/CMakeLists.txt index b6a2348fca6..b8e8ba47d6f 100644 --- a/tests/auto/network/ssl/qsslcipher/CMakeLists.txt +++ b/tests/auto/network/ssl/qsslcipher/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qsslcipher Test: ##################################################################### -qt_add_test(tst_qsslcipher +qt_internal_add_test(tst_qsslcipher SOURCES tst_qsslcipher.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/network/ssl/qssldiffiehellmanparameters/CMakeLists.txt b/tests/auto/network/ssl/qssldiffiehellmanparameters/CMakeLists.txt index 0beb8960187..0ef55a7b554 100644 --- a/tests/auto/network/ssl/qssldiffiehellmanparameters/CMakeLists.txt +++ b/tests/auto/network/ssl/qssldiffiehellmanparameters/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qssldiffiehellmanparameters Test: ##################################################################### -qt_add_test(tst_qssldiffiehellmanparameters +qt_internal_add_test(tst_qssldiffiehellmanparameters SOURCES tst_qssldiffiehellmanparameters.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/network/ssl/qsslellipticcurve/CMakeLists.txt b/tests/auto/network/ssl/qsslellipticcurve/CMakeLists.txt index 89ee2a1b917..bf4d255d193 100644 --- a/tests/auto/network/ssl/qsslellipticcurve/CMakeLists.txt +++ b/tests/auto/network/ssl/qsslellipticcurve/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qsslellipticcurve Test: ##################################################################### -qt_add_test(tst_qsslellipticcurve +qt_internal_add_test(tst_qsslellipticcurve SOURCES tst_qsslellipticcurve.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/network/ssl/qsslerror/CMakeLists.txt b/tests/auto/network/ssl/qsslerror/CMakeLists.txt index 8324220b46c..e9dd0953baa 100644 --- a/tests/auto/network/ssl/qsslerror/CMakeLists.txt +++ b/tests/auto/network/ssl/qsslerror/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qsslerror Test: ##################################################################### -qt_add_test(tst_qsslerror +qt_internal_add_test(tst_qsslerror SOURCES tst_qsslerror.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/network/ssl/qsslkey/CMakeLists.txt b/tests/auto/network/ssl/qsslkey/CMakeLists.txt index e83f4c1f40d..8bf450f8fd5 100644 --- a/tests/auto/network/ssl/qsslkey/CMakeLists.txt +++ b/tests/auto/network/ssl/qsslkey/CMakeLists.txt @@ -14,7 +14,7 @@ file(GLOB_RECURSE test_data_glob rsa-*.pem) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qsslkey +qt_internal_add_test(tst_qsslkey SOURCES tst_qsslkey.cpp PUBLIC_LIBRARIES @@ -25,7 +25,7 @@ qt_add_test(tst_qsslkey ## Scopes: ##################################################################### -qt_extend_target(tst_qsslkey CONDITION QT_FEATURE_private_tests +qt_internal_extend_target(tst_qsslkey CONDITION QT_FEATURE_private_tests PUBLIC_LIBRARIES Qt::CorePrivate Qt::NetworkPrivate diff --git a/tests/auto/network/ssl/qsslsocket/.prev_CMakeLists.txt b/tests/auto/network/ssl/qsslsocket/.prev_CMakeLists.txt index 59ab6ff93a4..5b37c90e51c 100644 --- a/tests/auto/network/ssl/qsslsocket/.prev_CMakeLists.txt +++ b/tests/auto/network/ssl/qsslsocket/.prev_CMakeLists.txt @@ -11,7 +11,7 @@ endif() # Collect test data list(APPEND test_data "certs") -qt_add_test(tst_qsslsocket +qt_internal_add_test(tst_qsslsocket SOURCES tst_qsslsocket.cpp DEFINES diff --git a/tests/auto/network/ssl/qsslsocket/CMakeLists.txt b/tests/auto/network/ssl/qsslsocket/CMakeLists.txt index d0307042f49..3d973fcde0b 100644 --- a/tests/auto/network/ssl/qsslsocket/CMakeLists.txt +++ b/tests/auto/network/ssl/qsslsocket/CMakeLists.txt @@ -11,7 +11,7 @@ endif() # Collect test data list(APPEND test_data "certs") -qt_add_test(tst_qsslsocket +qt_internal_add_test(tst_qsslsocket SOURCES tst_qsslsocket.cpp DEFINES diff --git a/tests/auto/network/ssl/qsslsocket_onDemandCertificates_member/.prev_CMakeLists.txt b/tests/auto/network/ssl/qsslsocket_onDemandCertificates_member/.prev_CMakeLists.txt index 9a1beaeb766..649548bc4f4 100644 --- a/tests/auto/network/ssl/qsslsocket_onDemandCertificates_member/.prev_CMakeLists.txt +++ b/tests/auto/network/ssl/qsslsocket_onDemandCertificates_member/.prev_CMakeLists.txt @@ -8,7 +8,7 @@ endif() ## tst_qsslsocket_onDemandCertificates_member Test: ##################################################################### -qt_add_test(tst_qsslsocket_onDemandCertificates_member +qt_internal_add_test(tst_qsslsocket_onDemandCertificates_member SOURCES tst_qsslsocket_onDemandCertificates_member.cpp DEFINES diff --git a/tests/auto/network/ssl/qsslsocket_onDemandCertificates_member/CMakeLists.txt b/tests/auto/network/ssl/qsslsocket_onDemandCertificates_member/CMakeLists.txt index 0d6b8a4c4ac..3f68cbfdf44 100644 --- a/tests/auto/network/ssl/qsslsocket_onDemandCertificates_member/CMakeLists.txt +++ b/tests/auto/network/ssl/qsslsocket_onDemandCertificates_member/CMakeLists.txt @@ -8,7 +8,7 @@ endif() ## tst_qsslsocket_onDemandCertificates_member Test: ##################################################################### -qt_add_test(tst_qsslsocket_onDemandCertificates_member +qt_internal_add_test(tst_qsslsocket_onDemandCertificates_member SOURCES tst_qsslsocket_onDemandCertificates_member.cpp DEFINES diff --git a/tests/auto/network/ssl/qsslsocket_onDemandCertificates_static/.prev_CMakeLists.txt b/tests/auto/network/ssl/qsslsocket_onDemandCertificates_static/.prev_CMakeLists.txt index f8d6735c20c..a0b6fc59f97 100644 --- a/tests/auto/network/ssl/qsslsocket_onDemandCertificates_static/.prev_CMakeLists.txt +++ b/tests/auto/network/ssl/qsslsocket_onDemandCertificates_static/.prev_CMakeLists.txt @@ -8,7 +8,7 @@ endif() ## tst_qsslsocket_onDemandCertificates_static Test: ##################################################################### -qt_add_test(tst_qsslsocket_onDemandCertificates_static +qt_internal_add_test(tst_qsslsocket_onDemandCertificates_static SOURCES tst_qsslsocket_onDemandCertificates_static.cpp DEFINES diff --git a/tests/auto/network/ssl/qsslsocket_onDemandCertificates_static/CMakeLists.txt b/tests/auto/network/ssl/qsslsocket_onDemandCertificates_static/CMakeLists.txt index b17da05d86e..976143f6499 100644 --- a/tests/auto/network/ssl/qsslsocket_onDemandCertificates_static/CMakeLists.txt +++ b/tests/auto/network/ssl/qsslsocket_onDemandCertificates_static/CMakeLists.txt @@ -8,7 +8,7 @@ endif() ## tst_qsslsocket_onDemandCertificates_static Test: ##################################################################### -qt_add_test(tst_qsslsocket_onDemandCertificates_static +qt_internal_add_test(tst_qsslsocket_onDemandCertificates_static SOURCES tst_qsslsocket_onDemandCertificates_static.cpp DEFINES diff --git a/tests/auto/other/android/CMakeLists.txt b/tests/auto/other/android/CMakeLists.txt index 437a4ee9d22..d58103679b8 100644 --- a/tests/auto/other/android/CMakeLists.txt +++ b/tests/auto/other/android/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_android Test: ##################################################################### -qt_add_test(tst_android +qt_internal_add_test(tst_android SOURCES tst_android.cpp ) diff --git a/tests/auto/other/compiler/.prev_CMakeLists.txt b/tests/auto/other/compiler/.prev_CMakeLists.txt index 4a9cdcef14d..7de467460c6 100644 --- a/tests/auto/other/compiler/.prev_CMakeLists.txt +++ b/tests/auto/other/compiler/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_compiler Test: ##################################################################### -qt_add_test(tst_compiler +qt_internal_add_test(tst_compiler SOURCES baseclass.cpp baseclass.h derivedclass.cpp derivedclass.h diff --git a/tests/auto/other/compiler/CMakeLists.txt b/tests/auto/other/compiler/CMakeLists.txt index 6aa7c439665..30c7ab1b525 100644 --- a/tests/auto/other/compiler/CMakeLists.txt +++ b/tests/auto/other/compiler/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_compiler Test: ##################################################################### -qt_add_test(tst_compiler +qt_internal_add_test(tst_compiler EXCEPTIONS # special case SOURCES baseclass.cpp baseclass.h diff --git a/tests/auto/other/gestures/CMakeLists.txt b/tests/auto/other/gestures/CMakeLists.txt index 71bcc22f012..e4ea953ee3f 100644 --- a/tests/auto/other/gestures/CMakeLists.txt +++ b/tests/auto/other/gestures/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_gestures Test: ##################################################################### -qt_add_test(tst_gestures +qt_internal_add_test(tst_gestures SOURCES tst_gestures.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/other/lancelot/CMakeLists.txt b/tests/auto/other/lancelot/CMakeLists.txt index f485a48ebe0..a4598ab65aa 100644 --- a/tests/auto/other/lancelot/CMakeLists.txt +++ b/tests/auto/other/lancelot/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob scripts/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_lancelot +qt_internal_add_test(tst_lancelot SOURCES ../../../baselineserver/shared/baselineprotocol.cpp ../../../baselineserver/shared/baselineprotocol.h ../../../baselineserver/shared/lookup3.cpp @@ -61,7 +61,7 @@ set(images_resource_files "images/zebra.png" ) -qt_add_resource(tst_lancelot "images" +qt_internal_add_resource(tst_lancelot "images" PREFIX "/" FILES @@ -72,7 +72,7 @@ qt_add_resource(tst_lancelot "images" ## Scopes: ##################################################################### -qt_extend_target(tst_lancelot CONDITION QT_FEATURE_opengl +qt_internal_extend_target(tst_lancelot CONDITION QT_FEATURE_opengl PUBLIC_LIBRARIES Qt::OpenGL ) diff --git a/tests/auto/other/languagechange/CMakeLists.txt b/tests/auto/other/languagechange/CMakeLists.txt index 0ace85d6548..0275ea05fd4 100644 --- a/tests/auto/other/languagechange/CMakeLists.txt +++ b/tests/auto/other/languagechange/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_languagechange Test: ##################################################################### -qt_add_test(tst_languagechange +qt_internal_add_test(tst_languagechange SOURCES tst_languagechange.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/other/macgui/.prev_CMakeLists.txt b/tests/auto/other/macgui/.prev_CMakeLists.txt index e9b794dcdc7..10facb3050c 100644 --- a/tests/auto/other/macgui/.prev_CMakeLists.txt +++ b/tests/auto/other/macgui/.prev_CMakeLists.txt @@ -11,7 +11,7 @@ endif() ## tst_macgui Test: ##################################################################### -qt_add_test(tst_macgui +qt_internal_add_test(tst_macgui SOURCES guitest.cpp guitest.h tst_macgui.cpp @@ -26,7 +26,7 @@ qt_add_test(tst_macgui ## Scopes: ##################################################################### -qt_extend_target(tst_macgui CONDITION MACOS +qt_internal_extend_target(tst_macgui CONDITION MACOS PUBLIC_LIBRARIES ${FWApplicationServices} ) diff --git a/tests/auto/other/macgui/CMakeLists.txt b/tests/auto/other/macgui/CMakeLists.txt index 116049bd851..348d7f1241e 100644 --- a/tests/auto/other/macgui/CMakeLists.txt +++ b/tests/auto/other/macgui/CMakeLists.txt @@ -11,7 +11,7 @@ endif() ## tst_macgui Test: ##################################################################### -qt_add_test(tst_macgui +qt_internal_add_test(tst_macgui SOURCES guitest.cpp guitest.h tst_macgui.cpp @@ -26,7 +26,7 @@ qt_add_test(tst_macgui ## Scopes: ##################################################################### -qt_extend_target(tst_macgui CONDITION MACOS +qt_internal_extend_target(tst_macgui CONDITION MACOS PUBLIC_LIBRARIES ${FWApplicationServices} ) diff --git a/tests/auto/other/macnativeevents/CMakeLists.txt b/tests/auto/other/macnativeevents/CMakeLists.txt index f22996a66e2..dd049c245a7 100644 --- a/tests/auto/other/macnativeevents/CMakeLists.txt +++ b/tests/auto/other/macnativeevents/CMakeLists.txt @@ -8,7 +8,7 @@ endif() ## tst_macnativeevents Test: ##################################################################### -qt_add_test(tst_macnativeevents +qt_internal_add_test(tst_macnativeevents SOURCES expectedeventlist.cpp expectedeventlist.h nativeeventlist.cpp nativeeventlist.h diff --git a/tests/auto/other/macplist/app/.prev_CMakeLists.txt b/tests/auto/other/macplist/app/.prev_CMakeLists.txt index 0cf205bf55b..c3c49ffd840 100644 --- a/tests/auto/other/macplist/app/.prev_CMakeLists.txt +++ b/tests/auto/other/macplist/app/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## app Binary: ##################################################################### -qt_add_executable(app +qt_internal_add_executable(app GUI SOURCES main.cpp diff --git a/tests/auto/other/macplist/app/CMakeLists.txt b/tests/auto/other/macplist/app/CMakeLists.txt index 65ccfee32b2..127d72b1e4e 100644 --- a/tests/auto/other/macplist/app/CMakeLists.txt +++ b/tests/auto/other/macplist/app/CMakeLists.txt @@ -4,7 +4,7 @@ ## app Binary: ##################################################################### -qt_add_executable(app +qt_internal_add_executable(app GUI OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case SOURCES diff --git a/tests/auto/other/macplist/test/CMakeLists.txt b/tests/auto/other/macplist/test/CMakeLists.txt index 23faffbdcfe..157df5767fc 100644 --- a/tests/auto/other/macplist/test/CMakeLists.txt +++ b/tests/auto/other/macplist/test/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_macplist Test: ##################################################################### -qt_add_test(tst_macplist +qt_internal_add_test(tst_macplist OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../" SOURCES ../tst_macplist.cpp diff --git a/tests/auto/other/networkselftest/CMakeLists.txt b/tests/auto/other/networkselftest/CMakeLists.txt index 7093ed0160c..17bbd7fae09 100644 --- a/tests/auto/other/networkselftest/CMakeLists.txt +++ b/tests/auto/other/networkselftest/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_networkselftest Test: ##################################################################### -qt_add_test(tst_networkselftest +qt_internal_add_test(tst_networkselftest SOURCES tst_networkselftest.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/other/qaccessibility/.prev_CMakeLists.txt b/tests/auto/other/qaccessibility/.prev_CMakeLists.txt index edbea40cc29..bbdb16ac89f 100644 --- a/tests/auto/other/qaccessibility/.prev_CMakeLists.txt +++ b/tests/auto/other/qaccessibility/.prev_CMakeLists.txt @@ -8,7 +8,7 @@ endif() ## tst_qaccessibility Test: ##################################################################### -qt_add_test(tst_qaccessibility +qt_internal_add_test(tst_qaccessibility SOURCES accessiblewidgets.h tst_qaccessibility.cpp @@ -26,12 +26,12 @@ qt_add_test(tst_qaccessibility ## Scopes: ##################################################################### -qt_extend_target(tst_qaccessibility CONDITION UNIX AND NOT APPLE AND NOT HAIKU AND NOT integity +qt_internal_extend_target(tst_qaccessibility CONDITION UNIX AND NOT APPLE AND NOT HAIKU AND NOT integity PUBLIC_LIBRARIES m ) -qt_extend_target(tst_qaccessibility CONDITION WIN32 +qt_internal_extend_target(tst_qaccessibility CONDITION WIN32 PUBLIC_LIBRARIES ole32 oleacc diff --git a/tests/auto/other/qaccessibility/CMakeLists.txt b/tests/auto/other/qaccessibility/CMakeLists.txt index 53960845abc..9752b196395 100644 --- a/tests/auto/other/qaccessibility/CMakeLists.txt +++ b/tests/auto/other/qaccessibility/CMakeLists.txt @@ -14,7 +14,7 @@ endif() ## tst_qaccessibility Test: ##################################################################### -qt_add_test(tst_qaccessibility +qt_internal_add_test(tst_qaccessibility SOURCES accessiblewidgets.h tst_qaccessibility.cpp @@ -32,12 +32,12 @@ qt_add_test(tst_qaccessibility ## Scopes: ##################################################################### -qt_extend_target(tst_qaccessibility CONDITION UNIX AND NOT APPLE AND NOT HAIKU AND NOT integity +qt_internal_extend_target(tst_qaccessibility CONDITION UNIX AND NOT APPLE AND NOT HAIKU AND NOT integity PUBLIC_LIBRARIES m ) -qt_extend_target(tst_qaccessibility CONDITION WIN32 +qt_internal_extend_target(tst_qaccessibility CONDITION WIN32 PUBLIC_LIBRARIES ole32 oleacc diff --git a/tests/auto/other/qaccessibilitylinux/.prev_CMakeLists.txt b/tests/auto/other/qaccessibilitylinux/.prev_CMakeLists.txt index 8d48b5a0fa0..5f7dc751a48 100644 --- a/tests/auto/other/qaccessibilitylinux/.prev_CMakeLists.txt +++ b/tests/auto/other/qaccessibilitylinux/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qaccessibilitylinux Test: ##################################################################### -qt_add_test(tst_qaccessibilitylinux +qt_internal_add_test(tst_qaccessibilitylinux SOURCES tst_qaccessibilitylinux.cpp DBUS_INTERFACE_SOURCES diff --git a/tests/auto/other/qaccessibilitylinux/CMakeLists.txt b/tests/auto/other/qaccessibilitylinux/CMakeLists.txt index 70f0c67f98a..ba6443d3646 100644 --- a/tests/auto/other/qaccessibilitylinux/CMakeLists.txt +++ b/tests/auto/other/qaccessibilitylinux/CMakeLists.txt @@ -10,7 +10,7 @@ endif() ## tst_qaccessibilitylinux Test: ##################################################################### -qt_add_test(tst_qaccessibilitylinux +qt_internal_add_test(tst_qaccessibilitylinux SOURCES tst_qaccessibilitylinux.cpp DBUS_INTERFACE_SOURCES diff --git a/tests/auto/other/qaccessibilitymac/CMakeLists.txt b/tests/auto/other/qaccessibilitymac/CMakeLists.txt index 40a4527011a..6dd30a6fa18 100644 --- a/tests/auto/other/qaccessibilitymac/CMakeLists.txt +++ b/tests/auto/other/qaccessibilitymac/CMakeLists.txt @@ -8,7 +8,7 @@ endif() ## tst_qaccessibilitymac Test: ##################################################################### -qt_add_test(tst_qaccessibilitymac +qt_internal_add_test(tst_qaccessibilitymac SOURCES tst_qaccessibilitymac.cpp tst_qaccessibilitymac_helpers.h @@ -23,7 +23,7 @@ qt_add_test(tst_qaccessibilitymac ## Scopes: ##################################################################### -qt_extend_target(tst_qaccessibilitymac CONDITION APPLE +qt_internal_extend_target(tst_qaccessibilitymac CONDITION APPLE SOURCES tst_qaccessibilitymac_helpers.mm PUBLIC_LIBRARIES diff --git a/tests/auto/other/qcomplextext/CMakeLists.txt b/tests/auto/other/qcomplextext/CMakeLists.txt index 2b5f951267e..3a86e9096bd 100644 --- a/tests/auto/other/qcomplextext/CMakeLists.txt +++ b/tests/auto/other/qcomplextext/CMakeLists.txt @@ -7,7 +7,7 @@ # Collect test data list(APPEND test_data "data") -qt_add_test(tst_qcomplextext +qt_internal_add_test(tst_qcomplextext SOURCES tst_qcomplextext.cpp PUBLIC_LIBRARIES @@ -27,7 +27,7 @@ if(ANDROID) "data/BidiTest.txt" ) - qt_add_resource(tst_qcomplextext "android_testdata" + qt_internal_add_resource(tst_qcomplextext "android_testdata" PREFIX "/android_testdata" FILES @@ -35,7 +35,7 @@ if(ANDROID) ) endif() -qt_extend_target(tst_qcomplextext CONDITION builtin_testdata +qt_internal_extend_target(tst_qcomplextext CONDITION builtin_testdata DEFINES BUILTIN_TESTDATA ) diff --git a/tests/auto/other/qfocusevent/CMakeLists.txt b/tests/auto/other/qfocusevent/CMakeLists.txt index 01275d7665d..d7f8d5982a7 100644 --- a/tests/auto/other/qfocusevent/CMakeLists.txt +++ b/tests/auto/other/qfocusevent/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qfocusevent Test: ##################################################################### -qt_add_test(tst_qfocusevent +qt_internal_add_test(tst_qfocusevent SOURCES tst_qfocusevent.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/other/qnetworkaccessmanager_and_qprogressdialog/CMakeLists.txt b/tests/auto/other/qnetworkaccessmanager_and_qprogressdialog/CMakeLists.txt index 1e806d4589a..e4041de2334 100644 --- a/tests/auto/other/qnetworkaccessmanager_and_qprogressdialog/CMakeLists.txt +++ b/tests/auto/other/qnetworkaccessmanager_and_qprogressdialog/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qnetworkaccessmanager_and_qprogressdialog Test: ##################################################################### -qt_add_test(tst_qnetworkaccessmanager_and_qprogressdialog +qt_internal_add_test(tst_qnetworkaccessmanager_and_qprogressdialog SOURCES tst_qnetworkaccessmanager_and_qprogressdialog.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/other/qobjectrace/CMakeLists.txt b/tests/auto/other/qobjectrace/CMakeLists.txt index c3189b1da6b..8069b40ad74 100644 --- a/tests/auto/other/qobjectrace/CMakeLists.txt +++ b/tests/auto/other/qobjectrace/CMakeLists.txt @@ -4,7 +4,7 @@ ## qobjectrace Test: ##################################################################### -qt_add_test(qobjectrace +qt_internal_add_test(qobjectrace SOURCES ../../../shared/emulationdetector.h tst_qobjectrace.cpp diff --git a/tests/auto/other/qprocess_and_guieventloop/CMakeLists.txt b/tests/auto/other/qprocess_and_guieventloop/CMakeLists.txt index cbb2d26a871..126feeeb2d3 100644 --- a/tests/auto/other/qprocess_and_guieventloop/CMakeLists.txt +++ b/tests/auto/other/qprocess_and_guieventloop/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qprocess_and_guieventloop Test: ##################################################################### -qt_add_test(tst_qprocess_and_guieventloop +qt_internal_add_test(tst_qprocess_and_guieventloop SOURCES tst_qprocess_and_guieventloop.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/other/qprocess_and_guieventloop/write-read-write/CMakeLists.txt b/tests/auto/other/qprocess_and_guieventloop/write-read-write/CMakeLists.txt index e5b746297f9..87a5e14fc33 100644 --- a/tests/auto/other/qprocess_and_guieventloop/write-read-write/CMakeLists.txt +++ b/tests/auto/other/qprocess_and_guieventloop/write-read-write/CMakeLists.txt @@ -4,7 +4,7 @@ ## write-read-write Binary: ##################################################################### -qt_add_executable(write-read-write +qt_internal_add_executable(write-read-write OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" SOURCES main.cpp diff --git a/tests/auto/other/qsharedpointer_and_qwidget/CMakeLists.txt b/tests/auto/other/qsharedpointer_and_qwidget/CMakeLists.txt index 9abf6a010d1..8ee04910e7e 100644 --- a/tests/auto/other/qsharedpointer_and_qwidget/CMakeLists.txt +++ b/tests/auto/other/qsharedpointer_and_qwidget/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qsharedpointer_and_qwidget Test: ##################################################################### -qt_add_test(tst_qsharedpointer_and_qwidget +qt_internal_add_test(tst_qsharedpointer_and_qwidget SOURCES tst_qsharedpointer_and_qwidget.cpp DEFINES diff --git a/tests/auto/other/qtokenautomaton/CMakeLists.txt b/tests/auto/other/qtokenautomaton/CMakeLists.txt deleted file mode 100644 index f495ddb1c66..00000000000 --- a/tests/auto/other/qtokenautomaton/CMakeLists.txt +++ /dev/null @@ -1,16 +0,0 @@ -# Generated from qtokenautomaton.pro. - -##################################################################### -## tst_qtokenautomaton Test: -##################################################################### - -add_qt_test(tst_qtokenautomaton - SOURCES - tokenizers/basic/basic.cpp tokenizers/basic/basic.h - tokenizers/basicNamespace/basicNamespace.cpp tokenizers/basicNamespace/basicNamespace.h - tokenizers/boilerplate/boilerplate.cpp tokenizers/boilerplate/boilerplate.h - tokenizers/noNamespace/noNamespace.cpp tokenizers/noNamespace/noNamespace.h - tokenizers/noToString/noToString.cpp tokenizers/noToString/noToString.h - tokenizers/withNamespace/withNamespace.cpp tokenizers/withNamespace/withNamespace.h - tst_qtokenautomaton.cpp -) diff --git a/tests/auto/other/toolsupport/CMakeLists.txt b/tests/auto/other/toolsupport/CMakeLists.txt index d13580799c9..686d702a233 100644 --- a/tests/auto/other/toolsupport/CMakeLists.txt +++ b/tests/auto/other/toolsupport/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_toolsupport Test: ##################################################################### -qt_add_test(tst_toolsupport +qt_internal_add_test(tst_toolsupport SOURCES tst_toolsupport.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/other/xkbkeyboard/CMakeLists.txt b/tests/auto/other/xkbkeyboard/CMakeLists.txt index 9c92ff65ba7..206f128cf8c 100644 --- a/tests/auto/other/xkbkeyboard/CMakeLists.txt +++ b/tests/auto/other/xkbkeyboard/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_xkbkeyboard Test: ##################################################################### -qt_add_test(tst_xkbkeyboard +qt_internal_add_test(tst_xkbkeyboard SOURCES tst_xkbkeyboard.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/printsupport/dialogs/qabstractprintdialog/CMakeLists.txt b/tests/auto/printsupport/dialogs/qabstractprintdialog/CMakeLists.txt index 93dbcec5d37..9bc1b3f6b0d 100644 --- a/tests/auto/printsupport/dialogs/qabstractprintdialog/CMakeLists.txt +++ b/tests/auto/printsupport/dialogs/qabstractprintdialog/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qabstractprintdialog Test: ##################################################################### -qt_add_test(tst_qabstractprintdialog +qt_internal_add_test(tst_qabstractprintdialog SOURCES tst_qabstractprintdialog.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/printsupport/kernel/qprintdevice/CMakeLists.txt b/tests/auto/printsupport/kernel/qprintdevice/CMakeLists.txt index 1319828c6b6..8cdd82068ed 100644 --- a/tests/auto/printsupport/kernel/qprintdevice/CMakeLists.txt +++ b/tests/auto/printsupport/kernel/qprintdevice/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qprintdevice Test: ##################################################################### -qt_add_test(tst_qprintdevice +qt_internal_add_test(tst_qprintdevice SOURCES tst_qprintdevice.cpp DEFINES diff --git a/tests/auto/printsupport/kernel/qprinter/CMakeLists.txt b/tests/auto/printsupport/kernel/qprinter/CMakeLists.txt index bd1b5d10338..2fffa945a7b 100644 --- a/tests/auto/printsupport/kernel/qprinter/CMakeLists.txt +++ b/tests/auto/printsupport/kernel/qprinter/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qprinter Test: ##################################################################### -qt_add_test(tst_qprinter +qt_internal_add_test(tst_qprinter SOURCES tst_qprinter.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/printsupport/kernel/qprinterinfo/CMakeLists.txt b/tests/auto/printsupport/kernel/qprinterinfo/CMakeLists.txt index b1fb41c4911..18a093c4e3f 100644 --- a/tests/auto/printsupport/kernel/qprinterinfo/CMakeLists.txt +++ b/tests/auto/printsupport/kernel/qprinterinfo/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qprinterinfo Test: ##################################################################### -qt_add_test(tst_qprinterinfo +qt_internal_add_test(tst_qprinterinfo SOURCES tst_qprinterinfo.cpp DEFINES diff --git a/tests/auto/sql/kernel/qsql/CMakeLists.txt b/tests/auto/sql/kernel/qsql/CMakeLists.txt index 24ae110fd32..b42a1b110de 100644 --- a/tests/auto/sql/kernel/qsql/CMakeLists.txt +++ b/tests/auto/sql/kernel/qsql/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qsql Test: ##################################################################### -qt_add_test(tst_qsql +qt_internal_add_test(tst_qsql SOURCES tst_qsql.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/sql/kernel/qsqldatabase/CMakeLists.txt b/tests/auto/sql/kernel/qsqldatabase/CMakeLists.txt index 9eccc47e520..aebf9013ff1 100644 --- a/tests/auto/sql/kernel/qsqldatabase/CMakeLists.txt +++ b/tests/auto/sql/kernel/qsqldatabase/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qsqldatabase Test: ##################################################################### -qt_add_test(tst_qsqldatabase +qt_internal_add_test(tst_qsqldatabase SOURCES tst_qsqldatabase.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/sql/kernel/qsqldriver/CMakeLists.txt b/tests/auto/sql/kernel/qsqldriver/CMakeLists.txt index 9d7d61487c1..0acfed40eea 100644 --- a/tests/auto/sql/kernel/qsqldriver/CMakeLists.txt +++ b/tests/auto/sql/kernel/qsqldriver/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qsqldriver Test: ##################################################################### -qt_add_test(tst_qsqldriver +qt_internal_add_test(tst_qsqldriver SOURCES tst_qsqldriver.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/sql/kernel/qsqlerror/CMakeLists.txt b/tests/auto/sql/kernel/qsqlerror/CMakeLists.txt index b9d4fbb24ed..d5100c18365 100644 --- a/tests/auto/sql/kernel/qsqlerror/CMakeLists.txt +++ b/tests/auto/sql/kernel/qsqlerror/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qsqlerror Test: ##################################################################### -qt_add_test(tst_qsqlerror +qt_internal_add_test(tst_qsqlerror SOURCES tst_qsqlerror.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/sql/kernel/qsqlfield/CMakeLists.txt b/tests/auto/sql/kernel/qsqlfield/CMakeLists.txt index 5459b9bb9a5..7f8c97f5847 100644 --- a/tests/auto/sql/kernel/qsqlfield/CMakeLists.txt +++ b/tests/auto/sql/kernel/qsqlfield/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qsqlfield Test: ##################################################################### -qt_add_test(tst_qsqlfield +qt_internal_add_test(tst_qsqlfield SOURCES tst_qsqlfield.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/sql/kernel/qsqlquery/CMakeLists.txt b/tests/auto/sql/kernel/qsqlquery/CMakeLists.txt index 8b2ff37644b..f00845a7cf8 100644 --- a/tests/auto/sql/kernel/qsqlquery/CMakeLists.txt +++ b/tests/auto/sql/kernel/qsqlquery/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qsqlquery Test: ##################################################################### -qt_add_test(tst_qsqlquery +qt_internal_add_test(tst_qsqlquery SOURCES tst_qsqlquery.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/sql/kernel/qsqlrecord/CMakeLists.txt b/tests/auto/sql/kernel/qsqlrecord/CMakeLists.txt index b6caf1b1faa..72eb1c0727f 100644 --- a/tests/auto/sql/kernel/qsqlrecord/CMakeLists.txt +++ b/tests/auto/sql/kernel/qsqlrecord/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qsqlrecord Test: ##################################################################### -qt_add_test(tst_qsqlrecord +qt_internal_add_test(tst_qsqlrecord SOURCES tst_qsqlrecord.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/sql/kernel/qsqlresult/CMakeLists.txt b/tests/auto/sql/kernel/qsqlresult/CMakeLists.txt index 3a68a227b9b..1dc3394770d 100644 --- a/tests/auto/sql/kernel/qsqlresult/CMakeLists.txt +++ b/tests/auto/sql/kernel/qsqlresult/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qsqlresult Test: ##################################################################### -qt_add_test(tst_qsqlresult +qt_internal_add_test(tst_qsqlresult SOURCES testsqldriver.h tst_qsqlresult.cpp diff --git a/tests/auto/sql/kernel/qsqlthread/CMakeLists.txt b/tests/auto/sql/kernel/qsqlthread/CMakeLists.txt index a2f66c7ed3a..6cdeec31621 100644 --- a/tests/auto/sql/kernel/qsqlthread/CMakeLists.txt +++ b/tests/auto/sql/kernel/qsqlthread/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qsqlthread Test: ##################################################################### -qt_add_test(tst_qsqlthread +qt_internal_add_test(tst_qsqlthread SOURCES tst_qsqlthread.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/sql/models/qsqlquerymodel/CMakeLists.txt b/tests/auto/sql/models/qsqlquerymodel/CMakeLists.txt index 75ce0fb6bcb..e38c51b4be9 100644 --- a/tests/auto/sql/models/qsqlquerymodel/CMakeLists.txt +++ b/tests/auto/sql/models/qsqlquerymodel/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qsqlquerymodel Test: ##################################################################### -qt_add_test(tst_qsqlquerymodel +qt_internal_add_test(tst_qsqlquerymodel SOURCES tst_qsqlquerymodel.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/sql/models/qsqlrelationaldelegate/CMakeLists.txt b/tests/auto/sql/models/qsqlrelationaldelegate/CMakeLists.txt index ce7f129a918..b76a3f7b9cc 100644 --- a/tests/auto/sql/models/qsqlrelationaldelegate/CMakeLists.txt +++ b/tests/auto/sql/models/qsqlrelationaldelegate/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qsqlrelationaldelegate Test: ##################################################################### -qt_add_test(tst_qsqlrelationaldelegate +qt_internal_add_test(tst_qsqlrelationaldelegate SOURCES tst_qsqlrelationaldelegate.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/sql/models/qsqlrelationaltablemodel/CMakeLists.txt b/tests/auto/sql/models/qsqlrelationaltablemodel/CMakeLists.txt index 67aad097bbd..736412731ec 100644 --- a/tests/auto/sql/models/qsqlrelationaltablemodel/CMakeLists.txt +++ b/tests/auto/sql/models/qsqlrelationaltablemodel/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qsqlrelationaltablemodel Test: ##################################################################### -qt_add_test(tst_qsqlrelationaltablemodel +qt_internal_add_test(tst_qsqlrelationaltablemodel SOURCES tst_qsqlrelationaltablemodel.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/sql/models/qsqltablemodel/CMakeLists.txt b/tests/auto/sql/models/qsqltablemodel/CMakeLists.txt index 1da555d3415..4cbd667ec41 100644 --- a/tests/auto/sql/models/qsqltablemodel/CMakeLists.txt +++ b/tests/auto/sql/models/qsqltablemodel/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qsqltablemodel Test: ##################################################################### -qt_add_test(tst_qsqltablemodel +qt_internal_add_test(tst_qsqltablemodel SOURCES tst_qsqltablemodel.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/testlib/qabstractitemmodeltester/CMakeLists.txt b/tests/auto/testlib/qabstractitemmodeltester/CMakeLists.txt index a28cf1f65a0..64b0c183807 100644 --- a/tests/auto/testlib/qabstractitemmodeltester/CMakeLists.txt +++ b/tests/auto/testlib/qabstractitemmodeltester/CMakeLists.txt @@ -4,7 +4,7 @@ ## qabstractitemmodeltester Test: ##################################################################### -qt_add_test(qabstractitemmodeltester +qt_internal_add_test(qabstractitemmodeltester SOURCES ../../other/qabstractitemmodelutils/dynamictreemodel.cpp ../../other/qabstractitemmodelutils/dynamictreemodel.h tst_qabstractitemmodeltester.cpp diff --git a/tests/auto/testlib/qsignalspy/CMakeLists.txt b/tests/auto/testlib/qsignalspy/CMakeLists.txt index 1d50fbcf0c9..ebec346460b 100644 --- a/tests/auto/testlib/qsignalspy/CMakeLists.txt +++ b/tests/auto/testlib/qsignalspy/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qsignalspy Test: ##################################################################### -qt_add_test(tst_qsignalspy +qt_internal_add_test(tst_qsignalspy SOURCES tst_qsignalspy.cpp ) diff --git a/tests/auto/testlib/selftests/CMakeLists.txt b/tests/auto/testlib/selftests/CMakeLists.txt index 74457765619..7a352740da5 100644 --- a/tests/auto/testlib/selftests/CMakeLists.txt +++ b/tests/auto/testlib/selftests/CMakeLists.txt @@ -5,7 +5,7 @@ include(../../../../src/testlib/selfcover.cmake) # ------------- Test runner ------------- -qt_add_test(tst_selftests +qt_internal_add_test(tst_selftests OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" EXCEPTIONS CATCH @@ -40,7 +40,7 @@ set(qmake_expected_files_resource_files ${resource_glob_0} ) -qt_add_resource(tst_selftests "qmake_expected_files" +qt_internal_add_resource(tst_selftests "qmake_expected_files" PREFIX "/" BASE @@ -59,7 +59,7 @@ qt_add_resource(tst_selftests "qmake_expected_files" #### Keys ignored in scope 7:.:..:../selftests.pri:TARGET Qt::Gui: # SUBPROGRAMS = "keyboard" "mouse" -qt_apply_testlib_coverage_options(tst_selftests) +qt_internal_apply_testlib_coverage_options(tst_selftests) # ------------- Sub tests ------------- @@ -134,7 +134,7 @@ foreach(subprogram IN LISTS subprograms) endforeach() list(JOIN subprograms " " subprograms) -qt_extend_target(tst_selftests +qt_internal_extend_target(tst_selftests DEFINES SUBPROGRAMS=${subprograms} ) diff --git a/tests/auto/testlib/selftests/assert/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/assert/.prev_CMakeLists.txt index 765750bb71d..db726c1a2d0 100644 --- a/tests/auto/testlib/selftests/assert/.prev_CMakeLists.txt +++ b/tests/auto/testlib/selftests/assert/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## assert Binary: ##################################################################### -qt_add_executable(assert +qt_internal_add_executable(assert SOURCES tst_assert.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/testlib/selftests/assert/CMakeLists.txt b/tests/auto/testlib/selftests/assert/CMakeLists.txt index 56a1b33bb42..07f1dd68255 100644 --- a/tests/auto/testlib/selftests/assert/CMakeLists.txt +++ b/tests/auto/testlib/selftests/assert/CMakeLists.txt @@ -4,7 +4,7 @@ ## assert Binary: ##################################################################### -qt_add_executable(assert +qt_internal_add_executable(assert NO_INSTALL # special case OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case SOURCES @@ -17,5 +17,5 @@ qt_add_executable(assert ##################################################################### # special case begin -qt_apply_testlib_coverage_options(assert) +qt_internal_apply_testlib_coverage_options(assert) # special case end diff --git a/tests/auto/testlib/selftests/badxml/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/badxml/.prev_CMakeLists.txt index 78ae572e036..a085cd97e48 100644 --- a/tests/auto/testlib/selftests/badxml/.prev_CMakeLists.txt +++ b/tests/auto/testlib/selftests/badxml/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## badxml Binary: ##################################################################### -qt_add_executable(badxml +qt_internal_add_executable(badxml SOURCES tst_badxml.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/testlib/selftests/badxml/CMakeLists.txt b/tests/auto/testlib/selftests/badxml/CMakeLists.txt index 8535ceb3cdc..733d826f970 100644 --- a/tests/auto/testlib/selftests/badxml/CMakeLists.txt +++ b/tests/auto/testlib/selftests/badxml/CMakeLists.txt @@ -4,7 +4,7 @@ ## badxml Binary: ##################################################################### -qt_add_executable(badxml +qt_internal_add_executable(badxml NO_INSTALL # special case OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case SOURCES @@ -18,5 +18,5 @@ qt_add_executable(badxml ##################################################################### # special case begin -qt_apply_testlib_coverage_options(badxml) +qt_internal_apply_testlib_coverage_options(badxml) # special case end diff --git a/tests/auto/testlib/selftests/benchlibcallgrind/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/benchlibcallgrind/.prev_CMakeLists.txt index 0dca3616e12..54922d52469 100644 --- a/tests/auto/testlib/selftests/benchlibcallgrind/.prev_CMakeLists.txt +++ b/tests/auto/testlib/selftests/benchlibcallgrind/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## benchlibcallgrind Binary: ##################################################################### -qt_add_executable(benchlibcallgrind +qt_internal_add_executable(benchlibcallgrind SOURCES tst_benchlibcallgrind.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/testlib/selftests/benchlibcallgrind/CMakeLists.txt b/tests/auto/testlib/selftests/benchlibcallgrind/CMakeLists.txt index f86bb4ae055..3dfc0d79169 100644 --- a/tests/auto/testlib/selftests/benchlibcallgrind/CMakeLists.txt +++ b/tests/auto/testlib/selftests/benchlibcallgrind/CMakeLists.txt @@ -4,7 +4,7 @@ ## benchlibcallgrind Binary: ##################################################################### -qt_add_executable(benchlibcallgrind +qt_internal_add_executable(benchlibcallgrind NO_INSTALL # special case OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case SOURCES @@ -17,5 +17,5 @@ qt_add_executable(benchlibcallgrind ##################################################################### # special case begin -qt_apply_testlib_coverage_options(benchlibcallgrind) +qt_internal_apply_testlib_coverage_options(benchlibcallgrind) # special case end diff --git a/tests/auto/testlib/selftests/benchlibcounting/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/benchlibcounting/.prev_CMakeLists.txt index 69ecc99b515..9f60f10beca 100644 --- a/tests/auto/testlib/selftests/benchlibcounting/.prev_CMakeLists.txt +++ b/tests/auto/testlib/selftests/benchlibcounting/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## benchlibcounting Binary: ##################################################################### -qt_add_executable(benchlibcounting +qt_internal_add_executable(benchlibcounting SOURCES tst_benchlibcounting.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/testlib/selftests/benchlibcounting/CMakeLists.txt b/tests/auto/testlib/selftests/benchlibcounting/CMakeLists.txt index 39d5a6e721d..efc813bb27a 100644 --- a/tests/auto/testlib/selftests/benchlibcounting/CMakeLists.txt +++ b/tests/auto/testlib/selftests/benchlibcounting/CMakeLists.txt @@ -4,7 +4,7 @@ ## benchlibcounting Binary: ##################################################################### -qt_add_executable(benchlibcounting +qt_internal_add_executable(benchlibcounting NO_INSTALL # special case OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case SOURCES @@ -17,5 +17,5 @@ qt_add_executable(benchlibcounting ##################################################################### # special case begin -qt_apply_testlib_coverage_options(tst_selftests) +qt_internal_apply_testlib_coverage_options(tst_selftests) # special case end diff --git a/tests/auto/testlib/selftests/benchlibeventcounter/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/benchlibeventcounter/.prev_CMakeLists.txt index e61fc6f93e4..2fe5b21a9a5 100644 --- a/tests/auto/testlib/selftests/benchlibeventcounter/.prev_CMakeLists.txt +++ b/tests/auto/testlib/selftests/benchlibeventcounter/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## benchlibeventcounter Binary: ##################################################################### -qt_add_executable(benchlibeventcounter +qt_internal_add_executable(benchlibeventcounter SOURCES tst_benchlibeventcounter.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/testlib/selftests/benchlibeventcounter/CMakeLists.txt b/tests/auto/testlib/selftests/benchlibeventcounter/CMakeLists.txt index 0b626def35c..0c9c5fdc32e 100644 --- a/tests/auto/testlib/selftests/benchlibeventcounter/CMakeLists.txt +++ b/tests/auto/testlib/selftests/benchlibeventcounter/CMakeLists.txt @@ -4,7 +4,7 @@ ## benchlibeventcounter Binary: ##################################################################### -qt_add_executable(benchlibeventcounter +qt_internal_add_executable(benchlibeventcounter NO_INSTALL # special case OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case SOURCES @@ -17,5 +17,5 @@ qt_add_executable(benchlibeventcounter ##################################################################### # special case begin -qt_apply_testlib_coverage_options(benchlibeventcounter) +qt_internal_apply_testlib_coverage_options(benchlibeventcounter) # special case end diff --git a/tests/auto/testlib/selftests/benchliboptions/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/benchliboptions/.prev_CMakeLists.txt index 73c72a56212..22ad02f2d8f 100644 --- a/tests/auto/testlib/selftests/benchliboptions/.prev_CMakeLists.txt +++ b/tests/auto/testlib/selftests/benchliboptions/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## benchliboptions Binary: ##################################################################### -qt_add_executable(benchliboptions +qt_internal_add_executable(benchliboptions SOURCES tst_benchliboptions.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/testlib/selftests/benchliboptions/CMakeLists.txt b/tests/auto/testlib/selftests/benchliboptions/CMakeLists.txt index fdb82184068..94ee9dd501c 100644 --- a/tests/auto/testlib/selftests/benchliboptions/CMakeLists.txt +++ b/tests/auto/testlib/selftests/benchliboptions/CMakeLists.txt @@ -4,7 +4,7 @@ ## benchliboptions Binary: ##################################################################### -qt_add_executable(benchliboptions +qt_internal_add_executable(benchliboptions NO_INSTALL # special case OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case SOURCES @@ -17,5 +17,5 @@ qt_add_executable(benchliboptions ##################################################################### # special case begin -qt_apply_testlib_coverage_options(tst_selftests) +qt_internal_apply_testlib_coverage_options(tst_selftests) # special case end diff --git a/tests/auto/testlib/selftests/benchlibtickcounter/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/benchlibtickcounter/.prev_CMakeLists.txt index 10696754dcc..e2f83a540ce 100644 --- a/tests/auto/testlib/selftests/benchlibtickcounter/.prev_CMakeLists.txt +++ b/tests/auto/testlib/selftests/benchlibtickcounter/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## benchlibtickcounter Binary: ##################################################################### -qt_add_executable(benchlibtickcounter +qt_internal_add_executable(benchlibtickcounter SOURCES tst_benchlibtickcounter.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/testlib/selftests/benchlibtickcounter/CMakeLists.txt b/tests/auto/testlib/selftests/benchlibtickcounter/CMakeLists.txt index 9c689584f89..463a74eaf78 100644 --- a/tests/auto/testlib/selftests/benchlibtickcounter/CMakeLists.txt +++ b/tests/auto/testlib/selftests/benchlibtickcounter/CMakeLists.txt @@ -4,7 +4,7 @@ ## benchlibtickcounter Binary: ##################################################################### -qt_add_executable(benchlibtickcounter +qt_internal_add_executable(benchlibtickcounter NO_INSTALL # special case OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case SOURCES @@ -17,5 +17,5 @@ qt_add_executable(benchlibtickcounter ##################################################################### # special case begin -qt_apply_testlib_coverage_options(benchlibtickcounter) +qt_internal_apply_testlib_coverage_options(benchlibtickcounter) # special case end diff --git a/tests/auto/testlib/selftests/benchlibwalltime/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/benchlibwalltime/.prev_CMakeLists.txt index 372dfe014fc..e2a724d1d91 100644 --- a/tests/auto/testlib/selftests/benchlibwalltime/.prev_CMakeLists.txt +++ b/tests/auto/testlib/selftests/benchlibwalltime/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## benchlibwalltime Binary: ##################################################################### -qt_add_executable(benchlibwalltime +qt_internal_add_executable(benchlibwalltime SOURCES tst_benchlibwalltime.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/testlib/selftests/benchlibwalltime/CMakeLists.txt b/tests/auto/testlib/selftests/benchlibwalltime/CMakeLists.txt index 32663614333..830e4154401 100644 --- a/tests/auto/testlib/selftests/benchlibwalltime/CMakeLists.txt +++ b/tests/auto/testlib/selftests/benchlibwalltime/CMakeLists.txt @@ -4,7 +4,7 @@ ## benchlibwalltime Binary: ##################################################################### -qt_add_executable(benchlibwalltime +qt_internal_add_executable(benchlibwalltime NO_INSTALL # special case OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case SOURCES @@ -17,5 +17,5 @@ qt_add_executable(benchlibwalltime ##################################################################### # special case begin -qt_apply_testlib_coverage_options(benchlibwalltime) +qt_internal_apply_testlib_coverage_options(benchlibwalltime) # special case end diff --git a/tests/auto/testlib/selftests/blacklisted/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/blacklisted/.prev_CMakeLists.txt index 5083fe8a52b..573da14d3f0 100644 --- a/tests/auto/testlib/selftests/blacklisted/.prev_CMakeLists.txt +++ b/tests/auto/testlib/selftests/blacklisted/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## blacklisted Binary: ##################################################################### -qt_add_executable(blacklisted +qt_internal_add_executable(blacklisted SOURCES tst_blacklisted.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/testlib/selftests/blacklisted/CMakeLists.txt b/tests/auto/testlib/selftests/blacklisted/CMakeLists.txt index 3b924c12bc7..87caa5770cd 100644 --- a/tests/auto/testlib/selftests/blacklisted/CMakeLists.txt +++ b/tests/auto/testlib/selftests/blacklisted/CMakeLists.txt @@ -4,7 +4,7 @@ ## blacklisted Binary: ##################################################################### -qt_add_executable(blacklisted +qt_internal_add_executable(blacklisted NO_INSTALL # special case OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case SOURCES @@ -17,5 +17,5 @@ qt_add_executable(blacklisted ##################################################################### # special case begin -qt_apply_testlib_coverage_options(blacklisted) +qt_internal_apply_testlib_coverage_options(blacklisted) # special case end diff --git a/tests/auto/testlib/selftests/cmptest/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/cmptest/.prev_CMakeLists.txt index abc5f9b023d..c9732fac816 100644 --- a/tests/auto/testlib/selftests/cmptest/.prev_CMakeLists.txt +++ b/tests/auto/testlib/selftests/cmptest/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## cmptest Binary: ##################################################################### -qt_add_executable(cmptest +qt_internal_add_executable(cmptest SOURCES tst_cmptest.cpp PUBLIC_LIBRARIES @@ -14,7 +14,7 @@ qt_add_executable(cmptest ## Scopes: ##################################################################### -qt_extend_target(cmptest CONDITION TARGET Qt::Gui +qt_internal_extend_target(cmptest CONDITION TARGET Qt::Gui PUBLIC_LIBRARIES Qt::Gui ) diff --git a/tests/auto/testlib/selftests/cmptest/CMakeLists.txt b/tests/auto/testlib/selftests/cmptest/CMakeLists.txt index 336fb01e74f..b5522fe4bba 100644 --- a/tests/auto/testlib/selftests/cmptest/CMakeLists.txt +++ b/tests/auto/testlib/selftests/cmptest/CMakeLists.txt @@ -4,7 +4,7 @@ ## cmptest Binary: ##################################################################### -qt_add_executable(cmptest +qt_internal_add_executable(cmptest NO_INSTALL # special case OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case SOURCES @@ -16,11 +16,11 @@ qt_add_executable(cmptest ## Scopes: ##################################################################### -qt_extend_target(cmptest CONDITION TARGET Qt::Gui +qt_internal_extend_target(cmptest CONDITION TARGET Qt::Gui PUBLIC_LIBRARIES Qt::Gui ) # special case begin -qt_apply_testlib_coverage_options(cmptest) +qt_internal_apply_testlib_coverage_options(cmptest) # special case end diff --git a/tests/auto/testlib/selftests/commandlinedata/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/commandlinedata/.prev_CMakeLists.txt index 2f08f35c036..fe0986edf62 100644 --- a/tests/auto/testlib/selftests/commandlinedata/.prev_CMakeLists.txt +++ b/tests/auto/testlib/selftests/commandlinedata/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## commandlinedata Binary: ##################################################################### -qt_add_executable(commandlinedata +qt_internal_add_executable(commandlinedata SOURCES tst_commandlinedata.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/testlib/selftests/commandlinedata/CMakeLists.txt b/tests/auto/testlib/selftests/commandlinedata/CMakeLists.txt index 889ef5377f4..ce5847db938 100644 --- a/tests/auto/testlib/selftests/commandlinedata/CMakeLists.txt +++ b/tests/auto/testlib/selftests/commandlinedata/CMakeLists.txt @@ -4,7 +4,7 @@ ## commandlinedata Binary: ##################################################################### -qt_add_executable(commandlinedata +qt_internal_add_executable(commandlinedata NO_INSTALL # special case OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case SOURCES @@ -17,5 +17,5 @@ qt_add_executable(commandlinedata ##################################################################### # special case begin -qt_apply_testlib_coverage_options(commandlinedata) +qt_internal_apply_testlib_coverage_options(commandlinedata) # special case end diff --git a/tests/auto/testlib/selftests/counting/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/counting/.prev_CMakeLists.txt index 88b5ffb6031..c61b30d4fa2 100644 --- a/tests/auto/testlib/selftests/counting/.prev_CMakeLists.txt +++ b/tests/auto/testlib/selftests/counting/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## counting Binary: ##################################################################### -qt_add_executable(counting +qt_internal_add_executable(counting SOURCES tst_counting.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/testlib/selftests/counting/CMakeLists.txt b/tests/auto/testlib/selftests/counting/CMakeLists.txt index 1a7af9ba4f5..bbcd3543d12 100644 --- a/tests/auto/testlib/selftests/counting/CMakeLists.txt +++ b/tests/auto/testlib/selftests/counting/CMakeLists.txt @@ -4,7 +4,7 @@ ## counting Binary: ##################################################################### -qt_add_executable(counting +qt_internal_add_executable(counting NO_INSTALL # special case OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case SOURCES @@ -17,5 +17,5 @@ qt_add_executable(counting ##################################################################### # special case begin -qt_apply_testlib_coverage_options(counting) +qt_internal_apply_testlib_coverage_options(counting) # special case end diff --git a/tests/auto/testlib/selftests/crashes/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/crashes/.prev_CMakeLists.txt index eb1e941c5ce..e6ace5f85b5 100644 --- a/tests/auto/testlib/selftests/crashes/.prev_CMakeLists.txt +++ b/tests/auto/testlib/selftests/crashes/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## crashes Binary: ##################################################################### -qt_add_executable(crashes +qt_internal_add_executable(crashes SOURCES tst_crashes.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/testlib/selftests/crashes/CMakeLists.txt b/tests/auto/testlib/selftests/crashes/CMakeLists.txt index 6e340067ece..c09049a9334 100644 --- a/tests/auto/testlib/selftests/crashes/CMakeLists.txt +++ b/tests/auto/testlib/selftests/crashes/CMakeLists.txt @@ -4,7 +4,7 @@ ## crashes Binary: ##################################################################### -qt_add_executable(crashes +qt_internal_add_executable(crashes NO_INSTALL # special case OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case SOURCES @@ -17,5 +17,5 @@ qt_add_executable(crashes ##################################################################### # special case begin -qt_apply_testlib_coverage_options(crashes) +qt_internal_apply_testlib_coverage_options(crashes) # special case end diff --git a/tests/auto/testlib/selftests/datatable/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/datatable/.prev_CMakeLists.txt index c7e2532c47a..638afbd9803 100644 --- a/tests/auto/testlib/selftests/datatable/.prev_CMakeLists.txt +++ b/tests/auto/testlib/selftests/datatable/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## datatable Binary: ##################################################################### -qt_add_executable(datatable +qt_internal_add_executable(datatable SOURCES tst_datatable.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/testlib/selftests/datatable/CMakeLists.txt b/tests/auto/testlib/selftests/datatable/CMakeLists.txt index 8d7abc7fbfc..66bfa4a208f 100644 --- a/tests/auto/testlib/selftests/datatable/CMakeLists.txt +++ b/tests/auto/testlib/selftests/datatable/CMakeLists.txt @@ -4,7 +4,7 @@ ## datatable Binary: ##################################################################### -qt_add_executable(datatable +qt_internal_add_executable(datatable NO_INSTALL # special case OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case SOURCES @@ -17,5 +17,5 @@ qt_add_executable(datatable ##################################################################### # special case begin -qt_apply_testlib_coverage_options(datatable) +qt_internal_apply_testlib_coverage_options(datatable) # special case end diff --git a/tests/auto/testlib/selftests/datetime/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/datetime/.prev_CMakeLists.txt index eb0040c218f..2d50d2cea29 100644 --- a/tests/auto/testlib/selftests/datetime/.prev_CMakeLists.txt +++ b/tests/auto/testlib/selftests/datetime/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## datetime Binary: ##################################################################### -qt_add_executable(datetime +qt_internal_add_executable(datetime SOURCES tst_datetime.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/testlib/selftests/datetime/CMakeLists.txt b/tests/auto/testlib/selftests/datetime/CMakeLists.txt index ade9978801f..5a3df8085da 100644 --- a/tests/auto/testlib/selftests/datetime/CMakeLists.txt +++ b/tests/auto/testlib/selftests/datetime/CMakeLists.txt @@ -4,7 +4,7 @@ ## datetime Binary: ##################################################################### -qt_add_executable(datetime +qt_internal_add_executable(datetime NO_INSTALL # special case OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case SOURCES @@ -17,5 +17,5 @@ qt_add_executable(datetime ##################################################################### # special case begin -qt_apply_testlib_coverage_options(datetime) +qt_internal_apply_testlib_coverage_options(datetime) # special case end diff --git a/tests/auto/testlib/selftests/deleteLater/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/deleteLater/.prev_CMakeLists.txt index 0b41340fdc9..20eabfd0a0f 100644 --- a/tests/auto/testlib/selftests/deleteLater/.prev_CMakeLists.txt +++ b/tests/auto/testlib/selftests/deleteLater/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## deleteLater Binary: ##################################################################### -qt_add_executable(deleteLater +qt_internal_add_executable(deleteLater SOURCES tst_deleteLater.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/testlib/selftests/deleteLater/CMakeLists.txt b/tests/auto/testlib/selftests/deleteLater/CMakeLists.txt index 8ba9a7ed2bd..ca42199665a 100644 --- a/tests/auto/testlib/selftests/deleteLater/CMakeLists.txt +++ b/tests/auto/testlib/selftests/deleteLater/CMakeLists.txt @@ -4,7 +4,7 @@ ## deleteLater Binary: ##################################################################### -qt_add_executable(deleteLater +qt_internal_add_executable(deleteLater NO_INSTALL # special case OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case SOURCES @@ -14,5 +14,5 @@ qt_add_executable(deleteLater ) # special case begin -qt_apply_testlib_coverage_options(deleteLater) +qt_internal_apply_testlib_coverage_options(deleteLater) # special case end diff --git a/tests/auto/testlib/selftests/deleteLater_noApp/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/deleteLater_noApp/.prev_CMakeLists.txt index 88bb80bd671..9247c8c5f39 100644 --- a/tests/auto/testlib/selftests/deleteLater_noApp/.prev_CMakeLists.txt +++ b/tests/auto/testlib/selftests/deleteLater_noApp/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## deleteLater_noApp Binary: ##################################################################### -qt_add_executable(deleteLater_noApp +qt_internal_add_executable(deleteLater_noApp SOURCES tst_deleteLater_noApp.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/testlib/selftests/deleteLater_noApp/CMakeLists.txt b/tests/auto/testlib/selftests/deleteLater_noApp/CMakeLists.txt index f681aafc35c..0ebdc89cb8c 100644 --- a/tests/auto/testlib/selftests/deleteLater_noApp/CMakeLists.txt +++ b/tests/auto/testlib/selftests/deleteLater_noApp/CMakeLists.txt @@ -4,7 +4,7 @@ ## deleteLater_noApp Binary: ##################################################################### -qt_add_executable(deleteLater_noApp +qt_internal_add_executable(deleteLater_noApp NO_INSTALL # special case OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case SOURCES @@ -14,5 +14,5 @@ qt_add_executable(deleteLater_noApp ) # special case begin -qt_apply_testlib_coverage_options(deleteLater_noApp) +qt_internal_apply_testlib_coverage_options(deleteLater_noApp) # special case end diff --git a/tests/auto/testlib/selftests/differentexec/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/differentexec/.prev_CMakeLists.txt index 69e37e0699a..65498104e70 100644 --- a/tests/auto/testlib/selftests/differentexec/.prev_CMakeLists.txt +++ b/tests/auto/testlib/selftests/differentexec/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## differentexec Binary: ##################################################################### -qt_add_executable(differentexec +qt_internal_add_executable(differentexec SOURCES tst_differentexec.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/testlib/selftests/differentexec/CMakeLists.txt b/tests/auto/testlib/selftests/differentexec/CMakeLists.txt index 45e0a948fd4..e13817f1e18 100644 --- a/tests/auto/testlib/selftests/differentexec/CMakeLists.txt +++ b/tests/auto/testlib/selftests/differentexec/CMakeLists.txt @@ -4,7 +4,7 @@ ## differentexec Binary: ##################################################################### -qt_add_executable(differentexec +qt_internal_add_executable(differentexec NO_INSTALL # special case OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case SOURCES @@ -17,5 +17,5 @@ qt_add_executable(differentexec ##################################################################### # special case begin -qt_apply_testlib_coverage_options(differentexec) +qt_internal_apply_testlib_coverage_options(differentexec) # special case end diff --git a/tests/auto/testlib/selftests/exceptionthrow/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/exceptionthrow/.prev_CMakeLists.txt index db2c576930c..0b9037d20ba 100644 --- a/tests/auto/testlib/selftests/exceptionthrow/.prev_CMakeLists.txt +++ b/tests/auto/testlib/selftests/exceptionthrow/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## exceptionthrow Binary: ##################################################################### -qt_add_executable(exceptionthrow +qt_internal_add_executable(exceptionthrow EXCEPTIONS SOURCES tst_exceptionthrow.cpp diff --git a/tests/auto/testlib/selftests/exceptionthrow/CMakeLists.txt b/tests/auto/testlib/selftests/exceptionthrow/CMakeLists.txt index 33ecfe585c6..ba793db66cc 100644 --- a/tests/auto/testlib/selftests/exceptionthrow/CMakeLists.txt +++ b/tests/auto/testlib/selftests/exceptionthrow/CMakeLists.txt @@ -4,7 +4,7 @@ ## exceptionthrow Binary: ##################################################################### -qt_add_executable(exceptionthrow +qt_internal_add_executable(exceptionthrow EXCEPTIONS NO_INSTALL # special case OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case @@ -18,5 +18,5 @@ qt_add_executable(exceptionthrow ##################################################################### # special case begin -qt_apply_testlib_coverage_options(exceptionthrow) +qt_internal_apply_testlib_coverage_options(exceptionthrow) # special case end diff --git a/tests/auto/testlib/selftests/expectfail/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/expectfail/.prev_CMakeLists.txt index faa09bbc6cf..4605e6848ec 100644 --- a/tests/auto/testlib/selftests/expectfail/.prev_CMakeLists.txt +++ b/tests/auto/testlib/selftests/expectfail/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## expectfail Binary: ##################################################################### -qt_add_executable(expectfail +qt_internal_add_executable(expectfail SOURCES tst_expectfail.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/testlib/selftests/expectfail/CMakeLists.txt b/tests/auto/testlib/selftests/expectfail/CMakeLists.txt index a7b072cfd30..84aa93d1caf 100644 --- a/tests/auto/testlib/selftests/expectfail/CMakeLists.txt +++ b/tests/auto/testlib/selftests/expectfail/CMakeLists.txt @@ -4,7 +4,7 @@ ## expectfail Binary: ##################################################################### -qt_add_executable(expectfail +qt_internal_add_executable(expectfail NO_INSTALL # special case OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case SOURCES @@ -17,5 +17,5 @@ qt_add_executable(expectfail ##################################################################### # special case begin -qt_apply_testlib_coverage_options(expectfail) +qt_internal_apply_testlib_coverage_options(expectfail) # special case end diff --git a/tests/auto/testlib/selftests/failcleanup/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/failcleanup/.prev_CMakeLists.txt index 6a8238af812..db4ab2a82a2 100644 --- a/tests/auto/testlib/selftests/failcleanup/.prev_CMakeLists.txt +++ b/tests/auto/testlib/selftests/failcleanup/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## failcleanup Binary: ##################################################################### -qt_add_executable(failcleanup +qt_internal_add_executable(failcleanup SOURCES tst_failcleanup.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/testlib/selftests/failcleanup/CMakeLists.txt b/tests/auto/testlib/selftests/failcleanup/CMakeLists.txt index fc02ec1fedb..e45d1b528bf 100644 --- a/tests/auto/testlib/selftests/failcleanup/CMakeLists.txt +++ b/tests/auto/testlib/selftests/failcleanup/CMakeLists.txt @@ -4,7 +4,7 @@ ## failcleanup Binary: ##################################################################### -qt_add_executable(failcleanup +qt_internal_add_executable(failcleanup NO_INSTALL # special case OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case SOURCES @@ -17,5 +17,5 @@ qt_add_executable(failcleanup ##################################################################### # special case begin -qt_apply_testlib_coverage_options(failcleanup) +qt_internal_apply_testlib_coverage_options(failcleanup) # special case end diff --git a/tests/auto/testlib/selftests/faildatatype/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/faildatatype/.prev_CMakeLists.txt index 2c67f1d445f..e333ba128c8 100644 --- a/tests/auto/testlib/selftests/faildatatype/.prev_CMakeLists.txt +++ b/tests/auto/testlib/selftests/faildatatype/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## faildatatype Binary: ##################################################################### -qt_add_executable(faildatatype +qt_internal_add_executable(faildatatype SOURCES tst_faildatatype.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/testlib/selftests/faildatatype/CMakeLists.txt b/tests/auto/testlib/selftests/faildatatype/CMakeLists.txt index 45c8e467777..0abba3e021f 100644 --- a/tests/auto/testlib/selftests/faildatatype/CMakeLists.txt +++ b/tests/auto/testlib/selftests/faildatatype/CMakeLists.txt @@ -4,7 +4,7 @@ ## faildatatype Binary: ##################################################################### -qt_add_executable(faildatatype +qt_internal_add_executable(faildatatype NO_INSTALL # special case OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case SOURCES @@ -17,5 +17,5 @@ qt_add_executable(faildatatype ##################################################################### # special case begin -qt_apply_testlib_coverage_options(faildatatype) +qt_internal_apply_testlib_coverage_options(faildatatype) # special case end diff --git a/tests/auto/testlib/selftests/failfetchtype/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/failfetchtype/.prev_CMakeLists.txt index 0323acd6354..daf2ac1a274 100644 --- a/tests/auto/testlib/selftests/failfetchtype/.prev_CMakeLists.txt +++ b/tests/auto/testlib/selftests/failfetchtype/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## failfetchtype Binary: ##################################################################### -qt_add_executable(failfetchtype +qt_internal_add_executable(failfetchtype SOURCES tst_failfetchtype.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/testlib/selftests/failfetchtype/CMakeLists.txt b/tests/auto/testlib/selftests/failfetchtype/CMakeLists.txt index 7f02dac54b3..0ce60f591e7 100644 --- a/tests/auto/testlib/selftests/failfetchtype/CMakeLists.txt +++ b/tests/auto/testlib/selftests/failfetchtype/CMakeLists.txt @@ -4,7 +4,7 @@ ## failfetchtype Binary: ##################################################################### -qt_add_executable(failfetchtype +qt_internal_add_executable(failfetchtype NO_INSTALL # special case OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case SOURCES @@ -17,5 +17,5 @@ qt_add_executable(failfetchtype ##################################################################### # special case begin -qt_apply_testlib_coverage_options(failfetchtype) +qt_internal_apply_testlib_coverage_options(failfetchtype) # special case end diff --git a/tests/auto/testlib/selftests/failinit/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/failinit/.prev_CMakeLists.txt index 42909ca3c58..9b56b8bf890 100644 --- a/tests/auto/testlib/selftests/failinit/.prev_CMakeLists.txt +++ b/tests/auto/testlib/selftests/failinit/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## failinit Binary: ##################################################################### -qt_add_executable(failinit +qt_internal_add_executable(failinit SOURCES tst_failinit.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/testlib/selftests/failinit/CMakeLists.txt b/tests/auto/testlib/selftests/failinit/CMakeLists.txt index 8ad3130c3cd..b6995e591de 100644 --- a/tests/auto/testlib/selftests/failinit/CMakeLists.txt +++ b/tests/auto/testlib/selftests/failinit/CMakeLists.txt @@ -4,7 +4,7 @@ ## failinit Binary: ##################################################################### -qt_add_executable(failinit +qt_internal_add_executable(failinit NO_INSTALL # special case OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case SOURCES @@ -17,5 +17,5 @@ qt_add_executable(failinit ##################################################################### # special case begin -qt_apply_testlib_coverage_options(failinit) +qt_internal_apply_testlib_coverage_options(failinit) # special case end diff --git a/tests/auto/testlib/selftests/failinitdata/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/failinitdata/.prev_CMakeLists.txt index 4ae38831a1d..31a244fabb9 100644 --- a/tests/auto/testlib/selftests/failinitdata/.prev_CMakeLists.txt +++ b/tests/auto/testlib/selftests/failinitdata/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## failinitdata Binary: ##################################################################### -qt_add_executable(failinitdata +qt_internal_add_executable(failinitdata SOURCES tst_failinitdata.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/testlib/selftests/failinitdata/CMakeLists.txt b/tests/auto/testlib/selftests/failinitdata/CMakeLists.txt index 2679d2eed55..dcc2bdafde7 100644 --- a/tests/auto/testlib/selftests/failinitdata/CMakeLists.txt +++ b/tests/auto/testlib/selftests/failinitdata/CMakeLists.txt @@ -4,7 +4,7 @@ ## failinitdata Binary: ##################################################################### -qt_add_executable(failinitdata +qt_internal_add_executable(failinitdata NO_INSTALL # special case OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case SOURCES @@ -17,5 +17,5 @@ qt_add_executable(failinitdata ##################################################################### # special case begin -qt_apply_testlib_coverage_options(failinitdata) +qt_internal_apply_testlib_coverage_options(failinitdata) # special case end diff --git a/tests/auto/testlib/selftests/fetchbogus/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/fetchbogus/.prev_CMakeLists.txt index 76fee4606da..e00655cefbe 100644 --- a/tests/auto/testlib/selftests/fetchbogus/.prev_CMakeLists.txt +++ b/tests/auto/testlib/selftests/fetchbogus/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## fetchbogus Binary: ##################################################################### -qt_add_executable(fetchbogus +qt_internal_add_executable(fetchbogus SOURCES tst_fetchbogus.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/testlib/selftests/fetchbogus/CMakeLists.txt b/tests/auto/testlib/selftests/fetchbogus/CMakeLists.txt index 7ad4fe65ae0..1f5f5cedf0a 100644 --- a/tests/auto/testlib/selftests/fetchbogus/CMakeLists.txt +++ b/tests/auto/testlib/selftests/fetchbogus/CMakeLists.txt @@ -4,7 +4,7 @@ ## fetchbogus Binary: ##################################################################### -qt_add_executable(fetchbogus +qt_internal_add_executable(fetchbogus NO_INSTALL # special case OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case SOURCES @@ -17,5 +17,5 @@ qt_add_executable(fetchbogus ##################################################################### # special case begin -qt_apply_testlib_coverage_options(fetchbogus) +qt_internal_apply_testlib_coverage_options(fetchbogus) # special case end diff --git a/tests/auto/testlib/selftests/findtestdata/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/findtestdata/.prev_CMakeLists.txt index 768abb68241..075f2830d3b 100644 --- a/tests/auto/testlib/selftests/findtestdata/.prev_CMakeLists.txt +++ b/tests/auto/testlib/selftests/findtestdata/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## findtestdata Binary: ##################################################################### -qt_add_executable(findtestdata +qt_internal_add_executable(findtestdata SOURCES findtestdata.cpp PUBLIC_LIBRARIES @@ -16,7 +16,7 @@ set(findtestdata_resource_files "qt.conf" ) -qt_add_resource(findtestdata "findtestdata" +qt_internal_add_resource(findtestdata "findtestdata" PREFIX "/qt/etc/" FILES diff --git a/tests/auto/testlib/selftests/findtestdata/CMakeLists.txt b/tests/auto/testlib/selftests/findtestdata/CMakeLists.txt index 2a3302fb3e2..9c06a09c183 100644 --- a/tests/auto/testlib/selftests/findtestdata/CMakeLists.txt +++ b/tests/auto/testlib/selftests/findtestdata/CMakeLists.txt @@ -4,7 +4,7 @@ ## findtestdata Binary: ##################################################################### -qt_add_executable(findtestdata +qt_internal_add_executable(findtestdata NO_INSTALL # special case OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case SOURCES @@ -18,7 +18,7 @@ set(findtestdata_resource_files "qt.conf" ) -qt_add_resource(findtestdata "findtestdata" +qt_internal_add_resource(findtestdata "findtestdata" PREFIX "/qt/etc/" FILES @@ -30,5 +30,5 @@ qt_add_resource(findtestdata "findtestdata" ##################################################################### # special case begin -qt_apply_testlib_coverage_options(findtestdata) +qt_internal_apply_testlib_coverage_options(findtestdata) # special case end diff --git a/tests/auto/testlib/selftests/float/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/float/.prev_CMakeLists.txt index 8b47df4c031..4390a9122d4 100644 --- a/tests/auto/testlib/selftests/float/.prev_CMakeLists.txt +++ b/tests/auto/testlib/selftests/float/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## float Binary: ##################################################################### -qt_add_executable(float +qt_internal_add_executable(float SOURCES ../../../../shared/emulationdetector.h tst_float.cpp diff --git a/tests/auto/testlib/selftests/float/CMakeLists.txt b/tests/auto/testlib/selftests/float/CMakeLists.txt index 2eb3264acdd..375cfe1e65d 100644 --- a/tests/auto/testlib/selftests/float/CMakeLists.txt +++ b/tests/auto/testlib/selftests/float/CMakeLists.txt @@ -4,7 +4,7 @@ ## float Binary: ##################################################################### -qt_add_executable(float +qt_internal_add_executable(float NO_INSTALL # special case OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case SOURCES @@ -20,5 +20,5 @@ qt_add_executable(float ##################################################################### # special case begin -qt_apply_testlib_coverage_options(float) +qt_internal_apply_testlib_coverage_options(float) # special case end diff --git a/tests/auto/testlib/selftests/globaldata/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/globaldata/.prev_CMakeLists.txt index 0ad53947322..6bbff782c65 100644 --- a/tests/auto/testlib/selftests/globaldata/.prev_CMakeLists.txt +++ b/tests/auto/testlib/selftests/globaldata/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## globaldata Binary: ##################################################################### -qt_add_executable(globaldata +qt_internal_add_executable(globaldata SOURCES tst_globaldata.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/testlib/selftests/globaldata/CMakeLists.txt b/tests/auto/testlib/selftests/globaldata/CMakeLists.txt index a2035f4bcf5..0793b6c4e3d 100644 --- a/tests/auto/testlib/selftests/globaldata/CMakeLists.txt +++ b/tests/auto/testlib/selftests/globaldata/CMakeLists.txt @@ -4,7 +4,7 @@ ## globaldata Binary: ##################################################################### -qt_add_executable(globaldata +qt_internal_add_executable(globaldata NO_INSTALL # special case OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case SOURCES @@ -17,5 +17,5 @@ qt_add_executable(globaldata ##################################################################### # special case begin -qt_apply_testlib_coverage_options(globaldata) +qt_internal_apply_testlib_coverage_options(globaldata) # special case end diff --git a/tests/auto/testlib/selftests/keyboard/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/keyboard/.prev_CMakeLists.txt index 3eb954cfa68..2300f2475e6 100644 --- a/tests/auto/testlib/selftests/keyboard/.prev_CMakeLists.txt +++ b/tests/auto/testlib/selftests/keyboard/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## keyboard Binary: ##################################################################### -qt_add_executable(keyboard +qt_internal_add_executable(keyboard SOURCES tst_keyboard.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/testlib/selftests/keyboard/CMakeLists.txt b/tests/auto/testlib/selftests/keyboard/CMakeLists.txt index 120cf1f82cb..998de7f0ed2 100644 --- a/tests/auto/testlib/selftests/keyboard/CMakeLists.txt +++ b/tests/auto/testlib/selftests/keyboard/CMakeLists.txt @@ -4,7 +4,7 @@ ## keyboard Binary: ##################################################################### -qt_add_executable(keyboard +qt_internal_add_executable(keyboard NO_INSTALL # special case OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case SOURCES @@ -20,5 +20,5 @@ qt_add_executable(keyboard ##################################################################### # special case begin -qt_apply_testlib_coverage_options(keyboard) +qt_internal_apply_testlib_coverage_options(keyboard) # special case end diff --git a/tests/auto/testlib/selftests/longstring/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/longstring/.prev_CMakeLists.txt index f2757e9760f..c1c09feccae 100644 --- a/tests/auto/testlib/selftests/longstring/.prev_CMakeLists.txt +++ b/tests/auto/testlib/selftests/longstring/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## longstring Binary: ##################################################################### -qt_add_executable(longstring +qt_internal_add_executable(longstring SOURCES tst_longstring.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/testlib/selftests/longstring/CMakeLists.txt b/tests/auto/testlib/selftests/longstring/CMakeLists.txt index 66554f871ef..1b123b1e0c0 100644 --- a/tests/auto/testlib/selftests/longstring/CMakeLists.txt +++ b/tests/auto/testlib/selftests/longstring/CMakeLists.txt @@ -4,7 +4,7 @@ ## longstring Binary: ##################################################################### -qt_add_executable(longstring +qt_internal_add_executable(longstring NO_INSTALL # special case OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case SOURCES @@ -17,5 +17,5 @@ qt_add_executable(longstring ##################################################################### # special case begin -qt_apply_testlib_coverage_options(longstring) +qt_internal_apply_testlib_coverage_options(longstring) # special case end diff --git a/tests/auto/testlib/selftests/maxwarnings/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/maxwarnings/.prev_CMakeLists.txt index a0d3f9f1e07..82063c3d2f3 100644 --- a/tests/auto/testlib/selftests/maxwarnings/.prev_CMakeLists.txt +++ b/tests/auto/testlib/selftests/maxwarnings/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## maxwarnings Binary: ##################################################################### -qt_add_executable(maxwarnings +qt_internal_add_executable(maxwarnings SOURCES maxwarnings.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/testlib/selftests/maxwarnings/CMakeLists.txt b/tests/auto/testlib/selftests/maxwarnings/CMakeLists.txt index 25c40909de3..6c2eca0935a 100644 --- a/tests/auto/testlib/selftests/maxwarnings/CMakeLists.txt +++ b/tests/auto/testlib/selftests/maxwarnings/CMakeLists.txt @@ -4,7 +4,7 @@ ## maxwarnings Binary: ##################################################################### -qt_add_executable(maxwarnings +qt_internal_add_executable(maxwarnings NO_INSTALL # special case OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case SOURCES @@ -17,5 +17,5 @@ qt_add_executable(maxwarnings ##################################################################### # special case begin -qt_apply_testlib_coverage_options(maxwarnings) +qt_internal_apply_testlib_coverage_options(maxwarnings) # special case end diff --git a/tests/auto/testlib/selftests/mouse/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/mouse/.prev_CMakeLists.txt index 88749cbd57b..7e7a3a7dffc 100644 --- a/tests/auto/testlib/selftests/mouse/.prev_CMakeLists.txt +++ b/tests/auto/testlib/selftests/mouse/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## mouse Binary: ##################################################################### -qt_add_executable(mouse +qt_internal_add_executable(mouse SOURCES tst_mouse.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/testlib/selftests/mouse/CMakeLists.txt b/tests/auto/testlib/selftests/mouse/CMakeLists.txt index 3059947fe2a..aab32b06ba3 100644 --- a/tests/auto/testlib/selftests/mouse/CMakeLists.txt +++ b/tests/auto/testlib/selftests/mouse/CMakeLists.txt @@ -4,7 +4,7 @@ ## mouse Binary: ##################################################################### -qt_add_executable(mouse +qt_internal_add_executable(mouse NO_INSTALL # special case OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case SOURCES @@ -20,5 +20,5 @@ qt_add_executable(mouse ##################################################################### # special case begin -qt_apply_testlib_coverage_options(mouse) +qt_internal_apply_testlib_coverage_options(mouse) # special case end diff --git a/tests/auto/testlib/selftests/multiexec/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/multiexec/.prev_CMakeLists.txt index 746399f4519..8b92a505d07 100644 --- a/tests/auto/testlib/selftests/multiexec/.prev_CMakeLists.txt +++ b/tests/auto/testlib/selftests/multiexec/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## multiexec Binary: ##################################################################### -qt_add_executable(multiexec +qt_internal_add_executable(multiexec SOURCES tst_multiexec.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/testlib/selftests/multiexec/CMakeLists.txt b/tests/auto/testlib/selftests/multiexec/CMakeLists.txt index 5ccd0119754..314765b803b 100644 --- a/tests/auto/testlib/selftests/multiexec/CMakeLists.txt +++ b/tests/auto/testlib/selftests/multiexec/CMakeLists.txt @@ -4,7 +4,7 @@ ## multiexec Binary: ##################################################################### -qt_add_executable(multiexec +qt_internal_add_executable(multiexec NO_INSTALL # special case OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case SOURCES @@ -17,5 +17,5 @@ qt_add_executable(multiexec ##################################################################### # special case begin -qt_apply_testlib_coverage_options(multiexec) +qt_internal_apply_testlib_coverage_options(multiexec) # special case end diff --git a/tests/auto/testlib/selftests/pairdiagnostics/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/pairdiagnostics/.prev_CMakeLists.txt index 30ca138997b..3015e9a0149 100644 --- a/tests/auto/testlib/selftests/pairdiagnostics/.prev_CMakeLists.txt +++ b/tests/auto/testlib/selftests/pairdiagnostics/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## pairdiagnostics Binary: ##################################################################### -qt_add_executable(pairdiagnostics +qt_internal_add_executable(pairdiagnostics SOURCES tst_pairdiagnostics.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/testlib/selftests/pairdiagnostics/CMakeLists.txt b/tests/auto/testlib/selftests/pairdiagnostics/CMakeLists.txt index ce5faf810b6..f7521313251 100644 --- a/tests/auto/testlib/selftests/pairdiagnostics/CMakeLists.txt +++ b/tests/auto/testlib/selftests/pairdiagnostics/CMakeLists.txt @@ -4,7 +4,7 @@ ## pairdiagnostics Binary: ##################################################################### -qt_add_executable(pairdiagnostics +qt_internal_add_executable(pairdiagnostics NO_INSTALL # special case OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case SOURCES @@ -14,5 +14,5 @@ qt_add_executable(pairdiagnostics ) # special case begin -qt_apply_testlib_coverage_options(pairdiagnostics) +qt_internal_apply_testlib_coverage_options(pairdiagnostics) # special case end diff --git a/tests/auto/testlib/selftests/pass/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/pass/.prev_CMakeLists.txt index c65690e7e0c..123a978b962 100644 --- a/tests/auto/testlib/selftests/pass/.prev_CMakeLists.txt +++ b/tests/auto/testlib/selftests/pass/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## pass Binary: ##################################################################### -qt_add_executable(pass +qt_internal_add_executable(pass SOURCES tst_pass.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/testlib/selftests/pass/CMakeLists.txt b/tests/auto/testlib/selftests/pass/CMakeLists.txt index 424201c5c80..1f54a009ec9 100644 --- a/tests/auto/testlib/selftests/pass/CMakeLists.txt +++ b/tests/auto/testlib/selftests/pass/CMakeLists.txt @@ -4,7 +4,7 @@ ## pass Binary: ##################################################################### -qt_add_executable(pass +qt_internal_add_executable(pass NO_INSTALL # special case OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}" # special case SOURCES @@ -17,6 +17,6 @@ qt_add_executable(pass ##################################################################### # special case begin -qt_apply_testlib_coverage_options(pass) +qt_internal_apply_testlib_coverage_options(pass) # special case end diff --git a/tests/auto/testlib/selftests/printdatatags/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/printdatatags/.prev_CMakeLists.txt index 174a6faf7cf..efff1b908cc 100644 --- a/tests/auto/testlib/selftests/printdatatags/.prev_CMakeLists.txt +++ b/tests/auto/testlib/selftests/printdatatags/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## printdatatags Binary: ##################################################################### -qt_add_executable(printdatatags +qt_internal_add_executable(printdatatags SOURCES tst_printdatatags.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/testlib/selftests/printdatatags/CMakeLists.txt b/tests/auto/testlib/selftests/printdatatags/CMakeLists.txt index 7ab050857ff..a323b1f73df 100644 --- a/tests/auto/testlib/selftests/printdatatags/CMakeLists.txt +++ b/tests/auto/testlib/selftests/printdatatags/CMakeLists.txt @@ -4,7 +4,7 @@ ## printdatatags Binary: ##################################################################### -qt_add_executable(printdatatags +qt_internal_add_executable(printdatatags NO_INSTALL # special case OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case SOURCES @@ -17,5 +17,5 @@ qt_add_executable(printdatatags ##################################################################### # special case begin -qt_apply_testlib_coverage_options(printdatatags) +qt_internal_apply_testlib_coverage_options(printdatatags) # special case end diff --git a/tests/auto/testlib/selftests/printdatatagswithglobaltags/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/printdatatagswithglobaltags/.prev_CMakeLists.txt index 0922d380d34..0b60f71967b 100644 --- a/tests/auto/testlib/selftests/printdatatagswithglobaltags/.prev_CMakeLists.txt +++ b/tests/auto/testlib/selftests/printdatatagswithglobaltags/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## printdatatagswithglobaltags Binary: ##################################################################### -qt_add_executable(printdatatagswithglobaltags +qt_internal_add_executable(printdatatagswithglobaltags SOURCES tst_printdatatagswithglobaltags.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/testlib/selftests/printdatatagswithglobaltags/CMakeLists.txt b/tests/auto/testlib/selftests/printdatatagswithglobaltags/CMakeLists.txt index 9d9edf1fae9..323d3d65ed4 100644 --- a/tests/auto/testlib/selftests/printdatatagswithglobaltags/CMakeLists.txt +++ b/tests/auto/testlib/selftests/printdatatagswithglobaltags/CMakeLists.txt @@ -4,7 +4,7 @@ ## printdatatagswithglobaltags Binary: ##################################################################### -qt_add_executable(printdatatagswithglobaltags +qt_internal_add_executable(printdatatagswithglobaltags NO_INSTALL # special case OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case SOURCES @@ -17,5 +17,5 @@ qt_add_executable(printdatatagswithglobaltags ##################################################################### # special case begin -qt_apply_testlib_coverage_options(printdatatagswithglobaltags) +qt_internal_apply_testlib_coverage_options(printdatatagswithglobaltags) # special case end diff --git a/tests/auto/testlib/selftests/qexecstringlist/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/qexecstringlist/.prev_CMakeLists.txt index 50cf4d8473b..4c3d57c0b21 100644 --- a/tests/auto/testlib/selftests/qexecstringlist/.prev_CMakeLists.txt +++ b/tests/auto/testlib/selftests/qexecstringlist/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## qexecstringlist Binary: ##################################################################### -qt_add_executable(qexecstringlist +qt_internal_add_executable(qexecstringlist SOURCES tst_qexecstringlist.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/testlib/selftests/qexecstringlist/CMakeLists.txt b/tests/auto/testlib/selftests/qexecstringlist/CMakeLists.txt index 22ad5b79110..2aec291154a 100644 --- a/tests/auto/testlib/selftests/qexecstringlist/CMakeLists.txt +++ b/tests/auto/testlib/selftests/qexecstringlist/CMakeLists.txt @@ -4,7 +4,7 @@ ## qexecstringlist Binary: ##################################################################### -qt_add_executable(qexecstringlist +qt_internal_add_executable(qexecstringlist NO_INSTALL # special case OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case SOURCES @@ -17,5 +17,5 @@ qt_add_executable(qexecstringlist ##################################################################### # special case begin -qt_apply_testlib_coverage_options(qexecstringlist) +qt_internal_apply_testlib_coverage_options(qexecstringlist) # special case end diff --git a/tests/auto/testlib/selftests/signaldumper/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/signaldumper/.prev_CMakeLists.txt index e0f9e382934..ae410890c41 100644 --- a/tests/auto/testlib/selftests/signaldumper/.prev_CMakeLists.txt +++ b/tests/auto/testlib/selftests/signaldumper/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## signaldumper Binary: ##################################################################### -qt_add_executable(signaldumper +qt_internal_add_executable(signaldumper SOURCES tst_signaldumper.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/testlib/selftests/signaldumper/CMakeLists.txt b/tests/auto/testlib/selftests/signaldumper/CMakeLists.txt index 67ae4e690a1..a8c667d721d 100644 --- a/tests/auto/testlib/selftests/signaldumper/CMakeLists.txt +++ b/tests/auto/testlib/selftests/signaldumper/CMakeLists.txt @@ -4,7 +4,7 @@ ## signaldumper Binary: ##################################################################### -qt_add_executable(signaldumper +qt_internal_add_executable(signaldumper NO_INSTALL # special case OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case SOURCES @@ -17,5 +17,5 @@ qt_add_executable(signaldumper ##################################################################### # special case begin -qt_apply_testlib_coverage_options(signaldumper) +qt_internal_apply_testlib_coverage_options(signaldumper) # special case end diff --git a/tests/auto/testlib/selftests/silent/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/silent/.prev_CMakeLists.txt index 205586621ae..4b491af8031 100644 --- a/tests/auto/testlib/selftests/silent/.prev_CMakeLists.txt +++ b/tests/auto/testlib/selftests/silent/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## silent Binary: ##################################################################### -qt_add_executable(silent +qt_internal_add_executable(silent SOURCES tst_silent.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/testlib/selftests/silent/CMakeLists.txt b/tests/auto/testlib/selftests/silent/CMakeLists.txt index 873e7e1fe9e..d029aa80215 100644 --- a/tests/auto/testlib/selftests/silent/CMakeLists.txt +++ b/tests/auto/testlib/selftests/silent/CMakeLists.txt @@ -4,7 +4,7 @@ ## silent Binary: ##################################################################### -qt_add_executable(silent +qt_internal_add_executable(silent NO_INSTALL # special case OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case SOURCES @@ -17,5 +17,5 @@ qt_add_executable(silent ##################################################################### # special case begin -qt_apply_testlib_coverage_options(silent) +qt_internal_apply_testlib_coverage_options(silent) # special case end diff --git a/tests/auto/testlib/selftests/singleskip/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/singleskip/.prev_CMakeLists.txt index 8813e9a7597..2113efbec42 100644 --- a/tests/auto/testlib/selftests/singleskip/.prev_CMakeLists.txt +++ b/tests/auto/testlib/selftests/singleskip/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## singleskip Binary: ##################################################################### -qt_add_executable(singleskip +qt_internal_add_executable(singleskip SOURCES tst_singleskip.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/testlib/selftests/singleskip/CMakeLists.txt b/tests/auto/testlib/selftests/singleskip/CMakeLists.txt index 158c8dd0944..fa8132a3c12 100644 --- a/tests/auto/testlib/selftests/singleskip/CMakeLists.txt +++ b/tests/auto/testlib/selftests/singleskip/CMakeLists.txt @@ -4,7 +4,7 @@ ## singleskip Binary: ##################################################################### -qt_add_executable(singleskip +qt_internal_add_executable(singleskip NO_INSTALL # special case OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case SOURCES @@ -17,5 +17,5 @@ qt_add_executable(singleskip ##################################################################### # special case begin -qt_apply_testlib_coverage_options(singleskip) +qt_internal_apply_testlib_coverage_options(singleskip) # special case end diff --git a/tests/auto/testlib/selftests/skip/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/skip/.prev_CMakeLists.txt index 74d7e19cf3a..c93194854a9 100644 --- a/tests/auto/testlib/selftests/skip/.prev_CMakeLists.txt +++ b/tests/auto/testlib/selftests/skip/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## skip Binary: ##################################################################### -qt_add_executable(skip +qt_internal_add_executable(skip SOURCES tst_skip.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/testlib/selftests/skip/CMakeLists.txt b/tests/auto/testlib/selftests/skip/CMakeLists.txt index 5b7e35e4ceb..2841dcbd9a2 100644 --- a/tests/auto/testlib/selftests/skip/CMakeLists.txt +++ b/tests/auto/testlib/selftests/skip/CMakeLists.txt @@ -4,7 +4,7 @@ ## skip Binary: ##################################################################### -qt_add_executable(skip +qt_internal_add_executable(skip NO_INSTALL # special case OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case SOURCES @@ -17,5 +17,5 @@ qt_add_executable(skip ##################################################################### # special case begin -qt_apply_testlib_coverage_options(skip) +qt_internal_apply_testlib_coverage_options(skip) # special case end diff --git a/tests/auto/testlib/selftests/skipcleanup/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/skipcleanup/.prev_CMakeLists.txt index fba23174bd5..ee3e8873457 100644 --- a/tests/auto/testlib/selftests/skipcleanup/.prev_CMakeLists.txt +++ b/tests/auto/testlib/selftests/skipcleanup/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## skipcleanup Binary: ##################################################################### -qt_add_executable(skipcleanup +qt_internal_add_executable(skipcleanup SOURCES tst_skipcleanup.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/testlib/selftests/skipcleanup/CMakeLists.txt b/tests/auto/testlib/selftests/skipcleanup/CMakeLists.txt index fd64c94d9e7..5af361e25a9 100644 --- a/tests/auto/testlib/selftests/skipcleanup/CMakeLists.txt +++ b/tests/auto/testlib/selftests/skipcleanup/CMakeLists.txt @@ -4,7 +4,7 @@ ## skipcleanup Binary: ##################################################################### -qt_add_executable(skipcleanup +qt_internal_add_executable(skipcleanup NO_INSTALL # special case OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case SOURCES @@ -17,5 +17,5 @@ qt_add_executable(skipcleanup ##################################################################### # special case begin -qt_apply_testlib_coverage_options(skipcleanup) +qt_internal_apply_testlib_coverage_options(skipcleanup) # special case end diff --git a/tests/auto/testlib/selftests/skipinit/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/skipinit/.prev_CMakeLists.txt index c9af8b4a2cb..abb3dba8083 100644 --- a/tests/auto/testlib/selftests/skipinit/.prev_CMakeLists.txt +++ b/tests/auto/testlib/selftests/skipinit/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## skipinit Binary: ##################################################################### -qt_add_executable(skipinit +qt_internal_add_executable(skipinit SOURCES tst_skipinit.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/testlib/selftests/skipinit/CMakeLists.txt b/tests/auto/testlib/selftests/skipinit/CMakeLists.txt index 564b1cc8a3b..6cf2e97688b 100644 --- a/tests/auto/testlib/selftests/skipinit/CMakeLists.txt +++ b/tests/auto/testlib/selftests/skipinit/CMakeLists.txt @@ -4,7 +4,7 @@ ## skipinit Binary: ##################################################################### -qt_add_executable(skipinit +qt_internal_add_executable(skipinit NO_INSTALL # special case OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case SOURCES @@ -17,5 +17,5 @@ qt_add_executable(skipinit ##################################################################### # special case begin -qt_apply_testlib_coverage_options(skipinit) +qt_internal_apply_testlib_coverage_options(skipinit) # special case end diff --git a/tests/auto/testlib/selftests/skipinitdata/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/skipinitdata/.prev_CMakeLists.txt index b369f2f8c0d..87b8296371b 100644 --- a/tests/auto/testlib/selftests/skipinitdata/.prev_CMakeLists.txt +++ b/tests/auto/testlib/selftests/skipinitdata/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## skipinitdata Binary: ##################################################################### -qt_add_executable(skipinitdata +qt_internal_add_executable(skipinitdata SOURCES tst_skipinitdata.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/testlib/selftests/skipinitdata/CMakeLists.txt b/tests/auto/testlib/selftests/skipinitdata/CMakeLists.txt index fb1d77ba126..cacc40af666 100644 --- a/tests/auto/testlib/selftests/skipinitdata/CMakeLists.txt +++ b/tests/auto/testlib/selftests/skipinitdata/CMakeLists.txt @@ -4,7 +4,7 @@ ## skipinitdata Binary: ##################################################################### -qt_add_executable(skipinitdata +qt_internal_add_executable(skipinitdata NO_INSTALL # special case OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case SOURCES @@ -17,5 +17,5 @@ qt_add_executable(skipinitdata ##################################################################### # special case begin -qt_apply_testlib_coverage_options(skipinitdata) +qt_internal_apply_testlib_coverage_options(skipinitdata) # special case end diff --git a/tests/auto/testlib/selftests/sleep/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/sleep/.prev_CMakeLists.txt index 69e4dd0b58f..e0e19c9b553 100644 --- a/tests/auto/testlib/selftests/sleep/.prev_CMakeLists.txt +++ b/tests/auto/testlib/selftests/sleep/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## sleep Binary: ##################################################################### -qt_add_executable(sleep +qt_internal_add_executable(sleep SOURCES tst_sleep.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/testlib/selftests/sleep/CMakeLists.txt b/tests/auto/testlib/selftests/sleep/CMakeLists.txt index f77da085328..418c61bab9d 100644 --- a/tests/auto/testlib/selftests/sleep/CMakeLists.txt +++ b/tests/auto/testlib/selftests/sleep/CMakeLists.txt @@ -4,7 +4,7 @@ ## sleep Binary: ##################################################################### -qt_add_executable(sleep +qt_internal_add_executable(sleep NO_INSTALL # special case OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case SOURCES @@ -17,5 +17,5 @@ qt_add_executable(sleep ##################################################################### # special case begin -qt_apply_testlib_coverage_options(sleep) +qt_internal_apply_testlib_coverage_options(sleep) # special case end diff --git a/tests/auto/testlib/selftests/strcmp/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/strcmp/.prev_CMakeLists.txt index a02ae81b766..151775652c1 100644 --- a/tests/auto/testlib/selftests/strcmp/.prev_CMakeLists.txt +++ b/tests/auto/testlib/selftests/strcmp/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## strcmp Binary: ##################################################################### -qt_add_executable(strcmp +qt_internal_add_executable(strcmp SOURCES tst_strcmp.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/testlib/selftests/strcmp/CMakeLists.txt b/tests/auto/testlib/selftests/strcmp/CMakeLists.txt index 02898232c5d..23919e5c320 100644 --- a/tests/auto/testlib/selftests/strcmp/CMakeLists.txt +++ b/tests/auto/testlib/selftests/strcmp/CMakeLists.txt @@ -4,7 +4,7 @@ ## strcmp Binary: ##################################################################### -qt_add_executable(strcmp +qt_internal_add_executable(strcmp NO_INSTALL # special case OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case SOURCES @@ -17,5 +17,5 @@ qt_add_executable(strcmp ##################################################################### # special case begin -qt_apply_testlib_coverage_options(strcmp) +qt_internal_apply_testlib_coverage_options(strcmp) # special case end diff --git a/tests/auto/testlib/selftests/subtest/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/subtest/.prev_CMakeLists.txt index 39243acfc9a..99c087bf03a 100644 --- a/tests/auto/testlib/selftests/subtest/.prev_CMakeLists.txt +++ b/tests/auto/testlib/selftests/subtest/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## subtest Binary: ##################################################################### -qt_add_executable(subtest +qt_internal_add_executable(subtest SOURCES tst_subtest.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/testlib/selftests/subtest/CMakeLists.txt b/tests/auto/testlib/selftests/subtest/CMakeLists.txt index e27c3a1b4a6..fc459b96e2d 100644 --- a/tests/auto/testlib/selftests/subtest/CMakeLists.txt +++ b/tests/auto/testlib/selftests/subtest/CMakeLists.txt @@ -4,7 +4,7 @@ ## subtest Binary: ##################################################################### -qt_add_executable(subtest +qt_internal_add_executable(subtest NO_INSTALL # special case OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case SOURCES @@ -17,5 +17,5 @@ qt_add_executable(subtest ##################################################################### # special case begin -qt_apply_testlib_coverage_options(subtest) +qt_internal_apply_testlib_coverage_options(subtest) # special case end diff --git a/tests/auto/testlib/selftests/testlib/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/testlib/.prev_CMakeLists.txt index 8e95483b3cc..680409cc7d7 100644 --- a/tests/auto/testlib/selftests/testlib/.prev_CMakeLists.txt +++ b/tests/auto/testlib/selftests/testlib/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## testlib Binary: ##################################################################### -qt_add_executable(testlib +qt_internal_add_executable(testlib SOURCES tst_testlib.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/testlib/selftests/testlib/CMakeLists.txt b/tests/auto/testlib/selftests/testlib/CMakeLists.txt index 0144bd8eeed..776f503bf26 100644 --- a/tests/auto/testlib/selftests/testlib/CMakeLists.txt +++ b/tests/auto/testlib/selftests/testlib/CMakeLists.txt @@ -4,7 +4,7 @@ ## testlib Binary: ##################################################################### -qt_add_executable(testlib +qt_internal_add_executable(testlib NO_INSTALL # special case OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case SOURCES @@ -17,5 +17,5 @@ qt_add_executable(testlib ##################################################################### # special case begin -qt_apply_testlib_coverage_options(testlib) +qt_internal_apply_testlib_coverage_options(testlib) # special case end diff --git a/tests/auto/testlib/selftests/tuplediagnostics/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/tuplediagnostics/.prev_CMakeLists.txt index 90dd3bf6a92..71062b5dba7 100644 --- a/tests/auto/testlib/selftests/tuplediagnostics/.prev_CMakeLists.txt +++ b/tests/auto/testlib/selftests/tuplediagnostics/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## tuplediagnostics Binary: ##################################################################### -qt_add_executable(tuplediagnostics +qt_internal_add_executable(tuplediagnostics SOURCES tst_tuplediagnostics.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/testlib/selftests/tuplediagnostics/CMakeLists.txt b/tests/auto/testlib/selftests/tuplediagnostics/CMakeLists.txt index f26a1ea5d6a..bf72eeae0bc 100644 --- a/tests/auto/testlib/selftests/tuplediagnostics/CMakeLists.txt +++ b/tests/auto/testlib/selftests/tuplediagnostics/CMakeLists.txt @@ -4,7 +4,7 @@ ## tuplediagnostics Binary: ##################################################################### -qt_add_executable(tuplediagnostics +qt_internal_add_executable(tuplediagnostics NO_INSTALL # special case OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case SOURCES @@ -14,5 +14,5 @@ qt_add_executable(tuplediagnostics ) # special case begin -qt_apply_testlib_coverage_options(tuplediagnostics) +qt_internal_apply_testlib_coverage_options(tuplediagnostics) # special case end diff --git a/tests/auto/testlib/selftests/verbose1/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/verbose1/.prev_CMakeLists.txt index bb821ab639b..3b5039c213c 100644 --- a/tests/auto/testlib/selftests/verbose1/.prev_CMakeLists.txt +++ b/tests/auto/testlib/selftests/verbose1/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## verbose1 Binary: ##################################################################### -qt_add_executable(verbose1 +qt_internal_add_executable(verbose1 SOURCES ../counting/tst_counting.cpp DEFINES diff --git a/tests/auto/testlib/selftests/verbose1/CMakeLists.txt b/tests/auto/testlib/selftests/verbose1/CMakeLists.txt index 2a827d4247e..7f608201113 100644 --- a/tests/auto/testlib/selftests/verbose1/CMakeLists.txt +++ b/tests/auto/testlib/selftests/verbose1/CMakeLists.txt @@ -4,7 +4,7 @@ ## verbose1 Binary: ##################################################################### -qt_add_executable(verbose1 +qt_internal_add_executable(verbose1 NO_INSTALL # special case OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case SOURCES @@ -19,5 +19,5 @@ qt_add_executable(verbose1 ##################################################################### # special case begin -qt_apply_testlib_coverage_options(verbose1) +qt_internal_apply_testlib_coverage_options(verbose1) # special case end diff --git a/tests/auto/testlib/selftests/verbose2/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/verbose2/.prev_CMakeLists.txt index fcef3dc5ec3..4704a90d34a 100644 --- a/tests/auto/testlib/selftests/verbose2/.prev_CMakeLists.txt +++ b/tests/auto/testlib/selftests/verbose2/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## verbose2 Binary: ##################################################################### -qt_add_executable(verbose2 +qt_internal_add_executable(verbose2 SOURCES ../counting/tst_counting.cpp DEFINES diff --git a/tests/auto/testlib/selftests/verbose2/CMakeLists.txt b/tests/auto/testlib/selftests/verbose2/CMakeLists.txt index 99a821d452e..63eae28728a 100644 --- a/tests/auto/testlib/selftests/verbose2/CMakeLists.txt +++ b/tests/auto/testlib/selftests/verbose2/CMakeLists.txt @@ -4,7 +4,7 @@ ## verbose2 Binary: ##################################################################### -qt_add_executable(verbose2 +qt_internal_add_executable(verbose2 NO_INSTALL # special case OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case SOURCES @@ -19,5 +19,5 @@ qt_add_executable(verbose2 ##################################################################### # special case begin -qt_apply_testlib_coverage_options(verbose2) +qt_internal_apply_testlib_coverage_options(verbose2) # special case end diff --git a/tests/auto/testlib/selftests/verifyexceptionthrown/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/verifyexceptionthrown/.prev_CMakeLists.txt index a5c4c6c1563..989827573b4 100644 --- a/tests/auto/testlib/selftests/verifyexceptionthrown/.prev_CMakeLists.txt +++ b/tests/auto/testlib/selftests/verifyexceptionthrown/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## verifyexceptionthrown Binary: ##################################################################### -qt_add_executable(verifyexceptionthrown +qt_internal_add_executable(verifyexceptionthrown EXCEPTIONS SOURCES tst_verifyexceptionthrown.cpp diff --git a/tests/auto/testlib/selftests/verifyexceptionthrown/CMakeLists.txt b/tests/auto/testlib/selftests/verifyexceptionthrown/CMakeLists.txt index b6467bdba81..b6177bc8c3a 100644 --- a/tests/auto/testlib/selftests/verifyexceptionthrown/CMakeLists.txt +++ b/tests/auto/testlib/selftests/verifyexceptionthrown/CMakeLists.txt @@ -4,7 +4,7 @@ ## verifyexceptionthrown Binary: ##################################################################### -qt_add_executable(verifyexceptionthrown +qt_internal_add_executable(verifyexceptionthrown EXCEPTIONS NO_INSTALL # special case OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case @@ -18,5 +18,5 @@ qt_add_executable(verifyexceptionthrown ##################################################################### # special case begin -qt_apply_testlib_coverage_options(verifyexceptionthrown) +qt_internal_apply_testlib_coverage_options(verifyexceptionthrown) # special case end diff --git a/tests/auto/testlib/selftests/warnings/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/warnings/.prev_CMakeLists.txt index f87eb13b42e..c806b034109 100644 --- a/tests/auto/testlib/selftests/warnings/.prev_CMakeLists.txt +++ b/tests/auto/testlib/selftests/warnings/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## warnings Binary: ##################################################################### -qt_add_executable(warnings +qt_internal_add_executable(warnings SOURCES tst_warnings.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/testlib/selftests/warnings/CMakeLists.txt b/tests/auto/testlib/selftests/warnings/CMakeLists.txt index ca8268bd37f..178a8077265 100644 --- a/tests/auto/testlib/selftests/warnings/CMakeLists.txt +++ b/tests/auto/testlib/selftests/warnings/CMakeLists.txt @@ -4,7 +4,7 @@ ## warnings Binary: ##################################################################### -qt_add_executable(warnings +qt_internal_add_executable(warnings NO_INSTALL # special case OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case SOURCES @@ -17,5 +17,5 @@ qt_add_executable(warnings ##################################################################### # special case begin -qt_apply_testlib_coverage_options(warnings) +qt_internal_apply_testlib_coverage_options(warnings) # special case end diff --git a/tests/auto/testlib/selftests/watchdog/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/watchdog/.prev_CMakeLists.txt index 3d21decf534..5183a6a9347 100644 --- a/tests/auto/testlib/selftests/watchdog/.prev_CMakeLists.txt +++ b/tests/auto/testlib/selftests/watchdog/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## watchdog Binary: ##################################################################### -qt_add_executable(watchdog +qt_internal_add_executable(watchdog SOURCES tst_watchdog.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/testlib/selftests/watchdog/CMakeLists.txt b/tests/auto/testlib/selftests/watchdog/CMakeLists.txt index 8fed7f8d798..1515e506190 100644 --- a/tests/auto/testlib/selftests/watchdog/CMakeLists.txt +++ b/tests/auto/testlib/selftests/watchdog/CMakeLists.txt @@ -4,7 +4,7 @@ ## watchdog Binary: ##################################################################### -qt_add_executable(watchdog +qt_internal_add_executable(watchdog NO_INSTALL # special case OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case SOURCES @@ -22,5 +22,5 @@ qt_add_executable(watchdog ##################################################################### # special case begin -qt_apply_testlib_coverage_options(watchdog) +qt_internal_apply_testlib_coverage_options(watchdog) # special case end diff --git a/tests/auto/testlib/selftests/xunit/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/xunit/.prev_CMakeLists.txt index 7ba9f326919..190f725b73c 100644 --- a/tests/auto/testlib/selftests/xunit/.prev_CMakeLists.txt +++ b/tests/auto/testlib/selftests/xunit/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## xunit Binary: ##################################################################### -qt_add_executable(xunit +qt_internal_add_executable(xunit SOURCES tst_xunit.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/testlib/selftests/xunit/CMakeLists.txt b/tests/auto/testlib/selftests/xunit/CMakeLists.txt index 5474ae91f64..c153d085d08 100644 --- a/tests/auto/testlib/selftests/xunit/CMakeLists.txt +++ b/tests/auto/testlib/selftests/xunit/CMakeLists.txt @@ -4,7 +4,7 @@ ## xunit Binary: ##################################################################### -qt_add_executable(xunit +qt_internal_add_executable(xunit NO_INSTALL # special case OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case SOURCES @@ -17,5 +17,5 @@ qt_add_executable(xunit ##################################################################### # special case begin -qt_apply_testlib_coverage_options(xunit) +qt_internal_apply_testlib_coverage_options(xunit) # special case end diff --git a/tests/auto/tools/moc/CMakeLists.txt b/tests/auto/tools/moc/CMakeLists.txt index db953ab735e..b34a4d0a3fe 100644 --- a/tests/auto/tools/moc/CMakeLists.txt +++ b/tests/auto/tools/moc/CMakeLists.txt @@ -60,7 +60,7 @@ qt_wrap_cpp(comparison_relevant_moc_list ${JSON_HEADERS} list(TRANSFORM comparison_relevant_moc_list APPEND ".json" OUTPUT_VARIABLE moc_json_files) -qt_add_test(tst_moc +qt_internal_add_test(tst_moc SOURCES cxx-attributes.h tst_moc.cpp @@ -77,9 +77,9 @@ qt_add_test(tst_moc EXCEPTIONS ) -qt_extend_target(tst_moc PUBLIC_LIBRARIES Qt::CorePrivate) +qt_internal_extend_target(tst_moc PUBLIC_LIBRARIES Qt::CorePrivate) -qt_extend_target(tst_moc CONDITION CMAKE_CROSSCOMPILING +qt_internal_extend_target(tst_moc CONDITION CMAKE_CROSSCOMPILING DEFINES MOC_CROSS_COMPILED ) @@ -88,34 +88,34 @@ if (UNIX AND (CLANG OR GCC OR ICC)) qt_wrap_cpp(os9_moc os9-newlines.h) endif() -qt_extend_target(tst_moc CONDITION UNIX AND (CLANG OR GCC OR ICC) +qt_internal_extend_target(tst_moc CONDITION UNIX AND (CLANG OR GCC OR ICC) SOURCES os9-newlines.h win-newlines.h ${os9_moc} ) -qt_extend_target(tst_moc CONDITION CLANG OR GCC +qt_internal_extend_target(tst_moc CONDITION CLANG OR GCC SOURCES dollars.h ) -qt_extend_target(tst_moc CONDITION TARGET Qt::DBus +qt_internal_extend_target(tst_moc CONDITION TARGET Qt::DBus PUBLIC_LIBRARIES Qt::DBus ) -qt_extend_target(tst_moc CONDITION TARGET Qt::Concurrent +qt_internal_extend_target(tst_moc CONDITION TARGET Qt::Concurrent PUBLIC_LIBRARIES Qt::Concurrent ) -qt_extend_target(tst_moc CONDITION TARGET Qt::Network +qt_internal_extend_target(tst_moc CONDITION TARGET Qt::Network PUBLIC_LIBRARIES Qt::Network ) -qt_extend_target(tst_moc CONDITION TARGET Qt::Sql +qt_internal_extend_target(tst_moc CONDITION TARGET Qt::Sql PUBLIC_LIBRARIES Qt::Sql ) diff --git a/tests/auto/tools/qdbuscpp2xml/CMakeLists.txt b/tests/auto/tools/qdbuscpp2xml/CMakeLists.txt index 83819cf2c6b..ad2d289eb43 100644 --- a/tests/auto/tools/qdbuscpp2xml/CMakeLists.txt +++ b/tests/auto/tools/qdbuscpp2xml/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qdbuscpp2xml Test: ##################################################################### -qt_add_test(tst_qdbuscpp2xml +qt_internal_add_test(tst_qdbuscpp2xml SOURCES test1.h tst_qdbuscpp2xml.cpp @@ -17,7 +17,7 @@ set(qdbuscpp2xml_resource_files "test1.h" ) -qt_add_resource(tst_qdbuscpp2xml "qdbuscpp2xml" +qt_internal_add_resource(tst_qdbuscpp2xml "qdbuscpp2xml" PREFIX "/tst_qdbuscpp2xml/" FILES diff --git a/tests/auto/tools/qdbusxml2cpp/CMakeLists.txt b/tests/auto/tools/qdbusxml2cpp/CMakeLists.txt index 6a240944620..9932f9f32ba 100644 --- a/tests/auto/tools/qdbusxml2cpp/CMakeLists.txt +++ b/tests/auto/tools/qdbusxml2cpp/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qdbusxml2cpp Test: ##################################################################### -qt_add_test(tst_qdbusxml2cpp +qt_internal_add_test(tst_qdbusxml2cpp SOURCES tst_qdbusxml2cpp.cpp ) diff --git a/tests/auto/tools/qmake/.prev_CMakeLists.txt b/tests/auto/tools/qmake/.prev_CMakeLists.txt index 48b88a2285e..a6aec5df5f7 100644 --- a/tests/auto/tools/qmake/.prev_CMakeLists.txt +++ b/tests/auto/tools/qmake/.prev_CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob testdata/*) list(APPEND test_data ${test_data_glob}) -add_qt_test(tst_qmake +qt_internal_add_test(tst_qmake SOURCES testcompiler.cpp testcompiler.h tst_qmake.cpp diff --git a/tests/auto/tools/qmake/CMakeLists.txt b/tests/auto/tools/qmake/CMakeLists.txt index adb2da7916d..a6aec5df5f7 100644 --- a/tests/auto/tools/qmake/CMakeLists.txt +++ b/tests/auto/tools/qmake/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob testdata/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qmake +qt_internal_add_test(tst_qmake SOURCES testcompiler.cpp testcompiler.h tst_qmake.cpp diff --git a/tests/auto/tools/qmakelib/CMakeLists.txt b/tests/auto/tools/qmakelib/CMakeLists.txt index c95ef2fe0fe..8d0f8d70267 100644 --- a/tests/auto/tools/qmakelib/CMakeLists.txt +++ b/tests/auto/tools/qmakelib/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qmakelib Test: ##################################################################### -qt_add_test(tst_qmakelib +qt_internal_add_test(tst_qmakelib SOURCES ../../../../qmake/library/ioutils.cpp ../../../../qmake/library/proitems.cpp @@ -29,7 +29,7 @@ qt_add_test(tst_qmakelib ## Scopes: ##################################################################### -qt_extend_target(tst_qmakelib CONDITION WIN32 +qt_internal_extend_target(tst_qmakelib CONDITION WIN32 PUBLIC_LIBRARIES advapi32 ) diff --git a/tests/auto/tools/rcc/CMakeLists.txt b/tests/auto/tools/rcc/CMakeLists.txt index 06d62244ffb..40b91baa3a1 100644 --- a/tests/auto/tools/rcc/CMakeLists.txt +++ b/tests/auto/tools/rcc/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_rcc Test: ##################################################################### -qt_add_test(tst_rcc +qt_internal_add_test(tst_rcc SOURCES tst_rcc.cpp ) @@ -16,7 +16,7 @@ set(images_resource_files "images/subdir/triangle.png" ) -qt_add_resource(tst_rcc "images" +qt_internal_add_resource(tst_rcc "images" PREFIX "/" BASE @@ -28,7 +28,7 @@ set(size-0_resource_files "data/data-0.txt" ) -qt_add_resource(tst_rcc "size-0" +qt_internal_add_resource(tst_rcc "size-0" PREFIX "/" BASE @@ -43,7 +43,7 @@ set(size-2-0-35-1_resource_files "data/data-35.txt" ) -qt_add_resource(tst_rcc "size-2-0-35-1" +qt_internal_add_resource(tst_rcc "size-2-0-35-1" PREFIX "/" BASE @@ -55,7 +55,7 @@ set(size-1_resource_files "data/data-1.txt" ) -qt_add_resource(tst_rcc "size-1" +qt_internal_add_resource(tst_rcc "size-1" PREFIX "/" BASE diff --git a/tests/auto/tools/uic/CMakeLists.txt b/tests/auto/tools/uic/CMakeLists.txt index 2f8b8aa648b..03af78a9c28 100644 --- a/tests/auto/tools/uic/CMakeLists.txt +++ b/tests/auto/tools/uic/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_uic Test: ##################################################################### -qt_add_test(tst_uic +qt_internal_add_test(tst_uic SOURCES tst_uic.cpp ) diff --git a/tests/auto/widgets/dialogs/qcolordialog/CMakeLists.txt b/tests/auto/widgets/dialogs/qcolordialog/CMakeLists.txt index e0c25e381b3..a25c02ad928 100644 --- a/tests/auto/widgets/dialogs/qcolordialog/CMakeLists.txt +++ b/tests/auto/widgets/dialogs/qcolordialog/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qcolordialog Test: ##################################################################### -qt_add_test(tst_qcolordialog +qt_internal_add_test(tst_qcolordialog SOURCES tst_qcolordialog.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/dialogs/qdialog/CMakeLists.txt b/tests/auto/widgets/dialogs/qdialog/CMakeLists.txt index 54bfb2aedb9..08c4222535e 100644 --- a/tests/auto/widgets/dialogs/qdialog/CMakeLists.txt +++ b/tests/auto/widgets/dialogs/qdialog/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qdialog Test: ##################################################################### -qt_add_test(tst_qdialog +qt_internal_add_test(tst_qdialog SOURCES tst_qdialog.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/dialogs/qerrormessage/CMakeLists.txt b/tests/auto/widgets/dialogs/qerrormessage/CMakeLists.txt index 1120c2b53b9..2ea2f01cdda 100644 --- a/tests/auto/widgets/dialogs/qerrormessage/CMakeLists.txt +++ b/tests/auto/widgets/dialogs/qerrormessage/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qerrormessage Test: ##################################################################### -qt_add_test(tst_qerrormessage +qt_internal_add_test(tst_qerrormessage SOURCES tst_qerrormessage.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/dialogs/qfiledialog/CMakeLists.txt b/tests/auto/widgets/dialogs/qfiledialog/CMakeLists.txt index a1f37df1376..6515645c052 100644 --- a/tests/auto/widgets/dialogs/qfiledialog/CMakeLists.txt +++ b/tests/auto/widgets/dialogs/qfiledialog/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qfiledialog Test: ##################################################################### -qt_add_test(tst_qfiledialog +qt_internal_add_test(tst_qfiledialog SOURCES tst_qfiledialog.cpp DEFINES diff --git a/tests/auto/widgets/dialogs/qfiledialog2/CMakeLists.txt b/tests/auto/widgets/dialogs/qfiledialog2/CMakeLists.txt index 6fae963999b..4fded21556d 100644 --- a/tests/auto/widgets/dialogs/qfiledialog2/CMakeLists.txt +++ b/tests/auto/widgets/dialogs/qfiledialog2/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qfiledialog2 Test: ##################################################################### -qt_add_test(tst_qfiledialog2 +qt_internal_add_test(tst_qfiledialog2 SOURCES tst_qfiledialog2.cpp DEFINES diff --git a/tests/auto/widgets/dialogs/qfontdialog/CMakeLists.txt b/tests/auto/widgets/dialogs/qfontdialog/CMakeLists.txt index e8a6d368b83..4e231cc6cc5 100644 --- a/tests/auto/widgets/dialogs/qfontdialog/CMakeLists.txt +++ b/tests/auto/widgets/dialogs/qfontdialog/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qfontdialog Test: ##################################################################### -qt_add_test(tst_qfontdialog +qt_internal_add_test(tst_qfontdialog SOURCES tst_qfontdialog.cpp PUBLIC_LIBRARIES @@ -27,7 +27,7 @@ set(testfonts_resource_files "../../../shared/resources/testfont.ttf" ) -qt_add_resource(tst_qfontdialog "testfonts" +qt_internal_add_resource(tst_qfontdialog "testfonts" PREFIX "/" FILES diff --git a/tests/auto/widgets/dialogs/qinputdialog/CMakeLists.txt b/tests/auto/widgets/dialogs/qinputdialog/CMakeLists.txt index 9cd73ef4f1f..cdb311a3c2d 100644 --- a/tests/auto/widgets/dialogs/qinputdialog/CMakeLists.txt +++ b/tests/auto/widgets/dialogs/qinputdialog/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qinputdialog Test: ##################################################################### -qt_add_test(tst_qinputdialog +qt_internal_add_test(tst_qinputdialog SOURCES tst_qinputdialog.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/dialogs/qmessagebox/CMakeLists.txt b/tests/auto/widgets/dialogs/qmessagebox/CMakeLists.txt index f26171f08a4..8b6b864cf72 100644 --- a/tests/auto/widgets/dialogs/qmessagebox/CMakeLists.txt +++ b/tests/auto/widgets/dialogs/qmessagebox/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qmessagebox Test: ##################################################################### -qt_add_test(tst_qmessagebox +qt_internal_add_test(tst_qmessagebox SOURCES tst_qmessagebox.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/dialogs/qprogressdialog/CMakeLists.txt b/tests/auto/widgets/dialogs/qprogressdialog/CMakeLists.txt index f3d7fc365ba..5651cf8d260 100644 --- a/tests/auto/widgets/dialogs/qprogressdialog/CMakeLists.txt +++ b/tests/auto/widgets/dialogs/qprogressdialog/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qprogressdialog Test: ##################################################################### -qt_add_test(tst_qprogressdialog +qt_internal_add_test(tst_qprogressdialog SOURCES tst_qprogressdialog.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/dialogs/qsidebar/CMakeLists.txt b/tests/auto/widgets/dialogs/qsidebar/CMakeLists.txt index d92fac52539..8d2fda708d8 100644 --- a/tests/auto/widgets/dialogs/qsidebar/CMakeLists.txt +++ b/tests/auto/widgets/dialogs/qsidebar/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qsidebar Test: ##################################################################### -qt_add_test(tst_qsidebar +qt_internal_add_test(tst_qsidebar SOURCES tst_qsidebar.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/dialogs/qwizard/CMakeLists.txt b/tests/auto/widgets/dialogs/qwizard/CMakeLists.txt index f385812b40c..81dc9e85b29 100644 --- a/tests/auto/widgets/dialogs/qwizard/CMakeLists.txt +++ b/tests/auto/widgets/dialogs/qwizard/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qwizard Test: ##################################################################### -qt_add_test(tst_qwizard +qt_internal_add_test(tst_qwizard SOURCES tst_qwizard.cpp tst_qwizard_2.cpp @@ -21,7 +21,7 @@ set(qwizard_resource_files "images/watermark.png" ) -qt_add_resource(tst_qwizard "qwizard" +qt_internal_add_resource(tst_qwizard "qwizard" PREFIX "/" FILES diff --git a/tests/auto/widgets/effects/qgraphicseffect/CMakeLists.txt b/tests/auto/widgets/effects/qgraphicseffect/CMakeLists.txt index b8665dc2d2b..a88859681bd 100644 --- a/tests/auto/widgets/effects/qgraphicseffect/CMakeLists.txt +++ b/tests/auto/widgets/effects/qgraphicseffect/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qgraphicseffect Test: ##################################################################### -qt_add_test(tst_qgraphicseffect +qt_internal_add_test(tst_qgraphicseffect SOURCES tst_qgraphicseffect.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/effects/qpixmapfilter/CMakeLists.txt b/tests/auto/widgets/effects/qpixmapfilter/CMakeLists.txt index 56feb2c09e7..733a45b3342 100644 --- a/tests/auto/widgets/effects/qpixmapfilter/CMakeLists.txt +++ b/tests/auto/widgets/effects/qpixmapfilter/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qpixmapfilter Test: ##################################################################### -qt_add_test(tst_qpixmapfilter +qt_internal_add_test(tst_qpixmapfilter SOURCES tst_qpixmapfilter.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/graphicsview/qgraphicsanchorlayout/CMakeLists.txt b/tests/auto/widgets/graphicsview/qgraphicsanchorlayout/CMakeLists.txt index 8bf6a5b5ad9..1d1e5762998 100644 --- a/tests/auto/widgets/graphicsview/qgraphicsanchorlayout/CMakeLists.txt +++ b/tests/auto/widgets/graphicsview/qgraphicsanchorlayout/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qgraphicsanchorlayout Test: ##################################################################### -qt_add_test(tst_qgraphicsanchorlayout +qt_internal_add_test(tst_qgraphicsanchorlayout SOURCES tst_qgraphicsanchorlayout.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/graphicsview/qgraphicsanchorlayout1/CMakeLists.txt b/tests/auto/widgets/graphicsview/qgraphicsanchorlayout1/CMakeLists.txt index a945cbf86f8..11d2767c9ea 100644 --- a/tests/auto/widgets/graphicsview/qgraphicsanchorlayout1/CMakeLists.txt +++ b/tests/auto/widgets/graphicsview/qgraphicsanchorlayout1/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qgraphicsanchorlayout1 Test: ##################################################################### -qt_add_test(tst_qgraphicsanchorlayout1 +qt_internal_add_test(tst_qgraphicsanchorlayout1 SOURCES tst_qgraphicsanchorlayout1.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/graphicsview/qgraphicseffectsource/CMakeLists.txt b/tests/auto/widgets/graphicsview/qgraphicseffectsource/CMakeLists.txt index a5089345540..5a4fda8234b 100644 --- a/tests/auto/widgets/graphicsview/qgraphicseffectsource/CMakeLists.txt +++ b/tests/auto/widgets/graphicsview/qgraphicseffectsource/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qgraphicseffectsource Test: ##################################################################### -qt_add_test(tst_qgraphicseffectsource +qt_internal_add_test(tst_qgraphicseffectsource SOURCES tst_qgraphicseffectsource.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/graphicsview/qgraphicsgridlayout/CMakeLists.txt b/tests/auto/widgets/graphicsview/qgraphicsgridlayout/CMakeLists.txt index 778f30d7bf0..0554d628073 100644 --- a/tests/auto/widgets/graphicsview/qgraphicsgridlayout/CMakeLists.txt +++ b/tests/auto/widgets/graphicsview/qgraphicsgridlayout/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qgraphicsgridlayout Test: ##################################################################### -qt_add_test(tst_qgraphicsgridlayout +qt_internal_add_test(tst_qgraphicsgridlayout SOURCES tst_qgraphicsgridlayout.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/graphicsview/qgraphicsitem/CMakeLists.txt b/tests/auto/widgets/graphicsview/qgraphicsitem/CMakeLists.txt index 013315c9b27..02a667eb9cb 100644 --- a/tests/auto/widgets/graphicsview/qgraphicsitem/CMakeLists.txt +++ b/tests/auto/widgets/graphicsview/qgraphicsitem/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qgraphicsitem Test: ##################################################################### -qt_add_test(tst_qgraphicsitem +qt_internal_add_test(tst_qgraphicsitem SOURCES tst_qgraphicsitem.cpp DEFINES @@ -21,7 +21,7 @@ qt_add_test(tst_qgraphicsitem ## Scopes: ##################################################################### -qt_extend_target(tst_qgraphicsitem CONDITION WIN32 +qt_internal_extend_target(tst_qgraphicsitem CONDITION WIN32 PUBLIC_LIBRARIES user32 ) diff --git a/tests/auto/widgets/graphicsview/qgraphicsitemanimation/CMakeLists.txt b/tests/auto/widgets/graphicsview/qgraphicsitemanimation/CMakeLists.txt index 63adc2ea780..48bb84d1bbb 100644 --- a/tests/auto/widgets/graphicsview/qgraphicsitemanimation/CMakeLists.txt +++ b/tests/auto/widgets/graphicsview/qgraphicsitemanimation/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qgraphicsitemanimation Test: ##################################################################### -qt_add_test(tst_qgraphicsitemanimation +qt_internal_add_test(tst_qgraphicsitemanimation SOURCES tst_qgraphicsitemanimation.cpp DEFINES diff --git a/tests/auto/widgets/graphicsview/qgraphicslayout/CMakeLists.txt b/tests/auto/widgets/graphicsview/qgraphicslayout/CMakeLists.txt index f11bcfe0a1e..768898549e4 100644 --- a/tests/auto/widgets/graphicsview/qgraphicslayout/CMakeLists.txt +++ b/tests/auto/widgets/graphicsview/qgraphicslayout/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qgraphicslayout Test: ##################################################################### -qt_add_test(tst_qgraphicslayout +qt_internal_add_test(tst_qgraphicslayout SOURCES tst_qgraphicslayout.cpp DEFINES diff --git a/tests/auto/widgets/graphicsview/qgraphicslayoutitem/CMakeLists.txt b/tests/auto/widgets/graphicsview/qgraphicslayoutitem/CMakeLists.txt index 36d7177f225..d927ec59aab 100644 --- a/tests/auto/widgets/graphicsview/qgraphicslayoutitem/CMakeLists.txt +++ b/tests/auto/widgets/graphicsview/qgraphicslayoutitem/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qgraphicslayoutitem Test: ##################################################################### -qt_add_test(tst_qgraphicslayoutitem +qt_internal_add_test(tst_qgraphicslayoutitem SOURCES tst_qgraphicslayoutitem.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/graphicsview/qgraphicslinearlayout/CMakeLists.txt b/tests/auto/widgets/graphicsview/qgraphicslinearlayout/CMakeLists.txt index 96dbadc4b97..6c2e7343486 100644 --- a/tests/auto/widgets/graphicsview/qgraphicslinearlayout/CMakeLists.txt +++ b/tests/auto/widgets/graphicsview/qgraphicslinearlayout/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qgraphicslinearlayout Test: ##################################################################### -qt_add_test(tst_qgraphicslinearlayout +qt_internal_add_test(tst_qgraphicslinearlayout SOURCES tst_qgraphicslinearlayout.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/graphicsview/qgraphicsobject/CMakeLists.txt b/tests/auto/widgets/graphicsview/qgraphicsobject/CMakeLists.txt index f999e131626..9b7bf4c63ca 100644 --- a/tests/auto/widgets/graphicsview/qgraphicsobject/CMakeLists.txt +++ b/tests/auto/widgets/graphicsview/qgraphicsobject/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qgraphicsobject Test: ##################################################################### -qt_add_test(tst_qgraphicsobject +qt_internal_add_test(tst_qgraphicsobject SOURCES tst_qgraphicsobject.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/graphicsview/qgraphicspixmapitem/CMakeLists.txt b/tests/auto/widgets/graphicsview/qgraphicspixmapitem/CMakeLists.txt index 8cb278720b5..a848a8dd77f 100644 --- a/tests/auto/widgets/graphicsview/qgraphicspixmapitem/CMakeLists.txt +++ b/tests/auto/widgets/graphicsview/qgraphicspixmapitem/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qgraphicspixmapitem Test: ##################################################################### -qt_add_test(tst_qgraphicspixmapitem +qt_internal_add_test(tst_qgraphicspixmapitem SOURCES tst_qgraphicspixmapitem.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/graphicsview/qgraphicspolygonitem/CMakeLists.txt b/tests/auto/widgets/graphicsview/qgraphicspolygonitem/CMakeLists.txt index 57423538925..8a3c88a8a2d 100644 --- a/tests/auto/widgets/graphicsview/qgraphicspolygonitem/CMakeLists.txt +++ b/tests/auto/widgets/graphicsview/qgraphicspolygonitem/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qgraphicspolygonitem Test: ##################################################################### -qt_add_test(tst_qgraphicspolygonitem +qt_internal_add_test(tst_qgraphicspolygonitem SOURCES tst_qgraphicspolygonitem.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/graphicsview/qgraphicsproxywidget/CMakeLists.txt b/tests/auto/widgets/graphicsview/qgraphicsproxywidget/CMakeLists.txt index 67509dae985..a1bf1270c25 100644 --- a/tests/auto/widgets/graphicsview/qgraphicsproxywidget/CMakeLists.txt +++ b/tests/auto/widgets/graphicsview/qgraphicsproxywidget/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qgraphicsproxywidget Test: ##################################################################### -qt_add_test(tst_qgraphicsproxywidget +qt_internal_add_test(tst_qgraphicsproxywidget SOURCES tst_qgraphicsproxywidget.cpp DEFINES diff --git a/tests/auto/widgets/graphicsview/qgraphicsscene/.prev_CMakeLists.txt b/tests/auto/widgets/graphicsview/qgraphicsscene/.prev_CMakeLists.txt index 3208cf2b36a..4e44e458245 100644 --- a/tests/auto/widgets/graphicsview/qgraphicsscene/.prev_CMakeLists.txt +++ b/tests/auto/widgets/graphicsview/qgraphicsscene/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qgraphicsscene Test: ##################################################################### -qt_add_test(tst_qgraphicsscene +qt_internal_add_test(tst_qgraphicsscene SOURCES tst_qgraphicsscene.cpp DEFINES @@ -23,7 +23,7 @@ set(images_resource_files "Ash_European.jpg" ) -qt_add_resource(tst_qgraphicsscene "images" +qt_internal_add_resource(tst_qgraphicsscene "images" PREFIX "/" FILES @@ -60,7 +60,7 @@ set(testdata_resource_files "testData/render/topright-topleft-untransformed.png" ) -qt_add_resource(tst_qgraphicsscene "testdata" +qt_internal_add_resource(tst_qgraphicsscene "testdata" PREFIX "/" FILES @@ -71,7 +71,7 @@ qt_add_resource(tst_qgraphicsscene "testdata" ## Scopes: ##################################################################### -qt_extend_target(tst_qgraphicsscene CONDITION WIN32 +qt_internal_extend_target(tst_qgraphicsscene CONDITION WIN32 PUBLIC_LIBRARIES user32 ) diff --git a/tests/auto/widgets/graphicsview/qgraphicsscene/CMakeLists.txt b/tests/auto/widgets/graphicsview/qgraphicsscene/CMakeLists.txt index b17d3284468..cf71701669e 100644 --- a/tests/auto/widgets/graphicsview/qgraphicsscene/CMakeLists.txt +++ b/tests/auto/widgets/graphicsview/qgraphicsscene/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qgraphicsscene Test: ##################################################################### -qt_add_test(tst_qgraphicsscene +qt_internal_add_test(tst_qgraphicsscene LOWDPI # special case SOURCES tst_qgraphicsscene.cpp @@ -24,7 +24,7 @@ set(images_resource_files "Ash_European.jpg" ) -qt_add_resource(tst_qgraphicsscene "images" +qt_internal_add_resource(tst_qgraphicsscene "images" PREFIX "/" FILES @@ -61,7 +61,7 @@ set(testdata_resource_files "testData/render/topright-topleft-untransformed.png" ) -qt_add_resource(tst_qgraphicsscene "testdata" +qt_internal_add_resource(tst_qgraphicsscene "testdata" PREFIX "/" FILES @@ -72,7 +72,7 @@ qt_add_resource(tst_qgraphicsscene "testdata" ## Scopes: ##################################################################### -qt_extend_target(tst_qgraphicsscene CONDITION WIN32 +qt_internal_extend_target(tst_qgraphicsscene CONDITION WIN32 PUBLIC_LIBRARIES user32 ) diff --git a/tests/auto/widgets/graphicsview/qgraphicssceneindex/CMakeLists.txt b/tests/auto/widgets/graphicsview/qgraphicssceneindex/CMakeLists.txt index 607bcd0ea4d..f95e618a16c 100644 --- a/tests/auto/widgets/graphicsview/qgraphicssceneindex/CMakeLists.txt +++ b/tests/auto/widgets/graphicsview/qgraphicssceneindex/CMakeLists.txt @@ -8,7 +8,7 @@ endif() ## tst_qgraphicssceneindex Test: ##################################################################### -qt_add_test(tst_qgraphicssceneindex +qt_internal_add_test(tst_qgraphicssceneindex SOURCES tst_qgraphicssceneindex.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/graphicsview/qgraphicstransform/CMakeLists.txt b/tests/auto/widgets/graphicsview/qgraphicstransform/CMakeLists.txt index a3a19931e64..12ba7dd8347 100644 --- a/tests/auto/widgets/graphicsview/qgraphicstransform/CMakeLists.txt +++ b/tests/auto/widgets/graphicsview/qgraphicstransform/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qgraphicstransform Test: ##################################################################### -qt_add_test(tst_qgraphicstransform +qt_internal_add_test(tst_qgraphicstransform SOURCES tst_qgraphicstransform.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/graphicsview/qgraphicsview/CMakeLists.txt b/tests/auto/widgets/graphicsview/qgraphicsview/CMakeLists.txt index c8ead072a24..be9c4a3bc49 100644 --- a/tests/auto/widgets/graphicsview/qgraphicsview/CMakeLists.txt +++ b/tests/auto/widgets/graphicsview/qgraphicsview/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qgraphicsview Test: ##################################################################### -qt_add_test(tst_qgraphicsview +qt_internal_add_test(tst_qgraphicsview SOURCES tst_qgraphicsview.cpp tst_qgraphicsview.h tst_qgraphicsview_2.cpp @@ -25,7 +25,7 @@ qt_add_test(tst_qgraphicsview ## Scopes: ##################################################################### -qt_extend_target(tst_qgraphicsview CONDITION QT_FEATURE_opengl +qt_internal_extend_target(tst_qgraphicsview CONDITION QT_FEATURE_opengl PUBLIC_LIBRARIES Qt::OpenGL Qt::OpenGLWidgets diff --git a/tests/auto/widgets/graphicsview/qgraphicswidget/CMakeLists.txt b/tests/auto/widgets/graphicsview/qgraphicswidget/CMakeLists.txt index d519985662a..8cf7f92cc33 100644 --- a/tests/auto/widgets/graphicsview/qgraphicswidget/CMakeLists.txt +++ b/tests/auto/widgets/graphicsview/qgraphicswidget/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qgraphicswidget Test: ##################################################################### -qt_add_test(tst_qgraphicswidget +qt_internal_add_test(tst_qgraphicswidget SOURCES tst_qgraphicswidget.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/itemviews/qabstractitemview/CMakeLists.txt b/tests/auto/widgets/itemviews/qabstractitemview/CMakeLists.txt index 0b292e06f8b..e779b1a1657 100644 --- a/tests/auto/widgets/itemviews/qabstractitemview/CMakeLists.txt +++ b/tests/auto/widgets/itemviews/qabstractitemview/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qabstractitemview Test: ##################################################################### -qt_add_test(tst_qabstractitemview +qt_internal_add_test(tst_qabstractitemview SOURCES tst_qabstractitemview.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/itemviews/qcolumnview/CMakeLists.txt b/tests/auto/widgets/itemviews/qcolumnview/CMakeLists.txt index 002912d5cf9..886971004ba 100644 --- a/tests/auto/widgets/itemviews/qcolumnview/CMakeLists.txt +++ b/tests/auto/widgets/itemviews/qcolumnview/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qcolumnview Test: ##################################################################### -qt_add_test(tst_qcolumnview +qt_internal_add_test(tst_qcolumnview SOURCES ../../../../shared/fakedirmodel.h tst_qcolumnview.cpp diff --git a/tests/auto/widgets/itemviews/qdatawidgetmapper/CMakeLists.txt b/tests/auto/widgets/itemviews/qdatawidgetmapper/CMakeLists.txt index 6cf9cbca438..325e8af9b0f 100644 --- a/tests/auto/widgets/itemviews/qdatawidgetmapper/CMakeLists.txt +++ b/tests/auto/widgets/itemviews/qdatawidgetmapper/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qdatawidgetmapper Test: ##################################################################### -qt_add_test(tst_qdatawidgetmapper +qt_internal_add_test(tst_qdatawidgetmapper SOURCES tst_qdatawidgetmapper.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/itemviews/qfileiconprovider/CMakeLists.txt b/tests/auto/widgets/itemviews/qfileiconprovider/CMakeLists.txt index 4107c3584e6..4f626e3b8c0 100644 --- a/tests/auto/widgets/itemviews/qfileiconprovider/CMakeLists.txt +++ b/tests/auto/widgets/itemviews/qfileiconprovider/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qfileiconprovider Test: ##################################################################### -qt_add_test(tst_qfileiconprovider +qt_internal_add_test(tst_qfileiconprovider SOURCES tst_qfileiconprovider.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/itemviews/qheaderview/CMakeLists.txt b/tests/auto/widgets/itemviews/qheaderview/CMakeLists.txt index d90c12869f8..de83539f56d 100644 --- a/tests/auto/widgets/itemviews/qheaderview/CMakeLists.txt +++ b/tests/auto/widgets/itemviews/qheaderview/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qheaderview Test: ##################################################################### -qt_add_test(tst_qheaderview +qt_internal_add_test(tst_qheaderview SOURCES tst_qheaderview.cpp DEFINES diff --git a/tests/auto/widgets/itemviews/qitemdelegate/CMakeLists.txt b/tests/auto/widgets/itemviews/qitemdelegate/CMakeLists.txt index 3ea37aa7376..50057bbd7c7 100644 --- a/tests/auto/widgets/itemviews/qitemdelegate/CMakeLists.txt +++ b/tests/auto/widgets/itemviews/qitemdelegate/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qitemdelegate Test: ##################################################################### -qt_add_test(tst_qitemdelegate +qt_internal_add_test(tst_qitemdelegate SOURCES tst_qitemdelegate.cpp PUBLIC_LIBRARIES @@ -16,7 +16,7 @@ qt_add_test(tst_qitemdelegate ## Scopes: ##################################################################### -qt_extend_target(tst_qitemdelegate CONDITION WIN32 +qt_internal_extend_target(tst_qitemdelegate CONDITION WIN32 PUBLIC_LIBRARIES user32 ) diff --git a/tests/auto/widgets/itemviews/qitemeditorfactory/CMakeLists.txt b/tests/auto/widgets/itemviews/qitemeditorfactory/CMakeLists.txt index e56ec2e865a..e57ee0d01cb 100644 --- a/tests/auto/widgets/itemviews/qitemeditorfactory/CMakeLists.txt +++ b/tests/auto/widgets/itemviews/qitemeditorfactory/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qitemeditorfactory Test: ##################################################################### -qt_add_test(tst_qitemeditorfactory +qt_internal_add_test(tst_qitemeditorfactory SOURCES tst_qitemeditorfactory.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/itemviews/qitemview/CMakeLists.txt b/tests/auto/widgets/itemviews/qitemview/CMakeLists.txt index b4331b87ca9..93f10f0fbfc 100644 --- a/tests/auto/widgets/itemviews/qitemview/CMakeLists.txt +++ b/tests/auto/widgets/itemviews/qitemview/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qitemview Test: ##################################################################### -qt_add_test(tst_qitemview +qt_internal_add_test(tst_qitemview SOURCES tst_qitemview.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/itemviews/qlistview/CMakeLists.txt b/tests/auto/widgets/itemviews/qlistview/CMakeLists.txt index 4a098c88f2d..bd440ff2039 100644 --- a/tests/auto/widgets/itemviews/qlistview/CMakeLists.txt +++ b/tests/auto/widgets/itemviews/qlistview/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qlistview Test: ##################################################################### -qt_add_test(tst_qlistview +qt_internal_add_test(tst_qlistview SOURCES tst_qlistview.cpp PUBLIC_LIBRARIES @@ -19,7 +19,7 @@ qt_add_test(tst_qlistview ## Scopes: ##################################################################### -qt_extend_target(tst_qlistview CONDITION WIN32 +qt_internal_extend_target(tst_qlistview CONDITION WIN32 PUBLIC_LIBRARIES user32 ) diff --git a/tests/auto/widgets/itemviews/qlistwidget/CMakeLists.txt b/tests/auto/widgets/itemviews/qlistwidget/CMakeLists.txt index 426b9088bcd..2c02f57324c 100644 --- a/tests/auto/widgets/itemviews/qlistwidget/CMakeLists.txt +++ b/tests/auto/widgets/itemviews/qlistwidget/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qlistwidget Test: ##################################################################### -qt_add_test(tst_qlistwidget +qt_internal_add_test(tst_qlistwidget SOURCES tst_qlistwidget.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/itemviews/qtableview/CMakeLists.txt b/tests/auto/widgets/itemviews/qtableview/CMakeLists.txt index d1291e709df..23e6a01f7da 100644 --- a/tests/auto/widgets/itemviews/qtableview/CMakeLists.txt +++ b/tests/auto/widgets/itemviews/qtableview/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qtableview Test: ##################################################################### -qt_add_test(tst_qtableview +qt_internal_add_test(tst_qtableview SOURCES tst_qtableview.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/itemviews/qtablewidget/CMakeLists.txt b/tests/auto/widgets/itemviews/qtablewidget/CMakeLists.txt index cdb393484ac..5409741dd9e 100644 --- a/tests/auto/widgets/itemviews/qtablewidget/CMakeLists.txt +++ b/tests/auto/widgets/itemviews/qtablewidget/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qtablewidget Test: ##################################################################### -qt_add_test(tst_qtablewidget +qt_internal_add_test(tst_qtablewidget SOURCES tst_qtablewidget.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/itemviews/qtreeview/CMakeLists.txt b/tests/auto/widgets/itemviews/qtreeview/CMakeLists.txt index a6c5adb967d..57267e1694d 100644 --- a/tests/auto/widgets/itemviews/qtreeview/CMakeLists.txt +++ b/tests/auto/widgets/itemviews/qtreeview/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qtreeview Test: ##################################################################### -qt_add_test(tst_qtreeview +qt_internal_add_test(tst_qtreeview SOURCES ../../../../shared/fakedirmodel.h tst_qtreeview.cpp diff --git a/tests/auto/widgets/itemviews/qtreewidget/CMakeLists.txt b/tests/auto/widgets/itemviews/qtreewidget/CMakeLists.txt index d58f0045617..8a9dba604e2 100644 --- a/tests/auto/widgets/itemviews/qtreewidget/CMakeLists.txt +++ b/tests/auto/widgets/itemviews/qtreewidget/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qtreewidget Test: ##################################################################### -qt_add_test(tst_qtreewidget +qt_internal_add_test(tst_qtreewidget SOURCES tst_qtreewidget.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/itemviews/qtreewidgetitemiterator/CMakeLists.txt b/tests/auto/widgets/itemviews/qtreewidgetitemiterator/CMakeLists.txt index ac3a0645e4c..c62b0d4c6ff 100644 --- a/tests/auto/widgets/itemviews/qtreewidgetitemiterator/CMakeLists.txt +++ b/tests/auto/widgets/itemviews/qtreewidgetitemiterator/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qtreewidgetitemiterator Test: ##################################################################### -qt_add_test(tst_qtreewidgetitemiterator +qt_internal_add_test(tst_qtreewidgetitemiterator SOURCES tst_qtreewidgetitemiterator.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/kernel/qaction/CMakeLists.txt b/tests/auto/widgets/kernel/qaction/CMakeLists.txt index 5779f881df9..dd70d5448f8 100644 --- a/tests/auto/widgets/kernel/qaction/CMakeLists.txt +++ b/tests/auto/widgets/kernel/qaction/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qaction Test: ##################################################################### -qt_add_test(tst_qaction +qt_internal_add_test(tst_qaction SOURCES tst_qaction.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/kernel/qactiongroup/CMakeLists.txt b/tests/auto/widgets/kernel/qactiongroup/CMakeLists.txt index 1f9c93b1d07..927802103c0 100644 --- a/tests/auto/widgets/kernel/qactiongroup/CMakeLists.txt +++ b/tests/auto/widgets/kernel/qactiongroup/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qactiongroup Test: ##################################################################### -qt_add_test(tst_qactiongroup +qt_internal_add_test(tst_qactiongroup SOURCES tst_qactiongroup.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/kernel/qapplication/desktopsettingsaware/.prev_CMakeLists.txt b/tests/auto/widgets/kernel/qapplication/desktopsettingsaware/.prev_CMakeLists.txt index 96929258314..8f04c7ff79e 100644 --- a/tests/auto/widgets/kernel/qapplication/desktopsettingsaware/.prev_CMakeLists.txt +++ b/tests/auto/widgets/kernel/qapplication/desktopsettingsaware/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## desktopsettingsaware Binary: ##################################################################### -qt_add_executable(desktopsettingsaware +qt_internal_add_executable(desktopsettingsaware SOURCES main.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/kernel/qapplication/desktopsettingsaware/CMakeLists.txt b/tests/auto/widgets/kernel/qapplication/desktopsettingsaware/CMakeLists.txt index 110c53d32fc..a391d5b13df 100644 --- a/tests/auto/widgets/kernel/qapplication/desktopsettingsaware/CMakeLists.txt +++ b/tests/auto/widgets/kernel/qapplication/desktopsettingsaware/CMakeLists.txt @@ -4,7 +4,7 @@ ## desktopsettingsaware Binary: ##################################################################### -qt_add_executable(desktopsettingsaware_helper # special case +qt_internal_add_executable(desktopsettingsaware_helper # special case SOURCES main.cpp OUTPUT_DIRECTORY # special case diff --git a/tests/auto/widgets/kernel/qapplication/modal/.prev_CMakeLists.txt b/tests/auto/widgets/kernel/qapplication/modal/.prev_CMakeLists.txt index fdd6547b419..24940d05892 100644 --- a/tests/auto/widgets/kernel/qapplication/modal/.prev_CMakeLists.txt +++ b/tests/auto/widgets/kernel/qapplication/modal/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## modal Binary: ##################################################################### -qt_add_executable(modal +qt_internal_add_executable(modal SOURCES base.cpp base.h main.cpp diff --git a/tests/auto/widgets/kernel/qapplication/modal/CMakeLists.txt b/tests/auto/widgets/kernel/qapplication/modal/CMakeLists.txt index da00368540d..95c429f9361 100644 --- a/tests/auto/widgets/kernel/qapplication/modal/CMakeLists.txt +++ b/tests/auto/widgets/kernel/qapplication/modal/CMakeLists.txt @@ -4,7 +4,7 @@ ## modal Binary: ##################################################################### -qt_add_executable(modal_helper # special case +qt_internal_add_executable(modal_helper # special case SOURCES base.cpp base.h main.cpp diff --git a/tests/auto/widgets/kernel/qapplication/test/.prev_CMakeLists.txt b/tests/auto/widgets/kernel/qapplication/test/.prev_CMakeLists.txt index 114b8a286b3..334a25bbac2 100644 --- a/tests/auto/widgets/kernel/qapplication/test/.prev_CMakeLists.txt +++ b/tests/auto/widgets/kernel/qapplication/test/.prev_CMakeLists.txt @@ -9,7 +9,7 @@ list(APPEND test_data "../test/test.pro") list(APPEND test_data "../tmp/README") list(APPEND test_data "../modal") -qt_add_test(test +qt_internal_add_test(test SOURCES ../tst_qapplication.cpp PUBLIC_LIBRARIES @@ -24,7 +24,7 @@ qt_add_test(test ## Scopes: ##################################################################### -qt_extend_target(test CONDITION builtin_testdata +qt_internal_extend_target(test CONDITION builtin_testdata DEFINES BUILTIN_TESTDATA ) diff --git a/tests/auto/widgets/kernel/qapplication/test/CMakeLists.txt b/tests/auto/widgets/kernel/qapplication/test/CMakeLists.txt index f30b05d2d3c..a93a677417b 100644 --- a/tests/auto/widgets/kernel/qapplication/test/CMakeLists.txt +++ b/tests/auto/widgets/kernel/qapplication/test/CMakeLists.txt @@ -9,7 +9,7 @@ list(APPEND test_data "../test/test.pro") list(APPEND test_data "../tmp/README") list(APPEND test_data "../modal") -qt_add_test(tst_qapplication # special case +qt_internal_add_test(tst_qapplication # special case SOURCES ../tst_qapplication.cpp PUBLIC_LIBRARIES @@ -25,7 +25,7 @@ qt_add_test(tst_qapplication # special case ## Scopes: ##################################################################### -qt_extend_target(tst_qapplication CONDITION builtin_testdata # special case +qt_internal_extend_target(tst_qapplication CONDITION builtin_testdata # special case DEFINES BUILTIN_TESTDATA ) diff --git a/tests/auto/widgets/kernel/qboxlayout/CMakeLists.txt b/tests/auto/widgets/kernel/qboxlayout/CMakeLists.txt index a1986aa1a8a..8fdc0d21a93 100644 --- a/tests/auto/widgets/kernel/qboxlayout/CMakeLists.txt +++ b/tests/auto/widgets/kernel/qboxlayout/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qboxlayout Test: ##################################################################### -qt_add_test(tst_qboxlayout +qt_internal_add_test(tst_qboxlayout SOURCES tst_qboxlayout.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/kernel/qformlayout/CMakeLists.txt b/tests/auto/widgets/kernel/qformlayout/CMakeLists.txt index 04124322e0f..b084fe16345 100644 --- a/tests/auto/widgets/kernel/qformlayout/CMakeLists.txt +++ b/tests/auto/widgets/kernel/qformlayout/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qformlayout Test: ##################################################################### -qt_add_test(tst_qformlayout +qt_internal_add_test(tst_qformlayout SOURCES tst_qformlayout.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/kernel/qgesturerecognizer/CMakeLists.txt b/tests/auto/widgets/kernel/qgesturerecognizer/CMakeLists.txt index 416a02ff190..9dfd6cb20c9 100644 --- a/tests/auto/widgets/kernel/qgesturerecognizer/CMakeLists.txt +++ b/tests/auto/widgets/kernel/qgesturerecognizer/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qgesturerecognizer Test: ##################################################################### -qt_add_test(tst_qgesturerecognizer +qt_internal_add_test(tst_qgesturerecognizer SOURCES tst_qgesturerecognizer.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/kernel/qgridlayout/CMakeLists.txt b/tests/auto/widgets/kernel/qgridlayout/CMakeLists.txt index c70edfc4acf..c9ac563f01d 100644 --- a/tests/auto/widgets/kernel/qgridlayout/CMakeLists.txt +++ b/tests/auto/widgets/kernel/qgridlayout/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qgridlayout Test: ##################################################################### -qt_add_test(tst_qgridlayout +qt_internal_add_test(tst_qgridlayout SOURCES sortdialog.ui tst_qgridlayout.cpp diff --git a/tests/auto/widgets/kernel/qlayout/CMakeLists.txt b/tests/auto/widgets/kernel/qlayout/CMakeLists.txt index 2acf0f1eb6e..0ee2ce145e4 100644 --- a/tests/auto/widgets/kernel/qlayout/CMakeLists.txt +++ b/tests/auto/widgets/kernel/qlayout/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob baseline/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qlayout +qt_internal_add_test(tst_qlayout SOURCES tst_qlayout.cpp PUBLIC_LIBRARIES @@ -30,7 +30,7 @@ if(ANDROID AND NOT ANDROID_EMBEDDED) "baseline/smartmaxsize" ) - qt_add_resource(tst_qlayout "testdata" + qt_internal_add_resource(tst_qlayout "testdata" PREFIX "/" FILES diff --git a/tests/auto/widgets/kernel/qshortcut/CMakeLists.txt b/tests/auto/widgets/kernel/qshortcut/CMakeLists.txt index f2b3272588f..06bd2d6ba8f 100644 --- a/tests/auto/widgets/kernel/qshortcut/CMakeLists.txt +++ b/tests/auto/widgets/kernel/qshortcut/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qshortcut Test: ##################################################################### -qt_add_test(tst_qshortcut +qt_internal_add_test(tst_qshortcut SOURCES tst_qshortcut.cpp INCLUDE_DIRECTORIES diff --git a/tests/auto/widgets/kernel/qsizepolicy/CMakeLists.txt b/tests/auto/widgets/kernel/qsizepolicy/CMakeLists.txt index 35ff76ab2ce..36450d4f801 100644 --- a/tests/auto/widgets/kernel/qsizepolicy/CMakeLists.txt +++ b/tests/auto/widgets/kernel/qsizepolicy/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qsizepolicy Test: ##################################################################### -qt_add_test(tst_qsizepolicy +qt_internal_add_test(tst_qsizepolicy SOURCES tst_qsizepolicy.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/kernel/qstackedlayout/CMakeLists.txt b/tests/auto/widgets/kernel/qstackedlayout/CMakeLists.txt index 470ad28bd19..2c1c3da2773 100644 --- a/tests/auto/widgets/kernel/qstackedlayout/CMakeLists.txt +++ b/tests/auto/widgets/kernel/qstackedlayout/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qstackedlayout Test: ##################################################################### -qt_add_test(tst_qstackedlayout +qt_internal_add_test(tst_qstackedlayout SOURCES tst_qstackedlayout.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/kernel/qtooltip/CMakeLists.txt b/tests/auto/widgets/kernel/qtooltip/CMakeLists.txt index 3a62e774909..a07cd1aa65a 100644 --- a/tests/auto/widgets/kernel/qtooltip/CMakeLists.txt +++ b/tests/auto/widgets/kernel/qtooltip/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qtooltip Test: ##################################################################### -qt_add_test(tst_qtooltip +qt_internal_add_test(tst_qtooltip SOURCES tst_qtooltip.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/kernel/qwidget/CMakeLists.txt b/tests/auto/widgets/kernel/qwidget/CMakeLists.txt index d9ac38be847..d04db40e87f 100644 --- a/tests/auto/widgets/kernel/qwidget/CMakeLists.txt +++ b/tests/auto/widgets/kernel/qwidget/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qwidget Test: ##################################################################### -qt_add_test(tst_qwidget +qt_internal_add_test(tst_qwidget SOURCES tst_qwidget.cpp PUBLIC_LIBRARIES @@ -24,7 +24,7 @@ set(qwidget_resource_files "hellotr_la.qm" ) -qt_add_resource(tst_qwidget "qwidget" +qt_internal_add_resource(tst_qwidget "qwidget" PREFIX "/" FILES @@ -38,12 +38,12 @@ qt_add_resource(tst_qwidget "qwidget" ## Scopes: ##################################################################### -qt_extend_target(tst_qwidget CONDITION AIX +qt_internal_extend_target(tst_qwidget CONDITION AIX COMPILE_OPTIONS -fpermissive ) -qt_extend_target(tst_qwidget CONDITION APPLE +qt_internal_extend_target(tst_qwidget CONDITION APPLE SOURCES tst_qwidget_mac_helpers.mm PUBLIC_LIBRARIES @@ -51,7 +51,7 @@ qt_extend_target(tst_qwidget CONDITION APPLE ${FWSecurity} ) -qt_extend_target(tst_qwidget CONDITION WIN32 +qt_internal_extend_target(tst_qwidget CONDITION WIN32 PUBLIC_LIBRARIES gdi32 user32 diff --git a/tests/auto/widgets/kernel/qwidget_window/CMakeLists.txt b/tests/auto/widgets/kernel/qwidget_window/CMakeLists.txt index d0349c7dcc0..9bae267970d 100644 --- a/tests/auto/widgets/kernel/qwidget_window/CMakeLists.txt +++ b/tests/auto/widgets/kernel/qwidget_window/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qwidget_window Test: ##################################################################### -qt_add_test(tst_qwidget_window +qt_internal_add_test(tst_qwidget_window SOURCES tst_qwidget_window.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/kernel/qwidgetaction/CMakeLists.txt b/tests/auto/widgets/kernel/qwidgetaction/CMakeLists.txt index 0a559dcac60..58dae2d0760 100644 --- a/tests/auto/widgets/kernel/qwidgetaction/CMakeLists.txt +++ b/tests/auto/widgets/kernel/qwidgetaction/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qwidgetaction Test: ##################################################################### -qt_add_test(tst_qwidgetaction +qt_internal_add_test(tst_qwidgetaction SOURCES tst_qwidgetaction.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/kernel/qwidgetmetatype/CMakeLists.txt b/tests/auto/widgets/kernel/qwidgetmetatype/CMakeLists.txt index a4b8867389c..3d8c3bbf4b2 100644 --- a/tests/auto/widgets/kernel/qwidgetmetatype/CMakeLists.txt +++ b/tests/auto/widgets/kernel/qwidgetmetatype/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qwidgetmetatype Test: ##################################################################### -qt_add_test(tst_qwidgetmetatype +qt_internal_add_test(tst_qwidgetmetatype SOURCES tst_qwidgetmetatype.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/kernel/qwidgetsvariant/CMakeLists.txt b/tests/auto/widgets/kernel/qwidgetsvariant/CMakeLists.txt index f4244f1a303..f387be73068 100644 --- a/tests/auto/widgets/kernel/qwidgetsvariant/CMakeLists.txt +++ b/tests/auto/widgets/kernel/qwidgetsvariant/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qwidgetsvariant Test: ##################################################################### -qt_add_test(tst_qwidgetsvariant +qt_internal_add_test(tst_qwidgetsvariant SOURCES tst_qwidgetsvariant.cpp INCLUDE_DIRECTORIES diff --git a/tests/auto/widgets/kernel/qwindowcontainer/CMakeLists.txt b/tests/auto/widgets/kernel/qwindowcontainer/CMakeLists.txt index b173fae54f2..63a3f9632d9 100644 --- a/tests/auto/widgets/kernel/qwindowcontainer/CMakeLists.txt +++ b/tests/auto/widgets/kernel/qwindowcontainer/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qwindowcontainer Test: ##################################################################### -qt_add_test(tst_qwindowcontainer +qt_internal_add_test(tst_qwindowcontainer SOURCES tst_qwindowcontainer.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/styles/qmacstyle/CMakeLists.txt b/tests/auto/widgets/styles/qmacstyle/CMakeLists.txt index d4deeaf2353..fcff4fcc219 100644 --- a/tests/auto/widgets/styles/qmacstyle/CMakeLists.txt +++ b/tests/auto/widgets/styles/qmacstyle/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qmacstyle Test: ##################################################################### -qt_add_test(tst_qmacstyle +qt_internal_add_test(tst_qmacstyle SOURCES tst_qmacstyle.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/styles/qstyle/CMakeLists.txt b/tests/auto/widgets/styles/qstyle/CMakeLists.txt index 8f4a1a4159d..c3b7b44e28b 100644 --- a/tests/auto/widgets/styles/qstyle/CMakeLists.txt +++ b/tests/auto/widgets/styles/qstyle/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qstyle Test: ##################################################################### -qt_add_test(tst_qstyle +qt_internal_add_test(tst_qstyle SOURCES tst_qstyle.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/styles/qstyleoption/CMakeLists.txt b/tests/auto/widgets/styles/qstyleoption/CMakeLists.txt index d023a2f36fa..05853dfb629 100644 --- a/tests/auto/widgets/styles/qstyleoption/CMakeLists.txt +++ b/tests/auto/widgets/styles/qstyleoption/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qstyleoption Test: ##################################################################### -qt_add_test(tst_qstyleoption +qt_internal_add_test(tst_qstyleoption SOURCES tst_qstyleoption.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/styles/qstylesheetstyle/CMakeLists.txt b/tests/auto/widgets/styles/qstylesheetstyle/CMakeLists.txt index 06c7a36edc3..bf4e52862cd 100644 --- a/tests/auto/widgets/styles/qstylesheetstyle/CMakeLists.txt +++ b/tests/auto/widgets/styles/qstylesheetstyle/CMakeLists.txt @@ -8,7 +8,7 @@ endif() ## tst_qstylesheetstyle Test: ##################################################################### -qt_add_test(tst_qstylesheetstyle +qt_internal_add_test(tst_qstylesheetstyle SOURCES tst_qstylesheetstyle.cpp PUBLIC_LIBRARIES @@ -25,7 +25,7 @@ set(resources_resource_files "images/[email protected]" ) -qt_add_resource(tst_qstylesheetstyle "resources" +qt_internal_add_resource(tst_qstylesheetstyle "resources" PREFIX "/" FILES diff --git a/tests/auto/widgets/util/qcompleter/CMakeLists.txt b/tests/auto/widgets/util/qcompleter/CMakeLists.txt index aba10e16002..5d4ff347a20 100644 --- a/tests/auto/widgets/util/qcompleter/CMakeLists.txt +++ b/tests/auto/widgets/util/qcompleter/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qcompleter Test: ##################################################################### -qt_add_test(tst_qcompleter +qt_internal_add_test(tst_qcompleter SOURCES tst_qcompleter.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/util/qscroller/CMakeLists.txt b/tests/auto/widgets/util/qscroller/CMakeLists.txt index f85caf33a27..11e13cdd9fa 100644 --- a/tests/auto/widgets/util/qscroller/CMakeLists.txt +++ b/tests/auto/widgets/util/qscroller/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qscroller Test: ##################################################################### -qt_add_test(tst_qscroller +qt_internal_add_test(tst_qscroller SOURCES tst_qscroller.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/util/qsystemtrayicon/CMakeLists.txt b/tests/auto/widgets/util/qsystemtrayicon/CMakeLists.txt index 6677a80a3c3..d84f229c04d 100644 --- a/tests/auto/widgets/util/qsystemtrayicon/CMakeLists.txt +++ b/tests/auto/widgets/util/qsystemtrayicon/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qsystemtrayicon Test: ##################################################################### -qt_add_test(tst_qsystemtrayicon +qt_internal_add_test(tst_qsystemtrayicon SOURCES tst_qsystemtrayicon.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/widgets/qabstractbutton/CMakeLists.txt b/tests/auto/widgets/widgets/qabstractbutton/CMakeLists.txt index a308721727d..d192549f945 100644 --- a/tests/auto/widgets/widgets/qabstractbutton/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qabstractbutton/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qabstractbutton Test: ##################################################################### -qt_add_test(tst_qabstractbutton +qt_internal_add_test(tst_qabstractbutton SOURCES tst_qabstractbutton.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/widgets/qabstractscrollarea/CMakeLists.txt b/tests/auto/widgets/widgets/qabstractscrollarea/CMakeLists.txt index 4a72b409e33..d756d28952d 100644 --- a/tests/auto/widgets/widgets/qabstractscrollarea/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qabstractscrollarea/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qabstractscrollarea Test: ##################################################################### -qt_add_test(tst_qabstractscrollarea +qt_internal_add_test(tst_qabstractscrollarea SOURCES tst_qabstractscrollarea.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/widgets/qabstractslider/CMakeLists.txt b/tests/auto/widgets/widgets/qabstractslider/CMakeLists.txt index d2dbcb35854..37c725c391b 100644 --- a/tests/auto/widgets/widgets/qabstractslider/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qabstractslider/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qabstractslider Test: ##################################################################### -qt_add_test(tst_qabstractslider +qt_internal_add_test(tst_qabstractslider SOURCES tst_qabstractslider.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/widgets/qabstractspinbox/CMakeLists.txt b/tests/auto/widgets/widgets/qabstractspinbox/CMakeLists.txt index 3ca8eb63d08..df077a0bbdf 100644 --- a/tests/auto/widgets/widgets/qabstractspinbox/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qabstractspinbox/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qabstractspinbox Test: ##################################################################### -qt_add_test(tst_qabstractspinbox +qt_internal_add_test(tst_qabstractspinbox SOURCES tst_qabstractspinbox.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/widgets/qbuttongroup/CMakeLists.txt b/tests/auto/widgets/widgets/qbuttongroup/CMakeLists.txt index 822fdf223c9..1f876ec5d69 100644 --- a/tests/auto/widgets/widgets/qbuttongroup/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qbuttongroup/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qbuttongroup Test: ##################################################################### -qt_add_test(tst_qbuttongroup +qt_internal_add_test(tst_qbuttongroup SOURCES tst_qbuttongroup.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/widgets/qcalendarwidget/CMakeLists.txt b/tests/auto/widgets/widgets/qcalendarwidget/CMakeLists.txt index 051b00d0bb1..853ff95a033 100644 --- a/tests/auto/widgets/widgets/qcalendarwidget/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qcalendarwidget/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qcalendarwidget Test: ##################################################################### -qt_add_test(tst_qcalendarwidget +qt_internal_add_test(tst_qcalendarwidget SOURCES tst_qcalendarwidget.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/widgets/qcheckbox/CMakeLists.txt b/tests/auto/widgets/widgets/qcheckbox/CMakeLists.txt index 1c44111753a..df03bea0797 100644 --- a/tests/auto/widgets/widgets/qcheckbox/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qcheckbox/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qcheckbox Test: ##################################################################### -qt_add_test(tst_qcheckbox +qt_internal_add_test(tst_qcheckbox SOURCES tst_qcheckbox.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/widgets/qcombobox/CMakeLists.txt b/tests/auto/widgets/widgets/qcombobox/CMakeLists.txt index a0aabd6773b..a1dded13847 100644 --- a/tests/auto/widgets/widgets/qcombobox/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qcombobox/CMakeLists.txt @@ -8,7 +8,7 @@ list(APPEND test_data "qtlogo.png") list(APPEND test_data "qtlogoinverted.png") -qt_add_test(tst_qcombobox +qt_internal_add_test(tst_qcombobox SOURCES tst_qcombobox.cpp DEFINES diff --git a/tests/auto/widgets/widgets/qcommandlinkbutton/CMakeLists.txt b/tests/auto/widgets/widgets/qcommandlinkbutton/CMakeLists.txt index 5beababe977..dfb555673a3 100644 --- a/tests/auto/widgets/widgets/qcommandlinkbutton/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qcommandlinkbutton/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qcommandlinkbutton Test: ##################################################################### -qt_add_test(tst_qcommandlinkbutton +qt_internal_add_test(tst_qcommandlinkbutton SOURCES tst_qcommandlinkbutton.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/widgets/qdatetimeedit/CMakeLists.txt b/tests/auto/widgets/widgets/qdatetimeedit/CMakeLists.txt index 8db14239921..8ddb0a3b0da 100644 --- a/tests/auto/widgets/widgets/qdatetimeedit/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qdatetimeedit/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qdatetimeedit Test: ##################################################################### -qt_add_test(tst_qdatetimeedit +qt_internal_add_test(tst_qdatetimeedit SOURCES tst_qdatetimeedit.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/widgets/qdial/CMakeLists.txt b/tests/auto/widgets/widgets/qdial/CMakeLists.txt index 162eda24eb8..e76cc4a7dbb 100644 --- a/tests/auto/widgets/widgets/qdial/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qdial/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qdial Test: ##################################################################### -qt_add_test(tst_qdial +qt_internal_add_test(tst_qdial SOURCES tst_qdial.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/widgets/qdialogbuttonbox/CMakeLists.txt b/tests/auto/widgets/widgets/qdialogbuttonbox/CMakeLists.txt index 16ad2286fb5..c42fccd87f1 100644 --- a/tests/auto/widgets/widgets/qdialogbuttonbox/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qdialogbuttonbox/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qdialogbuttonbox Test: ##################################################################### -qt_add_test(tst_qdialogbuttonbox +qt_internal_add_test(tst_qdialogbuttonbox SOURCES tst_qdialogbuttonbox.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/widgets/qdockwidget/CMakeLists.txt b/tests/auto/widgets/widgets/qdockwidget/CMakeLists.txt index 0f3e83cead2..adf48ddb11b 100644 --- a/tests/auto/widgets/widgets/qdockwidget/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qdockwidget/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qdockwidget Test: ##################################################################### -qt_add_test(tst_qdockwidget +qt_internal_add_test(tst_qdockwidget SOURCES tst_qdockwidget.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/widgets/qdoublespinbox/CMakeLists.txt b/tests/auto/widgets/widgets/qdoublespinbox/CMakeLists.txt index bef0745d010..6be779bb818 100644 --- a/tests/auto/widgets/widgets/qdoublespinbox/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qdoublespinbox/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qdoublespinbox Test: ##################################################################### -qt_add_test(tst_qdoublespinbox +qt_internal_add_test(tst_qdoublespinbox SOURCES tst_qdoublespinbox.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/widgets/qfocusframe/CMakeLists.txt b/tests/auto/widgets/widgets/qfocusframe/CMakeLists.txt index 6456e5b7c58..d5e32e93375 100644 --- a/tests/auto/widgets/widgets/qfocusframe/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qfocusframe/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qfocusframe Test: ##################################################################### -qt_add_test(tst_qfocusframe +qt_internal_add_test(tst_qfocusframe SOURCES tst_qfocusframe.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/widgets/qfontcombobox/CMakeLists.txt b/tests/auto/widgets/widgets/qfontcombobox/CMakeLists.txt index 1500be0023c..869666cb19c 100644 --- a/tests/auto/widgets/widgets/qfontcombobox/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qfontcombobox/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qfontcombobox Test: ##################################################################### -qt_add_test(tst_qfontcombobox +qt_internal_add_test(tst_qfontcombobox SOURCES tst_qfontcombobox.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/widgets/qframe/.prev_CMakeLists.txt b/tests/auto/widgets/widgets/qframe/.prev_CMakeLists.txt index 89f91d1967d..6d0c10d4ba8 100644 --- a/tests/auto/widgets/widgets/qframe/.prev_CMakeLists.txt +++ b/tests/auto/widgets/widgets/qframe/.prev_CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob images/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qframe +qt_internal_add_test(tst_qframe SOURCES tst_qframe.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/widgets/qframe/CMakeLists.txt b/tests/auto/widgets/widgets/qframe/CMakeLists.txt index be08a9b7970..968f9ac3f39 100644 --- a/tests/auto/widgets/widgets/qframe/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qframe/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob images/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qframe +qt_internal_add_test(tst_qframe LOWDPI # special case SOURCES tst_qframe.cpp diff --git a/tests/auto/widgets/widgets/qgroupbox/CMakeLists.txt b/tests/auto/widgets/widgets/qgroupbox/CMakeLists.txt index d71fcd18d80..ed08cce5f2d 100644 --- a/tests/auto/widgets/widgets/qgroupbox/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qgroupbox/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qgroupbox Test: ##################################################################### -qt_add_test(tst_qgroupbox +qt_internal_add_test(tst_qgroupbox SOURCES tst_qgroupbox.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/widgets/qkeysequenceedit/CMakeLists.txt b/tests/auto/widgets/widgets/qkeysequenceedit/CMakeLists.txt index e373c14ea48..a016280b5d5 100644 --- a/tests/auto/widgets/widgets/qkeysequenceedit/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qkeysequenceedit/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qkeysequenceedit Test: ##################################################################### -qt_add_test(tst_qkeysequenceedit +qt_internal_add_test(tst_qkeysequenceedit SOURCES tst_qkeysequenceedit.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/widgets/qlabel/CMakeLists.txt b/tests/auto/widgets/widgets/qlabel/CMakeLists.txt index 6f8ac33b837..bbd51a206cf 100644 --- a/tests/auto/widgets/widgets/qlabel/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qlabel/CMakeLists.txt @@ -14,7 +14,7 @@ file(GLOB_RECURSE test_data_glob *.png) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qlabel +qt_internal_add_test(tst_qlabel SOURCES tst_qlabel.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/widgets/qlcdnumber/CMakeLists.txt b/tests/auto/widgets/widgets/qlcdnumber/CMakeLists.txt index 739b9bb55f6..4d6a8ff77aa 100644 --- a/tests/auto/widgets/widgets/qlcdnumber/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qlcdnumber/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qlcdnumber Test: ##################################################################### -qt_add_test(tst_qlcdnumber +qt_internal_add_test(tst_qlcdnumber SOURCES tst_qlcdnumber.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/widgets/qlineedit/CMakeLists.txt b/tests/auto/widgets/widgets/qlineedit/CMakeLists.txt index cdb026c220d..8cdee2a111b 100644 --- a/tests/auto/widgets/widgets/qlineedit/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qlineedit/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qlineedit Test: ##################################################################### -qt_add_test(tst_qlineedit +qt_internal_add_test(tst_qlineedit SOURCES tst_qlineedit.cpp PUBLIC_LIBRARIES @@ -19,7 +19,7 @@ qt_add_test(tst_qlineedit ## Scopes: ##################################################################### -qt_extend_target(tst_qlineedit CONDITION MACOS +qt_internal_extend_target(tst_qlineedit CONDITION MACOS PUBLIC_LIBRARIES ${FWAppKit} ) diff --git a/tests/auto/widgets/widgets/qmainwindow/CMakeLists.txt b/tests/auto/widgets/widgets/qmainwindow/CMakeLists.txt index 93d0e212c64..85ce87f7643 100644 --- a/tests/auto/widgets/widgets/qmainwindow/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qmainwindow/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qmainwindow Test: ##################################################################### -qt_add_test(tst_qmainwindow +qt_internal_add_test(tst_qmainwindow SOURCES tst_qmainwindow.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/widgets/qmdiarea/CMakeLists.txt b/tests/auto/widgets/widgets/qmdiarea/CMakeLists.txt index aa694bd9b79..9586d693521 100644 --- a/tests/auto/widgets/widgets/qmdiarea/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qmdiarea/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qmdiarea Test: ##################################################################### -qt_add_test(tst_qmdiarea +qt_internal_add_test(tst_qmdiarea SOURCES tst_qmdiarea.cpp DEFINES @@ -21,12 +21,12 @@ qt_add_test(tst_qmdiarea ## Scopes: ##################################################################### -qt_extend_target(tst_qmdiarea CONDITION TARGET Qt::OpenGL +qt_internal_extend_target(tst_qmdiarea CONDITION TARGET Qt::OpenGL PUBLIC_LIBRARIES Qt::OpenGL ) -qt_extend_target(tst_qmdiarea CONDITION APPLE +qt_internal_extend_target(tst_qmdiarea CONDITION APPLE PUBLIC_LIBRARIES ${FWSecurity} ) diff --git a/tests/auto/widgets/widgets/qmdisubwindow/CMakeLists.txt b/tests/auto/widgets/widgets/qmdisubwindow/CMakeLists.txt index 47c80787774..2c72f7d4e1c 100644 --- a/tests/auto/widgets/widgets/qmdisubwindow/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qmdisubwindow/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qmdisubwindow Test: ##################################################################### -qt_add_test(tst_qmdisubwindow +qt_internal_add_test(tst_qmdisubwindow SOURCES tst_qmdisubwindow.cpp DEFINES diff --git a/tests/auto/widgets/widgets/qmenu/CMakeLists.txt b/tests/auto/widgets/widgets/qmenu/CMakeLists.txt index 493e8af6b14..8e596a6b5b3 100644 --- a/tests/auto/widgets/widgets/qmenu/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qmenu/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qmenu Test: ##################################################################### -qt_add_test(tst_qmenu +qt_internal_add_test(tst_qmenu SOURCES tst_qmenu.cpp PUBLIC_LIBRARIES @@ -17,14 +17,14 @@ qt_add_test(tst_qmenu ## Scopes: ##################################################################### -qt_extend_target(tst_qmenu CONDITION MACOS +qt_internal_extend_target(tst_qmenu CONDITION MACOS SOURCES tst_qmenu_mac.mm PUBLIC_LIBRARIES objc ) -qt_extend_target(tst_qmenu CONDITION NOT MACOS +qt_internal_extend_target(tst_qmenu CONDITION NOT MACOS DEFINES QTEST_QPA_MOUSE_HANDLING ) diff --git a/tests/auto/widgets/widgets/qmenubar/CMakeLists.txt b/tests/auto/widgets/widgets/qmenubar/CMakeLists.txt index 1b412981d8b..63f690a2ed1 100644 --- a/tests/auto/widgets/widgets/qmenubar/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qmenubar/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qmenubar Test: ##################################################################### -qt_add_test(tst_qmenubar +qt_internal_add_test(tst_qmenubar SOURCES tst_qmenubar.cpp PUBLIC_LIBRARIES @@ -16,7 +16,7 @@ qt_add_test(tst_qmenubar ## Scopes: ##################################################################### -qt_extend_target(tst_qmenubar CONDITION MACOS +qt_internal_extend_target(tst_qmenubar CONDITION MACOS SOURCES tst_qmenubar_mac.mm PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/widgets/qopenglwidget/.prev_CMakeLists.txt b/tests/auto/widgets/widgets/qopenglwidget/.prev_CMakeLists.txt index d1af2e811c4..9a724eccc15 100644 --- a/tests/auto/widgets/widgets/qopenglwidget/.prev_CMakeLists.txt +++ b/tests/auto/widgets/widgets/qopenglwidget/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qopenglwidget Test: ##################################################################### -qt_add_test(tst_qopenglwidget +qt_internal_add_test(tst_qopenglwidget SOURCES tst_qopenglwidget.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/widgets/qopenglwidget/CMakeLists.txt b/tests/auto/widgets/widgets/qopenglwidget/CMakeLists.txt index 036f3316d9b..f32b547329c 100644 --- a/tests/auto/widgets/widgets/qopenglwidget/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qopenglwidget/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qopenglwidget Test: ##################################################################### -qt_add_test(tst_qopenglwidget +qt_internal_add_test(tst_qopenglwidget LOWDPI # special case SOURCES tst_qopenglwidget.cpp diff --git a/tests/auto/widgets/widgets/qplaintextedit/CMakeLists.txt b/tests/auto/widgets/widgets/qplaintextedit/CMakeLists.txt index 994f2b97aba..a339b158c24 100644 --- a/tests/auto/widgets/widgets/qplaintextedit/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qplaintextedit/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qplaintextedit Test: ##################################################################### -qt_add_test(tst_qplaintextedit +qt_internal_add_test(tst_qplaintextedit SOURCES tst_qplaintextedit.cpp INCLUDE_DIRECTORIES @@ -19,7 +19,7 @@ qt_add_test(tst_qplaintextedit ## Scopes: ##################################################################### -qt_extend_target(tst_qplaintextedit CONDITION MACOS +qt_internal_extend_target(tst_qplaintextedit CONDITION MACOS PUBLIC_LIBRARIES ${FWAppKit} ) diff --git a/tests/auto/widgets/widgets/qprogressbar/CMakeLists.txt b/tests/auto/widgets/widgets/qprogressbar/CMakeLists.txt index 34131ba34e8..699ba0a2f15 100644 --- a/tests/auto/widgets/widgets/qprogressbar/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qprogressbar/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qprogressbar Test: ##################################################################### -qt_add_test(tst_qprogressbar +qt_internal_add_test(tst_qprogressbar SOURCES tst_qprogressbar.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/widgets/qpushbutton/CMakeLists.txt b/tests/auto/widgets/widgets/qpushbutton/CMakeLists.txt index 186bce967fb..0ec5c1fe099 100644 --- a/tests/auto/widgets/widgets/qpushbutton/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qpushbutton/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qpushbutton Test: ##################################################################### -qt_add_test(tst_qpushbutton +qt_internal_add_test(tst_qpushbutton SOURCES tst_qpushbutton.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/widgets/qradiobutton/CMakeLists.txt b/tests/auto/widgets/widgets/qradiobutton/CMakeLists.txt index 194f6689fef..8ce8aadea80 100644 --- a/tests/auto/widgets/widgets/qradiobutton/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qradiobutton/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qradiobutton Test: ##################################################################### -qt_add_test(tst_qradiobutton +qt_internal_add_test(tst_qradiobutton SOURCES tst_qradiobutton.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/widgets/qscrollarea/CMakeLists.txt b/tests/auto/widgets/widgets/qscrollarea/CMakeLists.txt index 0de4565b5da..a10c911286a 100644 --- a/tests/auto/widgets/widgets/qscrollarea/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qscrollarea/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qscrollarea Test: ##################################################################### -qt_add_test(tst_qscrollarea +qt_internal_add_test(tst_qscrollarea SOURCES tst_qscrollarea.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/widgets/qscrollbar/CMakeLists.txt b/tests/auto/widgets/widgets/qscrollbar/CMakeLists.txt index 8b9a3d85cef..fbaba594cf7 100644 --- a/tests/auto/widgets/widgets/qscrollbar/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qscrollbar/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qscrollbar Test: ##################################################################### -qt_add_test(tst_qscrollbar +qt_internal_add_test(tst_qscrollbar SOURCES tst_qscrollbar.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/widgets/qsizegrip/CMakeLists.txt b/tests/auto/widgets/widgets/qsizegrip/CMakeLists.txt index 084b6b1404b..c05b601d874 100644 --- a/tests/auto/widgets/widgets/qsizegrip/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qsizegrip/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qsizegrip Test: ##################################################################### -qt_add_test(tst_qsizegrip +qt_internal_add_test(tst_qsizegrip SOURCES tst_qsizegrip.cpp INCLUDE_DIRECTORIES diff --git a/tests/auto/widgets/widgets/qslider/CMakeLists.txt b/tests/auto/widgets/widgets/qslider/CMakeLists.txt index a34bfc1ef2d..4fe495b3c5b 100644 --- a/tests/auto/widgets/widgets/qslider/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qslider/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qslider Test: ##################################################################### -qt_add_test(tst_qslider +qt_internal_add_test(tst_qslider SOURCES tst_qslider.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/widgets/qspinbox/CMakeLists.txt b/tests/auto/widgets/widgets/qspinbox/CMakeLists.txt index 9b1dbaa3378..adc0ee093fe 100644 --- a/tests/auto/widgets/widgets/qspinbox/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qspinbox/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qspinbox Test: ##################################################################### -qt_add_test(tst_qspinbox +qt_internal_add_test(tst_qspinbox SOURCES tst_qspinbox.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/widgets/qsplashscreen/CMakeLists.txt b/tests/auto/widgets/widgets/qsplashscreen/CMakeLists.txt index fba11c19d75..7c13db39a2d 100644 --- a/tests/auto/widgets/widgets/qsplashscreen/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qsplashscreen/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qsplashscreen Test: ##################################################################### -qt_add_test(tst_qsplashscreen +qt_internal_add_test(tst_qsplashscreen SOURCES tst_qsplashscreen.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/widgets/qsplitter/CMakeLists.txt b/tests/auto/widgets/widgets/qsplitter/CMakeLists.txt index d25ce98e6c5..6cbbfd3792c 100644 --- a/tests/auto/widgets/widgets/qsplitter/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qsplitter/CMakeLists.txt @@ -8,7 +8,7 @@ list(APPEND test_data "extradata.txt") list(APPEND test_data "setSizes3.dat") -qt_add_test(tst_qsplitter +qt_internal_add_test(tst_qsplitter SOURCES tst_qsplitter.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/widgets/qstackedwidget/CMakeLists.txt b/tests/auto/widgets/widgets/qstackedwidget/CMakeLists.txt index 64a97eb7b7d..7c99df28a43 100644 --- a/tests/auto/widgets/widgets/qstackedwidget/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qstackedwidget/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qstackedwidget Test: ##################################################################### -qt_add_test(tst_qstackedwidget +qt_internal_add_test(tst_qstackedwidget SOURCES tst_qstackedwidget.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/widgets/qstatusbar/CMakeLists.txt b/tests/auto/widgets/widgets/qstatusbar/CMakeLists.txt index e5f731d9eb2..e4e19e230e6 100644 --- a/tests/auto/widgets/widgets/qstatusbar/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qstatusbar/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qstatusbar Test: ##################################################################### -qt_add_test(tst_qstatusbar +qt_internal_add_test(tst_qstatusbar SOURCES tst_qstatusbar.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/widgets/qtabbar/CMakeLists.txt b/tests/auto/widgets/widgets/qtabbar/CMakeLists.txt index 4df38be2593..edc90d31381 100644 --- a/tests/auto/widgets/widgets/qtabbar/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qtabbar/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qtabbar Test: ##################################################################### -qt_add_test(tst_qtabbar +qt_internal_add_test(tst_qtabbar SOURCES tst_qtabbar.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/widgets/qtabwidget/CMakeLists.txt b/tests/auto/widgets/widgets/qtabwidget/CMakeLists.txt index f433986a8bc..d0689d0b668 100644 --- a/tests/auto/widgets/widgets/qtabwidget/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qtabwidget/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qtabwidget Test: ##################################################################### -qt_add_test(tst_qtabwidget +qt_internal_add_test(tst_qtabwidget SOURCES tst_qtabwidget.cpp INCLUDE_DIRECTORIES @@ -18,7 +18,7 @@ qt_add_test(tst_qtabwidget ## Scopes: ##################################################################### -qt_extend_target(tst_qtabwidget CONDITION WIN32 +qt_internal_extend_target(tst_qtabwidget CONDITION WIN32 PUBLIC_LIBRARIES user32 ) diff --git a/tests/auto/widgets/widgets/qtextbrowser/CMakeLists.txt b/tests/auto/widgets/widgets/qtextbrowser/CMakeLists.txt index 8f1ddaf3bdf..170ac1e1392 100644 --- a/tests/auto/widgets/widgets/qtextbrowser/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qtextbrowser/CMakeLists.txt @@ -19,7 +19,7 @@ file(GLOB_RECURSE test_data_glob subdir/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qtextbrowser +qt_internal_add_test(tst_qtextbrowser SOURCES tst_qtextbrowser.cpp PUBLIC_LIBRARIES @@ -31,7 +31,7 @@ qt_add_test(tst_qtextbrowser ## Scopes: ##################################################################### -qt_extend_target(tst_qtextbrowser CONDITION builtin_testdata +qt_internal_extend_target(tst_qtextbrowser CONDITION builtin_testdata DEFINES BUILTIN_TESTDATA ) diff --git a/tests/auto/widgets/widgets/qtextedit/CMakeLists.txt b/tests/auto/widgets/widgets/qtextedit/CMakeLists.txt index df973fe087f..e90b59ccb86 100644 --- a/tests/auto/widgets/widgets/qtextedit/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qtextedit/CMakeLists.txt @@ -7,7 +7,7 @@ # Collect test data list(APPEND test_data "fullWidthSelection") -qt_add_test(tst_qtextedit +qt_internal_add_test(tst_qtextedit SOURCES tst_qtextedit.cpp PUBLIC_LIBRARIES @@ -22,7 +22,7 @@ qt_add_test(tst_qtextedit ## Scopes: ##################################################################### -qt_extend_target(tst_qtextedit CONDITION MACOS +qt_internal_extend_target(tst_qtextedit CONDITION MACOS PUBLIC_LIBRARIES ${FWAppKit} ) diff --git a/tests/auto/widgets/widgets/qtoolbar/CMakeLists.txt b/tests/auto/widgets/widgets/qtoolbar/CMakeLists.txt index afe50c1f137..79b4816d535 100644 --- a/tests/auto/widgets/widgets/qtoolbar/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qtoolbar/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qtoolbar Test: ##################################################################### -qt_add_test(tst_qtoolbar +qt_internal_add_test(tst_qtoolbar SOURCES tst_qtoolbar.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/widgets/qtoolbox/CMakeLists.txt b/tests/auto/widgets/widgets/qtoolbox/CMakeLists.txt index 1692176f50c..bb50233c6ed 100644 --- a/tests/auto/widgets/widgets/qtoolbox/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qtoolbox/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qtoolbox Test: ##################################################################### -qt_add_test(tst_qtoolbox +qt_internal_add_test(tst_qtoolbox SOURCES tst_qtoolbox.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/widgets/qtoolbutton/CMakeLists.txt b/tests/auto/widgets/widgets/qtoolbutton/CMakeLists.txt index 42d7cf73f18..b27d88f5039 100644 --- a/tests/auto/widgets/widgets/qtoolbutton/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qtoolbutton/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qtoolbutton Test: ##################################################################### -qt_add_test(tst_qtoolbutton +qt_internal_add_test(tst_qtoolbutton SOURCES tst_qtoolbutton.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/xml/dom/qdom/CMakeLists.txt b/tests/auto/xml/dom/qdom/CMakeLists.txt index 95a4cec92fc..d72ef573327 100644 --- a/tests/auto/xml/dom/qdom/CMakeLists.txt +++ b/tests/auto/xml/dom/qdom/CMakeLists.txt @@ -12,7 +12,7 @@ list(APPEND test_data ${test_data_glob}) list(APPEND test_data "doubleNamespaces.xml") list(APPEND test_data "umlaut.xml") -qt_add_test(tst_qdom +qt_internal_add_test(tst_qdom SOURCES tst_qdom.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/corelib/io/qdir/10000/CMakeLists.txt b/tests/benchmarks/corelib/io/qdir/10000/CMakeLists.txt index 255befd99ad..e83c4e9acc7 100644 --- a/tests/benchmarks/corelib/io/qdir/10000/CMakeLists.txt +++ b/tests/benchmarks/corelib/io/qdir/10000/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qdir_10000 Binary: ##################################################################### -qt_add_benchmark(tst_bench_qdir_10000 +qt_internal_add_benchmark(tst_bench_qdir_10000 SOURCES bench_qdir_10000.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/corelib/io/qdir/tree/CMakeLists.txt b/tests/benchmarks/corelib/io/qdir/tree/CMakeLists.txt index 1ea925928df..c60bfcfdc35 100644 --- a/tests/benchmarks/corelib/io/qdir/tree/CMakeLists.txt +++ b/tests/benchmarks/corelib/io/qdir/tree/CMakeLists.txt @@ -4,7 +4,7 @@ ## bench_qdir_tree Binary: ##################################################################### -qt_add_benchmark(bench_qdir_tree +qt_internal_add_benchmark(bench_qdir_tree SOURCES bench_qdir_tree.cpp PUBLIC_LIBRARIES @@ -16,7 +16,7 @@ set(bench_qdir_tree_resource_files "4.6.0-list.txt" ) -qt_add_resource(bench_qdir_tree "bench_qdir_tree" +qt_internal_add_resource(bench_qdir_tree "bench_qdir_tree" PREFIX "/" FILES diff --git a/tests/benchmarks/corelib/io/qdiriterator/CMakeLists.txt b/tests/benchmarks/corelib/io/qdiriterator/CMakeLists.txt index b534df57960..8ba331a1132 100644 --- a/tests/benchmarks/corelib/io/qdiriterator/CMakeLists.txt +++ b/tests/benchmarks/corelib/io/qdiriterator/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qdiriterator Binary: ##################################################################### -qt_add_benchmark(tst_bench_qdiriterator +qt_internal_add_benchmark(tst_bench_qdiriterator SOURCES main.cpp qfilesystemiterator.cpp qfilesystemiterator.h @@ -15,7 +15,7 @@ qt_add_benchmark(tst_bench_qdiriterator ## Scopes: ##################################################################### -qt_extend_target(tst_bench_qdiriterator CONDITION (QT_FEATURE_cxx17_filesystem) AND (GCC AND (QMAKE_GCC_MAJOR_VERSION LESS 9)) +qt_internal_extend_target(tst_bench_qdiriterator CONDITION (QT_FEATURE_cxx17_filesystem) AND (GCC AND (QMAKE_GCC_MAJOR_VERSION LESS 9)) LINK_OPTIONS "-lstdc++fs" ) diff --git a/tests/benchmarks/corelib/io/qfile/CMakeLists.txt b/tests/benchmarks/corelib/io/qfile/CMakeLists.txt index df33c1169f6..6ae5029a8a3 100644 --- a/tests/benchmarks/corelib/io/qfile/CMakeLists.txt +++ b/tests/benchmarks/corelib/io/qfile/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qfile Binary: ##################################################################### -qt_add_benchmark(tst_bench_qfile +qt_internal_add_benchmark(tst_bench_qfile SOURCES main.cpp PUBLIC_LIBRARIES @@ -18,7 +18,7 @@ qt_add_benchmark(tst_bench_qfile ## Scopes: ##################################################################### -qt_extend_target(tst_bench_qfile CONDITION WIN32 +qt_internal_extend_target(tst_bench_qfile CONDITION WIN32 DEFINES _CRT_SECURE_NO_WARNINGS ) diff --git a/tests/benchmarks/corelib/io/qfileinfo/CMakeLists.txt b/tests/benchmarks/corelib/io/qfileinfo/CMakeLists.txt index 691c3fb51de..1c088bf71a0 100644 --- a/tests/benchmarks/corelib/io/qfileinfo/CMakeLists.txt +++ b/tests/benchmarks/corelib/io/qfileinfo/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qfileinfo Binary: ##################################################################### -qt_add_benchmark(tst_bench_qfileinfo +qt_internal_add_benchmark(tst_bench_qfileinfo SOURCES main.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/corelib/io/qiodevice/CMakeLists.txt b/tests/benchmarks/corelib/io/qiodevice/CMakeLists.txt index 21052a584ca..3af6d4f214f 100644 --- a/tests/benchmarks/corelib/io/qiodevice/CMakeLists.txt +++ b/tests/benchmarks/corelib/io/qiodevice/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qiodevice Binary: ##################################################################### -qt_add_benchmark(tst_bench_qiodevice +qt_internal_add_benchmark(tst_bench_qiodevice SOURCES main.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/corelib/io/qprocess/test/CMakeLists.txt b/tests/benchmarks/corelib/io/qprocess/test/CMakeLists.txt index 93cca1827f9..ca7011a661b 100644 --- a/tests/benchmarks/corelib/io/qprocess/test/CMakeLists.txt +++ b/tests/benchmarks/corelib/io/qprocess/test/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qprocess Binary: ##################################################################### -qt_add_benchmark(tst_bench_qprocess +qt_internal_add_benchmark(tst_bench_qprocess SOURCES ../tst_bench_qprocess.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/corelib/io/qprocess/testProcessLoopback/.prev_CMakeLists.txt b/tests/benchmarks/corelib/io/qprocess/testProcessLoopback/.prev_CMakeLists.txt index 6c67fdbbedb..02c50f7df28 100644 --- a/tests/benchmarks/corelib/io/qprocess/testProcessLoopback/.prev_CMakeLists.txt +++ b/tests/benchmarks/corelib/io/qprocess/testProcessLoopback/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## testProcessLoopback Binary: ##################################################################### -add_qt_benchmark(testProcessLoopback +qt_internal_add_benchmark(testProcessLoopback OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" SOURCES main.cpp diff --git a/tests/benchmarks/corelib/io/qprocess/testProcessLoopback/CMakeLists.txt b/tests/benchmarks/corelib/io/qprocess/testProcessLoopback/CMakeLists.txt index 0d0115f7858..02c50f7df28 100644 --- a/tests/benchmarks/corelib/io/qprocess/testProcessLoopback/CMakeLists.txt +++ b/tests/benchmarks/corelib/io/qprocess/testProcessLoopback/CMakeLists.txt @@ -4,7 +4,7 @@ ## testProcessLoopback Binary: ##################################################################### -qt_add_benchmark(testProcessLoopback +qt_internal_add_benchmark(testProcessLoopback OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" SOURCES main.cpp diff --git a/tests/benchmarks/corelib/io/qtemporaryfile/CMakeLists.txt b/tests/benchmarks/corelib/io/qtemporaryfile/CMakeLists.txt index b9bc9164a7f..a12bfd1260a 100644 --- a/tests/benchmarks/corelib/io/qtemporaryfile/CMakeLists.txt +++ b/tests/benchmarks/corelib/io/qtemporaryfile/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qtemporaryfile Binary: ##################################################################### -qt_add_benchmark(tst_bench_qtemporaryfile +qt_internal_add_benchmark(tst_bench_qtemporaryfile SOURCES main.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/corelib/io/qtextstream/CMakeLists.txt b/tests/benchmarks/corelib/io/qtextstream/CMakeLists.txt index d84ba59f41d..0393b91119d 100644 --- a/tests/benchmarks/corelib/io/qtextstream/CMakeLists.txt +++ b/tests/benchmarks/corelib/io/qtextstream/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qtextstream Binary: ##################################################################### -qt_add_benchmark(tst_bench_qtextstream +qt_internal_add_benchmark(tst_bench_qtextstream SOURCES main.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/corelib/io/qurl/CMakeLists.txt b/tests/benchmarks/corelib/io/qurl/CMakeLists.txt index 77ede075366..d38c8b18c07 100644 --- a/tests/benchmarks/corelib/io/qurl/CMakeLists.txt +++ b/tests/benchmarks/corelib/io/qurl/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qurl Binary: ##################################################################### -qt_add_benchmark(tst_qurl +qt_internal_add_benchmark(tst_qurl SOURCES main.cpp PUBLIC_LIBRARIES @@ -17,7 +17,7 @@ qt_add_benchmark(tst_qurl ## Scopes: ##################################################################### -qt_extend_target(tst_qurl CONDITION WIN32 +qt_internal_extend_target(tst_qurl CONDITION WIN32 DEFINES _CRT_SECURE_NO_WARNINGS ) diff --git a/tests/benchmarks/corelib/json/CMakeLists.txt b/tests/benchmarks/corelib/json/CMakeLists.txt index 2108deb6bbe..657a2687412 100644 --- a/tests/benchmarks/corelib/json/CMakeLists.txt +++ b/tests/benchmarks/corelib/json/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qtjson Binary: ##################################################################### -qt_add_benchmark(tst_bench_qtjson +qt_internal_add_benchmark(tst_bench_qtjson SOURCES tst_bench_qtjson.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/corelib/kernel/events/CMakeLists.txt b/tests/benchmarks/corelib/kernel/events/CMakeLists.txt index e9c5cc694aa..41add9350e5 100644 --- a/tests/benchmarks/corelib/kernel/events/CMakeLists.txt +++ b/tests/benchmarks/corelib/kernel/events/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_events Binary: ##################################################################### -qt_add_benchmark(tst_bench_events +qt_internal_add_benchmark(tst_bench_events SOURCES main.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/corelib/kernel/qcoreapplication/CMakeLists.txt b/tests/benchmarks/corelib/kernel/qcoreapplication/CMakeLists.txt index c0d05628699..16189979095 100644 --- a/tests/benchmarks/corelib/kernel/qcoreapplication/CMakeLists.txt +++ b/tests/benchmarks/corelib/kernel/qcoreapplication/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qcoreapplication Binary: ##################################################################### -qt_add_benchmark(tst_bench_qcoreapplication +qt_internal_add_benchmark(tst_bench_qcoreapplication SOURCES main.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/corelib/kernel/qmetaobject/CMakeLists.txt b/tests/benchmarks/corelib/kernel/qmetaobject/CMakeLists.txt index 8f7dd523763..db4c3ab12e4 100644 --- a/tests/benchmarks/corelib/kernel/qmetaobject/CMakeLists.txt +++ b/tests/benchmarks/corelib/kernel/qmetaobject/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qmetaobject Binary: ##################################################################### -qt_add_benchmark(tst_bench_qmetaobject +qt_internal_add_benchmark(tst_bench_qmetaobject SOURCES main.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/corelib/kernel/qmetatype/CMakeLists.txt b/tests/benchmarks/corelib/kernel/qmetatype/CMakeLists.txt index ad63d9d8c80..ae4bc9c9062 100644 --- a/tests/benchmarks/corelib/kernel/qmetatype/CMakeLists.txt +++ b/tests/benchmarks/corelib/kernel/qmetatype/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qmetatype Binary: ##################################################################### -qt_add_benchmark(tst_bench_qmetatype +qt_internal_add_benchmark(tst_bench_qmetatype SOURCES tst_qmetatype.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/corelib/kernel/qobject/CMakeLists.txt b/tests/benchmarks/corelib/kernel/qobject/CMakeLists.txt index 92cffc29803..ce834905b0b 100644 --- a/tests/benchmarks/corelib/kernel/qobject/CMakeLists.txt +++ b/tests/benchmarks/corelib/kernel/qobject/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qobject Binary: ##################################################################### -qt_add_benchmark(tst_bench_qobject +qt_internal_add_benchmark(tst_bench_qobject SOURCES main.cpp object.cpp object.h diff --git a/tests/benchmarks/corelib/kernel/qtimer_vs_qmetaobject/CMakeLists.txt b/tests/benchmarks/corelib/kernel/qtimer_vs_qmetaobject/CMakeLists.txt index 2619d897790..5ba14e43a27 100644 --- a/tests/benchmarks/corelib/kernel/qtimer_vs_qmetaobject/CMakeLists.txt +++ b/tests/benchmarks/corelib/kernel/qtimer_vs_qmetaobject/CMakeLists.txt @@ -4,7 +4,7 @@ ## qtimer_vs_qmetaobject Binary: ##################################################################### -qt_add_benchmark(qtimer_vs_qmetaobject +qt_internal_add_benchmark(qtimer_vs_qmetaobject SOURCES tst_qtimer_vs_qmetaobject.cpp INCLUDE_DIRECTORIES diff --git a/tests/benchmarks/corelib/kernel/qvariant/CMakeLists.txt b/tests/benchmarks/corelib/kernel/qvariant/CMakeLists.txt index f5104b11ff4..418fd1da9f4 100644 --- a/tests/benchmarks/corelib/kernel/qvariant/CMakeLists.txt +++ b/tests/benchmarks/corelib/kernel/qvariant/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qvariant Binary: ##################################################################### -qt_add_benchmark(tst_bench_qvariant +qt_internal_add_benchmark(tst_bench_qvariant SOURCES tst_qvariant.cpp PUBLIC_LIBRARIES @@ -15,7 +15,7 @@ qt_add_benchmark(tst_bench_qvariant ## Scopes: ##################################################################### -qt_extend_target(tst_bench_qvariant CONDITION NOT TARGET Qt::Gui +qt_internal_extend_target(tst_bench_qvariant CONDITION NOT TARGET Qt::Gui PUBLIC_LIBRARIES # Remove: gui ) diff --git a/tests/benchmarks/corelib/mimetypes/qmimedatabase/CMakeLists.txt b/tests/benchmarks/corelib/mimetypes/qmimedatabase/CMakeLists.txt index 7f4ce4df13a..7adc0436392 100644 --- a/tests/benchmarks/corelib/mimetypes/qmimedatabase/CMakeLists.txt +++ b/tests/benchmarks/corelib/mimetypes/qmimedatabase/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qmimedatabase Binary: ##################################################################### -qt_add_benchmark(tst_bench_qmimedatabase +qt_internal_add_benchmark(tst_bench_qmimedatabase SOURCES main.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/corelib/plugin/quuid/CMakeLists.txt b/tests/benchmarks/corelib/plugin/quuid/CMakeLists.txt index 3f8b26c883b..3b787dc8e89 100644 --- a/tests/benchmarks/corelib/plugin/quuid/CMakeLists.txt +++ b/tests/benchmarks/corelib/plugin/quuid/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_quuid Binary: ##################################################################### -qt_add_benchmark(tst_bench_quuid +qt_internal_add_benchmark(tst_bench_quuid SOURCES tst_quuid.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/corelib/text/qbytearray/CMakeLists.txt b/tests/benchmarks/corelib/text/qbytearray/CMakeLists.txt index cdae659c92c..50574aa2216 100644 --- a/tests/benchmarks/corelib/text/qbytearray/CMakeLists.txt +++ b/tests/benchmarks/corelib/text/qbytearray/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qbytearray Binary: ##################################################################### -qt_add_benchmark(tst_bench_qbytearray +qt_internal_add_benchmark(tst_bench_qbytearray SOURCES main.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/corelib/text/qchar/CMakeLists.txt b/tests/benchmarks/corelib/text/qchar/CMakeLists.txt index af45da6bfac..afdf96e9d46 100644 --- a/tests/benchmarks/corelib/text/qchar/CMakeLists.txt +++ b/tests/benchmarks/corelib/text/qchar/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qchar Binary: ##################################################################### -qt_add_benchmark(tst_bench_qchar +qt_internal_add_benchmark(tst_bench_qchar SOURCES main.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/corelib/text/qlocale/CMakeLists.txt b/tests/benchmarks/corelib/text/qlocale/CMakeLists.txt index 830c6dbf120..1c692af6c87 100644 --- a/tests/benchmarks/corelib/text/qlocale/CMakeLists.txt +++ b/tests/benchmarks/corelib/text/qlocale/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qlocale Binary: ##################################################################### -qt_add_benchmark(tst_bench_qlocale +qt_internal_add_benchmark(tst_bench_qlocale SOURCES main.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/corelib/text/qstring/CMakeLists.txt b/tests/benchmarks/corelib/text/qstring/CMakeLists.txt index e0f3a0e2790..4b443cd4aaf 100644 --- a/tests/benchmarks/corelib/text/qstring/CMakeLists.txt +++ b/tests/benchmarks/corelib/text/qstring/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qstring Binary: ##################################################################### -qt_add_benchmark(tst_bench_qstring +qt_internal_add_benchmark(tst_bench_qstring SOURCES main.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/corelib/text/qstringbuilder/CMakeLists.txt b/tests/benchmarks/corelib/text/qstringbuilder/CMakeLists.txt index 3182c3faaaf..33b1b5fe5e3 100644 --- a/tests/benchmarks/corelib/text/qstringbuilder/CMakeLists.txt +++ b/tests/benchmarks/corelib/text/qstringbuilder/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qstringbuilder Binary: ##################################################################### -qt_add_benchmark(tst_bench_qstringbuilder +qt_internal_add_benchmark(tst_bench_qstringbuilder SOURCES main.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/corelib/text/qstringlist/CMakeLists.txt b/tests/benchmarks/corelib/text/qstringlist/CMakeLists.txt index f62b4a82a19..4649e3408a9 100644 --- a/tests/benchmarks/corelib/text/qstringlist/CMakeLists.txt +++ b/tests/benchmarks/corelib/text/qstringlist/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qstringlist Binary: ##################################################################### -qt_add_benchmark(tst_bench_qstringlist +qt_internal_add_benchmark(tst_bench_qstringlist SOURCES main.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/corelib/thread/qmutex/CMakeLists.txt b/tests/benchmarks/corelib/thread/qmutex/CMakeLists.txt index 4ba55034d8d..8872a50227f 100644 --- a/tests/benchmarks/corelib/thread/qmutex/CMakeLists.txt +++ b/tests/benchmarks/corelib/thread/qmutex/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qmutex Binary: ##################################################################### -qt_add_benchmark(tst_bench_qmutex +qt_internal_add_benchmark(tst_bench_qmutex SOURCES tst_qmutex.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/corelib/thread/qreadwritelock/CMakeLists.txt b/tests/benchmarks/corelib/thread/qreadwritelock/CMakeLists.txt index 228f589e08a..79d3a2f8794 100644 --- a/tests/benchmarks/corelib/thread/qreadwritelock/CMakeLists.txt +++ b/tests/benchmarks/corelib/thread/qreadwritelock/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qreadwritelock Binary: ##################################################################### -qt_add_benchmark(tst_bench_qreadwritelock +qt_internal_add_benchmark(tst_bench_qreadwritelock SOURCES tst_qreadwritelock.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/corelib/thread/qthreadpool/CMakeLists.txt b/tests/benchmarks/corelib/thread/qthreadpool/CMakeLists.txt index fef77ff03cd..7b0c81891e6 100644 --- a/tests/benchmarks/corelib/thread/qthreadpool/CMakeLists.txt +++ b/tests/benchmarks/corelib/thread/qthreadpool/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qthreadpool Binary: ##################################################################### -qt_add_benchmark(tst_bench_qthreadpool +qt_internal_add_benchmark(tst_bench_qthreadpool SOURCES tst_qthreadpool.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/corelib/thread/qthreadstorage/CMakeLists.txt b/tests/benchmarks/corelib/thread/qthreadstorage/CMakeLists.txt index 45e8c92c382..78ac072d355 100644 --- a/tests/benchmarks/corelib/thread/qthreadstorage/CMakeLists.txt +++ b/tests/benchmarks/corelib/thread/qthreadstorage/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qthreadstorage Binary: ##################################################################### -qt_add_benchmark(tst_bench_qthreadstorage +qt_internal_add_benchmark(tst_bench_qthreadstorage SOURCES tst_qthreadstorage.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/corelib/thread/qwaitcondition/CMakeLists.txt b/tests/benchmarks/corelib/thread/qwaitcondition/CMakeLists.txt index d686746e582..68c6e883421 100644 --- a/tests/benchmarks/corelib/thread/qwaitcondition/CMakeLists.txt +++ b/tests/benchmarks/corelib/thread/qwaitcondition/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qwaitcondition Binary: ##################################################################### -qt_add_benchmark(tst_bench_qwaitcondition +qt_internal_add_benchmark(tst_bench_qwaitcondition SOURCES tst_qwaitcondition.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/corelib/time/qdate/CMakeLists.txt b/tests/benchmarks/corelib/time/qdate/CMakeLists.txt index 2a70ef5f4f2..edc55463d83 100644 --- a/tests/benchmarks/corelib/time/qdate/CMakeLists.txt +++ b/tests/benchmarks/corelib/time/qdate/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qdate Binary: ##################################################################### -qt_add_benchmark(tst_bench_qdate +qt_internal_add_benchmark(tst_bench_qdate SOURCES tst_bench_qdate.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/corelib/time/qdatetime/CMakeLists.txt b/tests/benchmarks/corelib/time/qdatetime/CMakeLists.txt index 6abe0035c7a..2585b0d25d9 100644 --- a/tests/benchmarks/corelib/time/qdatetime/CMakeLists.txt +++ b/tests/benchmarks/corelib/time/qdatetime/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qdatetime Binary: ##################################################################### -qt_add_benchmark(tst_bench_qdatetime +qt_internal_add_benchmark(tst_bench_qdatetime SOURCES main.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/corelib/time/qtimezone/CMakeLists.txt b/tests/benchmarks/corelib/time/qtimezone/CMakeLists.txt index b4836337bcd..c6487499af3 100644 --- a/tests/benchmarks/corelib/time/qtimezone/CMakeLists.txt +++ b/tests/benchmarks/corelib/time/qtimezone/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qtimezone Binary: ##################################################################### -qt_add_benchmark(tst_bench_qtimezone +qt_internal_add_benchmark(tst_bench_qtimezone SOURCES main.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/corelib/tools/containers-associative/CMakeLists.txt b/tests/benchmarks/corelib/tools/containers-associative/CMakeLists.txt index d07794c25e2..1e653fa98d0 100644 --- a/tests/benchmarks/corelib/tools/containers-associative/CMakeLists.txt +++ b/tests/benchmarks/corelib/tools/containers-associative/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_containers-associative Binary: ##################################################################### -qt_add_benchmark(tst_bench_containers-associative +qt_internal_add_benchmark(tst_bench_containers-associative SOURCES main.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/corelib/tools/containers-sequential/CMakeLists.txt b/tests/benchmarks/corelib/tools/containers-sequential/CMakeLists.txt index 77e889160c8..f8ebc69c291 100644 --- a/tests/benchmarks/corelib/tools/containers-sequential/CMakeLists.txt +++ b/tests/benchmarks/corelib/tools/containers-sequential/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_containers-sequential Binary: ##################################################################### -qt_add_benchmark(tst_bench_containers-sequential +qt_internal_add_benchmark(tst_bench_containers-sequential SOURCES main.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/corelib/tools/qchar/CMakeLists.txt b/tests/benchmarks/corelib/tools/qchar/CMakeLists.txt deleted file mode 100644 index c51e2a00595..00000000000 --- a/tests/benchmarks/corelib/tools/qchar/CMakeLists.txt +++ /dev/null @@ -1 +0,0 @@ -add_qt_test(tst_bench_qchar SOURCES main.cpp) diff --git a/tests/benchmarks/corelib/tools/qcontiguouscache/CMakeLists.txt b/tests/benchmarks/corelib/tools/qcontiguouscache/CMakeLists.txt index 8d4bff59796..e683d60de24 100644 --- a/tests/benchmarks/corelib/tools/qcontiguouscache/CMakeLists.txt +++ b/tests/benchmarks/corelib/tools/qcontiguouscache/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qcontiguouscache Binary: ##################################################################### -qt_add_benchmark(tst_bench_qcontiguouscache +qt_internal_add_benchmark(tst_bench_qcontiguouscache SOURCES main.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/corelib/tools/qcryptographichash/CMakeLists.txt b/tests/benchmarks/corelib/tools/qcryptographichash/CMakeLists.txt index 77168e443b1..2ca8e683e10 100644 --- a/tests/benchmarks/corelib/tools/qcryptographichash/CMakeLists.txt +++ b/tests/benchmarks/corelib/tools/qcryptographichash/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qcryptographichash Binary: ##################################################################### -qt_add_benchmark(tst_bench_qcryptographichash +qt_internal_add_benchmark(tst_bench_qcryptographichash SOURCES main.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/corelib/tools/qdatetime/CMakeLists.txt b/tests/benchmarks/corelib/tools/qdatetime/CMakeLists.txt deleted file mode 100644 index 6875fdd6134..00000000000 --- a/tests/benchmarks/corelib/tools/qdatetime/CMakeLists.txt +++ /dev/null @@ -1 +0,0 @@ -add_qt_test(tst_bench_qdatetime SOURCES main.cpp) diff --git a/tests/benchmarks/corelib/tools/qhash/CMakeLists.txt b/tests/benchmarks/corelib/tools/qhash/CMakeLists.txt index 760b1848d7c..5286484b0c5 100644 --- a/tests/benchmarks/corelib/tools/qhash/CMakeLists.txt +++ b/tests/benchmarks/corelib/tools/qhash/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_hash Binary: ##################################################################### -qt_add_benchmark(tst_hash +qt_internal_add_benchmark(tst_hash SOURCES main.cpp outofline.cpp diff --git a/tests/benchmarks/corelib/tools/qlist/CMakeLists.txt b/tests/benchmarks/corelib/tools/qlist/CMakeLists.txt index 40be9e9374b..46ca1c85148 100644 --- a/tests/benchmarks/corelib/tools/qlist/CMakeLists.txt +++ b/tests/benchmarks/corelib/tools/qlist/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qlist Binary: ##################################################################### -qt_add_benchmark(tst_bench_qlist +qt_internal_add_benchmark(tst_bench_qlist SOURCES main.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/corelib/tools/qlocale/CMakeLists.txt b/tests/benchmarks/corelib/tools/qlocale/CMakeLists.txt deleted file mode 100644 index b8a23bc757a..00000000000 --- a/tests/benchmarks/corelib/tools/qlocale/CMakeLists.txt +++ /dev/null @@ -1 +0,0 @@ -add_qt_test(tst_bench_qlocale SOURCES main.cpp) diff --git a/tests/benchmarks/corelib/tools/qmap/CMakeLists.txt b/tests/benchmarks/corelib/tools/qmap/CMakeLists.txt index b814b018c00..5937eda37c8 100644 --- a/tests/benchmarks/corelib/tools/qmap/CMakeLists.txt +++ b/tests/benchmarks/corelib/tools/qmap/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qmap Binary: ##################################################################### -qt_add_benchmark(tst_bench_qmap +qt_internal_add_benchmark(tst_bench_qmap SOURCES main.cpp INCLUDE_DIRECTORIES diff --git a/tests/benchmarks/corelib/tools/qrect/CMakeLists.txt b/tests/benchmarks/corelib/tools/qrect/CMakeLists.txt index fd9ea5a6f2f..30234c70558 100644 --- a/tests/benchmarks/corelib/tools/qrect/CMakeLists.txt +++ b/tests/benchmarks/corelib/tools/qrect/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qrect Binary: ##################################################################### -qt_add_benchmark(tst_bench_qrect +qt_internal_add_benchmark(tst_bench_qrect SOURCES main.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/corelib/tools/qringbuffer/CMakeLists.txt b/tests/benchmarks/corelib/tools/qringbuffer/CMakeLists.txt index fd10411ff36..63128f5f95a 100644 --- a/tests/benchmarks/corelib/tools/qringbuffer/CMakeLists.txt +++ b/tests/benchmarks/corelib/tools/qringbuffer/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qringbuffer Binary: ##################################################################### -qt_add_benchmark(tst_bench_qringbuffer +qt_internal_add_benchmark(tst_bench_qringbuffer SOURCES main.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/corelib/tools/qset/CMakeLists.txt b/tests/benchmarks/corelib/tools/qset/CMakeLists.txt index 96273384147..00fd0887767 100644 --- a/tests/benchmarks/corelib/tools/qset/CMakeLists.txt +++ b/tests/benchmarks/corelib/tools/qset/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qset Binary: ##################################################################### -qt_add_benchmark(tst_qset +qt_internal_add_benchmark(tst_qset SOURCES main.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/corelib/tools/qstack/CMakeLists.txt b/tests/benchmarks/corelib/tools/qstack/CMakeLists.txt index 2389dd51cea..4526af60db2 100644 --- a/tests/benchmarks/corelib/tools/qstack/CMakeLists.txt +++ b/tests/benchmarks/corelib/tools/qstack/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_stack Binary: ##################################################################### -qt_add_benchmark(tst_bench_stack +qt_internal_add_benchmark(tst_bench_stack SOURCES main.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/corelib/tools/qstring/CMakeLists.txt b/tests/benchmarks/corelib/tools/qstring/CMakeLists.txt deleted file mode 100644 index 1dd6678e8e4..00000000000 --- a/tests/benchmarks/corelib/tools/qstring/CMakeLists.txt +++ /dev/null @@ -1 +0,0 @@ -add_qt_test(tst_bench_qstring SOURCES main.cpp) diff --git a/tests/benchmarks/corelib/tools/qtimezone/CMakeLists.txt b/tests/benchmarks/corelib/tools/qtimezone/CMakeLists.txt deleted file mode 100644 index 3947ae1c5e1..00000000000 --- a/tests/benchmarks/corelib/tools/qtimezone/CMakeLists.txt +++ /dev/null @@ -1 +0,0 @@ -add_qt_test(tst_bench_qtimezone SOURCES main.cpp) diff --git a/tests/benchmarks/corelib/tools/qvector/CMakeLists.txt b/tests/benchmarks/corelib/tools/qvector/CMakeLists.txt index ae402976049..467405eea0f 100644 --- a/tests/benchmarks/corelib/tools/qvector/CMakeLists.txt +++ b/tests/benchmarks/corelib/tools/qvector/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_vector Binary: ##################################################################### -qt_add_benchmark(tst_bench_vector +qt_internal_add_benchmark(tst_bench_vector SOURCES main.cpp outofline.cpp diff --git a/tests/benchmarks/dbus/qdbusperformance/server/CMakeLists.txt b/tests/benchmarks/dbus/qdbusperformance/server/CMakeLists.txt index 49658f2ee7b..ff4612d042f 100644 --- a/tests/benchmarks/dbus/qdbusperformance/server/CMakeLists.txt +++ b/tests/benchmarks/dbus/qdbusperformance/server/CMakeLists.txt @@ -4,7 +4,7 @@ ## server Binary: ##################################################################### -qt_add_benchmark(server +qt_internal_add_benchmark(server GUI OUTPUT_DIRECTORY "." SOURCES diff --git a/tests/benchmarks/dbus/qdbusperformance/test/CMakeLists.txt b/tests/benchmarks/dbus/qdbusperformance/test/CMakeLists.txt index a31a310f050..6b22096b4da 100644 --- a/tests/benchmarks/dbus/qdbusperformance/test/CMakeLists.txt +++ b/tests/benchmarks/dbus/qdbusperformance/test/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qdbusperformance Binary: ##################################################################### -qt_add_benchmark(tst_qdbusperformance +qt_internal_add_benchmark(tst_qdbusperformance SOURCES ../serverobject.h ../tst_qdbusperformance.cpp diff --git a/tests/benchmarks/dbus/qdbustype/CMakeLists.txt b/tests/benchmarks/dbus/qdbustype/CMakeLists.txt index 9493dd43d09..13169cc0a04 100644 --- a/tests/benchmarks/dbus/qdbustype/CMakeLists.txt +++ b/tests/benchmarks/dbus/qdbustype/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qdbustype Binary: ##################################################################### -qt_add_benchmark(tst_bench_qdbustype +qt_internal_add_benchmark(tst_bench_qdbustype SOURCES main.cpp PUBLIC_LIBRARIES @@ -16,14 +16,14 @@ qt_add_benchmark(tst_bench_qdbustype ## Scopes: ##################################################################### -qt_extend_target(tst_bench_qdbustype CONDITION QT_FEATURE_dbus_linked +qt_internal_extend_target(tst_bench_qdbustype CONDITION QT_FEATURE_dbus_linked DEFINES QT_LINKED_LIBDBUS PUBLIC_LIBRARIES dbus-1 ) -qt_extend_target(tst_bench_qdbustype CONDITION NOT QT_FEATURE_dbus_linked +qt_internal_extend_target(tst_bench_qdbustype CONDITION NOT QT_FEATURE_dbus_linked SOURCES ../../../../src/dbus/qdbus_symbols.cpp ) diff --git a/tests/benchmarks/gui/animation/qanimation/CMakeLists.txt b/tests/benchmarks/gui/animation/qanimation/CMakeLists.txt index 30022b270f8..4d611eedb19 100644 --- a/tests/benchmarks/gui/animation/qanimation/CMakeLists.txt +++ b/tests/benchmarks/gui/animation/qanimation/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qanimation Binary: ##################################################################### -qt_add_benchmark(tst_bench_qanimation +qt_internal_add_benchmark(tst_bench_qanimation SOURCES dummyanimation.cpp dummyanimation.h dummyobject.cpp dummyobject.h diff --git a/tests/benchmarks/gui/image/blendbench/CMakeLists.txt b/tests/benchmarks/gui/image/blendbench/CMakeLists.txt index 1569e8f8b18..d0d61cea19b 100644 --- a/tests/benchmarks/gui/image/blendbench/CMakeLists.txt +++ b/tests/benchmarks/gui/image/blendbench/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_blendbench Binary: ##################################################################### -qt_add_benchmark(tst_bench_blendbench +qt_internal_add_benchmark(tst_bench_blendbench SOURCES main.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/gui/image/qimageconversion/CMakeLists.txt b/tests/benchmarks/gui/image/qimageconversion/CMakeLists.txt index 5b0bb330187..f67a2b69084 100644 --- a/tests/benchmarks/gui/image/qimageconversion/CMakeLists.txt +++ b/tests/benchmarks/gui/image/qimageconversion/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_imageConversion Binary: ##################################################################### -qt_add_benchmark(tst_bench_imageConversion +qt_internal_add_benchmark(tst_bench_imageConversion SOURCES tst_qimageconversion.cpp PUBLIC_LIBRARIES @@ -19,12 +19,12 @@ qt_add_benchmark(tst_bench_imageConversion ## Scopes: ##################################################################### -qt_extend_target(tst_bench_imageConversion CONDITION QT_FEATURE_gif +qt_internal_extend_target(tst_bench_imageConversion CONDITION QT_FEATURE_gif DEFINES QTEST_HAVE_GIF ) -qt_extend_target(tst_bench_imageConversion CONDITION QT_FEATURE_jpeg +qt_internal_extend_target(tst_bench_imageConversion CONDITION QT_FEATURE_jpeg DEFINES QTEST_HAVE_JPEG ) diff --git a/tests/benchmarks/gui/image/qimagereader/CMakeLists.txt b/tests/benchmarks/gui/image/qimagereader/CMakeLists.txt index d6522478776..d0ef0e3984c 100644 --- a/tests/benchmarks/gui/image/qimagereader/CMakeLists.txt +++ b/tests/benchmarks/gui/image/qimagereader/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qimagereader Binary: ##################################################################### -qt_add_benchmark(tst_bench_qimagereader +qt_internal_add_benchmark(tst_bench_qimagereader SOURCES tst_qimagereader.cpp PUBLIC_LIBRARIES @@ -20,12 +20,12 @@ qt_add_benchmark(tst_bench_qimagereader ## Scopes: ##################################################################### -qt_extend_target(tst_bench_qimagereader CONDITION QT_FEATURE_gif +qt_internal_extend_target(tst_bench_qimagereader CONDITION QT_FEATURE_gif DEFINES QTEST_HAVE_GIF ) -qt_extend_target(tst_bench_qimagereader CONDITION QT_FEATURE_jpeg +qt_internal_extend_target(tst_bench_qimagereader CONDITION QT_FEATURE_jpeg DEFINES QTEST_HAVE_JPEG ) diff --git a/tests/benchmarks/gui/image/qimagescale/CMakeLists.txt b/tests/benchmarks/gui/image/qimagescale/CMakeLists.txt index 84011be1bdc..51610fa567a 100644 --- a/tests/benchmarks/gui/image/qimagescale/CMakeLists.txt +++ b/tests/benchmarks/gui/image/qimagescale/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_imageScale Binary: ##################################################################### -qt_add_benchmark(tst_bench_imageScale +qt_internal_add_benchmark(tst_bench_imageScale SOURCES tst_qimagescale.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/gui/image/qpixmap/CMakeLists.txt b/tests/benchmarks/gui/image/qpixmap/CMakeLists.txt index 5413cc700e4..f8b1a4c7545 100644 --- a/tests/benchmarks/gui/image/qpixmap/CMakeLists.txt +++ b/tests/benchmarks/gui/image/qpixmap/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qpixmap Binary: ##################################################################### -qt_add_benchmark(tst_bench_qpixmap +qt_internal_add_benchmark(tst_bench_qpixmap SOURCES tst_qpixmap.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/gui/image/qpixmapcache/CMakeLists.txt b/tests/benchmarks/gui/image/qpixmapcache/CMakeLists.txt index b8d72d76594..0f4a57c1916 100644 --- a/tests/benchmarks/gui/image/qpixmapcache/CMakeLists.txt +++ b/tests/benchmarks/gui/image/qpixmapcache/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qpixmapcache Binary: ##################################################################### -qt_add_benchmark(tst_bench_qpixmapcache +qt_internal_add_benchmark(tst_bench_qpixmapcache SOURCES tst_qpixmapcache.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/gui/kernel/qguimetatype/CMakeLists.txt b/tests/benchmarks/gui/kernel/qguimetatype/CMakeLists.txt index ac0e5f3566f..1b11788093d 100644 --- a/tests/benchmarks/gui/kernel/qguimetatype/CMakeLists.txt +++ b/tests/benchmarks/gui/kernel/qguimetatype/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qguimetatype Binary: ##################################################################### -qt_add_benchmark(tst_bench_qguimetatype +qt_internal_add_benchmark(tst_bench_qguimetatype SOURCES tst_qguimetatype.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/gui/kernel/qguivariant/CMakeLists.txt b/tests/benchmarks/gui/kernel/qguivariant/CMakeLists.txt index 0d2c99f3ec1..ef1c2202594 100644 --- a/tests/benchmarks/gui/kernel/qguivariant/CMakeLists.txt +++ b/tests/benchmarks/gui/kernel/qguivariant/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qguivariant Binary: ##################################################################### -qt_add_benchmark(tst_bench_qguivariant +qt_internal_add_benchmark(tst_bench_qguivariant SOURCES tst_qguivariant.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/gui/math3d/qmatrix4x4/CMakeLists.txt b/tests/benchmarks/gui/math3d/qmatrix4x4/CMakeLists.txt index 4d7162a6788..28ada45257e 100644 --- a/tests/benchmarks/gui/math3d/qmatrix4x4/CMakeLists.txt +++ b/tests/benchmarks/gui/math3d/qmatrix4x4/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qmatrix4x4 Binary: ##################################################################### -qt_add_benchmark(tst_bench_qmatrix4x4 +qt_internal_add_benchmark(tst_bench_qmatrix4x4 SOURCES tst_qmatrix4x4.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/gui/math3d/qquaternion/CMakeLists.txt b/tests/benchmarks/gui/math3d/qquaternion/CMakeLists.txt index 863179b1718..147f4ce15f4 100644 --- a/tests/benchmarks/gui/math3d/qquaternion/CMakeLists.txt +++ b/tests/benchmarks/gui/math3d/qquaternion/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qquaternion Binary: ##################################################################### -qt_add_benchmark(tst_bench_qquaternion +qt_internal_add_benchmark(tst_bench_qquaternion SOURCES tst_qquaternion.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/gui/painting/drawtexture/CMakeLists.txt b/tests/benchmarks/gui/painting/drawtexture/CMakeLists.txt index 843c84e050d..2d30686339b 100644 --- a/tests/benchmarks/gui/painting/drawtexture/CMakeLists.txt +++ b/tests/benchmarks/gui/painting/drawtexture/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_drawtexture Binary: ##################################################################### -qt_add_benchmark(tst_bench_drawtexture +qt_internal_add_benchmark(tst_bench_drawtexture SOURCES tst_drawtexture.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/gui/painting/lancebench/CMakeLists.txt b/tests/benchmarks/gui/painting/lancebench/CMakeLists.txt index b272dcac73e..2807332cca9 100644 --- a/tests/benchmarks/gui/painting/lancebench/CMakeLists.txt +++ b/tests/benchmarks/gui/painting/lancebench/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_lancebench Binary: ##################################################################### -qt_add_benchmark(tst_bench_lancebench +qt_internal_add_benchmark(tst_bench_lancebench SOURCES ../../../../auto/other/lancelot/paintcommands.cpp ../../../../auto/other/lancelot/paintcommands.h tst_lancebench.cpp @@ -134,7 +134,7 @@ set(images_resource_files "images/zebra.png" ) -qt_add_resource(tst_bench_lancebench "images" +qt_internal_add_resource(tst_bench_lancebench "images" PREFIX "/" BASE @@ -151,7 +151,7 @@ qt_add_resource(tst_bench_lancebench "images" ## Scopes: ##################################################################### -qt_extend_target(tst_bench_lancebench CONDITION QT_FEATURE_opengl +qt_internal_extend_target(tst_bench_lancebench CONDITION QT_FEATURE_opengl PUBLIC_LIBRARIES Qt::OpenGL ) diff --git a/tests/benchmarks/gui/painting/qcolor/CMakeLists.txt b/tests/benchmarks/gui/painting/qcolor/CMakeLists.txt index 423047f906c..d482102f1b2 100644 --- a/tests/benchmarks/gui/painting/qcolor/CMakeLists.txt +++ b/tests/benchmarks/gui/painting/qcolor/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qcolor Binary: ##################################################################### -qt_add_benchmark(tst_bench_qcolor +qt_internal_add_benchmark(tst_bench_qcolor SOURCES tst_qcolor.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/gui/painting/qpainter/CMakeLists.txt b/tests/benchmarks/gui/painting/qpainter/CMakeLists.txt index 590d85b1b6c..ce302599cf9 100644 --- a/tests/benchmarks/gui/painting/qpainter/CMakeLists.txt +++ b/tests/benchmarks/gui/painting/qpainter/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qpainter Binary: ##################################################################### -qt_add_benchmark(tst_bench_qpainter +qt_internal_add_benchmark(tst_bench_qpainter SOURCES tst_qpainter.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/gui/painting/qregion/CMakeLists.txt b/tests/benchmarks/gui/painting/qregion/CMakeLists.txt index 1cb2a8b24cd..43d397c456f 100644 --- a/tests/benchmarks/gui/painting/qregion/CMakeLists.txt +++ b/tests/benchmarks/gui/painting/qregion/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qregion Binary: ##################################################################### -qt_add_benchmark(tst_bench_qregion +qt_internal_add_benchmark(tst_bench_qregion SOURCES main.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/gui/painting/qtbench/CMakeLists.txt b/tests/benchmarks/gui/painting/qtbench/CMakeLists.txt index ce065d070cb..e6e2ed76ab7 100644 --- a/tests/benchmarks/gui/painting/qtbench/CMakeLists.txt +++ b/tests/benchmarks/gui/painting/qtbench/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qtbench Binary: ##################################################################### -qt_add_benchmark(tst_bench_qtbench +qt_internal_add_benchmark(tst_bench_qtbench SOURCES tst_qtbench.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/gui/painting/qtransform/CMakeLists.txt b/tests/benchmarks/gui/painting/qtransform/CMakeLists.txt index 33df9646c79..b9adb340dc4 100644 --- a/tests/benchmarks/gui/painting/qtransform/CMakeLists.txt +++ b/tests/benchmarks/gui/painting/qtransform/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qtransform Binary: ##################################################################### -qt_add_benchmark(tst_bench_qtransform +qt_internal_add_benchmark(tst_bench_qtransform SOURCES tst_qtransform.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/gui/text/qfontmetrics/CMakeLists.txt b/tests/benchmarks/gui/text/qfontmetrics/CMakeLists.txt index fff90a7172a..b580a6fd3dd 100644 --- a/tests/benchmarks/gui/text/qfontmetrics/CMakeLists.txt +++ b/tests/benchmarks/gui/text/qfontmetrics/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_QFontMetrics Binary: ##################################################################### -qt_add_benchmark(tst_bench_QFontMetrics +qt_internal_add_benchmark(tst_bench_QFontMetrics SOURCES main.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/gui/text/qtext/CMakeLists.txt b/tests/benchmarks/gui/text/qtext/CMakeLists.txt index abf152a3266..5b154a431b1 100644 --- a/tests/benchmarks/gui/text/qtext/CMakeLists.txt +++ b/tests/benchmarks/gui/text/qtext/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_QText Binary: ##################################################################### -qt_add_benchmark(tst_bench_QText +qt_internal_add_benchmark(tst_bench_QText SOURCES main.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/gui/text/qtextdocument/CMakeLists.txt b/tests/benchmarks/gui/text/qtextdocument/CMakeLists.txt index 4cfda68a1bb..9a9017c8e0c 100644 --- a/tests/benchmarks/gui/text/qtextdocument/CMakeLists.txt +++ b/tests/benchmarks/gui/text/qtextdocument/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_QTextDocument Binary: ##################################################################### -qt_add_benchmark(tst_bench_QTextDocument +qt_internal_add_benchmark(tst_bench_QTextDocument SOURCES main.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/network/access/qdecompresshelper/.prev_CMakeLists.txt b/tests/benchmarks/network/access/qdecompresshelper/.prev_CMakeLists.txt index 6ac77db67d6..eef53e1133e 100644 --- a/tests/benchmarks/network/access/qdecompresshelper/.prev_CMakeLists.txt +++ b/tests/benchmarks/network/access/qdecompresshelper/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## qdecompresshelper Binary: ##################################################################### -qt_add_benchmark(qdecompresshelper +qt_internal_add_benchmark(qdecompresshelper SOURCES main.cpp DEFINES diff --git a/tests/benchmarks/network/access/qdecompresshelper/CMakeLists.txt b/tests/benchmarks/network/access/qdecompresshelper/CMakeLists.txt index e8c7493250f..92a729d3739 100644 --- a/tests/benchmarks/network/access/qdecompresshelper/CMakeLists.txt +++ b/tests/benchmarks/network/access/qdecompresshelper/CMakeLists.txt @@ -4,7 +4,7 @@ ## qdecompresshelper Binary: ##################################################################### -qt_add_benchmark(qdecompresshelper +qt_internal_add_benchmark(qdecompresshelper SOURCES main.cpp DEFINES diff --git a/tests/benchmarks/network/access/qfile_vs_qnetworkaccessmanager/CMakeLists.txt b/tests/benchmarks/network/access/qfile_vs_qnetworkaccessmanager/CMakeLists.txt index f34a3c475c3..929e87908b8 100644 --- a/tests/benchmarks/network/access/qfile_vs_qnetworkaccessmanager/CMakeLists.txt +++ b/tests/benchmarks/network/access/qfile_vs_qnetworkaccessmanager/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qfile_vs_qnetworkaccessmanager Binary: ##################################################################### -qt_add_benchmark(tst_bench_qfile_vs_qnetworkaccessmanager +qt_internal_add_benchmark(tst_bench_qfile_vs_qnetworkaccessmanager SOURCES main.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/network/access/qnetworkdiskcache/CMakeLists.txt b/tests/benchmarks/network/access/qnetworkdiskcache/CMakeLists.txt index e7f966da66c..4b8f3f4406d 100644 --- a/tests/benchmarks/network/access/qnetworkdiskcache/CMakeLists.txt +++ b/tests/benchmarks/network/access/qnetworkdiskcache/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qnetworkdiskcache Binary: ##################################################################### -qt_add_benchmark(tst_bench_qnetworkdiskcache +qt_internal_add_benchmark(tst_bench_qnetworkdiskcache SOURCES tst_qnetworkdiskcache.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/network/access/qnetworkreply/CMakeLists.txt b/tests/benchmarks/network/access/qnetworkreply/CMakeLists.txt index feefb7c825e..ad0224e82c1 100644 --- a/tests/benchmarks/network/access/qnetworkreply/CMakeLists.txt +++ b/tests/benchmarks/network/access/qnetworkreply/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qnetworkreply Binary: ##################################################################### -qt_add_benchmark(tst_bench_qnetworkreply +qt_internal_add_benchmark(tst_bench_qnetworkreply SOURCES tst_qnetworkreply.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/network/access/qnetworkreply_from_cache/CMakeLists.txt b/tests/benchmarks/network/access/qnetworkreply_from_cache/CMakeLists.txt index 4f321d125a0..ced1a0850e9 100644 --- a/tests/benchmarks/network/access/qnetworkreply_from_cache/CMakeLists.txt +++ b/tests/benchmarks/network/access/qnetworkreply_from_cache/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qnetworkreply_from_cache Binary: ##################################################################### -qt_add_benchmark(tst_bench_qnetworkreply_from_cache +qt_internal_add_benchmark(tst_bench_qnetworkreply_from_cache SOURCES tst_qnetworkreply_from_cache.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/network/kernel/qhostinfo/CMakeLists.txt b/tests/benchmarks/network/kernel/qhostinfo/CMakeLists.txt index 0d847e60c51..7611998c268 100644 --- a/tests/benchmarks/network/kernel/qhostinfo/CMakeLists.txt +++ b/tests/benchmarks/network/kernel/qhostinfo/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qhostinfo Binary: ##################################################################### -qt_add_benchmark(tst_bench_qhostinfo +qt_internal_add_benchmark(tst_bench_qhostinfo SOURCES main.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/network/socket/qtcpserver/CMakeLists.txt b/tests/benchmarks/network/socket/qtcpserver/CMakeLists.txt index 7f20130b375..f566c4f3417 100644 --- a/tests/benchmarks/network/socket/qtcpserver/CMakeLists.txt +++ b/tests/benchmarks/network/socket/qtcpserver/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qtcpserver Binary: ##################################################################### -qt_add_benchmark(tst_bench_qtcpserver +qt_internal_add_benchmark(tst_bench_qtcpserver SOURCES tst_qtcpserver.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/network/socket/qudpsocket/CMakeLists.txt b/tests/benchmarks/network/socket/qudpsocket/CMakeLists.txt index ff357490e78..02293cdae63 100644 --- a/tests/benchmarks/network/socket/qudpsocket/CMakeLists.txt +++ b/tests/benchmarks/network/socket/qudpsocket/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qudpsocket Binary: ##################################################################### -qt_add_benchmark(tst_bench_qudpsocket +qt_internal_add_benchmark(tst_bench_qudpsocket SOURCES tst_qudpsocket.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/network/ssl/qsslsocket/CMakeLists.txt b/tests/benchmarks/network/ssl/qsslsocket/CMakeLists.txt index f8e546c9705..95bbda6758d 100644 --- a/tests/benchmarks/network/ssl/qsslsocket/CMakeLists.txt +++ b/tests/benchmarks/network/ssl/qsslsocket/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qsslsocket Binary: ##################################################################### -qt_add_benchmark(tst_bench_qsslsocket +qt_internal_add_benchmark(tst_bench_qsslsocket SOURCES tst_qsslsocket.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/plugins/imageformats/jpeg/CMakeLists.txt b/tests/benchmarks/plugins/imageformats/jpeg/CMakeLists.txt index c2586ce86c8..d0fcd51f4e2 100644 --- a/tests/benchmarks/plugins/imageformats/jpeg/CMakeLists.txt +++ b/tests/benchmarks/plugins/imageformats/jpeg/CMakeLists.txt @@ -4,7 +4,7 @@ ## jpeg Binary: ##################################################################### -qt_add_benchmark(jpeg +qt_internal_add_benchmark(jpeg SOURCES jpeg.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/sql/kernel/qsqlquery/CMakeLists.txt b/tests/benchmarks/sql/kernel/qsqlquery/CMakeLists.txt index 3f79595c434..977ea673acd 100644 --- a/tests/benchmarks/sql/kernel/qsqlquery/CMakeLists.txt +++ b/tests/benchmarks/sql/kernel/qsqlquery/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qsqlquery Binary: ##################################################################### -qt_add_benchmark(tst_bench_qsqlquery +qt_internal_add_benchmark(tst_bench_qsqlquery SOURCES main.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/sql/kernel/qsqlrecord/CMakeLists.txt b/tests/benchmarks/sql/kernel/qsqlrecord/CMakeLists.txt index fe955851dbc..ac425891461 100644 --- a/tests/benchmarks/sql/kernel/qsqlrecord/CMakeLists.txt +++ b/tests/benchmarks/sql/kernel/qsqlrecord/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qsqlrecord Binary: ##################################################################### -qt_add_benchmark(tst_bench_qsqlrecord +qt_internal_add_benchmark(tst_bench_qsqlrecord SOURCES tst_qsqlrecord.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/testlib/tostring/CMakeLists.txt b/tests/benchmarks/testlib/tostring/CMakeLists.txt index 3fa3b9e2da8..161fae4c018 100644 --- a/tests/benchmarks/testlib/tostring/CMakeLists.txt +++ b/tests/benchmarks/testlib/tostring/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_tostring Binary: ##################################################################### -qt_add_benchmark(tst_bench_tostring +qt_internal_add_benchmark(tst_bench_tostring SOURCES tst_tostring.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/CMakeLists.txt b/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/CMakeLists.txt index 3bdb724faef..491b7fc6d1f 100644 --- a/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/CMakeLists.txt +++ b/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_GraphicsViewBenchmark Binary: ##################################################################### -qt_add_benchmark(tst_GraphicsViewBenchmark +qt_internal_add_benchmark(tst_GraphicsViewBenchmark SOURCES main.cpp widgets/abstractitemcontainer.cpp widgets/abstractitemcontainer.h @@ -124,7 +124,7 @@ set(GraphicsViewBenchmark_resource_files "resources/blue_SVG/blue_user_status_online_38x38px.svg" ) -qt_add_resource(tst_GraphicsViewBenchmark "GraphicsViewBenchmark" +qt_internal_add_resource(tst_GraphicsViewBenchmark "GraphicsViewBenchmark" PREFIX "/themes/blue" FILES @@ -213,7 +213,7 @@ set(GraphicsViewBenchmark1_resource_files "resources/lime_SVG/lime_user_status_online_24x24px.svg" ) -qt_add_resource(tst_GraphicsViewBenchmark "GraphicsViewBenchmark1" +qt_internal_add_resource(tst_GraphicsViewBenchmark "GraphicsViewBenchmark1" PREFIX "/themes/lime" FILES @@ -322,7 +322,7 @@ set(GraphicsViewBenchmark2_resource_files "resources/avatars/avatar_woman_010_58x58.png" ) -qt_add_resource(tst_GraphicsViewBenchmark "GraphicsViewBenchmark2" +qt_internal_add_resource(tst_GraphicsViewBenchmark "GraphicsViewBenchmark2" PREFIX "/avatars" FILES @@ -347,7 +347,7 @@ set(GraphicsViewBenchmark3_resource_files "resources/contacts/lastnames.txt" ) -qt_add_resource(tst_GraphicsViewBenchmark "GraphicsViewBenchmark3" +qt_internal_add_resource(tst_GraphicsViewBenchmark "GraphicsViewBenchmark3" PREFIX "/contact" FILES @@ -361,7 +361,7 @@ qt_add_resource(tst_GraphicsViewBenchmark "GraphicsViewBenchmark3" ## Scopes: ##################################################################### -qt_extend_target(tst_GraphicsViewBenchmark CONDITION TARGET Qt::OpenGL +qt_internal_extend_target(tst_GraphicsViewBenchmark CONDITION TARGET Qt::OpenGL PUBLIC_LIBRARIES Qt::OpenGL Qt::OpenGLWidgets diff --git a/tests/benchmarks/widgets/graphicsview/qgraphicsanchorlayout/CMakeLists.txt b/tests/benchmarks/widgets/graphicsview/qgraphicsanchorlayout/CMakeLists.txt index 4355be1f99a..eca0a60d0d7 100644 --- a/tests/benchmarks/widgets/graphicsview/qgraphicsanchorlayout/CMakeLists.txt +++ b/tests/benchmarks/widgets/graphicsview/qgraphicsanchorlayout/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qgraphicsanchorlayout Binary: ##################################################################### -qt_add_benchmark(tst_bench_qgraphicsanchorlayout +qt_internal_add_benchmark(tst_bench_qgraphicsanchorlayout SOURCES tst_qgraphicsanchorlayout.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/widgets/graphicsview/qgraphicsitem/CMakeLists.txt b/tests/benchmarks/widgets/graphicsview/qgraphicsitem/CMakeLists.txt index e32fd82819f..e5d19ceb24a 100644 --- a/tests/benchmarks/widgets/graphicsview/qgraphicsitem/CMakeLists.txt +++ b/tests/benchmarks/widgets/graphicsview/qgraphicsitem/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qgraphicsitem Binary: ##################################################################### -qt_add_benchmark(tst_bench_qgraphicsitem +qt_internal_add_benchmark(tst_bench_qgraphicsitem SOURCES tst_qgraphicsitem.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/widgets/graphicsview/qgraphicslayout/CMakeLists.txt b/tests/benchmarks/widgets/graphicsview/qgraphicslayout/CMakeLists.txt index aa25f356ca0..5e507124967 100644 --- a/tests/benchmarks/widgets/graphicsview/qgraphicslayout/CMakeLists.txt +++ b/tests/benchmarks/widgets/graphicsview/qgraphicslayout/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qgraphicslayout Binary: ##################################################################### -qt_add_benchmark(tst_bench_qgraphicslayout +qt_internal_add_benchmark(tst_bench_qgraphicslayout SOURCES tst_qgraphicslayout.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/widgets/graphicsview/qgraphicslinearlayout/CMakeLists.txt b/tests/benchmarks/widgets/graphicsview/qgraphicslinearlayout/CMakeLists.txt index 5d682dcddef..247ca92efff 100644 --- a/tests/benchmarks/widgets/graphicsview/qgraphicslinearlayout/CMakeLists.txt +++ b/tests/benchmarks/widgets/graphicsview/qgraphicslinearlayout/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qgraphicslinearlayout Binary: ##################################################################### -qt_add_benchmark(tst_bench_qgraphicslinearlayout +qt_internal_add_benchmark(tst_bench_qgraphicslinearlayout SOURCES tst_qgraphicslinearlayout.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/widgets/graphicsview/qgraphicsscene/CMakeLists.txt b/tests/benchmarks/widgets/graphicsview/qgraphicsscene/CMakeLists.txt index 682fb1acae2..4ac043e058c 100644 --- a/tests/benchmarks/widgets/graphicsview/qgraphicsscene/CMakeLists.txt +++ b/tests/benchmarks/widgets/graphicsview/qgraphicsscene/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qgraphicsscene Binary: ##################################################################### -qt_add_benchmark(tst_bench_qgraphicsscene +qt_internal_add_benchmark(tst_bench_qgraphicsscene SOURCES tst_qgraphicsscene.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/widgets/graphicsview/qgraphicsview/CMakeLists.txt b/tests/benchmarks/widgets/graphicsview/qgraphicsview/CMakeLists.txt index a86f2366646..178e5dc1251 100644 --- a/tests/benchmarks/widgets/graphicsview/qgraphicsview/CMakeLists.txt +++ b/tests/benchmarks/widgets/graphicsview/qgraphicsview/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qgraphicsview Binary: ##################################################################### -qt_add_benchmark(tst_bench_qgraphicsview +qt_internal_add_benchmark(tst_bench_qgraphicsview SOURCES chiptester/chip.cpp chiptester/chip.h chiptester/chiptester.cpp chiptester/chiptester.h @@ -23,7 +23,7 @@ set(qgraphicsview_resource_files "random.data" ) -qt_add_resource(tst_bench_qgraphicsview "qgraphicsview" +qt_internal_add_resource(tst_bench_qgraphicsview "qgraphicsview" PREFIX "/" FILES @@ -33,7 +33,7 @@ set(images_resource_files "qt4logo.png" ) -qt_add_resource(tst_bench_qgraphicsview "images" +qt_internal_add_resource(tst_bench_qgraphicsview "images" PREFIX "/" BASE @@ -49,7 +49,7 @@ qt_add_resource(tst_bench_qgraphicsview "images" ## Scopes: ##################################################################### -qt_extend_target(tst_bench_qgraphicsview CONDITION TARGET Qt::OpenGL +qt_internal_extend_target(tst_bench_qgraphicsview CONDITION TARGET Qt::OpenGL PUBLIC_LIBRARIES Qt::OpenGL ) diff --git a/tests/benchmarks/widgets/graphicsview/qgraphicsview/benchapps/chipTest/CMakeLists.txt b/tests/benchmarks/widgets/graphicsview/qgraphicsview/benchapps/chipTest/CMakeLists.txt index ae5a17f020a..c3a708a56c1 100644 --- a/tests/benchmarks/widgets/graphicsview/qgraphicsview/benchapps/chipTest/CMakeLists.txt +++ b/tests/benchmarks/widgets/graphicsview/qgraphicsview/benchapps/chipTest/CMakeLists.txt @@ -4,7 +4,7 @@ ## chip Binary: ##################################################################### -qt_add_benchmark(chip +qt_internal_add_benchmark(chip GUI SOURCES chip.cpp chip.h @@ -25,7 +25,7 @@ set(images_resource_files "zoomout.png" ) -qt_add_resource(chip "images" +qt_internal_add_resource(chip "images" PREFIX "/" FILES @@ -42,7 +42,7 @@ qt_add_resource(chip "images" ## Scopes: ##################################################################### -qt_extend_target(chip CONDITION TARGET Qt::OpenGL +qt_internal_extend_target(chip CONDITION TARGET Qt::OpenGL PUBLIC_LIBRARIES Qt::OpenGL ) diff --git a/tests/benchmarks/widgets/graphicsview/qgraphicsview/benchapps/moveItems/CMakeLists.txt b/tests/benchmarks/widgets/graphicsview/qgraphicsview/benchapps/moveItems/CMakeLists.txt index 6b7867a7cbb..82f665c4d46 100644 --- a/tests/benchmarks/widgets/graphicsview/qgraphicsview/benchapps/moveItems/CMakeLists.txt +++ b/tests/benchmarks/widgets/graphicsview/qgraphicsview/benchapps/moveItems/CMakeLists.txt @@ -4,7 +4,7 @@ ## moveItems Binary: ##################################################################### -qt_add_benchmark(moveItems +qt_internal_add_benchmark(moveItems GUI SOURCES main.cpp diff --git a/tests/benchmarks/widgets/graphicsview/qgraphicsview/benchapps/scrolltest/CMakeLists.txt b/tests/benchmarks/widgets/graphicsview/qgraphicsview/benchapps/scrolltest/CMakeLists.txt index 716fc03774f..f30ca150824 100644 --- a/tests/benchmarks/widgets/graphicsview/qgraphicsview/benchapps/scrolltest/CMakeLists.txt +++ b/tests/benchmarks/widgets/graphicsview/qgraphicsview/benchapps/scrolltest/CMakeLists.txt @@ -4,7 +4,7 @@ ## scrolltest Binary: ##################################################################### -qt_add_benchmark(scrolltest +qt_internal_add_benchmark(scrolltest GUI SOURCES main.cpp diff --git a/tests/benchmarks/widgets/graphicsview/qgraphicswidget/CMakeLists.txt b/tests/benchmarks/widgets/graphicsview/qgraphicswidget/CMakeLists.txt index 2646da95fcc..f2c32fbb78f 100644 --- a/tests/benchmarks/widgets/graphicsview/qgraphicswidget/CMakeLists.txt +++ b/tests/benchmarks/widgets/graphicsview/qgraphicswidget/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qgraphicswidget Binary: ##################################################################### -qt_add_benchmark(tst_bench_qgraphicswidget +qt_internal_add_benchmark(tst_bench_qgraphicswidget SOURCES tst_qgraphicswidget.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/widgets/itemviews/qheaderview/CMakeLists.txt b/tests/benchmarks/widgets/itemviews/qheaderview/CMakeLists.txt index 8271ff9df31..74fa7a37edb 100644 --- a/tests/benchmarks/widgets/itemviews/qheaderview/CMakeLists.txt +++ b/tests/benchmarks/widgets/itemviews/qheaderview/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qheaderview Binary: ##################################################################### -qt_add_benchmark(tst_bench_qheaderview +qt_internal_add_benchmark(tst_bench_qheaderview SOURCES qheaderviewbench.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/widgets/itemviews/qlistview/CMakeLists.txt b/tests/benchmarks/widgets/itemviews/qlistview/CMakeLists.txt index 0e8dcd01bc0..0a9a89f7cb6 100644 --- a/tests/benchmarks/widgets/itemviews/qlistview/CMakeLists.txt +++ b/tests/benchmarks/widgets/itemviews/qlistview/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qlistview Binary: ##################################################################### -qt_add_benchmark(tst_bench_qlistview +qt_internal_add_benchmark(tst_bench_qlistview SOURCES tst_qlistview.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/widgets/itemviews/qtableview/CMakeLists.txt b/tests/benchmarks/widgets/itemviews/qtableview/CMakeLists.txt index 0245ba6d478..9fecbeb2325 100644 --- a/tests/benchmarks/widgets/itemviews/qtableview/CMakeLists.txt +++ b/tests/benchmarks/widgets/itemviews/qtableview/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qtableview Binary: ##################################################################### -qt_add_benchmark(tst_bench_qtableview +qt_internal_add_benchmark(tst_bench_qtableview SOURCES tst_qtableview.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/widgets/kernel/qapplication/CMakeLists.txt b/tests/benchmarks/widgets/kernel/qapplication/CMakeLists.txt index 7cb2318d7d3..a89faa0c0e7 100644 --- a/tests/benchmarks/widgets/kernel/qapplication/CMakeLists.txt +++ b/tests/benchmarks/widgets/kernel/qapplication/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qapplication Binary: ##################################################################### -qt_add_benchmark(tst_bench_qapplication +qt_internal_add_benchmark(tst_bench_qapplication SOURCES main.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/widgets/kernel/qwidget/CMakeLists.txt b/tests/benchmarks/widgets/kernel/qwidget/CMakeLists.txt index 5eb2ea97d16..fcdffbf4254 100644 --- a/tests/benchmarks/widgets/kernel/qwidget/CMakeLists.txt +++ b/tests/benchmarks/widgets/kernel/qwidget/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qwidget Binary: ##################################################################### -qt_add_benchmark(tst_bench_qwidget +qt_internal_add_benchmark(tst_bench_qwidget SOURCES tst_qwidget.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/widgets/styles/qstylesheetstyle/CMakeLists.txt b/tests/benchmarks/widgets/styles/qstylesheetstyle/CMakeLists.txt index ca86f324b5c..be43709be78 100644 --- a/tests/benchmarks/widgets/styles/qstylesheetstyle/CMakeLists.txt +++ b/tests/benchmarks/widgets/styles/qstylesheetstyle/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qstylesheetstyle Binary: ##################################################################### -qt_add_benchmark(tst_bench_qstylesheetstyle +qt_internal_add_benchmark(tst_bench_qstylesheetstyle SOURCES main.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/widgets/widgets/qtextbrowser/CMakeLists.txt b/tests/benchmarks/widgets/widgets/qtextbrowser/CMakeLists.txt index 5a6f419533b..22c321d5bb3 100644 --- a/tests/benchmarks/widgets/widgets/qtextbrowser/CMakeLists.txt +++ b/tests/benchmarks/widgets/widgets/qtextbrowser/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_QTextBrowser Binary: ##################################################################### -qt_add_benchmark(tst_bench_QTextBrowser +qt_internal_add_benchmark(tst_bench_QTextBrowser SOURCES main.cpp PUBLIC_LIBRARIES diff --git a/tests/libfuzzer/corelib/text/qregularexpression/optimize/CMakeLists.txt b/tests/libfuzzer/corelib/text/qregularexpression/optimize/CMakeLists.txt index a82e5fa3403..303f2494dbe 100644 --- a/tests/libfuzzer/corelib/text/qregularexpression/optimize/CMakeLists.txt +++ b/tests/libfuzzer/corelib/text/qregularexpression/optimize/CMakeLists.txt @@ -4,7 +4,7 @@ ## optimize Binary: ##################################################################### -qt_add_executable(optimize +qt_internal_add_executable(optimize GUI SOURCES main.cpp @@ -16,12 +16,12 @@ qt_add_executable(optimize ## Scopes: ##################################################################### -qt_extend_target(optimize CONDITION FUZZ_ENGINE_ISEMPTY +qt_internal_extend_target(optimize CONDITION FUZZ_ENGINE_ISEMPTY LINK_OPTIONS "-fsanitize=fuzzer" ) -qt_extend_target(optimize CONDITION NOT FUZZ_ENGINE_ISEMPTY +qt_internal_extend_target(optimize CONDITION NOT FUZZ_ENGINE_ISEMPTY PUBLIC_LIBRARIES $ENV{LIB_FUZZING_ENGINE} ) diff --git a/tests/libfuzzer/gui/painting/qcolorspace/fromiccprofile/CMakeLists.txt b/tests/libfuzzer/gui/painting/qcolorspace/fromiccprofile/CMakeLists.txt index ec52626e2dd..14daff2a7a5 100644 --- a/tests/libfuzzer/gui/painting/qcolorspace/fromiccprofile/CMakeLists.txt +++ b/tests/libfuzzer/gui/painting/qcolorspace/fromiccprofile/CMakeLists.txt @@ -4,7 +4,7 @@ ## fromiccprofile Binary: ##################################################################### -qt_add_executable(fromiccprofile +qt_internal_add_executable(fromiccprofile GUI SOURCES main.cpp @@ -19,12 +19,12 @@ qt_add_executable(fromiccprofile ## Scopes: ##################################################################### -qt_extend_target(fromiccprofile CONDITION FUZZ_ENGINE_ISEMPTY +qt_internal_extend_target(fromiccprofile CONDITION FUZZ_ENGINE_ISEMPTY LINK_OPTIONS "-fsanitize=fuzzer" ) -qt_extend_target(fromiccprofile CONDITION NOT FUZZ_ENGINE_ISEMPTY +qt_internal_extend_target(fromiccprofile CONDITION NOT FUZZ_ENGINE_ISEMPTY PUBLIC_LIBRARIES $ENV{LIB_FUZZING_ENGINE} ) diff --git a/tests/libfuzzer/gui/text/qtextdocument/sethtml/CMakeLists.txt b/tests/libfuzzer/gui/text/qtextdocument/sethtml/CMakeLists.txt index 982957bedf8..1fefea01282 100644 --- a/tests/libfuzzer/gui/text/qtextdocument/sethtml/CMakeLists.txt +++ b/tests/libfuzzer/gui/text/qtextdocument/sethtml/CMakeLists.txt @@ -4,7 +4,7 @@ ## sethtml Binary: ##################################################################### -qt_add_executable(sethtml +qt_internal_add_executable(sethtml GUI SOURCES main.cpp @@ -19,12 +19,12 @@ qt_add_executable(sethtml ## Scopes: ##################################################################### -qt_extend_target(sethtml CONDITION FUZZ_ENGINE_ISEMPTY +qt_internal_extend_target(sethtml CONDITION FUZZ_ENGINE_ISEMPTY LINK_OPTIONS "-fsanitize=fuzzer" ) -qt_extend_target(sethtml CONDITION NOT FUZZ_ENGINE_ISEMPTY +qt_internal_extend_target(sethtml CONDITION NOT FUZZ_ENGINE_ISEMPTY PUBLIC_LIBRARIES $ENV{LIB_FUZZING_ENGINE} ) diff --git a/tests/libfuzzer/gui/text/qtextdocument/setmarkdown/CMakeLists.txt b/tests/libfuzzer/gui/text/qtextdocument/setmarkdown/CMakeLists.txt index a10d4325568..acc678f2ef6 100644 --- a/tests/libfuzzer/gui/text/qtextdocument/setmarkdown/CMakeLists.txt +++ b/tests/libfuzzer/gui/text/qtextdocument/setmarkdown/CMakeLists.txt @@ -4,7 +4,7 @@ ## setmarkdown Binary: ##################################################################### -qt_add_executable(setmarkdown +qt_internal_add_executable(setmarkdown GUI SOURCES main.cpp @@ -19,12 +19,12 @@ qt_add_executable(setmarkdown ## Scopes: ##################################################################### -qt_extend_target(setmarkdown CONDITION FUZZ_ENGINE_ISEMPTY +qt_internal_extend_target(setmarkdown CONDITION FUZZ_ENGINE_ISEMPTY LINK_OPTIONS "-fsanitize=fuzzer" ) -qt_extend_target(setmarkdown CONDITION NOT FUZZ_ENGINE_ISEMPTY +qt_internal_extend_target(setmarkdown CONDITION NOT FUZZ_ENGINE_ISEMPTY PUBLIC_LIBRARIES $ENV{LIB_FUZZING_ENGINE} ) diff --git a/tests/libfuzzer/gui/text/qtextlayout/beginlayout/CMakeLists.txt b/tests/libfuzzer/gui/text/qtextlayout/beginlayout/CMakeLists.txt index 1810c5ed6f3..637ce2f51bb 100644 --- a/tests/libfuzzer/gui/text/qtextlayout/beginlayout/CMakeLists.txt +++ b/tests/libfuzzer/gui/text/qtextlayout/beginlayout/CMakeLists.txt @@ -4,7 +4,7 @@ ## beginlayout Binary: ##################################################################### -qt_add_executable(beginlayout +qt_internal_add_executable(beginlayout GUI SOURCES main.cpp @@ -19,12 +19,12 @@ qt_add_executable(beginlayout ## Scopes: ##################################################################### -qt_extend_target(beginlayout CONDITION FUZZ_ENGINE_ISEMPTY +qt_internal_extend_target(beginlayout CONDITION FUZZ_ENGINE_ISEMPTY LINK_OPTIONS "-fsanitize=fuzzer" ) -qt_extend_target(beginlayout CONDITION NOT FUZZ_ENGINE_ISEMPTY +qt_internal_extend_target(beginlayout CONDITION NOT FUZZ_ENGINE_ISEMPTY PUBLIC_LIBRARIES $ENV{LIB_FUZZING_ENGINE} ) diff --git a/tests/manual/cocoa/appicon/CMakeLists.txt b/tests/manual/cocoa/appicon/CMakeLists.txt index 258c6ce7e35..b027994db14 100644 --- a/tests/manual/cocoa/appicon/CMakeLists.txt +++ b/tests/manual/cocoa/appicon/CMakeLists.txt @@ -4,7 +4,7 @@ ## appicon Binary: ##################################################################### -qt_add_manual_test(appicon +qt_internal_add_manual_test(appicon GUI SOURCES main.cpp diff --git a/tests/manual/cocoa/menurama/CMakeLists.txt b/tests/manual/cocoa/menurama/CMakeLists.txt index 56fe17e34d7..2d93198df8e 100644 --- a/tests/manual/cocoa/menurama/CMakeLists.txt +++ b/tests/manual/cocoa/menurama/CMakeLists.txt @@ -4,7 +4,7 @@ ## Menurama Binary: ##################################################################### -qt_add_manual_test(Menurama +qt_internal_add_manual_test(Menurama GUI SOURCES main.cpp diff --git a/tests/manual/cocoa/menus/CMakeLists.txt b/tests/manual/cocoa/menus/CMakeLists.txt index 534a567a7d9..878a7ce998d 100644 --- a/tests/manual/cocoa/menus/CMakeLists.txt +++ b/tests/manual/cocoa/menus/CMakeLists.txt @@ -4,7 +4,7 @@ ## menus Binary: ##################################################################### -qt_add_manual_test(menus +qt_internal_add_manual_test(menus SOURCES main.cpp PUBLIC_LIBRARIES diff --git a/tests/manual/cocoa/nativewidgets/CMakeLists.txt b/tests/manual/cocoa/nativewidgets/CMakeLists.txt index 25d1963feb8..342a99372ba 100644 --- a/tests/manual/cocoa/nativewidgets/CMakeLists.txt +++ b/tests/manual/cocoa/nativewidgets/CMakeLists.txt @@ -4,7 +4,7 @@ ## nativewigets Binary: ##################################################################### -qt_add_manual_test(nativewigets +qt_internal_add_manual_test(nativewigets GUI SOURCES main.cpp diff --git a/tests/manual/cocoa/popups/CMakeLists.txt b/tests/manual/cocoa/popups/CMakeLists.txt index 8c572b56c2d..ac48dec3184 100644 --- a/tests/manual/cocoa/popups/CMakeLists.txt +++ b/tests/manual/cocoa/popups/CMakeLists.txt @@ -4,7 +4,7 @@ ## popups Binary: ##################################################################### -qt_add_manual_test(popups +qt_internal_add_manual_test(popups SOURCES main.cpp PUBLIC_LIBRARIES diff --git a/tests/manual/cocoa/qsystemtrayicon/CMakeLists.txt b/tests/manual/cocoa/qsystemtrayicon/CMakeLists.txt index f00b8359027..37220922d0a 100644 --- a/tests/manual/cocoa/qsystemtrayicon/CMakeLists.txt +++ b/tests/manual/cocoa/qsystemtrayicon/CMakeLists.txt @@ -4,7 +4,7 @@ ## qsystemtrayicon Binary: ##################################################################### -qt_add_manual_test(qsystemtrayicon +qt_internal_add_manual_test(qsystemtrayicon GUI SOURCES main.cpp @@ -26,7 +26,7 @@ set(icons_resource_files "macsystray64x64.png" ) -qt_add_resource(qsystemtrayicon "icons" +qt_internal_add_resource(qsystemtrayicon "icons" PREFIX "/" FILES diff --git a/tests/manual/cocoa/qt_on_cocoa/CMakeLists.txt b/tests/manual/cocoa/qt_on_cocoa/CMakeLists.txt index fb9c3951694..332fd8c9d78 100644 --- a/tests/manual/cocoa/qt_on_cocoa/CMakeLists.txt +++ b/tests/manual/cocoa/qt_on_cocoa/CMakeLists.txt @@ -4,7 +4,7 @@ ## qt_on_cocoa Binary: ##################################################################### -qt_add_manual_test(qt_on_cocoa +qt_internal_add_manual_test(qt_on_cocoa GUI SOURCES main.mm diff --git a/tests/manual/cocoa/wheelevent/CMakeLists.txt b/tests/manual/cocoa/wheelevent/CMakeLists.txt index d544ab2730c..e52da47db1e 100644 --- a/tests/manual/cocoa/wheelevent/CMakeLists.txt +++ b/tests/manual/cocoa/wheelevent/CMakeLists.txt @@ -4,7 +4,7 @@ ## wheelevent Binary: ##################################################################### -qt_add_manual_test(wheelevent +qt_internal_add_manual_test(wheelevent GUI SOURCES main.cpp diff --git a/tests/manual/dialogs/CMakeLists.txt b/tests/manual/dialogs/CMakeLists.txt index d449c191fe9..09c9a287c2d 100644 --- a/tests/manual/dialogs/CMakeLists.txt +++ b/tests/manual/dialogs/CMakeLists.txt @@ -4,7 +4,7 @@ ## dialogs Binary: ##################################################################### -qt_add_manual_test(dialogs +qt_internal_add_manual_test(dialogs GUI SOURCES colordialogpanel.cpp colordialogpanel.h @@ -25,12 +25,12 @@ qt_add_manual_test(dialogs ## Scopes: ##################################################################### -qt_extend_target(dialogs CONDITION TARGET Qt::PrintSupport +qt_internal_extend_target(dialogs CONDITION TARGET Qt::PrintSupport PUBLIC_LIBRARIES Qt::PrintSupport ) -qt_extend_target(dialogs CONDITION NOT (QT_FEATURE_printer EQUAL FALSE) +qt_internal_extend_target(dialogs CONDITION NOT (QT_FEATURE_printer EQUAL FALSE) SOURCES printdialogpanel.cpp printdialogpanel.h printdialogpanel.ui ENABLE_AUTOGEN_TOOLS diff --git a/tests/manual/embeddedintoforeignwindow/CMakeLists.txt b/tests/manual/embeddedintoforeignwindow/CMakeLists.txt index 06fee7d482e..84ce8b4daa1 100644 --- a/tests/manual/embeddedintoforeignwindow/CMakeLists.txt +++ b/tests/manual/embeddedintoforeignwindow/CMakeLists.txt @@ -4,7 +4,7 @@ ## embeddedintoforeignwindow Binary: ##################################################################### -qt_add_manual_test(embeddedintoforeignwindow +qt_internal_add_manual_test(embeddedintoforeignwindow SOURCES ../diaglib/eventfilter.cpp ../diaglib/eventfilter.h ../diaglib/nativewindowdump.h @@ -28,19 +28,19 @@ qt_add_manual_test(embeddedintoforeignwindow ## Scopes: ##################################################################### -qt_extend_target(embeddedintoforeignwindow CONDITION WIN32 +qt_internal_extend_target(embeddedintoforeignwindow CONDITION WIN32 SOURCES ../diaglib/nativewindowdump_win.cpp PUBLIC_LIBRARIES user32 ) -qt_extend_target(embeddedintoforeignwindow CONDITION UNIX +qt_internal_extend_target(embeddedintoforeignwindow CONDITION UNIX SOURCES ../diaglib/nativewindowdump.cpp ) -qt_extend_target(embeddedintoforeignwindow CONDITION QT_FEATURE_widgets +qt_internal_extend_target(embeddedintoforeignwindow CONDITION QT_FEATURE_widgets SOURCES ../diaglib/debugproxystyle.cpp ../diaglib/debugproxystyle.h ../diaglib/logwidget.cpp ../diaglib/logwidget.h @@ -49,7 +49,7 @@ qt_extend_target(embeddedintoforeignwindow CONDITION QT_FEATURE_widgets Qt::WidgetsPrivate ) -qt_extend_target(embeddedintoforeignwindow CONDITION QT_FEATURE_opengl +qt_internal_extend_target(embeddedintoforeignwindow CONDITION QT_FEATURE_opengl SOURCES ../diaglib/glinfo.cpp ../diaglib/glinfo.h PUBLIC_LIBRARIES diff --git a/tests/manual/filetest/CMakeLists.txt b/tests/manual/filetest/CMakeLists.txt index e8c04be928a..f1b562ccf10 100644 --- a/tests/manual/filetest/CMakeLists.txt +++ b/tests/manual/filetest/CMakeLists.txt @@ -4,7 +4,7 @@ ## filetest Binary: ##################################################################### -qt_add_manual_test(filetest +qt_internal_add_manual_test(filetest SOURCES main.cpp ) diff --git a/tests/manual/foreignwindows/CMakeLists.txt b/tests/manual/foreignwindows/CMakeLists.txt index bd0af73058e..96df481ba49 100644 --- a/tests/manual/foreignwindows/CMakeLists.txt +++ b/tests/manual/foreignwindows/CMakeLists.txt @@ -4,7 +4,7 @@ ## foreignwindows Binary: ##################################################################### -qt_add_manual_test(foreignwindows +qt_internal_add_manual_test(foreignwindows SOURCES ../diaglib/eventfilter.cpp ../diaglib/eventfilter.h ../diaglib/nativewindowdump.h @@ -29,19 +29,19 @@ qt_add_manual_test(foreignwindows ## Scopes: ##################################################################### -qt_extend_target(foreignwindows CONDITION WIN32 +qt_internal_extend_target(foreignwindows CONDITION WIN32 SOURCES ../diaglib/nativewindowdump_win.cpp PUBLIC_LIBRARIES user32 ) -qt_extend_target(foreignwindows CONDITION UNIX +qt_internal_extend_target(foreignwindows CONDITION UNIX SOURCES ../diaglib/nativewindowdump.cpp ) -qt_extend_target(foreignwindows CONDITION QT_FEATURE_widgets +qt_internal_extend_target(foreignwindows CONDITION QT_FEATURE_widgets SOURCES ../diaglib/debugproxystyle.cpp ../diaglib/debugproxystyle.h ../diaglib/logwidget.cpp ../diaglib/logwidget.h @@ -50,7 +50,7 @@ qt_extend_target(foreignwindows CONDITION QT_FEATURE_widgets Qt::WidgetsPrivate ) -qt_extend_target(foreignwindows CONDITION QT_FEATURE_opengl +qt_internal_extend_target(foreignwindows CONDITION QT_FEATURE_opengl SOURCES ../diaglib/glinfo.cpp ../diaglib/glinfo.h PUBLIC_LIBRARIES diff --git a/tests/manual/gestures/graphicsview/CMakeLists.txt b/tests/manual/gestures/graphicsview/CMakeLists.txt index e998bf113e7..e728dba5422 100644 --- a/tests/manual/gestures/graphicsview/CMakeLists.txt +++ b/tests/manual/gestures/graphicsview/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_manual_graphicsview Binary: ##################################################################### -qt_add_manual_test(tst_manual_graphicsview +qt_internal_add_manual_test(tst_manual_graphicsview GUI SOURCES gestures.cpp gestures.h diff --git a/tests/manual/gestures/scrollarea/CMakeLists.txt b/tests/manual/gestures/scrollarea/CMakeLists.txt index d1446964cd5..fe33655ca15 100644 --- a/tests/manual/gestures/scrollarea/CMakeLists.txt +++ b/tests/manual/gestures/scrollarea/CMakeLists.txt @@ -4,7 +4,7 @@ ## scrollarea Binary: ##################################################################### -qt_add_manual_test(scrollarea +qt_internal_add_manual_test(scrollarea GUI SOURCES main.cpp diff --git a/tests/manual/highdpi/CMakeLists.txt b/tests/manual/highdpi/CMakeLists.txt index 72ed49bb71d..b1635991858 100644 --- a/tests/manual/highdpi/CMakeLists.txt +++ b/tests/manual/highdpi/CMakeLists.txt @@ -4,7 +4,7 @@ ## highdpi Binary: ##################################################################### -qt_add_manual_test(highdpi +qt_internal_add_manual_test(highdpi SOURCES dragwidget.cpp dragwidget.h main.cpp @@ -28,7 +28,7 @@ set(highdpi_resource_files "qticon64.png" ) -qt_add_resource(highdpi "highdpi" +qt_internal_add_resource(highdpi "highdpi" PREFIX "/" FILES diff --git a/tests/manual/inputmethodhints/CMakeLists.txt b/tests/manual/inputmethodhints/CMakeLists.txt index 8b501f66a03..6a25220c45e 100644 --- a/tests/manual/inputmethodhints/CMakeLists.txt +++ b/tests/manual/inputmethodhints/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_inputmethodhints Binary: ##################################################################### -qt_add_manual_test(tst_inputmethodhints +qt_internal_add_manual_test(tst_inputmethodhints GUI SOURCES inputmethodhints.cpp inputmethodhints.h inputmethodhints.ui diff --git a/tests/manual/keypadnavigation/CMakeLists.txt b/tests/manual/keypadnavigation/CMakeLists.txt index 34946e643fa..17206e8c315 100644 --- a/tests/manual/keypadnavigation/CMakeLists.txt +++ b/tests/manual/keypadnavigation/CMakeLists.txt @@ -4,7 +4,7 @@ ## keypadnavigation Binary: ##################################################################### -qt_add_manual_test(keypadnavigation +qt_internal_add_manual_test(keypadnavigation GUI SOURCES keypadnavigation.ui diff --git a/tests/manual/lance/CMakeLists.txt b/tests/manual/lance/CMakeLists.txt index d0d898b2577..568aeaa6e71 100644 --- a/tests/manual/lance/CMakeLists.txt +++ b/tests/manual/lance/CMakeLists.txt @@ -4,7 +4,7 @@ ## lance Binary: ##################################################################### -qt_add_manual_test(lance +qt_internal_add_manual_test(lance SOURCES ../../auto/other/lancelot/paintcommands.cpp ../../auto/other/lancelot/paintcommands.h interactivewidget.cpp interactivewidget.h @@ -28,7 +28,7 @@ set(icons_resource_files "tools.png" ) -qt_add_resource(lance "icons" +qt_internal_add_resource(lance "icons" PREFIX "/icons" FILES @@ -153,7 +153,7 @@ set(images_resource_files "images/zebra.png" ) -qt_add_resource(lance "images" +qt_internal_add_resource(lance "images" PREFIX "/" BASE @@ -169,7 +169,7 @@ qt_add_resource(lance "images" ## Scopes: ##################################################################### -qt_extend_target(lance CONDITION TARGET Qt::OpenGL +qt_internal_extend_target(lance CONDITION TARGET Qt::OpenGL PUBLIC_LIBRARIES Qt::OpenGL ) diff --git a/tests/manual/markdown/CMakeLists.txt b/tests/manual/markdown/CMakeLists.txt index 33af58f812c..e02515a80b7 100644 --- a/tests/manual/markdown/CMakeLists.txt +++ b/tests/manual/markdown/CMakeLists.txt @@ -4,7 +4,7 @@ ## html2md Binary: ##################################################################### -qt_add_manual_test(html2md +qt_internal_add_manual_test(html2md GUI SOURCES html2md.cpp diff --git a/tests/manual/network_remote_stresstest/CMakeLists.txt b/tests/manual/network_remote_stresstest/CMakeLists.txt index 409f5c28332..20006c2cb99 100644 --- a/tests/manual/network_remote_stresstest/CMakeLists.txt +++ b/tests/manual/network_remote_stresstest/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_network_remote_stresstest Binary: ##################################################################### -qt_add_manual_test(tst_network_remote_stresstest +qt_internal_add_manual_test(tst_network_remote_stresstest SOURCES tst_network_remote_stresstest.cpp PUBLIC_LIBRARIES @@ -19,7 +19,7 @@ set(url-list_resource_files "url-list.txt" ) -qt_add_resource(tst_network_remote_stresstest "url-list" +qt_internal_add_resource(tst_network_remote_stresstest "url-list" PREFIX "/" FILES diff --git a/tests/manual/network_stresstest/CMakeLists.txt b/tests/manual/network_stresstest/CMakeLists.txt index 664457caef2..bb29e746157 100644 --- a/tests/manual/network_stresstest/CMakeLists.txt +++ b/tests/manual/network_stresstest/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_network_stresstest Binary: ##################################################################### -qt_add_manual_test(tst_network_stresstest +qt_internal_add_manual_test(tst_network_stresstest SOURCES minihttpserver.cpp minihttpserver.h tst_network_stresstest.cpp @@ -21,7 +21,7 @@ set(wwwfiles_resource_files "qtest" ) -qt_add_resource(tst_network_stresstest "wwwfiles" +qt_internal_add_resource(tst_network_stresstest "wwwfiles" PREFIX "/" FILES diff --git a/tests/manual/qcursor/allcursors/CMakeLists.txt b/tests/manual/qcursor/allcursors/CMakeLists.txt index cfaf947ff9b..65e7251c6d2 100644 --- a/tests/manual/qcursor/allcursors/CMakeLists.txt +++ b/tests/manual/qcursor/allcursors/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_allcursors Binary: ##################################################################### -qt_add_manual_test(tst_allcursors +qt_internal_add_manual_test(tst_allcursors GUI SOURCES main.cpp diff --git a/tests/manual/qcursor/childwidget/CMakeLists.txt b/tests/manual/qcursor/childwidget/CMakeLists.txt index bb357f348dc..ca377cb90fd 100644 --- a/tests/manual/qcursor/childwidget/CMakeLists.txt +++ b/tests/manual/qcursor/childwidget/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_manual_childwidget Binary: ##################################################################### -qt_add_manual_test(tst_manual_childwidget +qt_internal_add_manual_test(tst_manual_childwidget GUI SOURCES main.cpp diff --git a/tests/manual/qcursor/childwindow/CMakeLists.txt b/tests/manual/qcursor/childwindow/CMakeLists.txt index 5399735075a..147bd065d1e 100644 --- a/tests/manual/qcursor/childwindow/CMakeLists.txt +++ b/tests/manual/qcursor/childwindow/CMakeLists.txt @@ -4,7 +4,7 @@ ## childwindow Binary: ##################################################################### -qt_add_manual_test(childwindow +qt_internal_add_manual_test(childwindow GUI SOURCES main.cpp diff --git a/tests/manual/qcursor/childwindowcontainer/CMakeLists.txt b/tests/manual/qcursor/childwindowcontainer/CMakeLists.txt index 1653e5764ff..0efe0cb61a0 100644 --- a/tests/manual/qcursor/childwindowcontainer/CMakeLists.txt +++ b/tests/manual/qcursor/childwindowcontainer/CMakeLists.txt @@ -4,7 +4,7 @@ ## childwindowcontainer Binary: ##################################################################### -qt_add_manual_test(childwindowcontainer +qt_internal_add_manual_test(childwindowcontainer GUI SOURCES main.cpp diff --git a/tests/manual/qcursor/grab_override/CMakeLists.txt b/tests/manual/qcursor/grab_override/CMakeLists.txt index d2395630e83..c52ed6a1dd5 100644 --- a/tests/manual/qcursor/grab_override/CMakeLists.txt +++ b/tests/manual/qcursor/grab_override/CMakeLists.txt @@ -4,7 +4,7 @@ ## t_cursors Binary: ##################################################################### -qt_add_manual_test(t_cursors +qt_internal_add_manual_test(t_cursors GUI SOURCES main.cpp @@ -21,7 +21,7 @@ set(images_resource_files "data/monkey_on_64x64.png" ) -qt_add_resource(t_cursors "images" +qt_internal_add_resource(t_cursors "images" PREFIX "/" FILES diff --git a/tests/manual/qcursor/qcursorhighdpi/CMakeLists.txt b/tests/manual/qcursor/qcursorhighdpi/CMakeLists.txt index 635536c9ed3..99114a0514a 100644 --- a/tests/manual/qcursor/qcursorhighdpi/CMakeLists.txt +++ b/tests/manual/qcursor/qcursorhighdpi/CMakeLists.txt @@ -4,7 +4,7 @@ ## qcursorhighdpi Binary: ##################################################################### -qt_add_manual_test(qcursorhighdpi +qt_internal_add_manual_test(qcursorhighdpi SOURCES main.cpp PUBLIC_LIBRARIES @@ -20,7 +20,7 @@ qt_add_manual_test(qcursorhighdpi ## Scopes: ##################################################################### -qt_extend_target(qcursorhighdpi CONDITION WIN32 +qt_internal_extend_target(qcursorhighdpi CONDITION WIN32 PUBLIC_LIBRARIES User32 ) diff --git a/tests/manual/qdesktopservices/CMakeLists.txt b/tests/manual/qdesktopservices/CMakeLists.txt index 8b93835b666..3909128fd3d 100644 --- a/tests/manual/qdesktopservices/CMakeLists.txt +++ b/tests/manual/qdesktopservices/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_manual_qdesktopservices Binary: ##################################################################### -qt_add_manual_test(tst_manual_qdesktopservices +qt_internal_add_manual_test(tst_manual_qdesktopservices SOURCES tst_qdesktopservices.cpp DEFINES diff --git a/tests/manual/qgraphicsitem/CMakeLists.txt b/tests/manual/qgraphicsitem/CMakeLists.txt index 32814afb33f..85303d3674a 100644 --- a/tests/manual/qgraphicsitem/CMakeLists.txt +++ b/tests/manual/qgraphicsitem/CMakeLists.txt @@ -4,7 +4,7 @@ ## qgraphicsitem Binary: ##################################################################### -qt_add_manual_test(qgraphicsitem +qt_internal_add_manual_test(qgraphicsitem GUI SOURCES main.cpp diff --git a/tests/manual/qgraphicsitemgroup/CMakeLists.txt b/tests/manual/qgraphicsitemgroup/CMakeLists.txt index 0558b9475d4..737bcd5851f 100644 --- a/tests/manual/qgraphicsitemgroup/CMakeLists.txt +++ b/tests/manual/qgraphicsitemgroup/CMakeLists.txt @@ -4,7 +4,7 @@ ## qgraphicsitemgroup Binary: ##################################################################### -qt_add_manual_test(qgraphicsitemgroup +qt_internal_add_manual_test(qgraphicsitemgroup GUI SOURCES customitem.cpp customitem.h diff --git a/tests/manual/qgraphicslayout/flicker/CMakeLists.txt b/tests/manual/qgraphicslayout/flicker/CMakeLists.txt index 005c6ca07f9..73130ed9c7c 100644 --- a/tests/manual/qgraphicslayout/flicker/CMakeLists.txt +++ b/tests/manual/qgraphicslayout/flicker/CMakeLists.txt @@ -4,7 +4,7 @@ ## flicker Binary: ##################################################################### -qt_add_manual_test(flicker +qt_internal_add_manual_test(flicker GUI SOURCES main.cpp diff --git a/tests/manual/qhttpnetworkconnection/CMakeLists.txt b/tests/manual/qhttpnetworkconnection/CMakeLists.txt index 08308011a67..1606869d21e 100644 --- a/tests/manual/qhttpnetworkconnection/CMakeLists.txt +++ b/tests/manual/qhttpnetworkconnection/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_manual_qhttpnetworkconnection Binary: ##################################################################### -qt_add_manual_test(tst_manual_qhttpnetworkconnection +qt_internal_add_manual_test(tst_manual_qhttpnetworkconnection SOURCES main.cpp PUBLIC_LIBRARIES diff --git a/tests/manual/qimagereader/CMakeLists.txt b/tests/manual/qimagereader/CMakeLists.txt index 898cdbae0ef..00cceab5846 100644 --- a/tests/manual/qimagereader/CMakeLists.txt +++ b/tests/manual/qimagereader/CMakeLists.txt @@ -4,7 +4,7 @@ ## qimagereader Binary: ##################################################################### -qt_add_manual_test(qimagereader +qt_internal_add_manual_test(qimagereader GUI SOURCES main.cpp diff --git a/tests/manual/qlayout/CMakeLists.txt b/tests/manual/qlayout/CMakeLists.txt index 72702a47010..746a6392ce5 100644 --- a/tests/manual/qlayout/CMakeLists.txt +++ b/tests/manual/qlayout/CMakeLists.txt @@ -4,7 +4,7 @@ ## qlayout Binary: ##################################################################### -qt_add_manual_test(qlayout +qt_internal_add_manual_test(qlayout GUI SOURCES gridwidget.cpp gridwidget.h diff --git a/tests/manual/qlocale/CMakeLists.txt b/tests/manual/qlocale/CMakeLists.txt index c837bf5a9b0..a41d3fb33a6 100644 --- a/tests/manual/qlocale/CMakeLists.txt +++ b/tests/manual/qlocale/CMakeLists.txt @@ -4,7 +4,7 @@ ## qlocale Binary: ##################################################################### -qt_add_manual_test(qlocale +qt_internal_add_manual_test(qlocale GUI SOURCES calendar.cpp calendar.h diff --git a/tests/manual/qmetatype/CMakeLists.txt b/tests/manual/qmetatype/CMakeLists.txt index 696c74ee34a..76e565a0ac2 100644 --- a/tests/manual/qmetatype/CMakeLists.txt +++ b/tests/manual/qmetatype/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qmetatype_expect_fail Test: ##################################################################### -qt_add_test(tst_qmetatype_expect_fail +qt_internal_add_test(tst_qmetatype_expect_fail GUI SOURCES declare_metatype_noninline.cpp declare_metatype_noninline.h diff --git a/tests/manual/qmimedatabase/CMakeLists.txt b/tests/manual/qmimedatabase/CMakeLists.txt index 4b15506e1ce..b308eeac675 100644 --- a/tests/manual/qmimedatabase/CMakeLists.txt +++ b/tests/manual/qmimedatabase/CMakeLists.txt @@ -4,7 +4,7 @@ ## qmimedatabase Binary: ##################################################################### -qt_add_manual_test(qmimedatabase +qt_internal_add_manual_test(qmimedatabase SOURCES main.cpp ) diff --git a/tests/manual/qnetconmonitor/.prev_CMakeLists.txt b/tests/manual/qnetconmonitor/.prev_CMakeLists.txt index 0c08769907a..71d18e8f6bd 100644 --- a/tests/manual/qnetconmonitor/.prev_CMakeLists.txt +++ b/tests/manual/qnetconmonitor/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## qnetconmonitor Binary: ##################################################################### -qt_add_manual_test(qnetconmonitor +qt_internal_add_manual_test(qnetconmonitor SOURCES tst_qnetconmonitor.cpp PUBLIC_LIBRARIES diff --git a/tests/manual/qnetconmonitor/CMakeLists.txt b/tests/manual/qnetconmonitor/CMakeLists.txt index 714344e1d9e..cddb59b3da7 100644 --- a/tests/manual/qnetconmonitor/CMakeLists.txt +++ b/tests/manual/qnetconmonitor/CMakeLists.txt @@ -10,7 +10,7 @@ if (NOT QT_FEATURE_private_tests) endif() # special case end -qt_add_manual_test(qnetconmonitor +qt_internal_add_manual_test(qnetconmonitor SOURCES tst_qnetconmonitor.cpp PUBLIC_LIBRARIES diff --git a/tests/manual/qnetworkaccessmanager/qget/CMakeLists.txt b/tests/manual/qnetworkaccessmanager/qget/CMakeLists.txt index 21d129d09f4..1de539cbb0c 100644 --- a/tests/manual/qnetworkaccessmanager/qget/CMakeLists.txt +++ b/tests/manual/qnetworkaccessmanager/qget/CMakeLists.txt @@ -4,7 +4,7 @@ ## qget Binary: ##################################################################### -qt_add_manual_test(qget +qt_internal_add_manual_test(qget SOURCES downloadmanager.cpp qget.cpp qget.h diff --git a/tests/manual/qnetworkreply/.prev_CMakeLists.txt b/tests/manual/qnetworkreply/.prev_CMakeLists.txt index 2b2ba41e0be..052f8e4b58c 100644 --- a/tests/manual/qnetworkreply/.prev_CMakeLists.txt +++ b/tests/manual/qnetworkreply/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_manual_qnetworkreply Binary: ##################################################################### -qt_add_manual_test(tst_manual_qnetworkreply +qt_internal_add_manual_test(tst_manual_qnetworkreply SOURCES main.cpp PUBLIC_LIBRARIES diff --git a/tests/manual/qnetworkreply/CMakeLists.txt b/tests/manual/qnetworkreply/CMakeLists.txt index 9af59aae917..6fc330b6a41 100644 --- a/tests/manual/qnetworkreply/CMakeLists.txt +++ b/tests/manual/qnetworkreply/CMakeLists.txt @@ -10,7 +10,7 @@ if (NOT QT_FEATURE_private_tests) endif() # special case end -qt_add_manual_test(tst_manual_qnetworkreply +qt_internal_add_manual_test(tst_manual_qnetworkreply SOURCES main.cpp PUBLIC_LIBRARIES diff --git a/tests/manual/qopenglcontext/CMakeLists.txt b/tests/manual/qopenglcontext/CMakeLists.txt index 396da589ca3..fe9d332ca85 100644 --- a/tests/manual/qopenglcontext/CMakeLists.txt +++ b/tests/manual/qopenglcontext/CMakeLists.txt @@ -4,7 +4,7 @@ ## qopenglcontext Binary: ##################################################################### -qt_add_manual_test(qopenglcontext +qt_internal_add_manual_test(qopenglcontext GUI SOURCES main.cpp diff --git a/tests/manual/qopengltextureblitter/.prev_CMakeLists.txt b/tests/manual/qopengltextureblitter/.prev_CMakeLists.txt index db7fff80939..b79130458d6 100644 --- a/tests/manual/qopengltextureblitter/.prev_CMakeLists.txt +++ b/tests/manual/qopengltextureblitter/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## qopengltextureblitter Binary: ##################################################################### -qt_add_manual_test(qopengltextureblitter +qt_internal_add_manual_test(qopengltextureblitter GUI SOURCES main.cpp diff --git a/tests/manual/qopengltextureblitter/CMakeLists.txt b/tests/manual/qopengltextureblitter/CMakeLists.txt index c9e9a49901a..e45089d778d 100644 --- a/tests/manual/qopengltextureblitter/CMakeLists.txt +++ b/tests/manual/qopengltextureblitter/CMakeLists.txt @@ -4,7 +4,7 @@ ## qopengltextureblitter Binary: ##################################################################### -qt_add_manual_test(qopengltextureblitter +qt_internal_add_manual_test(qopengltextureblitter GUI SOURCES main.cpp diff --git a/tests/manual/qopenglwidget/openglwidget/CMakeLists.txt b/tests/manual/qopenglwidget/openglwidget/CMakeLists.txt index 66c7b8495ee..c0c031489f7 100644 --- a/tests/manual/qopenglwidget/openglwidget/CMakeLists.txt +++ b/tests/manual/qopenglwidget/openglwidget/CMakeLists.txt @@ -4,7 +4,7 @@ ## openglwidget Binary: ##################################################################### -qt_add_manual_test(openglwidget +qt_internal_add_manual_test(openglwidget GUI SOURCES main.cpp diff --git a/tests/manual/qopenglwindow/multiwindow/CMakeLists.txt b/tests/manual/qopenglwindow/multiwindow/CMakeLists.txt index c322d40027f..5f6aaef0d2e 100644 --- a/tests/manual/qopenglwindow/multiwindow/CMakeLists.txt +++ b/tests/manual/qopenglwindow/multiwindow/CMakeLists.txt @@ -4,7 +4,7 @@ ## multiwindow Binary: ##################################################################### -qt_add_manual_test(multiwindow +qt_internal_add_manual_test(multiwindow GUI SOURCES main.cpp diff --git a/tests/manual/qprintdevice_dump/CMakeLists.txt b/tests/manual/qprintdevice_dump/CMakeLists.txt index 73e25b66775..78334c603bb 100644 --- a/tests/manual/qprintdevice_dump/CMakeLists.txt +++ b/tests/manual/qprintdevice_dump/CMakeLists.txt @@ -4,7 +4,7 @@ ## qprintdevice_dump Binary: ##################################################################### -qt_add_manual_test(qprintdevice_dump +qt_internal_add_manual_test(qprintdevice_dump GUI SOURCES main.cpp diff --git a/tests/manual/qscreen/CMakeLists.txt b/tests/manual/qscreen/CMakeLists.txt index 3c5622536a3..22c1401f1dd 100644 --- a/tests/manual/qscreen/CMakeLists.txt +++ b/tests/manual/qscreen/CMakeLists.txt @@ -4,7 +4,7 @@ ## qscreen Binary: ##################################################################### -qt_add_manual_test(qscreen +qt_internal_add_manual_test(qscreen SOURCES main.cpp propertyfield.cpp propertyfield.h diff --git a/tests/manual/qssloptions/CMakeLists.txt b/tests/manual/qssloptions/CMakeLists.txt index 92983a7a5ba..edfbf88d80f 100644 --- a/tests/manual/qssloptions/CMakeLists.txt +++ b/tests/manual/qssloptions/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qssloptions Binary: ##################################################################### -qt_add_manual_test(tst_qssloptions +qt_internal_add_manual_test(tst_qssloptions SOURCES main.cpp PUBLIC_LIBRARIES diff --git a/tests/manual/qsslsocket/CMakeLists.txt b/tests/manual/qsslsocket/CMakeLists.txt index a0d0fd23a0c..9347418bffc 100644 --- a/tests/manual/qsslsocket/CMakeLists.txt +++ b/tests/manual/qsslsocket/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_manual_qsslsocket Test: ##################################################################### -qt_add_test(tst_manual_qsslsocket +qt_internal_add_test(tst_manual_qsslsocket SOURCES main.cpp PUBLIC_LIBRARIES diff --git a/tests/manual/qstorageinfo/CMakeLists.txt b/tests/manual/qstorageinfo/CMakeLists.txt index 58782c138db..40bf1fdeaf2 100644 --- a/tests/manual/qstorageinfo/CMakeLists.txt +++ b/tests/manual/qstorageinfo/CMakeLists.txt @@ -4,7 +4,7 @@ ## qstorageinfo Binary: ##################################################################### -qt_add_manual_test(qstorageinfo +qt_internal_add_manual_test(qstorageinfo SOURCES main.cpp ) diff --git a/tests/manual/qsysinfo/CMakeLists.txt b/tests/manual/qsysinfo/CMakeLists.txt index e0e49fa1bf4..08117af9fc9 100644 --- a/tests/manual/qsysinfo/CMakeLists.txt +++ b/tests/manual/qsysinfo/CMakeLists.txt @@ -4,7 +4,7 @@ ## qsysinfo Binary: ##################################################################### -qt_add_manual_test(qsysinfo +qt_internal_add_manual_test(qsysinfo SOURCES main.cpp ) diff --git a/tests/manual/qt_poll/CMakeLists.txt b/tests/manual/qt_poll/CMakeLists.txt index d8784a6ed36..2b61787b101 100644 --- a/tests/manual/qt_poll/CMakeLists.txt +++ b/tests/manual/qt_poll/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qt_poll Test: ##################################################################### -qt_add_test(tst_qt_poll +qt_internal_add_test(tst_qt_poll SOURCES ../../../src/corelib/kernel/qpoll.cpp tst_qt_poll.cpp diff --git a/tests/manual/qtabbar/CMakeLists.txt b/tests/manual/qtabbar/CMakeLists.txt index 157c64250f6..ea8d27ac915 100644 --- a/tests/manual/qtabbar/CMakeLists.txt +++ b/tests/manual/qtabbar/CMakeLists.txt @@ -4,7 +4,7 @@ ## qtabbar Binary: ##################################################################### -qt_add_manual_test(qtabbar +qt_internal_add_manual_test(qtabbar GUI SOURCES main.cpp diff --git a/tests/manual/qtabletevent/device_information/CMakeLists.txt b/tests/manual/qtabletevent/device_information/CMakeLists.txt index 8a13e6e7302..02c0789ffea 100644 --- a/tests/manual/qtabletevent/device_information/CMakeLists.txt +++ b/tests/manual/qtabletevent/device_information/CMakeLists.txt @@ -4,7 +4,7 @@ ## device_information Binary: ##################################################################### -qt_add_manual_test(device_information +qt_internal_add_manual_test(device_information GUI SOURCES main.cpp diff --git a/tests/manual/qtabletevent/event_compression/CMakeLists.txt b/tests/manual/qtabletevent/event_compression/CMakeLists.txt index 1f959a51e26..8f5b6a39629 100644 --- a/tests/manual/qtabletevent/event_compression/CMakeLists.txt +++ b/tests/manual/qtabletevent/event_compression/CMakeLists.txt @@ -4,7 +4,7 @@ ## event_compression Binary: ##################################################################### -qt_add_manual_test(event_compression +qt_internal_add_manual_test(event_compression SOURCES main.cpp mousestatwidget.cpp mousestatwidget.h diff --git a/tests/manual/qtabletevent/regular_widgets/CMakeLists.txt b/tests/manual/qtabletevent/regular_widgets/CMakeLists.txt index f4630a3789f..340510fc6b4 100644 --- a/tests/manual/qtabletevent/regular_widgets/CMakeLists.txt +++ b/tests/manual/qtabletevent/regular_widgets/CMakeLists.txt @@ -4,7 +4,7 @@ ## regular_widgets Binary: ##################################################################### -qt_add_manual_test(regular_widgets +qt_internal_add_manual_test(regular_widgets GUI SOURCES main.cpp diff --git a/tests/manual/qtbug-52641/CMakeLists.txt b/tests/manual/qtbug-52641/CMakeLists.txt index 7ae762b62f1..7b752dc1eee 100644 --- a/tests/manual/qtbug-52641/CMakeLists.txt +++ b/tests/manual/qtbug-52641/CMakeLists.txt @@ -4,7 +4,7 @@ ## qtbug-52641 Binary: ##################################################################### -qt_add_manual_test(qtbug-52641 +qt_internal_add_manual_test(qtbug-52641 GUI SOURCES main.cpp diff --git a/tests/manual/qtbug-8933/CMakeLists.txt b/tests/manual/qtbug-8933/CMakeLists.txt index ec47dd5ce7e..5405c77f345 100644 --- a/tests/manual/qtbug-8933/CMakeLists.txt +++ b/tests/manual/qtbug-8933/CMakeLists.txt @@ -4,7 +4,7 @@ ## qtbug-8933 Binary: ##################################################################### -qt_add_manual_test(qtbug-8933 +qt_internal_add_manual_test(qtbug-8933 GUI SOURCES main.cpp diff --git a/tests/manual/qtexteditlist/CMakeLists.txt b/tests/manual/qtexteditlist/CMakeLists.txt index 49647ca7c03..7b11cade93b 100644 --- a/tests/manual/qtexteditlist/CMakeLists.txt +++ b/tests/manual/qtexteditlist/CMakeLists.txt @@ -4,7 +4,7 @@ ## qtexteditlist Binary: ##################################################################### -qt_add_manual_test(qtexteditlist +qt_internal_add_manual_test(qtexteditlist GUI SOURCES main.cpp diff --git a/tests/manual/qtexttableborders/CMakeLists.txt b/tests/manual/qtexttableborders/CMakeLists.txt index 83c46c5ad56..0f88a2443bd 100644 --- a/tests/manual/qtexttableborders/CMakeLists.txt +++ b/tests/manual/qtexttableborders/CMakeLists.txt @@ -4,7 +4,7 @@ ## qtexttableborders Binary: ##################################################################### -qt_add_manual_test(qtexttableborders +qt_internal_add_manual_test(qtexttableborders GUI SOURCES main.cpp @@ -23,7 +23,7 @@ set(resources_resource_files "table-border-test.html" ) -qt_add_resource(qtexttableborders "resources" +qt_internal_add_resource(qtexttableborders "resources" PREFIX "/" FILES diff --git a/tests/manual/qtouchevent/CMakeLists.txt b/tests/manual/qtouchevent/CMakeLists.txt index 031d2b35218..21042a12c8e 100644 --- a/tests/manual/qtouchevent/CMakeLists.txt +++ b/tests/manual/qtouchevent/CMakeLists.txt @@ -4,7 +4,7 @@ ## qtouchevent Binary: ##################################################################### -qt_add_manual_test(qtouchevent +qt_internal_add_manual_test(qtouchevent SOURCES form.ui main.cpp diff --git a/tests/manual/qvulkaninstance/CMakeLists.txt b/tests/manual/qvulkaninstance/CMakeLists.txt index e645ee007c1..eafd1baa0af 100644 --- a/tests/manual/qvulkaninstance/CMakeLists.txt +++ b/tests/manual/qvulkaninstance/CMakeLists.txt @@ -4,7 +4,7 @@ ## qvulkaninstance Binary: ##################################################################### -qt_add_manual_test(qvulkaninstance +qt_internal_add_manual_test(qvulkaninstance GUI SOURCES main.cpp diff --git a/tests/manual/qwidget_zorder/CMakeLists.txt b/tests/manual/qwidget_zorder/CMakeLists.txt index 62c3963481a..7d769c2be9e 100644 --- a/tests/manual/qwidget_zorder/CMakeLists.txt +++ b/tests/manual/qwidget_zorder/CMakeLists.txt @@ -4,7 +4,7 @@ ## qwidget_zorder Binary: ##################################################################### -qt_add_manual_test(qwidget_zorder +qt_internal_add_manual_test(qwidget_zorder GUI SOURCES main.cpp diff --git a/tests/manual/repaint/mainwindow/CMakeLists.txt b/tests/manual/repaint/mainwindow/CMakeLists.txt index 24bbbc93c02..f632da98275 100644 --- a/tests/manual/repaint/mainwindow/CMakeLists.txt +++ b/tests/manual/repaint/mainwindow/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_manual_mainwindow Binary: ##################################################################### -qt_add_manual_test(tst_manual_mainwindow +qt_internal_add_manual_test(tst_manual_mainwindow GUI SOURCES ../shared/shared.h diff --git a/tests/manual/repaint/scrollarea/CMakeLists.txt b/tests/manual/repaint/scrollarea/CMakeLists.txt index 1c1bfdfb3f5..54ab0fd4105 100644 --- a/tests/manual/repaint/scrollarea/CMakeLists.txt +++ b/tests/manual/repaint/scrollarea/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_manual_scrollarea Binary: ##################################################################### -qt_add_manual_test(tst_manual_scrollarea +qt_internal_add_manual_test(tst_manual_scrollarea GUI SOURCES ../shared/shared.h diff --git a/tests/manual/repaint/splitter/CMakeLists.txt b/tests/manual/repaint/splitter/CMakeLists.txt index 2cecbc3741b..9799abce098 100644 --- a/tests/manual/repaint/splitter/CMakeLists.txt +++ b/tests/manual/repaint/splitter/CMakeLists.txt @@ -4,7 +4,7 @@ ## splitter Binary: ##################################################################### -qt_add_manual_test(splitter +qt_internal_add_manual_test(splitter GUI SOURCES ../shared/shared.h diff --git a/tests/manual/repaint/tableview/CMakeLists.txt b/tests/manual/repaint/tableview/CMakeLists.txt index 0c7ed5d532e..18850765010 100644 --- a/tests/manual/repaint/tableview/CMakeLists.txt +++ b/tests/manual/repaint/tableview/CMakeLists.txt @@ -4,7 +4,7 @@ ## tableview Binary: ##################################################################### -qt_add_manual_test(tableview +qt_internal_add_manual_test(tableview GUI SOURCES ../shared/shared.h diff --git a/tests/manual/repaint/task141091/CMakeLists.txt b/tests/manual/repaint/task141091/CMakeLists.txt index 3d899d79e3c..1ef2896c03b 100644 --- a/tests/manual/repaint/task141091/CMakeLists.txt +++ b/tests/manual/repaint/task141091/CMakeLists.txt @@ -4,7 +4,7 @@ ## task141091 Binary: ##################################################################### -qt_add_manual_test(task141091 +qt_internal_add_manual_test(task141091 SOURCES main.cpp PUBLIC_LIBRARIES diff --git a/tests/manual/repaint/toplevel/CMakeLists.txt b/tests/manual/repaint/toplevel/CMakeLists.txt index a4e603686a4..c345ce974c9 100644 --- a/tests/manual/repaint/toplevel/CMakeLists.txt +++ b/tests/manual/repaint/toplevel/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_manual_toplevel Binary: ##################################################################### -qt_add_manual_test(tst_manual_toplevel +qt_internal_add_manual_test(tst_manual_toplevel SOURCES ../shared/shared.h main.cpp diff --git a/tests/manual/repaint/widget/CMakeLists.txt b/tests/manual/repaint/widget/CMakeLists.txt index 681f1e090c0..2900692f1b7 100644 --- a/tests/manual/repaint/widget/CMakeLists.txt +++ b/tests/manual/repaint/widget/CMakeLists.txt @@ -4,7 +4,7 @@ ## widget Binary: ##################################################################### -qt_add_manual_test(widget +qt_internal_add_manual_test(widget GUI SOURCES ../shared/shared.h diff --git a/tests/manual/rhi/compressedtexture_bc1/CMakeLists.txt b/tests/manual/rhi/compressedtexture_bc1/CMakeLists.txt index 294b6cb9421..ee500729196 100644 --- a/tests/manual/rhi/compressedtexture_bc1/CMakeLists.txt +++ b/tests/manual/rhi/compressedtexture_bc1/CMakeLists.txt @@ -4,7 +4,7 @@ ## compressedtexture_bc1 Binary: ##################################################################### -qt_add_manual_test(compressedtexture_bc1 +qt_internal_add_manual_test(compressedtexture_bc1 GUI SOURCES compressedtexture_bc1.cpp @@ -29,7 +29,7 @@ set(compressedtexture_bc1_resource_files "../shared/texture.vert.qsb" ) -qt_add_resource(compressedtexture_bc1 "compressedtexture_bc1" +qt_internal_add_resource(compressedtexture_bc1 "compressedtexture_bc1" PREFIX "/" FILES diff --git a/tests/manual/rhi/compressedtexture_bc1_subupload/CMakeLists.txt b/tests/manual/rhi/compressedtexture_bc1_subupload/CMakeLists.txt index 508df6b5d54..e77e09e2e6e 100644 --- a/tests/manual/rhi/compressedtexture_bc1_subupload/CMakeLists.txt +++ b/tests/manual/rhi/compressedtexture_bc1_subupload/CMakeLists.txt @@ -4,7 +4,7 @@ ## compressedtexture_bc1_subupload Binary: ##################################################################### -qt_add_manual_test(compressedtexture_bc1_subupload +qt_internal_add_manual_test(compressedtexture_bc1_subupload GUI SOURCES compressedtexture_bc1_subupload.cpp @@ -33,7 +33,7 @@ set(compressedtexture_bc1_subupload_resource_files "../shared/texture.vert.qsb" ) -qt_add_resource(compressedtexture_bc1_subupload "compressedtexture_bc1_subupload" +qt_internal_add_resource(compressedtexture_bc1_subupload "compressedtexture_bc1_subupload" PREFIX "/" FILES diff --git a/tests/manual/rhi/computebuffer/CMakeLists.txt b/tests/manual/rhi/computebuffer/CMakeLists.txt index 3d19620dce6..a47a8436f88 100644 --- a/tests/manual/rhi/computebuffer/CMakeLists.txt +++ b/tests/manual/rhi/computebuffer/CMakeLists.txt @@ -4,7 +4,7 @@ ## computebuffer Binary: ##################################################################### -qt_add_manual_test(computebuffer +qt_internal_add_manual_test(computebuffer GUI SOURCES computebuffer.cpp @@ -20,7 +20,7 @@ set(computebuffer_resource_files "main.vert.qsb" ) -qt_add_resource(computebuffer "computebuffer" +qt_internal_add_resource(computebuffer "computebuffer" PREFIX "/" FILES diff --git a/tests/manual/rhi/computeimage/CMakeLists.txt b/tests/manual/rhi/computeimage/CMakeLists.txt index a5408233d57..f7ecd5ce65e 100644 --- a/tests/manual/rhi/computeimage/CMakeLists.txt +++ b/tests/manual/rhi/computeimage/CMakeLists.txt @@ -4,7 +4,7 @@ ## computeimage Binary: ##################################################################### -qt_add_manual_test(computeimage +qt_internal_add_manual_test(computeimage GUI SOURCES computeimage.cpp @@ -30,7 +30,7 @@ set(computeimage_resource_files "image.comp.qsb" ) -qt_add_resource(computeimage "computeimage" +qt_internal_add_resource(computeimage "computeimage" PREFIX "/" FILES diff --git a/tests/manual/rhi/cubemap/CMakeLists.txt b/tests/manual/rhi/cubemap/CMakeLists.txt index 6a69d760653..b3e3206cf59 100644 --- a/tests/manual/rhi/cubemap/CMakeLists.txt +++ b/tests/manual/rhi/cubemap/CMakeLists.txt @@ -4,7 +4,7 @@ ## cubemap Binary: ##################################################################### -qt_add_manual_test(cubemap +qt_internal_add_manual_test(cubemap GUI SOURCES cubemap.cpp @@ -20,7 +20,7 @@ set(cubemap_resource_files "cubemap.vert.qsb" ) -qt_add_resource(cubemap "cubemap" +qt_internal_add_resource(cubemap "cubemap" PREFIX "/" FILES diff --git a/tests/manual/rhi/cubemap_render/CMakeLists.txt b/tests/manual/rhi/cubemap_render/CMakeLists.txt index c21ebc40a34..66abf688eae 100644 --- a/tests/manual/rhi/cubemap_render/CMakeLists.txt +++ b/tests/manual/rhi/cubemap_render/CMakeLists.txt @@ -4,7 +4,7 @@ ## cubemap_render Binary: ##################################################################### -qt_add_manual_test(cubemap_render +qt_internal_add_manual_test(cubemap_render GUI SOURCES cubemap_render.cpp @@ -23,7 +23,7 @@ set(cubemap_render_resource_files "cubemap_sample.vert.qsb" ) -qt_add_resource(cubemap_render "cubemap_render" +qt_internal_add_resource(cubemap_render "cubemap_render" PREFIX "/" FILES diff --git a/tests/manual/rhi/cubemap_scissor/CMakeLists.txt b/tests/manual/rhi/cubemap_scissor/CMakeLists.txt index 759c7220064..dd59b1791cf 100644 --- a/tests/manual/rhi/cubemap_scissor/CMakeLists.txt +++ b/tests/manual/rhi/cubemap_scissor/CMakeLists.txt @@ -4,7 +4,7 @@ ## cubemap_scissor Binary: ##################################################################### -qt_add_manual_test(cubemap_scissor +qt_internal_add_manual_test(cubemap_scissor GUI SOURCES cubemap_scissor.cpp @@ -29,7 +29,7 @@ set(cubemap_scissor_resource_files "../cubemap/cubemap.vert.qsb" ) -qt_add_resource(cubemap_scissor "cubemap_scissor" +qt_internal_add_resource(cubemap_scissor "cubemap_scissor" PREFIX "/" FILES diff --git a/tests/manual/rhi/float16texture_with_compute/CMakeLists.txt b/tests/manual/rhi/float16texture_with_compute/CMakeLists.txt index 935f653742c..e50a3c841fd 100644 --- a/tests/manual/rhi/float16texture_with_compute/CMakeLists.txt +++ b/tests/manual/rhi/float16texture_with_compute/CMakeLists.txt @@ -4,7 +4,7 @@ ## float16texture_with_compute Binary: ##################################################################### -qt_add_manual_test(float16texture_with_compute +qt_internal_add_manual_test(float16texture_with_compute GUI SOURCES float16texture_with_compute.cpp @@ -31,7 +31,7 @@ set(float16texture_with_compute_resource_files "prefilter.comp.qsb" ) -qt_add_resource(float16texture_with_compute "float16texture_with_compute" +qt_internal_add_resource(float16texture_with_compute "float16texture_with_compute" PREFIX "/" FILES diff --git a/tests/manual/rhi/floattexture/CMakeLists.txt b/tests/manual/rhi/floattexture/CMakeLists.txt index 241387eb4b5..7748388c546 100644 --- a/tests/manual/rhi/floattexture/CMakeLists.txt +++ b/tests/manual/rhi/floattexture/CMakeLists.txt @@ -4,7 +4,7 @@ ## floattexture Binary: ##################################################################### -qt_add_manual_test(floattexture +qt_internal_add_manual_test(floattexture GUI SOURCES floattexture.cpp @@ -29,7 +29,7 @@ set(floattexture_resource_files "../shared/texture.vert.qsb" ) -qt_add_resource(floattexture "floattexture" +qt_internal_add_resource(floattexture "floattexture" PREFIX "/" FILES diff --git a/tests/manual/rhi/hellominimalcrossgfxtriangle/CMakeLists.txt b/tests/manual/rhi/hellominimalcrossgfxtriangle/CMakeLists.txt index c995f56de20..d695bcbb9b1 100644 --- a/tests/manual/rhi/hellominimalcrossgfxtriangle/CMakeLists.txt +++ b/tests/manual/rhi/hellominimalcrossgfxtriangle/CMakeLists.txt @@ -4,7 +4,7 @@ ## hellominimalcrossgfxtriangle Binary: ##################################################################### -qt_add_manual_test(hellominimalcrossgfxtriangle +qt_internal_add_manual_test(hellominimalcrossgfxtriangle SOURCES hellowindow.cpp hellowindow.h main.cpp @@ -26,7 +26,7 @@ set(hellominimalcrossgfxtriangle_resource_files "../shared/color.vert.qsb" ) -qt_add_resource(hellominimalcrossgfxtriangle "hellominimalcrossgfxtriangle" +qt_internal_add_resource(hellominimalcrossgfxtriangle "hellominimalcrossgfxtriangle" PREFIX "/" FILES diff --git a/tests/manual/rhi/instancing/CMakeLists.txt b/tests/manual/rhi/instancing/CMakeLists.txt index 6cc41c7a733..71de7da4949 100644 --- a/tests/manual/rhi/instancing/CMakeLists.txt +++ b/tests/manual/rhi/instancing/CMakeLists.txt @@ -4,7 +4,7 @@ ## instancing Binary: ##################################################################### -qt_add_manual_test(instancing +qt_internal_add_manual_test(instancing GUI SOURCES instancing.cpp @@ -19,7 +19,7 @@ set(instancing_resource_files "inst.vert.qsb" ) -qt_add_resource(instancing "instancing" +qt_internal_add_resource(instancing "instancing" PREFIX "/" FILES diff --git a/tests/manual/rhi/mrt/CMakeLists.txt b/tests/manual/rhi/mrt/CMakeLists.txt index 0df83106d04..cd30003cd8e 100644 --- a/tests/manual/rhi/mrt/CMakeLists.txt +++ b/tests/manual/rhi/mrt/CMakeLists.txt @@ -4,7 +4,7 @@ ## mrt Binary: ##################################################################### -qt_add_manual_test(mrt +qt_internal_add_manual_test(mrt GUI SOURCES mrt.cpp @@ -27,7 +27,7 @@ set(mrt_resource_files "mrt.vert.qsb" ) -qt_add_resource(mrt "mrt" +qt_internal_add_resource(mrt "mrt" PREFIX "/" FILES diff --git a/tests/manual/rhi/msaarenderbuffer/CMakeLists.txt b/tests/manual/rhi/msaarenderbuffer/CMakeLists.txt index 2b682d81f7b..c9050bcdd9c 100644 --- a/tests/manual/rhi/msaarenderbuffer/CMakeLists.txt +++ b/tests/manual/rhi/msaarenderbuffer/CMakeLists.txt @@ -4,7 +4,7 @@ ## msaarenderbuffer Binary: ##################################################################### -qt_add_manual_test(msaarenderbuffer +qt_internal_add_manual_test(msaarenderbuffer GUI SOURCES msaarenderbuffer.cpp @@ -33,7 +33,7 @@ set(msaarenderbuffer_resource_files "../shared/texture.vert.qsb" ) -qt_add_resource(msaarenderbuffer "msaarenderbuffer" +qt_internal_add_resource(msaarenderbuffer "msaarenderbuffer" PREFIX "/" FILES diff --git a/tests/manual/rhi/msaatexture/CMakeLists.txt b/tests/manual/rhi/msaatexture/CMakeLists.txt index e2392e4c3de..a498780e4e0 100644 --- a/tests/manual/rhi/msaatexture/CMakeLists.txt +++ b/tests/manual/rhi/msaatexture/CMakeLists.txt @@ -4,7 +4,7 @@ ## msaatexture Binary: ##################################################################### -qt_add_manual_test(msaatexture +qt_internal_add_manual_test(msaatexture GUI SOURCES msaatexture.cpp @@ -37,7 +37,7 @@ set(msaatexture_resource_files "../shared/texture_ms4.frag.qsb" ) -qt_add_resource(msaatexture "msaatexture" +qt_internal_add_resource(msaatexture "msaatexture" PREFIX "/" FILES diff --git a/tests/manual/rhi/multiwindow/CMakeLists.txt b/tests/manual/rhi/multiwindow/CMakeLists.txt index eb6e739addc..57960fc7d1c 100644 --- a/tests/manual/rhi/multiwindow/CMakeLists.txt +++ b/tests/manual/rhi/multiwindow/CMakeLists.txt @@ -4,7 +4,7 @@ ## multiwindow Binary: ##################################################################### -qt_add_manual_test(multiwindow +qt_internal_add_manual_test(multiwindow GUI SOURCES multiwindow.cpp @@ -26,7 +26,7 @@ set(multiwindow_resource_files "../shared/color.vert.qsb" ) -qt_add_resource(multiwindow "multiwindow" +qt_internal_add_resource(multiwindow "multiwindow" PREFIX "/" FILES diff --git a/tests/manual/rhi/multiwindow_threaded/CMakeLists.txt b/tests/manual/rhi/multiwindow_threaded/CMakeLists.txt index 2aad008e741..421042f84f8 100644 --- a/tests/manual/rhi/multiwindow_threaded/CMakeLists.txt +++ b/tests/manual/rhi/multiwindow_threaded/CMakeLists.txt @@ -4,7 +4,7 @@ ## multiwindow_threaded Binary: ##################################################################### -qt_add_manual_test(multiwindow_threaded +qt_internal_add_manual_test(multiwindow_threaded GUI SOURCES multiwindow_threaded.cpp @@ -31,7 +31,7 @@ set(multiwindow_threaded_resource_files "../shared/texture.vert.qsb" ) -qt_add_resource(multiwindow_threaded "multiwindow_threaded" +qt_internal_add_resource(multiwindow_threaded "multiwindow_threaded" PREFIX "/" FILES diff --git a/tests/manual/rhi/offscreen/CMakeLists.txt b/tests/manual/rhi/offscreen/CMakeLists.txt index ffda2b17b48..00a4221dc42 100644 --- a/tests/manual/rhi/offscreen/CMakeLists.txt +++ b/tests/manual/rhi/offscreen/CMakeLists.txt @@ -4,7 +4,7 @@ ## offscreen Binary: ##################################################################### -qt_add_manual_test(offscreen +qt_internal_add_manual_test(offscreen SOURCES offscreen.cpp PUBLIC_LIBRARIES @@ -24,7 +24,7 @@ set(offscreen_resource_files "../shared/color.vert.qsb" ) -qt_add_resource(offscreen "offscreen" +qt_internal_add_resource(offscreen "offscreen" PREFIX "/" FILES diff --git a/tests/manual/rhi/qrhiprof/CMakeLists.txt b/tests/manual/rhi/qrhiprof/CMakeLists.txt index a10161afaf5..f064db65651 100644 --- a/tests/manual/rhi/qrhiprof/CMakeLists.txt +++ b/tests/manual/rhi/qrhiprof/CMakeLists.txt @@ -4,7 +4,7 @@ ## qrhiprof Binary: ##################################################################### -qt_add_manual_test(qrhiprof +qt_internal_add_manual_test(qrhiprof GUI SOURCES qrhiprof.cpp diff --git a/tests/manual/rhi/shadowmap/CMakeLists.txt b/tests/manual/rhi/shadowmap/CMakeLists.txt index 23e24c17623..07c25d3a07d 100644 --- a/tests/manual/rhi/shadowmap/CMakeLists.txt +++ b/tests/manual/rhi/shadowmap/CMakeLists.txt @@ -4,7 +4,7 @@ ## shadowmap Binary: ##################################################################### -qt_add_manual_test(shadowmap +qt_internal_add_manual_test(shadowmap GUI SOURCES shadowmap.cpp @@ -21,7 +21,7 @@ set(shadowmap_resource_files "shadowmap.vert.qsb" ) -qt_add_resource(shadowmap "shadowmap" +qt_internal_add_resource(shadowmap "shadowmap" PREFIX "/" FILES diff --git a/tests/manual/rhi/texuploads/CMakeLists.txt b/tests/manual/rhi/texuploads/CMakeLists.txt index 20078d40676..ce37af18ede 100644 --- a/tests/manual/rhi/texuploads/CMakeLists.txt +++ b/tests/manual/rhi/texuploads/CMakeLists.txt @@ -4,7 +4,7 @@ ## texuploads Binary: ##################################################################### -qt_add_manual_test(texuploads +qt_internal_add_manual_test(texuploads GUI SOURCES texuploads.cpp @@ -29,7 +29,7 @@ set(texuploads_resource_files "../shared/texture.vert.qsb" ) -qt_add_resource(texuploads "texuploads" +qt_internal_add_resource(texuploads "texuploads" PREFIX "/" FILES diff --git a/tests/manual/rhi/triquadcube/CMakeLists.txt b/tests/manual/rhi/triquadcube/CMakeLists.txt index c4fd5a04980..8c343890b3d 100644 --- a/tests/manual/rhi/triquadcube/CMakeLists.txt +++ b/tests/manual/rhi/triquadcube/CMakeLists.txt @@ -4,7 +4,7 @@ ## triquadcube Binary: ##################################################################### -qt_add_manual_test(triquadcube +qt_internal_add_manual_test(triquadcube GUI SOURCES quadrenderer.cpp quadrenderer.h @@ -41,7 +41,7 @@ set(triquadcube_resource_files "../shared/texture.vert.qsb" ) -qt_add_resource(triquadcube "triquadcube" +qt_internal_add_resource(triquadcube "triquadcube" PREFIX "/" FILES diff --git a/tests/manual/shortcuts/CMakeLists.txt b/tests/manual/shortcuts/CMakeLists.txt index e8474fc9a7a..23d468e228e 100644 --- a/tests/manual/shortcuts/CMakeLists.txt +++ b/tests/manual/shortcuts/CMakeLists.txt @@ -4,7 +4,7 @@ ## shortcuts Binary: ##################################################################### -qt_add_manual_test(shortcuts +qt_internal_add_manual_test(shortcuts GUI SOURCES main.cpp diff --git a/tests/manual/socketengine/.prev_CMakeLists.txt b/tests/manual/socketengine/.prev_CMakeLists.txt index a96c5b2e75c..10f9c5e938a 100644 --- a/tests/manual/socketengine/.prev_CMakeLists.txt +++ b/tests/manual/socketengine/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_socketengine Binary: ##################################################################### -qt_add_manual_test(tst_socketengine +qt_internal_add_manual_test(tst_socketengine SOURCES main.cpp PUBLIC_LIBRARIES diff --git a/tests/manual/socketengine/CMakeLists.txt b/tests/manual/socketengine/CMakeLists.txt index 81e937a3c3a..02de1484555 100644 --- a/tests/manual/socketengine/CMakeLists.txt +++ b/tests/manual/socketengine/CMakeLists.txt @@ -10,7 +10,7 @@ if (NOT QT_FEATURE_private_tests) endif() # special case end -qt_add_manual_test(tst_socketengine +qt_internal_add_manual_test(tst_socketengine SOURCES main.cpp PUBLIC_LIBRARIES diff --git a/tests/manual/textrendering/glyphshaping/CMakeLists.txt b/tests/manual/textrendering/glyphshaping/CMakeLists.txt index 0dd163183b4..e0a69745e8f 100644 --- a/tests/manual/textrendering/glyphshaping/CMakeLists.txt +++ b/tests/manual/textrendering/glyphshaping/CMakeLists.txt @@ -4,7 +4,7 @@ ## glyphshaping Binary: ##################################################################### -qt_add_manual_test(glyphshaping +qt_internal_add_manual_test(glyphshaping GUI SOURCES main.cpp diff --git a/tests/manual/textrendering/nativetext/CMakeLists.txt b/tests/manual/textrendering/nativetext/CMakeLists.txt index b8f215f57bb..447288e6df6 100644 --- a/tests/manual/textrendering/nativetext/CMakeLists.txt +++ b/tests/manual/textrendering/nativetext/CMakeLists.txt @@ -4,7 +4,7 @@ ## nativetext Binary: ##################################################################### -qt_add_manual_test(nativetext +qt_internal_add_manual_test(nativetext SOURCES main.cpp PUBLIC_LIBRARIES @@ -17,7 +17,7 @@ qt_add_manual_test(nativetext ## Scopes: ##################################################################### -qt_extend_target(nativetext CONDITION APPLE +qt_internal_extend_target(nativetext CONDITION APPLE PUBLIC_LIBRARIES ${FWAppKit} ${FWCoreGraphics} diff --git a/tests/manual/textrendering/textperformance/CMakeLists.txt b/tests/manual/textrendering/textperformance/CMakeLists.txt index b84db9e0aa7..ed1664dd2ab 100644 --- a/tests/manual/textrendering/textperformance/CMakeLists.txt +++ b/tests/manual/textrendering/textperformance/CMakeLists.txt @@ -4,7 +4,7 @@ ## textperformance Binary: ##################################################################### -qt_add_manual_test(textperformance +qt_internal_add_manual_test(textperformance GUI SOURCES main.cpp diff --git a/tests/manual/touch/CMakeLists.txt b/tests/manual/touch/CMakeLists.txt index 1545095efad..2d941a6c94a 100644 --- a/tests/manual/touch/CMakeLists.txt +++ b/tests/manual/touch/CMakeLists.txt @@ -4,7 +4,7 @@ ## touch Binary: ##################################################################### -qt_add_manual_test(touch +qt_internal_add_manual_test(touch SOURCES main.cpp PUBLIC_LIBRARIES diff --git a/tests/manual/touchGraphicsItem/CMakeLists.txt b/tests/manual/touchGraphicsItem/CMakeLists.txt index 1055a761b27..870b297ba69 100644 --- a/tests/manual/touchGraphicsItem/CMakeLists.txt +++ b/tests/manual/touchGraphicsItem/CMakeLists.txt @@ -4,7 +4,7 @@ ## touchGraphicsItem Binary: ##################################################################### -qt_add_manual_test(touchGraphicsItem +qt_internal_add_manual_test(touchGraphicsItem GUI SOURCES main.cpp diff --git a/tests/manual/transientwindow/CMakeLists.txt b/tests/manual/transientwindow/CMakeLists.txt index c3307282c10..20d37bbc696 100644 --- a/tests/manual/transientwindow/CMakeLists.txt +++ b/tests/manual/transientwindow/CMakeLists.txt @@ -4,7 +4,7 @@ ## transientwindow Binary: ##################################################################### -qt_add_manual_test(transientwindow +qt_internal_add_manual_test(transientwindow GUI SOURCES main.cpp diff --git a/tests/manual/triangulator/CMakeLists.txt b/tests/manual/triangulator/CMakeLists.txt index d3d6a8cc1f1..e9fe7f50efb 100644 --- a/tests/manual/triangulator/CMakeLists.txt +++ b/tests/manual/triangulator/CMakeLists.txt @@ -4,7 +4,7 @@ ## triangulator Binary: ##################################################################### -qt_add_manual_test(triangulator +qt_internal_add_manual_test(triangulator GUI SOURCES main.cpp diff --git a/tests/manual/unc/CMakeLists.txt b/tests/manual/unc/CMakeLists.txt index edab5ef368d..e8c90cbd65c 100644 --- a/tests/manual/unc/CMakeLists.txt +++ b/tests/manual/unc/CMakeLists.txt @@ -4,7 +4,7 @@ ## unc Binary: ##################################################################### -qt_add_manual_test(unc +qt_internal_add_manual_test(unc GUI SOURCES main.cpp diff --git a/tests/manual/widgetgrab/CMakeLists.txt b/tests/manual/widgetgrab/CMakeLists.txt index 8285d19992d..1ad19e581be 100644 --- a/tests/manual/widgetgrab/CMakeLists.txt +++ b/tests/manual/widgetgrab/CMakeLists.txt @@ -4,7 +4,7 @@ ## widgetgrab Binary: ##################################################################### -qt_add_manual_test(widgetgrab +qt_internal_add_manual_test(widgetgrab GUI SOURCES main.cpp diff --git a/tests/manual/widgets/itemviews/autoResizePrecision/tablehorz/CMakeLists.txt b/tests/manual/widgets/itemviews/autoResizePrecision/tablehorz/CMakeLists.txt index fe6202f6447..e37182121b4 100644 --- a/tests/manual/widgets/itemviews/autoResizePrecision/tablehorz/CMakeLists.txt +++ b/tests/manual/widgets/itemviews/autoResizePrecision/tablehorz/CMakeLists.txt @@ -4,7 +4,7 @@ ## testtable1 Binary: ##################################################################### -qt_add_manual_test(testtable1 +qt_internal_add_manual_test(testtable1 GUI SOURCES testtable1.cpp diff --git a/tests/manual/widgets/itemviews/autoResizePrecision/tablevert/CMakeLists.txt b/tests/manual/widgets/itemviews/autoResizePrecision/tablevert/CMakeLists.txt index ad27ac86982..ccb4477247c 100644 --- a/tests/manual/widgets/itemviews/autoResizePrecision/tablevert/CMakeLists.txt +++ b/tests/manual/widgets/itemviews/autoResizePrecision/tablevert/CMakeLists.txt @@ -4,7 +4,7 @@ ## testtable2 Binary: ##################################################################### -qt_add_manual_test(testtable2 +qt_internal_add_manual_test(testtable2 GUI SOURCES testtable2.cpp diff --git a/tests/manual/widgets/itemviews/autoResizePrecision/treeview/CMakeLists.txt b/tests/manual/widgets/itemviews/autoResizePrecision/treeview/CMakeLists.txt index 9812b7956fb..30fad7c9104 100644 --- a/tests/manual/widgets/itemviews/autoResizePrecision/treeview/CMakeLists.txt +++ b/tests/manual/widgets/itemviews/autoResizePrecision/treeview/CMakeLists.txt @@ -4,7 +4,7 @@ ## testtree Binary: ##################################################################### -qt_add_manual_test(testtree +qt_internal_add_manual_test(testtree GUI SOURCES testtree.cpp diff --git a/tests/manual/widgets/itemviews/delegate/CMakeLists.txt b/tests/manual/widgets/itemviews/delegate/CMakeLists.txt index b00639bc3fb..62ff4e33ca6 100644 --- a/tests/manual/widgets/itemviews/delegate/CMakeLists.txt +++ b/tests/manual/widgets/itemviews/delegate/CMakeLists.txt @@ -4,7 +4,7 @@ ## delegate Binary: ##################################################################### -qt_add_manual_test(delegate +qt_internal_add_manual_test(delegate GUI SOURCES example.cpp diff --git a/tests/manual/widgets/itemviews/qconcatenatetablesproxymodel/CMakeLists.txt b/tests/manual/widgets/itemviews/qconcatenatetablesproxymodel/CMakeLists.txt index 47d53d16461..0859204297c 100644 --- a/tests/manual/widgets/itemviews/qconcatenatetablesproxymodel/CMakeLists.txt +++ b/tests/manual/widgets/itemviews/qconcatenatetablesproxymodel/CMakeLists.txt @@ -4,7 +4,7 @@ ## qconcatenatetablesproxymodel Binary: ##################################################################### -qt_add_manual_test(qconcatenatetablesproxymodel +qt_internal_add_manual_test(qconcatenatetablesproxymodel GUI SOURCES main.cpp diff --git a/tests/manual/widgets/itemviews/qheaderview/CMakeLists.txt b/tests/manual/widgets/itemviews/qheaderview/CMakeLists.txt index d99ecf0f399..02dc7fd5b1d 100644 --- a/tests/manual/widgets/itemviews/qheaderview/CMakeLists.txt +++ b/tests/manual/widgets/itemviews/qheaderview/CMakeLists.txt @@ -4,7 +4,7 @@ ## qheaderview Binary: ##################################################################### -qt_add_manual_test(qheaderview +qt_internal_add_manual_test(qheaderview GUI SOURCES qheaderviewtest1.cpp diff --git a/tests/manual/widgets/itemviews/qtreeview/CMakeLists.txt b/tests/manual/widgets/itemviews/qtreeview/CMakeLists.txt index 06bf5b71a6a..719ef928c91 100644 --- a/tests/manual/widgets/itemviews/qtreeview/CMakeLists.txt +++ b/tests/manual/widgets/itemviews/qtreeview/CMakeLists.txt @@ -4,7 +4,7 @@ ## qtreeview Binary: ##################################################################### -qt_add_manual_test(qtreeview +qt_internal_add_manual_test(qtreeview GUI SOURCES main.cpp diff --git a/tests/manual/widgets/itemviews/qtreewidget/CMakeLists.txt b/tests/manual/widgets/itemviews/qtreewidget/CMakeLists.txt index ada07cd5f8a..1cefae616ce 100644 --- a/tests/manual/widgets/itemviews/qtreewidget/CMakeLists.txt +++ b/tests/manual/widgets/itemviews/qtreewidget/CMakeLists.txt @@ -4,7 +4,7 @@ ## qtreewidget Binary: ##################################################################### -qt_add_manual_test(qtreewidget +qt_internal_add_manual_test(qtreewidget GUI SOURCES main.cpp diff --git a/tests/manual/widgets/itemviews/tableview-span-navigation/CMakeLists.txt b/tests/manual/widgets/itemviews/tableview-span-navigation/CMakeLists.txt index cad99e4783c..a1ff2f70dac 100644 --- a/tests/manual/widgets/itemviews/tableview-span-navigation/CMakeLists.txt +++ b/tests/manual/widgets/itemviews/tableview-span-navigation/CMakeLists.txt @@ -4,7 +4,7 @@ ## tableview-span-navigation Binary: ##################################################################### -qt_add_manual_test(tableview-span-navigation +qt_internal_add_manual_test(tableview-span-navigation GUI SOURCES main.cpp diff --git a/tests/manual/widgets/kernel/layoutreplace/CMakeLists.txt b/tests/manual/widgets/kernel/layoutreplace/CMakeLists.txt index 1f36f4c326e..e6a54cfea39 100644 --- a/tests/manual/widgets/kernel/layoutreplace/CMakeLists.txt +++ b/tests/manual/widgets/kernel/layoutreplace/CMakeLists.txt @@ -4,7 +4,7 @@ ## layoutreplace Binary: ##################################################################### -qt_add_manual_test(layoutreplace +qt_internal_add_manual_test(layoutreplace GUI SOURCES main.cpp diff --git a/tests/manual/widgets/kernel/qtooltip/CMakeLists.txt b/tests/manual/widgets/kernel/qtooltip/CMakeLists.txt index 10d98cb0c5b..bc076cf5232 100644 --- a/tests/manual/widgets/kernel/qtooltip/CMakeLists.txt +++ b/tests/manual/widgets/kernel/qtooltip/CMakeLists.txt @@ -4,7 +4,7 @@ ## qtooltip Binary: ##################################################################### -qt_add_manual_test(qtooltip +qt_internal_add_manual_test(qtooltip SOURCES main.cpp PUBLIC_LIBRARIES diff --git a/tests/manual/widgets/kernel/setscreen/CMakeLists.txt b/tests/manual/widgets/kernel/setscreen/CMakeLists.txt index 610a7488309..67544504815 100644 --- a/tests/manual/widgets/kernel/setscreen/CMakeLists.txt +++ b/tests/manual/widgets/kernel/setscreen/CMakeLists.txt @@ -4,7 +4,7 @@ ## setscreen Binary: ##################################################################### -qt_add_manual_test(setscreen +qt_internal_add_manual_test(setscreen GUI SOURCES main.cpp diff --git a/tests/manual/widgets/kernel/sizeonhide/CMakeLists.txt b/tests/manual/widgets/kernel/sizeonhide/CMakeLists.txt index de3b7241964..f1b420f1b2f 100644 --- a/tests/manual/widgets/kernel/sizeonhide/CMakeLists.txt +++ b/tests/manual/widgets/kernel/sizeonhide/CMakeLists.txt @@ -4,7 +4,7 @@ ## sizeonhide Binary: ##################################################################### -qt_add_manual_test(sizeonhide +qt_internal_add_manual_test(sizeonhide GUI SOURCES main.cpp diff --git a/tests/manual/widgets/qgraphicsview/rubberband/CMakeLists.txt b/tests/manual/widgets/qgraphicsview/rubberband/CMakeLists.txt index 06e5029bb56..1e265eda2a2 100644 --- a/tests/manual/widgets/qgraphicsview/rubberband/CMakeLists.txt +++ b/tests/manual/widgets/qgraphicsview/rubberband/CMakeLists.txt @@ -4,7 +4,7 @@ ## rubberband Binary: ##################################################################### -qt_add_manual_test(rubberband +qt_internal_add_manual_test(rubberband GUI SOURCES rubberbandtest.cpp diff --git a/tests/manual/widgets/styles/CMakeLists.txt b/tests/manual/widgets/styles/CMakeLists.txt index 4dfa6d7d307..c1344723559 100644 --- a/tests/manual/widgets/styles/CMakeLists.txt +++ b/tests/manual/widgets/styles/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_manual_styles Binary: ##################################################################### -qt_add_manual_test(tst_manual_styles +qt_internal_add_manual_test(tst_manual_styles SOURCES main.cpp PUBLIC_LIBRARIES diff --git a/tests/manual/widgets/widgets/bigmenucreator/CMakeLists.txt b/tests/manual/widgets/widgets/bigmenucreator/CMakeLists.txt index 44db18eefeb..c44d8397148 100644 --- a/tests/manual/widgets/widgets/bigmenucreator/CMakeLists.txt +++ b/tests/manual/widgets/widgets/bigmenucreator/CMakeLists.txt @@ -4,7 +4,7 @@ ## BigMenuCreator Binary: ##################################################################### -qt_add_manual_test(BigMenuCreator +qt_internal_add_manual_test(BigMenuCreator GUI SOURCES main.cpp diff --git a/tests/manual/widgets/widgets/defaultUpMenuBar/CMakeLists.txt b/tests/manual/widgets/widgets/defaultUpMenuBar/CMakeLists.txt index 1327ea39ef9..7e973fdcf2a 100644 --- a/tests/manual/widgets/widgets/defaultUpMenuBar/CMakeLists.txt +++ b/tests/manual/widgets/widgets/defaultUpMenuBar/CMakeLists.txt @@ -4,7 +4,7 @@ ## defaultUpMenuBar Binary: ##################################################################### -qt_add_manual_test(defaultUpMenuBar +qt_internal_add_manual_test(defaultUpMenuBar GUI SOURCES main.cpp diff --git a/tests/manual/widgets/widgets/multiscreen-menus/CMakeLists.txt b/tests/manual/widgets/widgets/multiscreen-menus/CMakeLists.txt index 40fd38edf71..b5e97479fb1 100644 --- a/tests/manual/widgets/widgets/multiscreen-menus/CMakeLists.txt +++ b/tests/manual/widgets/widgets/multiscreen-menus/CMakeLists.txt @@ -4,7 +4,7 @@ ## multiscreen-menus Binary: ##################################################################### -qt_add_manual_test(multiscreen-menus +qt_internal_add_manual_test(multiscreen-menus GUI SOURCES main.cpp diff --git a/tests/manual/widgets/widgets/qmainwindow/saveStateSize/CMakeLists.txt b/tests/manual/widgets/widgets/qmainwindow/saveStateSize/CMakeLists.txt index e49d5ea559c..183855d6b29 100644 --- a/tests/manual/widgets/widgets/qmainwindow/saveStateSize/CMakeLists.txt +++ b/tests/manual/widgets/widgets/qmainwindow/saveStateSize/CMakeLists.txt @@ -4,7 +4,7 @@ ## saveStateSize Binary: ##################################################################### -qt_add_manual_test(saveStateSize +qt_internal_add_manual_test(saveStateSize GUI SOURCES main.cpp diff --git a/tests/manual/widgets/widgets/qtabbar/CMakeLists.txt b/tests/manual/widgets/widgets/qtabbar/CMakeLists.txt index cb4ee1f4d19..2b8b71eb442 100644 --- a/tests/manual/widgets/widgets/qtabbar/CMakeLists.txt +++ b/tests/manual/widgets/widgets/qtabbar/CMakeLists.txt @@ -4,7 +4,7 @@ ## qtabbar Binary: ##################################################################### -qt_add_manual_test(qtabbar +qt_internal_add_manual_test(qtabbar GUI PUBLIC_LIBRARIES Qt::Gui diff --git a/tests/manual/widgets/widgets/qtoolbutton/menuOnMultiScreens/CMakeLists.txt b/tests/manual/widgets/widgets/qtoolbutton/menuOnMultiScreens/CMakeLists.txt index 4be0bcf05e5..f1a4a13462c 100644 --- a/tests/manual/widgets/widgets/qtoolbutton/menuOnMultiScreens/CMakeLists.txt +++ b/tests/manual/widgets/widgets/qtoolbutton/menuOnMultiScreens/CMakeLists.txt @@ -4,7 +4,7 @@ ## menuOnMultiScreens Binary: ##################################################################### -qt_add_manual_test(menuOnMultiScreens +qt_internal_add_manual_test(menuOnMultiScreens GUI SOURCES main.cpp diff --git a/tests/manual/windowchildgeometry/CMakeLists.txt b/tests/manual/windowchildgeometry/CMakeLists.txt index 22b4af820b1..17117ce80fa 100644 --- a/tests/manual/windowchildgeometry/CMakeLists.txt +++ b/tests/manual/windowchildgeometry/CMakeLists.txt @@ -4,7 +4,7 @@ ## windowchildgeometry Binary: ##################################################################### -qt_add_manual_test(windowchildgeometry +qt_internal_add_manual_test(windowchildgeometry GUI SOURCES ../windowflags/controls.cpp ../windowflags/controls.h diff --git a/tests/manual/windowflags/CMakeLists.txt b/tests/manual/windowflags/CMakeLists.txt index 179acbef727..5c4941bec89 100644 --- a/tests/manual/windowflags/CMakeLists.txt +++ b/tests/manual/windowflags/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_manual_windowflags Binary: ##################################################################### -qt_add_manual_test(tst_manual_windowflags +qt_internal_add_manual_test(tst_manual_windowflags GUI SOURCES controllerwindow.cpp controllerwindow.h diff --git a/tests/manual/windowgeometry/CMakeLists.txt b/tests/manual/windowgeometry/CMakeLists.txt index 1c158a513ad..0467958e592 100644 --- a/tests/manual/windowgeometry/CMakeLists.txt +++ b/tests/manual/windowgeometry/CMakeLists.txt @@ -4,7 +4,7 @@ ## windowgeometry Binary: ##################################################################### -qt_add_manual_test(windowgeometry +qt_internal_add_manual_test(windowgeometry GUI SOURCES ../windowflags/controls.cpp ../windowflags/controls.h diff --git a/tests/manual/windowmodality/CMakeLists.txt b/tests/manual/windowmodality/CMakeLists.txt index 02280cef9b3..63a18701ba5 100644 --- a/tests/manual/windowmodality/CMakeLists.txt +++ b/tests/manual/windowmodality/CMakeLists.txt @@ -4,7 +4,7 @@ ## windowmodality Binary: ##################################################################### -qt_add_manual_test(windowmodality +qt_internal_add_manual_test(windowmodality GUI SOURCES dialog.ui diff --git a/tests/manual/windowtransparency/CMakeLists.txt b/tests/manual/windowtransparency/CMakeLists.txt index 6b245898dce..c35f0bebd9b 100644 --- a/tests/manual/windowtransparency/CMakeLists.txt +++ b/tests/manual/windowtransparency/CMakeLists.txt @@ -4,7 +4,7 @@ ## windowtransparency Binary: ##################################################################### -qt_add_manual_test(windowtransparency +qt_internal_add_manual_test(windowtransparency SOURCES windowtransparency.cpp PUBLIC_LIBRARIES diff --git a/tests/manual/xcb_gl_integration/CMakeLists.txt b/tests/manual/xcb_gl_integration/CMakeLists.txt index 6d3f32e68ef..45faaf10f98 100644 --- a/tests/manual/xcb_gl_integration/CMakeLists.txt +++ b/tests/manual/xcb_gl_integration/CMakeLists.txt @@ -4,7 +4,7 @@ ## xcb_gl_integration Binary: ##################################################################### -qt_add_manual_test(xcb_gl_integration +qt_internal_add_manual_test(xcb_gl_integration GUI SOURCES main.cpp diff --git a/tests/manual/xembed-raster/CMakeLists.txt b/tests/manual/xembed-raster/CMakeLists.txt index be322752222..20ec90e2c69 100644 --- a/tests/manual/xembed-raster/CMakeLists.txt +++ b/tests/manual/xembed-raster/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_manual_rasterwindow Binary: ##################################################################### -qt_add_manual_test(tst_manual_rasterwindow +qt_internal_add_manual_test(tst_manual_rasterwindow GUI SOURCES main.cpp diff --git a/tests/manual/xembed-widgets/CMakeLists.txt b/tests/manual/xembed-widgets/CMakeLists.txt index 2164095c784..411df543e3f 100644 --- a/tests/manual/xembed-widgets/CMakeLists.txt +++ b/tests/manual/xembed-widgets/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_manual_lineedits Binary: ##################################################################### -qt_add_manual_test(tst_manual_lineedits +qt_internal_add_manual_test(tst_manual_lineedits GUI SOURCES main.cpp |