diff options
136 files changed, 999 insertions, 1000 deletions
diff --git a/qmake/.prev_CMakeLists.txt b/qmake/.prev_CMakeLists.txt index 5381bea434..d914f1cd85 100644 --- a/qmake/.prev_CMakeLists.txt +++ b/qmake/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## qmake Binary: ##################################################################### -add_qt_executable(qmake +qt_add_executable(qmake SOURCES ../src/corelib/codecs/qutfcodec.cpp ../src/corelib/codecs/qutfcodec_p.h ../src/corelib/global/qglobal.cpp ../src/corelib/global/qglobal.h @@ -127,7 +127,7 @@ add_qt_executable(qmake ## Scopes: ##################################################################### -extend_target(qmake CONDITION WIN32 +qt_extend_target(qmake CONDITION WIN32 SOURCES ../src/corelib/global/qoperatingsystemversion_win.cpp ../src/corelib/io/qfilesystemengine_win.cpp @@ -149,7 +149,7 @@ extend_target(qmake CONDITION WIN32 ole32 ) -extend_target(qmake CONDITION UNIX +qt_extend_target(qmake CONDITION UNIX SOURCES ../src/corelib/io/qfilesystemengine_unix.cpp ../src/corelib/io/qfilesystemiterator_unix.cpp @@ -158,7 +158,7 @@ extend_target(qmake CONDITION UNIX qlocale_unix.cpp-NOTFOUND ) -extend_target(qmake CONDITION APPLE_OSX +qt_extend_target(qmake CONDITION APPLE_OSX SOURCES qcore_foundation.mm qcore_mac.cpp @@ -172,12 +172,12 @@ extend_target(qmake CONDITION APPLE_OSX -fconstant-cfstrings ) -extend_target(qmake CONDITION WIN32 AND mingw +qt_extend_target(qmake CONDITION WIN32 AND mingw PUBLIC_LIBRARIES uuid ) -extend_target(qmake CONDITION CLANG AND WIN32 +qt_extend_target(qmake 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 3e81ef4820..85a0d41171 100644 --- a/qmake/CMakeLists.txt +++ b/qmake/CMakeLists.txt @@ -4,7 +4,7 @@ ## qmake Binary: ##################################################################### -add_qt_tool(qmake # special case +qt_add_tool(qmake # special case NO_QT # special case TOOLS_TARGET Core # special case # GUI # special case: remove this @@ -133,7 +133,7 @@ qt_internal_add_target_aliases(Bootstrap) # special case ## Scopes: ##################################################################### -extend_target(qmake CONDITION WIN32 +qt_extend_target(qmake CONDITION WIN32 SOURCES ../src/corelib/global/qoperatingsystemversion_win.cpp ../src/corelib/io/qfilesystemengine_win.cpp @@ -155,7 +155,7 @@ extend_target(qmake CONDITION WIN32 ole32 ) -extend_target(qmake CONDITION UNIX +qt_extend_target(qmake CONDITION UNIX SOURCES ../src/corelib/io/qfilesystemengine_unix.cpp ../src/corelib/io/qfilesystemiterator_unix.cpp @@ -164,7 +164,7 @@ extend_target(qmake CONDITION UNIX ../src/corelib/text/qlocale_unix.cpp ) -extend_target(qmake CONDITION APPLE_OSX +qt_extend_target(qmake CONDITION APPLE_OSX SOURCES ../src/corelib/kernel/qcore_foundation.mm # special case ../src/corelib/kernel/qcore_mac.cpp # special case @@ -195,12 +195,12 @@ extend_target(qmake CONDITION WIN32 ole32 advapi32 kernel32 netapi32 ) -extend_target(qmake CONDITION WIN32 AND mingw +qt_extend_target(qmake CONDITION WIN32 AND mingw PUBLIC_LIBRARIES uuid ) -extend_target(qmake CONDITION CLANG AND WIN32 +qt_extend_target(qmake CONDITION CLANG AND WIN32 COMPILE_OPTIONS "-fms-compatibility-version=19.00.23506" "-Wno-microsoft-enum-value" diff --git a/src/concurrent/CMakeLists.txt b/src/concurrent/CMakeLists.txt index b159c4e7cc..b908ef90a1 100644 --- a/src/concurrent/CMakeLists.txt +++ b/src/concurrent/CMakeLists.txt @@ -4,7 +4,7 @@ ## Concurrent Module: ##################################################################### -add_qt_module(Concurrent +qt_add_module(Concurrent EXCEPTIONS SOURCES qtconcurrent_global.h @@ -36,11 +36,11 @@ add_qt_module(Concurrent ## Scopes: ##################################################################### -extend_target(Concurrent CONDITION MSVC AND (TEST_architecture_arch STREQUAL "i386") +qt_extend_target(Concurrent CONDITION MSVC AND (TEST_architecture_arch STREQUAL "i386") LINK_OPTIONS "/BASE:0x66000000" ) -add_qt_docs(Concurrent +qt_add_docs(Concurrent doc/qtconcurrent.qdocconf ) diff --git a/src/corelib/.prev_CMakeLists.txt b/src/corelib/.prev_CMakeLists.txt index 3c9a3de8e2..3837e785a5 100644 --- a/src/corelib/.prev_CMakeLists.txt +++ b/src/corelib/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## Core Module: ##################################################################### -add_qt_module(Core +qt_add_module(Core QMAKE_MODULE_CONFIG moc resources EXCEPTIONS SOURCES @@ -244,7 +244,7 @@ add_qt_module(Core ) -add_qt_simd_part(Core SIMD mips_dsp +qt_add_simd_part(Core SIMD mips_dsp SOURCES ../gui/painting/qt_mips_asm_dsp_p.h text/qstring_mips_dsp_asm.S @@ -308,7 +308,7 @@ endif() #### Keys ignored in scope 3:.:.:corelib.pro:NOT QT_NAMESPACE_ISEMPTY: # MODULE_DEFINES = "QT_NAMESPACE=$$QT_NAMESPACE" -extend_target(Core CONDITION ANDROID +qt_extend_target(Core CONDITION ANDROID SOURCES kernel/qsharedmemory_android.cpp kernel/qsystemsemaphore_android.cpp @@ -316,7 +316,7 @@ extend_target(Core CONDITION ANDROID LIBS_SUFFIX='\\"_${CMAKE_SYSTEM_PROCESSOR}.so\\"' ) -extend_target(Core CONDITION MSVC AND (TEST_architecture_arch STREQUAL "i386") +qt_extend_target(Core CONDITION MSVC AND (TEST_architecture_arch STREQUAL "i386") LINK_OPTIONS "/BASE:0x67000000" ) @@ -324,7 +324,7 @@ 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> -extend_target(Core CONDITION QT_FEATURE_animation +qt_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 @@ -335,7 +335,7 @@ extend_target(Core CONDITION QT_FEATURE_animation animation/qvariantanimation.cpp animation/qvariantanimation.h animation/qvariantanimation_p.h ) -extend_target(Core CONDITION WIN32 +qt_extend_target(Core CONDITION WIN32 SOURCES global/qoperatingsystemversion_win.cpp global/qoperatingsystemversion_win_p.h io/qfilesystemengine_win.cpp @@ -355,7 +355,7 @@ extend_target(Core CONDITION WIN32 ws2_32 ) -extend_target(Core CONDITION WIN32 AND NOT WINRT +qt_extend_target(Core CONDITION WIN32 AND NOT WINRT SOURCES io/qstandardpaths_win.cpp io/qstorageinfo_win.cpp @@ -378,7 +378,7 @@ extend_target(Core CONDITION WIN32 AND NOT WINRT userenv ) -extend_target(Core CONDITION APPLE +qt_extend_target(Core CONDITION APPLE SOURCES global/qoperatingsystemversion_darwin.mm io/qstandardpaths_mac.mm @@ -394,7 +394,7 @@ extend_target(Core CONDITION APPLE ${FWFoundation} ) -extend_target(Core CONDITION APPLE_OSX +qt_extend_target(Core CONDITION APPLE_OSX LIBRARIES ${FWAppKit} ${FWApplicationServices} @@ -405,7 +405,7 @@ extend_target(Core CONDITION APPLE_OSX ${FWIOKit} ) -extend_target(Core CONDITION INTEGRITY +qt_extend_target(Core CONDITION INTEGRITY LIBRARIES ivfs net @@ -439,26 +439,26 @@ extend_target(Core CONDITION INTEGRITY #### Keys ignored in scope 26:.:global:global/global.pri:else: # f16c_cxx = "false" -extend_target(Core CONDITION _ss_f16c_cxx +qt_extend_target(Core CONDITION _ss_f16c_cxx DEFINES QFLOAT16_INCLUDE_FAST ) if(NOT _ss_f16c_cxx) - add_qt_simd_part(Core SIMD f16c + qt_add_simd_part(Core SIMD f16c SOURCES global/qfloat16_f16c.c ) endif() -extend_target(Core CONDITION NOT _x_-armcc_x_ AND NOT cross_compile AND NOT static AND (hurd_x_ OR linux_x_) +qt_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 "-Wl,-e,qt_core_boilerplate" ) -extend_target(Core CONDITION LINUX AND NOT static +qt_extend_target(Core CONDITION LINUX AND NOT static SOURCES global/minimum-linux_p.h ) @@ -475,17 +475,17 @@ extend_target(Core CONDITION LINUX AND NOT static #### Keys ignored in scope 34:.:global:global/global.pri:silent: # no_pch_assembler.commands = "@echo" "compiling[no_pch]" "${QMAKE_FILE_IN}" "&&" -extend_target(Core CONDITION LINUX AND NOT precompile_header AND NOT static +qt_extend_target(Core CONDITION LINUX AND NOT precompile_header AND NOT static SOURCES global/minimum-linux.S ) -extend_target(Core CONDITION QT_FEATURE_slog2 +qt_extend_target(Core CONDITION QT_FEATURE_slog2 LIBRARIES Slog2::Slog2 ) -extend_target(Core CONDITION QT_FEATURE_journald +qt_extend_target(Core CONDITION QT_FEATURE_journald LIBRARIES PkgConfig::Libsystemd ) @@ -502,12 +502,12 @@ extend_target(Core CONDITION QT_FEATURE_journald #### Keys ignored in scope 39:.:global:global/global.pri:silent: # versiontagging_compiler.commands = "@echo" "compiling[versiontagging]" "${QMAKE_FILE_IN}" "&&" -extend_target(Core CONDITION NOT GCC OR NOT ltcg +qt_extend_target(Core CONDITION NOT GCC OR NOT ltcg SOURCES global/qversiontagging.cpp ) -extend_target(Core CONDITION UNIX +qt_extend_target(Core CONDITION UNIX SOURCES io/qfilesystemengine_unix.cpp io/qfilesystemiterator_unix.cpp @@ -520,7 +520,7 @@ extend_target(Core CONDITION UNIX thread/qthread_unix.cpp ) -extend_target(Core CONDITION QT_FEATURE_thread +qt_extend_target(Core CONDITION QT_FEATURE_thread SOURCES thread/qatomic.cpp thread/qatomic.h thread/qatomic_bootstrap.h @@ -538,33 +538,33 @@ extend_target(Core CONDITION QT_FEATURE_thread thread/qthreadstorage.cpp ) -extend_target(Core CONDITION QT_FEATURE_thread AND WIN32 +qt_extend_target(Core CONDITION QT_FEATURE_thread AND WIN32 SOURCES thread/qmutex_win.cpp thread/qwaitcondition_win.cpp ) -extend_target(Core CONDITION QT_FEATURE_thread AND UNIX +qt_extend_target(Core CONDITION QT_FEATURE_thread AND UNIX SOURCES thread/qwaitcondition_unix.cpp ) -extend_target(Core CONDITION APPLE AND QT_FEATURE_thread +qt_extend_target(Core CONDITION APPLE AND QT_FEATURE_thread SOURCES thread/qmutex_mac.cpp ) -extend_target(Core CONDITION LINUX AND QT_FEATURE_thread +qt_extend_target(Core CONDITION LINUX AND QT_FEATURE_thread SOURCES thread/qmutex_linux.cpp ) -extend_target(Core CONDITION QT_FEATURE_thread AND UNIX AND NOT APPLE AND NOT LINUX +qt_extend_target(Core CONDITION QT_FEATURE_thread AND UNIX AND NOT APPLE AND NOT LINUX SOURCES thread/qmutex_unix.cpp ) -extend_target(Core CONDITION QT_FEATURE_future +qt_extend_target(Core CONDITION QT_FEATURE_future SOURCES thread/qexception.cpp thread/qexception.h thread/qfuture.h @@ -574,57 +574,57 @@ extend_target(Core CONDITION QT_FEATURE_future thread/qresultstore.cpp thread/qresultstore.h ) -extend_target(Core CONDITION QT_FEATURE_std_atomic64 +qt_extend_target(Core CONDITION QT_FEATURE_std_atomic64 PUBLIC_LIBRARIES Atomic ) -extend_target(Core CONDITION ICC +qt_extend_target(Core CONDITION ICC COMPILE_OPTIONS -fp-model strict ) -extend_target(Core CONDITION MSVC +qt_extend_target(Core CONDITION MSVC SOURCES tools/qvector_msvc.cpp NO_PCH_SOURCES "tools/qvector_msvc.cpp" ) -extend_target(Core CONDITION QT_FEATURE_commandlineparser +qt_extend_target(Core CONDITION QT_FEATURE_commandlineparser SOURCES tools/qcommandlineoption.cpp tools/qcommandlineoption.h tools/qcommandlineparser.cpp tools/qcommandlineparser.h ) -extend_target(Core CONDITION QT_FEATURE_easingcurve +qt_extend_target(Core CONDITION QT_FEATURE_easingcurve SOURCES tools/qeasingcurve.cpp tools/qeasingcurve.h tools/qtimeline.cpp tools/qtimeline.h ) -extend_target(Core CONDITION UNIX AND NOT HAIKU AND NOT INTEGRITY AND NOT VXWORKS AND NOT WASM AND (NOT APPLE_OSX OR NOT ICC) +qt_extend_target(Core CONDITION UNIX AND NOT HAIKU AND NOT INTEGRITY AND NOT VXWORKS AND NOT WASM AND (NOT APPLE_OSX OR NOT ICC) LIBRARIES m ) -extend_target(Core CONDITION APPLE_OSX AND NOT NACL +qt_extend_target(Core CONDITION APPLE_OSX AND NOT NACL SOURCES text/qlocale_mac.mm ) -extend_target(Core CONDITION UNIX AND (NACL OR NOT APPLE_OSX) +qt_extend_target(Core CONDITION UNIX AND (NACL OR NOT APPLE_OSX) SOURCES text/qlocale_unix.cpp ) -extend_target(Core CONDITION WIN32 AND (NACL OR NOT APPLE_OSX) +qt_extend_target(Core CONDITION WIN32 AND (NACL OR NOT APPLE_OSX) SOURCES text/qlocale_win.cpp ) -extend_target(Core CONDITION QT_FEATURE_icu +qt_extend_target(Core CONDITION QT_FEATURE_icu SOURCES text/qcollator_icu.cpp text/qlocale_icu.cpp @@ -632,159 +632,159 @@ extend_target(Core CONDITION QT_FEATURE_icu ICU::i18n ICU::uc ICU::data ) -extend_target(Core CONDITION WIN32 AND NOT QT_FEATURE_icu +qt_extend_target(Core CONDITION WIN32 AND NOT QT_FEATURE_icu SOURCES text/qcollator_win.cpp ) -extend_target(Core CONDITION APPLE_OSX AND NOT QT_FEATURE_icu +qt_extend_target(Core CONDITION APPLE_OSX AND NOT QT_FEATURE_icu SOURCES text/qcollator_macx.cpp ) -extend_target(Core CONDITION UNIX AND NOT APPLE_OSX AND NOT QT_FEATURE_icu +qt_extend_target(Core CONDITION UNIX AND NOT APPLE_OSX AND NOT QT_FEATURE_icu SOURCES text/qcollator_posix.cpp ) -extend_target(Core CONDITION QT_FEATURE_regularexpression +qt_extend_target(Core CONDITION QT_FEATURE_regularexpression SOURCES text/qregularexpression.cpp text/qregularexpression.h LIBRARIES WrapPCRE2::WrapPCRE2 ) -extend_target(Core CONDITION QT_FEATURE_hijricalendar +qt_extend_target(Core CONDITION QT_FEATURE_hijricalendar SOURCES time/qhijricalendar.cpp time/qhijricalendar_p.h time/qhijricalendar_data_p.h ) -extend_target(Core CONDITION QT_FEATURE_islamiccivilcalendar +qt_extend_target(Core CONDITION QT_FEATURE_islamiccivilcalendar SOURCES time/qislamiccivilcalendar.cpp time/qislamiccivilcalendar_p.h ) -extend_target(Core CONDITION QT_FEATURE_jalalicalendar +qt_extend_target(Core CONDITION QT_FEATURE_jalalicalendar SOURCES time/qjalalicalendar.cpp time/qjalalicalendar_p.h time/qjalalicalendar_data_p.h ) -extend_target(Core CONDITION QT_FEATURE_timezone +qt_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 ) -extend_target(Core CONDITION APPLE AND QT_FEATURE_timezone AND NOT NACL +qt_extend_target(Core CONDITION APPLE AND QT_FEATURE_timezone AND NOT NACL SOURCES time/qtimezoneprivate_mac.mm ) -extend_target(Core CONDITION ANDROID AND QT_FEATURE_timezone AND NOT ANDROID_EMBEDDED AND (NACL OR NOT APPLE) +qt_extend_target(Core CONDITION ANDROID AND QT_FEATURE_timezone AND NOT ANDROID_EMBEDDED AND (NACL OR NOT APPLE) SOURCES time/qtimezoneprivate_android.cpp ) -extend_target(Core CONDITION QT_FEATURE_timezone AND UNIX AND (ANDROID_EMBEDDED OR NOT ANDROID) AND (NACL OR NOT APPLE) +qt_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 ) -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_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 ) -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_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 ) -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_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 ) -extend_target(Core CONDITION QT_FEATURE_datetimeparser +qt_extend_target(Core CONDITION QT_FEATURE_datetimeparser SOURCES time/qdatetimeparser.cpp time/qdatetimeparser_p.h ) -extend_target(Core CONDITION QT_FEATURE_zstd +qt_extend_target(Core CONDITION QT_FEATURE_zstd LIBRARIES ZSTD::ZSTD ) -extend_target(Core CONDITION QT_FEATURE_filesystemwatcher +qt_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 ) -extend_target(Core CONDITION QT_FEATURE_filesystemwatcher AND WIN32 +qt_extend_target(Core CONDITION QT_FEATURE_filesystemwatcher AND WIN32 SOURCES io/qfilesystemwatcher_win.cpp io/qfilesystemwatcher_win_p.h ) -extend_target(Core CONDITION APPLE_OSX AND QT_FEATURE_filesystemwatcher +qt_extend_target(Core CONDITION APPLE_OSX AND QT_FEATURE_filesystemwatcher SOURCES io/qfilesystemwatcher_fsevents.mm io/qfilesystemwatcher_fsevents_p.h ) -extend_target(Core CONDITION QT_FEATURE_filesystemwatcher AND QT_FEATURE_inotify AND UNIX AND NOT APPLE_OSX +qt_extend_target(Core CONDITION QT_FEATURE_filesystemwatcher AND QT_FEATURE_inotify AND UNIX AND NOT APPLE_OSX SOURCES io/qfilesystemwatcher_inotify.cpp io/qfilesystemwatcher_inotify_p.h ) -extend_target(Core CONDITION QT_FEATURE_filesystemwatcher AND UNIX AND NOT APPLE_OSX AND NOT QT_FEATURE_inotify AND (APPLE OR FREEBSD OR NETBSD OR OPENBSD) +qt_extend_target(Core CONDITION QT_FEATURE_filesystemwatcher AND UNIX AND NOT APPLE_OSX AND NOT QT_FEATURE_inotify AND (APPLE OR FREEBSD OR NETBSD OR OPENBSD) SOURCES io/qfilesystemwatcher_kqueue.cpp io/qfilesystemwatcher_kqueue_p.h ) -extend_target(Core CONDITION QT_FEATURE_processenvironment +qt_extend_target(Core CONDITION QT_FEATURE_processenvironment SOURCES io/qprocess.cpp io/qprocess.h io/qprocess_p.h ) -extend_target(Core CONDITION QT_FEATURE_processenvironment AND WIN32 AND NOT WINRT +qt_extend_target(Core CONDITION QT_FEATURE_processenvironment AND WIN32 AND NOT WINRT SOURCES io/qprocess_win.cpp ) -extend_target(Core CONDITION QT_FEATURE_processenvironment AND UNIX +qt_extend_target(Core CONDITION QT_FEATURE_processenvironment AND UNIX SOURCES io/qprocess_unix.cpp ) -extend_target(Core CONDITION QT_FEATURE_settings +qt_extend_target(Core CONDITION QT_FEATURE_settings SOURCES io/qsettings.cpp io/qsettings.h io/qsettings_p.h ) -extend_target(Core CONDITION QT_FEATURE_settings AND WIN32 AND NOT WINRT +qt_extend_target(Core CONDITION QT_FEATURE_settings AND WIN32 AND NOT WINRT SOURCES io/qsettings_win.cpp ) -extend_target(Core CONDITION QT_FEATURE_settings AND WINRT +qt_extend_target(Core CONDITION QT_FEATURE_settings AND WINRT SOURCES io/qsettings_winrt.cpp ) -extend_target(Core CONDITION APPLE AND QT_FEATURE_settings AND NOT NACL +qt_extend_target(Core CONDITION APPLE AND QT_FEATURE_settings AND NOT NACL SOURCES io/qsettings_mac.cpp ) -extend_target(Core CONDITION QT_FEATURE_filesystemiterator AND WIN32 +qt_extend_target(Core CONDITION QT_FEATURE_filesystemiterator AND WIN32 SOURCES io/qfilesystemiterator_win.cpp ) -extend_target(Core CONDITION WINRT +qt_extend_target(Core CONDITION WINRT SOURCES io/qstandardpaths_winrt.cpp io/qstorageinfo_stub.cpp @@ -793,7 +793,7 @@ extend_target(Core CONDITION WINRT kernel/qfunctions_winrt.cpp kernel/qfunctions_winrt.h ) -extend_target(Core CONDITION UNIX AND NOT APPLE_UIKIT AND NOT INTEGRITY AND NOT rtems +qt_extend_target(Core CONDITION UNIX AND NOT APPLE_UIKIT AND NOT INTEGRITY AND NOT rtems SOURCES ../3rdparty/forkfd/forkfd.h io/forkfd_qt.cpp @@ -801,17 +801,17 @@ extend_target(Core CONDITION UNIX AND NOT APPLE_UIKIT AND NOT INTEGRITY AND NOT ../3rdparty/forkfd ) -extend_target(Core CONDITION APPLE AND QT_FEATURE_processenvironment +qt_extend_target(Core CONDITION APPLE AND QT_FEATURE_processenvironment SOURCES io/qprocess_darwin.mm ) -extend_target(Core CONDITION APPLE AND NOT APPLE_OSX +qt_extend_target(Core CONDITION APPLE AND NOT APPLE_OSX PUBLIC_LIBRARIES ${FWMobileCoreServices} ) -extend_target(Core CONDITION ANDROID AND NOT ANDROID_EMBEDDED +qt_extend_target(Core CONDITION ANDROID AND NOT ANDROID_EMBEDDED SOURCES io/qstandardpaths_android.cpp io/qstorageinfo_unix.cpp @@ -820,7 +820,7 @@ extend_target(Core CONDITION ANDROID AND NOT ANDROID_EMBEDDED kernel/qjnionload.cpp ) -extend_target(Core CONDITION HAIKU AND (ANDROID_EMBEDDED OR NOT ANDROID) +qt_extend_target(Core CONDITION HAIKU AND (ANDROID_EMBEDDED OR NOT ANDROID) SOURCES io/qstandardpaths_haiku.cpp io/qstorageinfo_unix.cpp @@ -828,107 +828,107 @@ extend_target(Core CONDITION HAIKU AND (ANDROID_EMBEDDED OR NOT ANDROID) be ) -extend_target(Core CONDITION UNIX AND NOT APPLE AND NOT HAIKU AND (ANDROID_EMBEDDED OR NOT ANDROID) +qt_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 ) -extend_target(Core CONDITION QT_FEATURE_proxymodel +qt_extend_target(Core CONDITION QT_FEATURE_proxymodel SOURCES itemmodels/qabstractproxymodel.cpp itemmodels/qabstractproxymodel.h itemmodels/qabstractproxymodel_p.h ) -extend_target(Core CONDITION QT_FEATURE_concatenatetablesproxymodel AND QT_FEATURE_proxymodel +qt_extend_target(Core CONDITION QT_FEATURE_concatenatetablesproxymodel AND QT_FEATURE_proxymodel SOURCES itemmodels/qconcatenatetablesproxymodel.cpp itemmodels/qconcatenatetablesproxymodel.h ) -extend_target(Core CONDITION QT_FEATURE_identityproxymodel AND QT_FEATURE_proxymodel +qt_extend_target(Core CONDITION QT_FEATURE_identityproxymodel AND QT_FEATURE_proxymodel SOURCES itemmodels/qidentityproxymodel.cpp itemmodels/qidentityproxymodel.h ) -extend_target(Core CONDITION QT_FEATURE_proxymodel AND QT_FEATURE_sortfilterproxymodel +qt_extend_target(Core CONDITION QT_FEATURE_proxymodel AND QT_FEATURE_sortfilterproxymodel SOURCES itemmodels/qsortfilterproxymodel.cpp itemmodels/qsortfilterproxymodel.h ) -extend_target(Core CONDITION QT_FEATURE_proxymodel AND QT_FEATURE_transposeproxymodel +qt_extend_target(Core CONDITION QT_FEATURE_proxymodel AND QT_FEATURE_transposeproxymodel SOURCES itemmodels/qtransposeproxymodel.cpp itemmodels/qtransposeproxymodel.h itemmodels/qtransposeproxymodel_p.h ) -extend_target(Core CONDITION QT_FEATURE_stringlistmodel +qt_extend_target(Core CONDITION QT_FEATURE_stringlistmodel SOURCES itemmodels/qstringlistmodel.cpp itemmodels/qstringlistmodel.h ) -extend_target(Core CONDITION QT_FEATURE_library +qt_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 ) -extend_target(Core CONDITION QT_FEATURE_library AND UNIX +qt_extend_target(Core CONDITION QT_FEATURE_library AND UNIX SOURCES plugin/qlibrary_unix.cpp ) -extend_target(Core CONDITION QT_FEATURE_library AND WIN32 +qt_extend_target(Core CONDITION QT_FEATURE_library AND WIN32 SOURCES plugin/qlibrary_win.cpp ) -extend_target(Core CONDITION QT_FEATURE_dlopen AND QT_FEATURE_library +qt_extend_target(Core CONDITION QT_FEATURE_dlopen AND QT_FEATURE_library LIBRARIES ${CMAKE_DL_LIBS} ) -extend_target(Core CONDITION APPLE AND NOT NACL +qt_extend_target(Core CONDITION APPLE AND NOT NACL SOURCES kernel/qelapsedtimer_mac.cpp ) -extend_target(Core CONDITION APPLE AND (APPLE_IOS OR APPLE_TVOS) +qt_extend_target(Core CONDITION APPLE AND (APPLE_IOS OR APPLE_TVOS) LIBRARIES ${FWUIKit} ) -extend_target(Core CONDITION APPLE_WATCHOS +qt_extend_target(Core CONDITION APPLE_WATCHOS LIBRARIES ${FWWatchKit} ) -extend_target(Core CONDITION NACL +qt_extend_target(Core CONDITION NACL SOURCES kernel/qfunctions_nacl.cpp kernel/qfunctions_nacl.h ) -extend_target(Core CONDITION INTEGRITY OR (NACL AND UNIX) OR (UNIX AND NOT APPLE) +qt_extend_target(Core CONDITION INTEGRITY OR (NACL AND UNIX) OR (UNIX AND NOT APPLE) SOURCES kernel/qelapsedtimer_unix.cpp ) -extend_target(Core CONDITION QT_FEATURE_poll_select AND UNIX +qt_extend_target(Core CONDITION QT_FEATURE_poll_select AND UNIX SOURCES kernel/qpoll.cpp ) -extend_target(Core CONDITION QT_FEATURE_glib AND UNIX +qt_extend_target(Core CONDITION QT_FEATURE_glib AND UNIX SOURCES kernel/qeventdispatcher_glib.cpp kernel/qeventdispatcher_glib_p.h LIBRARIES GLIB2::GLIB2 ) -extend_target(Core CONDITION QT_FEATURE_clock_gettime AND UNIX +qt_extend_target(Core CONDITION QT_FEATURE_clock_gettime AND UNIX LIBRARIES WrapRt ) -extend_target(Core CONDITION UNIX AND NOT ANDROID +qt_extend_target(Core CONDITION UNIX AND NOT ANDROID SOURCES kernel/qsharedmemory_posix.cpp kernel/qsharedmemory_systemv.cpp @@ -938,12 +938,12 @@ extend_target(Core CONDITION UNIX AND NOT ANDROID kernel/qsystemsemaphore_unix.cpp ) -extend_target(Core CONDITION VXWORKS +qt_extend_target(Core CONDITION VXWORKS SOURCES kernel/qfunctions_vxworks.cpp kernel/qfunctions_vxworks.h ) -extend_target(Core CONDITION QNX AND QT_FEATURE_qqnx_pps +qt_extend_target(Core CONDITION QNX AND QT_FEATURE_qqnx_pps SOURCES kernel/qppsattribute.cpp kernel/qppsattribute_p.h kernel/qppsattributeprivate_p.h @@ -953,25 +953,25 @@ extend_target(Core CONDITION QNX AND QT_FEATURE_qqnx_pps PPS::PPS ) -extend_target(Core CONDITION QT_FEATURE_textcodec +qt_extend_target(Core CONDITION QT_FEATURE_textcodec SOURCES codecs/qlatincodec.cpp codecs/qlatincodec_p.h codecs/qsimplecodec.cpp codecs/qsimplecodec_p.h codecs/qtextcodec.cpp codecs/qtextcodec.h ) -extend_target(Core CONDITION QT_FEATURE_codecs AND QT_FEATURE_textcodec +qt_extend_target(Core CONDITION QT_FEATURE_codecs AND QT_FEATURE_textcodec SOURCES codecs/qisciicodec.cpp codecs/qisciicodec_p.h codecs/qtsciicodec.cpp codecs/qtsciicodec_p.h ) -extend_target(Core CONDITION QT_FEATURE_icu AND QT_FEATURE_textcodec +qt_extend_target(Core CONDITION QT_FEATURE_icu AND QT_FEATURE_textcodec SOURCES codecs/qicucodec.cpp codecs/qicucodec_p.h ) -extend_target(Core CONDITION QT_FEATURE_big_codecs AND QT_FEATURE_textcodec AND NOT QT_FEATURE_icu +qt_extend_target(Core CONDITION QT_FEATURE_big_codecs AND QT_FEATURE_textcodec AND NOT QT_FEATURE_icu SOURCES codecs/qbig5codec.cpp codecs/qbig5codec_p.h codecs/qeucjpcodec.cpp codecs/qeucjpcodec_p.h @@ -982,29 +982,29 @@ extend_target(Core CONDITION QT_FEATURE_big_codecs AND QT_FEATURE_textcodec AND codecs/qsjiscodec.cpp codecs/qsjiscodec_p.h ) -extend_target(Core CONDITION QT_FEATURE_iconv AND QT_FEATURE_textcodec AND NOT QT_FEATURE_icu +qt_extend_target(Core CONDITION QT_FEATURE_iconv AND QT_FEATURE_textcodec AND NOT QT_FEATURE_icu SOURCES codecs/qiconvcodec.cpp codecs/qiconvcodec_p.h LIBRARIES iconv ) -extend_target(Core CONDITION QT_FEATURE_textcodec AND WIN32 AND NOT QT_FEATURE_icu +qt_extend_target(Core CONDITION QT_FEATURE_textcodec AND WIN32 AND NOT QT_FEATURE_icu SOURCES codecs/qwindowscodec.cpp codecs/qwindowscodec_p.h ) -extend_target(Core CONDITION QT_FEATURE_cborstream +qt_extend_target(Core CONDITION QT_FEATURE_cborstream SOURCES serialization/qcborstream.cpp serialization/qcborstream.h ) -extend_target(Core CONDITION QT_FEATURE_qeventtransition +qt_extend_target(Core CONDITION QT_FEATURE_qeventtransition SOURCES statemachine/qeventtransition.cpp statemachine/qeventtransition.h statemachine/qeventtransition_p.h ) -extend_target(Core CONDITION QT_FEATURE_mimetype +qt_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 @@ -1024,7 +1024,7 @@ if(QT_FEATURE_mimetype AND QT_FEATURE_mimetype_database) "mime/packages/freedesktop.org.xml" ) - add_qt_resource(Core "mimetypes" + qt_add_resource(Core "mimetypes" PREFIX "/qt-project.org/qmime/packages" BASE @@ -1034,14 +1034,14 @@ if(QT_FEATURE_mimetype AND QT_FEATURE_mimetype_database) ) endif() -extend_target(Core CONDITION WASM +qt_extend_target(Core CONDITION WASM SOURCES platform/wasm/qstdweb.cpp platform/wasm/qstdweb_p.h ) qt_create_tracepoints(Core qtcore.tracepoints) -add_qt_docs(Core +qt_add_docs(Core doc/qtcore.qdocconf ) diff --git a/src/corelib/CMakeLists.txt b/src/corelib/CMakeLists.txt index 25457b4628..4b507814b2 100644 --- a/src/corelib/CMakeLists.txt +++ b/src/corelib/CMakeLists.txt @@ -26,7 +26,7 @@ file(RELATIVE_PATH QT_INVERSE_CONFIG_INSTALL_DIR ${_clean_prefix} ${CMAKE_INSTAL ## Core Module: ##################################################################### -add_qt_module(Core +qt_add_module(Core QMAKE_MODULE_CONFIG moc resources EXCEPTIONS SOURCES @@ -328,7 +328,7 @@ if (LINUX AND NOT CMAKE_CROSSCOMPILING AND BUILD_SHARED_LIBS) endif() # special case end -add_qt_simd_part(Core SIMD mips_dsp +qt_add_simd_part(Core SIMD mips_dsp SOURCES ../gui/painting/qt_mips_asm_dsp_p.h text/qstring_mips_dsp_asm.S @@ -392,7 +392,7 @@ endif() #### Keys ignored in scope 3:.:.:corelib.pro:NOT QT_NAMESPACE_ISEMPTY: # MODULE_DEFINES = "QT_NAMESPACE=$$QT_NAMESPACE" -extend_target(Core CONDITION ANDROID +qt_extend_target(Core CONDITION ANDROID SOURCES kernel/qsharedmemory_android.cpp kernel/qsystemsemaphore_android.cpp @@ -400,7 +400,7 @@ extend_target(Core CONDITION ANDROID LIBS_SUFFIX="\\\\"_${CMAKE_SYSTEM_PROCESSOR}.so\\\\"" # special case ) -extend_target(Core CONDITION MSVC AND (TEST_architecture_arch STREQUAL "i386") +qt_extend_target(Core CONDITION MSVC AND (TEST_architecture_arch STREQUAL "i386") LINK_OPTIONS "/BASE:0x67000000" ) @@ -408,7 +408,7 @@ 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> -extend_target(Core CONDITION QT_FEATURE_animation +qt_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 @@ -419,7 +419,7 @@ extend_target(Core CONDITION QT_FEATURE_animation animation/qvariantanimation.cpp animation/qvariantanimation.h animation/qvariantanimation_p.h ) -extend_target(Core CONDITION WIN32 +qt_extend_target(Core CONDITION WIN32 SOURCES global/qoperatingsystemversion_win.cpp global/qoperatingsystemversion_win_p.h io/qfilesystemengine_win.cpp @@ -438,7 +438,7 @@ extend_target(Core CONDITION WIN32 ws2_32 ) -extend_target(Core CONDITION WIN32 AND NOT WINRT +qt_extend_target(Core CONDITION WIN32 AND NOT WINRT SOURCES io/qstandardpaths_win.cpp io/qstorageinfo_win.cpp @@ -461,7 +461,7 @@ extend_target(Core CONDITION WIN32 AND NOT WINRT userenv ) -extend_target(Core CONDITION APPLE +qt_extend_target(Core CONDITION APPLE SOURCES global/qoperatingsystemversion_darwin.mm io/qstandardpaths_mac.mm @@ -477,7 +477,7 @@ extend_target(Core CONDITION APPLE ${FWFoundation} ) -extend_target(Core CONDITION APPLE_OSX +qt_extend_target(Core CONDITION APPLE_OSX LIBRARIES ${FWAppKit} ${FWApplicationServices} @@ -488,7 +488,7 @@ extend_target(Core CONDITION APPLE_OSX ${FWIOKit} ) -extend_target(Core CONDITION INTEGRITY +qt_extend_target(Core CONDITION INTEGRITY LIBRARIES ivfs net @@ -534,7 +534,7 @@ extend_target(Core CONDITION INTEGRITY #) # special case end -extend_target(Core CONDITION LINUX AND NOT static +qt_extend_target(Core CONDITION LINUX AND NOT static SOURCES global/minimum-linux_p.h ) @@ -551,17 +551,17 @@ extend_target(Core CONDITION LINUX AND NOT static #### Keys ignored in scope 34:.:global:global/global.pri:silent: # no_pch_assembler.commands = "@echo" "compiling[no_pch]" "${QMAKE_FILE_IN}" "&&" -extend_target(Core CONDITION LINUX AND NOT precompile_header AND NOT static +qt_extend_target(Core CONDITION LINUX AND NOT precompile_header AND NOT static SOURCES global/minimum-linux.S ) -extend_target(Core CONDITION QT_FEATURE_slog2 +qt_extend_target(Core CONDITION QT_FEATURE_slog2 LIBRARIES Slog2::Slog2 ) -extend_target(Core CONDITION QT_FEATURE_journald +qt_extend_target(Core CONDITION QT_FEATURE_journald LIBRARIES PkgConfig::Libsystemd ) @@ -578,12 +578,12 @@ extend_target(Core CONDITION QT_FEATURE_journald #### Keys ignored in scope 39:.:global:global/global.pri:silent: # versiontagging_compiler.commands = "@echo" "compiling[versiontagging]" "${QMAKE_FILE_IN}" "&&" -extend_target(Core CONDITION NOT GCC OR NOT ltcg +qt_extend_target(Core CONDITION NOT GCC OR NOT ltcg SOURCES global/qversiontagging.cpp ) -extend_target(Core CONDITION UNIX +qt_extend_target(Core CONDITION UNIX SOURCES io/qfilesystemengine_unix.cpp io/qfilesystemiterator_unix.cpp @@ -596,7 +596,7 @@ extend_target(Core CONDITION UNIX thread/qthread_unix.cpp ) -extend_target(Core CONDITION QT_FEATURE_thread +qt_extend_target(Core CONDITION QT_FEATURE_thread SOURCES thread/qatomic.cpp thread/qatomic.h thread/qatomic_bootstrap.h @@ -614,33 +614,33 @@ extend_target(Core CONDITION QT_FEATURE_thread thread/qthreadstorage.cpp ) -extend_target(Core CONDITION QT_FEATURE_thread AND WIN32 +qt_extend_target(Core CONDITION QT_FEATURE_thread AND WIN32 SOURCES thread/qmutex_win.cpp thread/qwaitcondition_win.cpp ) -extend_target(Core CONDITION QT_FEATURE_thread AND UNIX +qt_extend_target(Core CONDITION QT_FEATURE_thread AND UNIX SOURCES thread/qwaitcondition_unix.cpp ) -extend_target(Core CONDITION APPLE AND QT_FEATURE_thread +qt_extend_target(Core CONDITION APPLE AND QT_FEATURE_thread SOURCES thread/qmutex_mac.cpp ) -extend_target(Core CONDITION LINUX AND QT_FEATURE_thread +qt_extend_target(Core CONDITION LINUX AND QT_FEATURE_thread SOURCES thread/qmutex_linux.cpp ) -extend_target(Core CONDITION QT_FEATURE_thread AND UNIX AND NOT APPLE AND NOT LINUX +qt_extend_target(Core CONDITION QT_FEATURE_thread AND UNIX AND NOT APPLE AND NOT LINUX SOURCES thread/qmutex_unix.cpp ) -extend_target(Core CONDITION QT_FEATURE_future +qt_extend_target(Core CONDITION QT_FEATURE_future SOURCES thread/qexception.cpp thread/qexception.h thread/qfuture.h @@ -650,57 +650,57 @@ extend_target(Core CONDITION QT_FEATURE_future thread/qresultstore.cpp thread/qresultstore.h ) -extend_target(Core CONDITION QT_FEATURE_std_atomic64 +qt_extend_target(Core CONDITION QT_FEATURE_std_atomic64 PUBLIC_LIBRARIES Atomic ) -extend_target(Core CONDITION ICC +qt_extend_target(Core CONDITION ICC COMPILE_OPTIONS -fp-model strict ) -extend_target(Core CONDITION MSVC +qt_extend_target(Core CONDITION MSVC SOURCES tools/qvector_msvc.cpp NO_PCH_SOURCES "tools/qvector_msvc.cpp" ) -extend_target(Core CONDITION QT_FEATURE_commandlineparser +qt_extend_target(Core CONDITION QT_FEATURE_commandlineparser SOURCES tools/qcommandlineoption.cpp tools/qcommandlineoption.h tools/qcommandlineparser.cpp tools/qcommandlineparser.h ) -extend_target(Core CONDITION QT_FEATURE_easingcurve +qt_extend_target(Core CONDITION QT_FEATURE_easingcurve SOURCES tools/qeasingcurve.cpp tools/qeasingcurve.h tools/qtimeline.cpp tools/qtimeline.h ) -extend_target(Core CONDITION UNIX AND NOT HAIKU AND NOT INTEGRITY AND NOT VXWORKS AND NOT WASM AND (NOT APPLE_OSX OR NOT ICC) +qt_extend_target(Core CONDITION UNIX AND NOT HAIKU AND NOT INTEGRITY AND NOT VXWORKS AND NOT WASM AND (NOT APPLE_OSX OR NOT ICC) LIBRARIES m ) -extend_target(Core CONDITION APPLE_OSX AND NOT NACL +qt_extend_target(Core CONDITION APPLE_OSX AND NOT NACL SOURCES text/qlocale_mac.mm ) -extend_target(Core CONDITION UNIX AND (NACL OR NOT APPLE_OSX) +qt_extend_target(Core CONDITION UNIX AND (NACL OR NOT APPLE_OSX) SOURCES text/qlocale_unix.cpp ) -extend_target(Core CONDITION WIN32 AND (NACL OR NOT APPLE_OSX) +qt_extend_target(Core CONDITION WIN32 AND (NACL OR NOT APPLE_OSX) SOURCES text/qlocale_win.cpp ) -extend_target(Core CONDITION QT_FEATURE_icu +qt_extend_target(Core CONDITION QT_FEATURE_icu SOURCES text/qcollator_icu.cpp text/qlocale_icu.cpp @@ -708,159 +708,159 @@ extend_target(Core CONDITION QT_FEATURE_icu ICU::i18n ICU::uc ICU::data ) -extend_target(Core CONDITION WIN32 AND NOT QT_FEATURE_icu +qt_extend_target(Core CONDITION WIN32 AND NOT QT_FEATURE_icu SOURCES text/qcollator_win.cpp ) -extend_target(Core CONDITION APPLE_OSX AND NOT QT_FEATURE_icu +qt_extend_target(Core CONDITION APPLE_OSX AND NOT QT_FEATURE_icu SOURCES text/qcollator_macx.cpp ) -extend_target(Core CONDITION UNIX AND NOT APPLE_OSX AND NOT QT_FEATURE_icu +qt_extend_target(Core CONDITION UNIX AND NOT APPLE_OSX AND NOT QT_FEATURE_icu SOURCES text/qcollator_posix.cpp ) -extend_target(Core CONDITION QT_FEATURE_regularexpression +qt_extend_target(Core CONDITION QT_FEATURE_regularexpression SOURCES text/qregularexpression.cpp text/qregularexpression.h LIBRARIES WrapPCRE2::WrapPCRE2 ) -extend_target(Core CONDITION QT_FEATURE_hijricalendar +qt_extend_target(Core CONDITION QT_FEATURE_hijricalendar SOURCES time/qhijricalendar.cpp time/qhijricalendar_p.h time/qhijricalendar_data_p.h ) -extend_target(Core CONDITION QT_FEATURE_islamiccivilcalendar +qt_extend_target(Core CONDITION QT_FEATURE_islamiccivilcalendar SOURCES time/qislamiccivilcalendar.cpp time/qislamiccivilcalendar_p.h ) -extend_target(Core CONDITION QT_FEATURE_jalalicalendar +qt_extend_target(Core CONDITION QT_FEATURE_jalalicalendar SOURCES time/qjalalicalendar.cpp time/qjalalicalendar_p.h time/qjalalicalendar_data_p.h ) -extend_target(Core CONDITION QT_FEATURE_timezone +qt_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 ) -extend_target(Core CONDITION APPLE AND QT_FEATURE_timezone AND NOT NACL +qt_extend_target(Core CONDITION APPLE AND QT_FEATURE_timezone AND NOT NACL SOURCES time/qtimezoneprivate_mac.mm ) -extend_target(Core CONDITION ANDROID AND QT_FEATURE_timezone AND NOT ANDROID_EMBEDDED AND (NACL OR NOT APPLE) +qt_extend_target(Core CONDITION ANDROID AND QT_FEATURE_timezone AND NOT ANDROID_EMBEDDED AND (NACL OR NOT APPLE) SOURCES time/qtimezoneprivate_android.cpp ) -extend_target(Core CONDITION QT_FEATURE_timezone AND UNIX AND (ANDROID_EMBEDDED OR NOT ANDROID) AND (NACL OR NOT APPLE) +qt_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 ) -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_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 ) -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_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 ) -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_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 ) -extend_target(Core CONDITION QT_FEATURE_datetimeparser +qt_extend_target(Core CONDITION QT_FEATURE_datetimeparser SOURCES time/qdatetimeparser.cpp time/qdatetimeparser_p.h ) -extend_target(Core CONDITION QT_FEATURE_zstd +qt_extend_target(Core CONDITION QT_FEATURE_zstd LIBRARIES ZSTD::ZSTD ) -extend_target(Core CONDITION QT_FEATURE_filesystemwatcher +qt_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 ) -extend_target(Core CONDITION QT_FEATURE_filesystemwatcher AND WIN32 +qt_extend_target(Core CONDITION QT_FEATURE_filesystemwatcher AND WIN32 SOURCES io/qfilesystemwatcher_win.cpp io/qfilesystemwatcher_win_p.h ) -extend_target(Core CONDITION APPLE_OSX AND QT_FEATURE_filesystemwatcher +qt_extend_target(Core CONDITION APPLE_OSX AND QT_FEATURE_filesystemwatcher SOURCES io/qfilesystemwatcher_fsevents.mm io/qfilesystemwatcher_fsevents_p.h ) -extend_target(Core CONDITION QT_FEATURE_filesystemwatcher AND QT_FEATURE_inotify AND UNIX AND NOT APPLE_OSX +qt_extend_target(Core CONDITION QT_FEATURE_filesystemwatcher AND QT_FEATURE_inotify AND UNIX AND NOT APPLE_OSX SOURCES io/qfilesystemwatcher_inotify.cpp io/qfilesystemwatcher_inotify_p.h ) -extend_target(Core CONDITION QT_FEATURE_filesystemwatcher AND UNIX AND NOT APPLE_OSX AND NOT QT_FEATURE_inotify AND (APPLE OR FREEBSD OR NETBSD OR OPENBSD) +qt_extend_target(Core CONDITION QT_FEATURE_filesystemwatcher AND UNIX AND NOT APPLE_OSX AND NOT QT_FEATURE_inotify AND (APPLE OR FREEBSD OR NETBSD OR OPENBSD) SOURCES io/qfilesystemwatcher_kqueue.cpp io/qfilesystemwatcher_kqueue_p.h ) -extend_target(Core CONDITION QT_FEATURE_processenvironment +qt_extend_target(Core CONDITION QT_FEATURE_processenvironment SOURCES io/qprocess.cpp io/qprocess.h io/qprocess_p.h ) -extend_target(Core CONDITION QT_FEATURE_processenvironment AND WIN32 AND NOT WINRT +qt_extend_target(Core CONDITION QT_FEATURE_processenvironment AND WIN32 AND NOT WINRT SOURCES io/qprocess_win.cpp ) -extend_target(Core CONDITION QT_FEATURE_processenvironment AND UNIX +qt_extend_target(Core CONDITION QT_FEATURE_processenvironment AND UNIX SOURCES io/qprocess_unix.cpp ) -extend_target(Core CONDITION QT_FEATURE_settings +qt_extend_target(Core CONDITION QT_FEATURE_settings SOURCES io/qsettings.cpp io/qsettings.h io/qsettings_p.h ) -extend_target(Core CONDITION QT_FEATURE_settings AND WIN32 AND NOT WINRT +qt_extend_target(Core CONDITION QT_FEATURE_settings AND WIN32 AND NOT WINRT SOURCES io/qsettings_win.cpp ) -extend_target(Core CONDITION QT_FEATURE_settings AND WINRT +qt_extend_target(Core CONDITION QT_FEATURE_settings AND WINRT SOURCES io/qsettings_winrt.cpp ) -extend_target(Core CONDITION APPLE AND QT_FEATURE_settings AND NOT NACL +qt_extend_target(Core CONDITION APPLE AND QT_FEATURE_settings AND NOT NACL SOURCES io/qsettings_mac.cpp ) -extend_target(Core CONDITION QT_FEATURE_filesystemiterator AND WIN32 +qt_extend_target(Core CONDITION QT_FEATURE_filesystemiterator AND WIN32 SOURCES io/qfilesystemiterator_win.cpp ) -extend_target(Core CONDITION WINRT +qt_extend_target(Core CONDITION WINRT SOURCES io/qstandardpaths_winrt.cpp io/qstorageinfo_stub.cpp @@ -869,7 +869,7 @@ extend_target(Core CONDITION WINRT kernel/qfunctions_winrt.cpp kernel/qfunctions_winrt.h ) -extend_target(Core CONDITION UNIX AND NOT APPLE_UIKIT AND NOT INTEGRITY AND NOT rtems +qt_extend_target(Core CONDITION UNIX AND NOT APPLE_UIKIT AND NOT INTEGRITY AND NOT rtems SOURCES ../3rdparty/forkfd/forkfd.h io/forkfd_qt.cpp @@ -877,17 +877,17 @@ extend_target(Core CONDITION UNIX AND NOT APPLE_UIKIT AND NOT INTEGRITY AND NOT ../3rdparty/forkfd ) -extend_target(Core CONDITION APPLE AND QT_FEATURE_processenvironment +qt_extend_target(Core CONDITION APPLE AND QT_FEATURE_processenvironment SOURCES io/qprocess_darwin.mm ) -extend_target(Core CONDITION APPLE AND NOT APPLE_OSX +qt_extend_target(Core CONDITION APPLE AND NOT APPLE_OSX PUBLIC_LIBRARIES ${FWMobileCoreServices} ) -extend_target(Core CONDITION ANDROID AND NOT ANDROID_EMBEDDED +qt_extend_target(Core CONDITION ANDROID AND NOT ANDROID_EMBEDDED SOURCES io/qstandardpaths_android.cpp io/qstorageinfo_unix.cpp @@ -896,7 +896,7 @@ extend_target(Core CONDITION ANDROID AND NOT ANDROID_EMBEDDED kernel/qjnionload.cpp ) -extend_target(Core CONDITION HAIKU AND (ANDROID_EMBEDDED OR NOT ANDROID) +qt_extend_target(Core CONDITION HAIKU AND (ANDROID_EMBEDDED OR NOT ANDROID) SOURCES io/qstandardpaths_haiku.cpp io/qstorageinfo_unix.cpp @@ -904,107 +904,107 @@ extend_target(Core CONDITION HAIKU AND (ANDROID_EMBEDDED OR NOT ANDROID) be ) -extend_target(Core CONDITION UNIX AND NOT APPLE AND NOT HAIKU AND (ANDROID_EMBEDDED OR NOT ANDROID) +qt_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 ) -extend_target(Core CONDITION QT_FEATURE_proxymodel +qt_extend_target(Core CONDITION QT_FEATURE_proxymodel SOURCES itemmodels/qabstractproxymodel.cpp itemmodels/qabstractproxymodel.h itemmodels/qabstractproxymodel_p.h ) -extend_target(Core CONDITION QT_FEATURE_concatenatetablesproxymodel AND QT_FEATURE_proxymodel +qt_extend_target(Core CONDITION QT_FEATURE_concatenatetablesproxymodel AND QT_FEATURE_proxymodel SOURCES itemmodels/qconcatenatetablesproxymodel.cpp itemmodels/qconcatenatetablesproxymodel.h ) -extend_target(Core CONDITION QT_FEATURE_identityproxymodel AND QT_FEATURE_proxymodel +qt_extend_target(Core CONDITION QT_FEATURE_identityproxymodel AND QT_FEATURE_proxymodel SOURCES itemmodels/qidentityproxymodel.cpp itemmodels/qidentityproxymodel.h ) -extend_target(Core CONDITION QT_FEATURE_proxymodel AND QT_FEATURE_sortfilterproxymodel +qt_extend_target(Core CONDITION QT_FEATURE_proxymodel AND QT_FEATURE_sortfilterproxymodel SOURCES itemmodels/qsortfilterproxymodel.cpp itemmodels/qsortfilterproxymodel.h ) -extend_target(Core CONDITION QT_FEATURE_proxymodel AND QT_FEATURE_transposeproxymodel +qt_extend_target(Core CONDITION QT_FEATURE_proxymodel AND QT_FEATURE_transposeproxymodel SOURCES itemmodels/qtransposeproxymodel.cpp itemmodels/qtransposeproxymodel.h itemmodels/qtransposeproxymodel_p.h ) -extend_target(Core CONDITION QT_FEATURE_stringlistmodel +qt_extend_target(Core CONDITION QT_FEATURE_stringlistmodel SOURCES itemmodels/qstringlistmodel.cpp itemmodels/qstringlistmodel.h ) -extend_target(Core CONDITION QT_FEATURE_library +qt_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 ) -extend_target(Core CONDITION QT_FEATURE_library AND UNIX +qt_extend_target(Core CONDITION QT_FEATURE_library AND UNIX SOURCES plugin/qlibrary_unix.cpp ) -extend_target(Core CONDITION QT_FEATURE_library AND WIN32 +qt_extend_target(Core CONDITION QT_FEATURE_library AND WIN32 SOURCES plugin/qlibrary_win.cpp ) -extend_target(Core CONDITION QT_FEATURE_dlopen AND QT_FEATURE_library +qt_extend_target(Core CONDITION QT_FEATURE_dlopen AND QT_FEATURE_library LIBRARIES ${CMAKE_DL_LIBS} ) -extend_target(Core CONDITION APPLE AND NOT NACL +qt_extend_target(Core CONDITION APPLE AND NOT NACL SOURCES kernel/qelapsedtimer_mac.cpp ) -extend_target(Core CONDITION APPLE AND (APPLE_IOS OR APPLE_TVOS) +qt_extend_target(Core CONDITION APPLE AND (APPLE_IOS OR APPLE_TVOS) LIBRARIES ${FWUIKit} ) -extend_target(Core CONDITION APPLE_WATCHOS +qt_extend_target(Core CONDITION APPLE_WATCHOS LIBRARIES ${FWWatchKit} ) -extend_target(Core CONDITION NACL +qt_extend_target(Core CONDITION NACL SOURCES kernel/qfunctions_nacl.cpp kernel/qfunctions_nacl.h ) -extend_target(Core CONDITION INTEGRITY OR (NACL AND UNIX) OR (UNIX AND NOT APPLE) +qt_extend_target(Core CONDITION INTEGRITY OR (NACL AND UNIX) OR (UNIX AND NOT APPLE) SOURCES kernel/qelapsedtimer_unix.cpp ) -extend_target(Core CONDITION QT_FEATURE_poll_select AND UNIX +qt_extend_target(Core CONDITION QT_FEATURE_poll_select AND UNIX SOURCES kernel/qpoll.cpp ) -extend_target(Core CONDITION QT_FEATURE_glib AND UNIX +qt_extend_target(Core CONDITION QT_FEATURE_glib AND UNIX SOURCES kernel/qeventdispatcher_glib.cpp kernel/qeventdispatcher_glib_p.h LIBRARIES GLIB2::GLIB2 ) -extend_target(Core CONDITION QT_FEATURE_clock_gettime AND UNIX +qt_extend_target(Core CONDITION QT_FEATURE_clock_gettime AND UNIX LIBRARIES WrapRt ) -extend_target(Core CONDITION UNIX AND NOT ANDROID +qt_extend_target(Core CONDITION UNIX AND NOT ANDROID SOURCES kernel/qsharedmemory_posix.cpp kernel/qsharedmemory_systemv.cpp @@ -1014,12 +1014,12 @@ extend_target(Core CONDITION UNIX AND NOT ANDROID kernel/qsystemsemaphore_unix.cpp ) -extend_target(Core CONDITION VXWORKS +qt_extend_target(Core CONDITION VXWORKS SOURCES kernel/qfunctions_vxworks.cpp kernel/qfunctions_vxworks.h ) -extend_target(Core CONDITION QNX AND QT_FEATURE_qqnx_pps +qt_extend_target(Core CONDITION QNX AND QT_FEATURE_qqnx_pps SOURCES kernel/qppsattribute.cpp kernel/qppsattribute_p.h kernel/qppsattributeprivate_p.h @@ -1029,25 +1029,25 @@ extend_target(Core CONDITION QNX AND QT_FEATURE_qqnx_pps PPS::PPS ) -extend_target(Core CONDITION QT_FEATURE_textcodec +qt_extend_target(Core CONDITION QT_FEATURE_textcodec SOURCES codecs/qlatincodec.cpp codecs/qlatincodec_p.h codecs/qsimplecodec.cpp codecs/qsimplecodec_p.h codecs/qtextcodec.cpp codecs/qtextcodec.h ) -extend_target(Core CONDITION QT_FEATURE_codecs AND QT_FEATURE_textcodec +qt_extend_target(Core CONDITION QT_FEATURE_codecs AND QT_FEATURE_textcodec SOURCES codecs/qisciicodec.cpp codecs/qisciicodec_p.h codecs/qtsciicodec.cpp codecs/qtsciicodec_p.h ) -extend_target(Core CONDITION QT_FEATURE_icu AND QT_FEATURE_textcodec +qt_extend_target(Core CONDITION QT_FEATURE_icu AND QT_FEATURE_textcodec SOURCES codecs/qicucodec.cpp codecs/qicucodec_p.h ) -extend_target(Core CONDITION QT_FEATURE_big_codecs AND QT_FEATURE_textcodec AND NOT QT_FEATURE_icu +qt_extend_target(Core CONDITION QT_FEATURE_big_codecs AND QT_FEATURE_textcodec AND NOT QT_FEATURE_icu SOURCES codecs/qbig5codec.cpp codecs/qbig5codec_p.h codecs/qeucjpcodec.cpp codecs/qeucjpcodec_p.h @@ -1058,29 +1058,29 @@ extend_target(Core CONDITION QT_FEATURE_big_codecs AND QT_FEATURE_textcodec AND codecs/qsjiscodec.cpp codecs/qsjiscodec_p.h ) -extend_target(Core CONDITION QT_FEATURE_iconv AND QT_FEATURE_textcodec AND NOT QT_FEATURE_icu +qt_extend_target(Core CONDITION QT_FEATURE_iconv AND QT_FEATURE_textcodec AND NOT QT_FEATURE_icu SOURCES codecs/qiconvcodec.cpp codecs/qiconvcodec_p.h LIBRARIES iconv ) -extend_target(Core CONDITION QT_FEATURE_textcodec AND WIN32 AND NOT QT_FEATURE_icu +qt_extend_target(Core CONDITION QT_FEATURE_textcodec AND WIN32 AND NOT QT_FEATURE_icu SOURCES codecs/qwindowscodec.cpp codecs/qwindowscodec_p.h ) -extend_target(Core CONDITION QT_FEATURE_cborstream +qt_extend_target(Core CONDITION QT_FEATURE_cborstream SOURCES serialization/qcborstream.cpp serialization/qcborstream.h ) -extend_target(Core CONDITION QT_FEATURE_qeventtransition +qt_extend_target(Core CONDITION QT_FEATURE_qeventtransition SOURCES statemachine/qeventtransition.cpp statemachine/qeventtransition.h statemachine/qeventtransition_p.h ) -extend_target(Core CONDITION QT_FEATURE_mimetype +qt_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 @@ -1102,7 +1102,7 @@ if(QT_FEATURE_mimetype AND QT_FEATURE_mimetype_database) endif() # special case end -extend_target(Core CONDITION WASM +qt_extend_target(Core CONDITION WASM SOURCES platform/wasm/qstdweb.cpp platform/wasm/qstdweb_p.h ) @@ -1116,7 +1116,7 @@ if(TEST_arch_${TEST_architecture_arch}_subarch_f16c) QFLOAT16_INCLUDE_FAST ) else() - add_qt_simd_part(Core SIMD f16c + qt_add_simd_part(Core SIMD f16c SOURCES global/qfloat16_f16c.c ) @@ -1152,7 +1152,7 @@ endif() # special case end qt_create_tracepoints(Core qtcore.tracepoints) -add_qt_docs(Core +qt_add_docs(Core doc/qtcore.qdocconf ) diff --git a/src/corelib/mimetypes/mimetypes_resources.cmake b/src/corelib/mimetypes/mimetypes_resources.cmake index 42454beb87..33c7e01326 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 alias "freedesktop.org.xml" ) - add_qt_resource(${target} "mimetypes" + qt_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 ef0d29c849..45e1e11a25 100644 --- a/src/dbus/.prev_CMakeLists.txt +++ b/src/dbus/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## DBus Module: ##################################################################### -add_qt_module(DBus +qt_add_module(DBus QMAKE_MODULE_CONFIG dbusadaptors dbusinterfaces SOURCES dbus_minimal_p.h @@ -54,21 +54,21 @@ add_qt_module(DBus ## Scopes: ##################################################################### -extend_target(DBus CONDITION QT_FEATURE_dbus_linked +qt_extend_target(DBus CONDITION QT_FEATURE_dbus_linked DEFINES QT_LINKED_LIBDBUS LIBRARIES dbus-1 ) -extend_target(DBus CONDITION WIN32 +qt_extend_target(DBus CONDITION WIN32 LIBRARIES advapi32 netapi32 user32 ws2_32 ) -add_qt_docs(DBus +qt_add_docs(DBus doc/qtdbus.qdocconf ) diff --git a/src/dbus/CMakeLists.txt b/src/dbus/CMakeLists.txt index 9449328646..d6b6d95798 100644 --- a/src/dbus/CMakeLists.txt +++ b/src/dbus/CMakeLists.txt @@ -4,7 +4,7 @@ ## DBus Module: ##################################################################### -add_qt_module(DBus +qt_add_module(DBus QMAKE_MODULE_CONFIG dbusadaptors dbusinterfaces SOURCES dbus_minimal_p.h @@ -57,21 +57,21 @@ set_source_files_properties(qdbusmarshaller.cpp ## Scopes: ##################################################################### -extend_target(DBus CONDITION QT_FEATURE_dbus_linked +qt_extend_target(DBus CONDITION QT_FEATURE_dbus_linked DEFINES QT_LINKED_LIBDBUS LIBRARIES dbus-1 ) -extend_target(DBus CONDITION WIN32 +qt_extend_target(DBus CONDITION WIN32 LIBRARIES advapi32 netapi32 user32 ws2_32 ) -add_qt_docs(DBus +qt_add_docs(DBus doc/qtdbus.qdocconf ) diff --git a/src/gui/.prev_CMakeLists.txt b/src/gui/.prev_CMakeLists.txt index 1da0aada57..634a2a3209 100644 --- a/src/gui/.prev_CMakeLists.txt +++ b/src/gui/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## Gui Module: ##################################################################### -add_qt_module(Gui +qt_add_module(Gui PLUGIN_TYPES platforms platforms/darwin xcbglintegrations platformthemes platforminputcontexts generic iconengines imageformats egldeviceintegrations SOURCES image/qbitmap.cpp image/qbitmap.h @@ -232,7 +232,7 @@ set(qpdf_resource_files "qpdfa_metadata.xml" ) -add_qt_resource(Gui "qpdf" +qt_add_resource(Gui "qpdf" PREFIX "/qpdf/" BASE @@ -244,7 +244,7 @@ set(qmake_webgradients_resource_files "painting/webgradients.binaryjson" ) -add_qt_resource(Gui "qmake_webgradients" +qt_add_resource(Gui "qmake_webgradients" PREFIX "qgradient" BASE @@ -261,7 +261,7 @@ add_qt_resource(Gui "qmake_webgradients" ## Scopes: ##################################################################### -extend_target(Gui CONDITION QT_FEATURE_opengl +qt_extend_target(Gui CONDITION QT_FEATURE_opengl SOURCES kernel/qopenglcontext.cpp kernel/qopenglcontext.h kernel/qopenglcontext_p.h kernel/qopenglwindow.cpp kernel/qopenglwindow.h @@ -303,7 +303,7 @@ extend_target(Gui CONDITION QT_FEATURE_opengl #### Keys ignored in scope 3:.:.:gui.pro:QT_FEATURE_angle: # MODULE_AUX_INCLUDES = "\$\$QT_MODULE_INCLUDE_BASE/QtANGLE" -extend_target(Gui CONDITION APPLE_OSX +qt_extend_target(Gui CONDITION APPLE_OSX SOURCES rhi/qrhimetal.mm rhi/qrhimetal_p.h rhi/qrhimetal_p_p.h @@ -314,7 +314,7 @@ extend_target(Gui CONDITION APPLE_OSX ${FWMetal} ) -extend_target(Gui CONDITION APPLE +qt_extend_target(Gui CONDITION APPLE SOURCES image/qimage_darwin.mm painting/qcoregraphics.mm painting/qcoregraphics_p.h @@ -322,12 +322,12 @@ extend_target(Gui CONDITION APPLE ${FWCoreGraphics} ) -extend_target(Gui CONDITION QT_FEATURE_animation +qt_extend_target(Gui CONDITION QT_FEATURE_animation SOURCES animation/qguivariantanimation.cpp ) -extend_target(Gui CONDITION WIN32 +qt_extend_target(Gui CONDITION WIN32 SOURCES kernel/qwindowdefs_win.h rhi/qrhid3d11.cpp rhi/qrhid3d11_p.h @@ -379,7 +379,7 @@ extend_target(Gui CONDITION WIN32 #### Keys ignored in scope 22:.:.:gui.pro:QT_FEATURE_egl: # CMAKE_EGL_INCDIRS = "$$cmakePortablePaths($$QMAKE_INCDIR_EGL)" -extend_target(Gui CONDITION QT_FEATURE_accessibility +qt_extend_target(Gui CONDITION QT_FEATURE_accessibility SOURCES accessible/qaccessible.cpp accessible/qaccessible.h accessible/qaccessiblebridge.cpp accessible/qaccessiblebridge.h @@ -389,14 +389,14 @@ extend_target(Gui CONDITION QT_FEATURE_accessibility accessible/qplatformaccessibility.cpp accessible/qplatformaccessibility.h ) -extend_target(Gui CONDITION APPLE AND QT_FEATURE_accessibility +qt_extend_target(Gui CONDITION APPLE AND QT_FEATURE_accessibility SOURCES accessible/qaccessiblecache_mac.mm LIBRARIES ${FWFoundation} ) -extend_target(Gui CONDITION QT_FEATURE_draganddrop +qt_extend_target(Gui CONDITION QT_FEATURE_draganddrop SOURCES kernel/qdnd.cpp kernel/qdnd_p.h kernel/qdrag.cpp kernel/qdrag.h @@ -405,17 +405,17 @@ extend_target(Gui CONDITION QT_FEATURE_draganddrop kernel/qsimpledrag.cpp kernel/qsimpledrag_p.h ) -extend_target(Gui CONDITION QT_FEATURE_movie +qt_extend_target(Gui CONDITION QT_FEATURE_movie SOURCES image/qmovie.cpp image/qmovie.h ) -extend_target(Gui CONDITION WIN32 AND NOT WINRT +qt_extend_target(Gui CONDITION WIN32 AND NOT WINRT SOURCES image/qpixmap_win.cpp ) -extend_target(Gui CONDITION QT_FEATURE_png +qt_extend_target(Gui CONDITION QT_FEATURE_png SOURCES image/qpnghandler.cpp image/qpnghandler_p.h LIBRARIES @@ -423,58 +423,58 @@ extend_target(Gui CONDITION QT_FEATURE_png ) if(NOT ANDROID) - add_qt_simd_part(Gui SIMD sse2 + qt_add_simd_part(Gui SIMD sse2 SOURCES painting/qdrawhelper_sse2.cpp ) - add_qt_simd_part(Gui SIMD ssse3 + qt_add_simd_part(Gui SIMD ssse3 SOURCES image/qimage_ssse3.cpp painting/qdrawhelper_ssse3.cpp ) - add_qt_simd_part(Gui SIMD sse4_1 + qt_add_simd_part(Gui SIMD sse4_1 SOURCES painting/qdrawhelper_sse4.cpp painting/qimagescale_sse4.cpp ) - add_qt_simd_part(Gui SIMD neon + qt_add_simd_part(Gui SIMD neon SOURCES image/qimage_neon.cpp painting/qdrawhelper_neon.cpp painting/qdrawhelper_neon_p.h painting/qimagescale_neon.cpp ) - add_qt_simd_part(Gui SIMD mips_dsp + qt_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 ) - add_qt_simd_part(Gui SIMD mips_dspr2 + qt_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 ) - add_qt_simd_part(Gui SIMD arch_haswell + qt_add_simd_part(Gui SIMD arch_haswell SOURCES painting/qdrawhelper_avx2.cpp ) endif() -extend_target(Gui CONDITION ANDROID AND TEST_architecture_arch STREQUAL arm64 +qt_extend_target(Gui CONDITION ANDROID AND TEST_architecture_arch STREQUAL arm64 SOURCES image/qimage_neon.cpp painting/qdrawhelper_neon.cpp painting/qdrawhelper_neon_p.h painting/qimagescale_neon.cpp ) -extend_target(Gui CONDITION ANDROID AND (TEST_architecture_arch STREQUAL i386 OR TEST_architecture_arch STREQUAL x86_64) +qt_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 @@ -485,14 +485,14 @@ extend_target(Gui CONDITION ANDROID AND (TEST_architecture_arch STREQUAL i386 OR QT_COMPILER_SUPPORTS_SSSE3 QT_COMPILER_SUPPORTS_SSSE3 ) -extend_target(Gui CONDITION QT_FEATURE_harfbuzz +qt_extend_target(Gui CONDITION QT_FEATURE_harfbuzz SOURCES text/qharfbuzzng.cpp text/qharfbuzzng_p.h LIBRARIES harfbuzz::harfbuzz ) -extend_target(Gui CONDITION QT_FEATURE_textodfwriter +qt_extend_target(Gui CONDITION QT_FEATURE_textodfwriter SOURCES text/qtextodfwriter.cpp text/qtextodfwriter_p.h text/qzip.cpp @@ -500,48 +500,48 @@ extend_target(Gui CONDITION QT_FEATURE_textodfwriter text/qzipwriter_p.h ) -extend_target(Gui CONDITION QT_FEATURE_textmarkdownreader +qt_extend_target(Gui CONDITION QT_FEATURE_textmarkdownreader SOURCES text/qtextmarkdownimporter.cpp text/qtextmarkdownimporter_p.h ) -extend_target(Gui CONDITION QT_FEATURE_system_textmarkdownreader AND QT_FEATURE_textmarkdownreader +qt_extend_target(Gui CONDITION QT_FEATURE_system_textmarkdownreader AND QT_FEATURE_textmarkdownreader PUBLIC_LIBRARIES libmd4c ) -extend_target(Gui CONDITION QT_FEATURE_textmarkdownreader AND NOT QT_FEATURE_system_textmarkdownreader +qt_extend_target(Gui CONDITION QT_FEATURE_textmarkdownreader AND NOT QT_FEATURE_system_textmarkdownreader SOURCES ../3rdparty/md4c/md4c.c ../3rdparty/md4c/md4c.h INCLUDE_DIRECTORIES ../3rdparty/md4c ) -extend_target(Gui CONDITION QT_FEATURE_textmarkdownwriter +qt_extend_target(Gui CONDITION QT_FEATURE_textmarkdownwriter SOURCES text/qtextmarkdownwriter.cpp text/qtextmarkdownwriter_p.h ) -extend_target(Gui CONDITION QT_FEATURE_cssparser +qt_extend_target(Gui CONDITION QT_FEATURE_cssparser SOURCES painting/qcssutil.cpp text/qcssparser.cpp text/qcssparser_p.h ) -extend_target(Gui CONDITION UNIX AND NOT ANDROID AND NOT APPLE_UIKIT AND NOT INTEGRITY AND NOT (TEST_architecture_arch STREQUAL "arm64") +qt_extend_target(Gui CONDITION UNIX AND NOT ANDROID AND NOT APPLE_UIKIT AND NOT INTEGRITY AND NOT (TEST_architecture_arch STREQUAL "arm64") DEFINES ENABLE_PIXMAN_DRAWHELPERS ) if(UNIX AND NOT ANDROID AND NOT APPLE_UIKIT AND NOT INTEGRITY AND NOT (TEST_architecture_arch STREQUAL "arm64")) - add_qt_simd_part(Gui SIMD neon + qt_add_simd_part(Gui SIMD neon SOURCES ../3rdparty/pixman/pixman-arm-neon-asm.S painting/qdrawhelper_neon_asm.S ) endif() -extend_target(Gui CONDITION ANDROID AND TEST_architecture_arch STREQUAL x86_64 +qt_extend_target(Gui CONDITION ANDROID AND TEST_architecture_arch STREQUAL x86_64 SOURCES painting/qdrawhelper_sse4.cpp painting/qimagescale_sse4.cpp @@ -550,12 +550,12 @@ extend_target(Gui CONDITION ANDROID AND TEST_architecture_arch STREQUAL x86_64 QT_COMPILER_SUPPORTS_SSE4_2 ) -extend_target(Gui CONDITION QT_FEATURE_regularexpression +qt_extend_target(Gui CONDITION QT_FEATURE_regularexpression SOURCES util/qshadergenerator.cpp util/qshadergenerator_p.h ) -extend_target(Gui CONDITION QT_FEATURE_opengl AND NOT QT_FEATURE_opengles2 +qt_extend_target(Gui CONDITION QT_FEATURE_opengl AND NOT QT_FEATURE_opengles2 SOURCES opengl/qopenglfunctions_1_0.cpp opengl/qopenglfunctions_1_0.h opengl/qopenglfunctions_1_1.cpp opengl/qopenglfunctions_1_1.h @@ -587,12 +587,12 @@ extend_target(Gui CONDITION QT_FEATURE_opengl AND NOT QT_FEATURE_opengles2 opengl/qopengltimerquery.cpp opengl/qopengltimerquery.h ) -extend_target(Gui CONDITION QT_FEATURE_opengl AND QT_FEATURE_opengles2 +qt_extend_target(Gui CONDITION QT_FEATURE_opengl AND QT_FEATURE_opengles2 SOURCES opengl/qopenglfunctions_es2.cpp opengl/qopenglfunctions_es2.h ) -extend_target(Gui CONDITION QT_FEATURE_vulkan +qt_extend_target(Gui CONDITION QT_FEATURE_vulkan SOURCES rhi/qrhivulkan.cpp rhi/qrhivulkan_p.h rhi/qrhivulkan_p_p.h @@ -626,12 +626,12 @@ extend_target(Gui CONDITION QT_FEATURE_vulkan #### Keys ignored in scope 80:.:vulkan:vulkan/vulkan.pri:else: # qvkgen_h.CONFIG = "target_predeps" "no_link" -extend_target(Gui CONDITION WASM +qt_extend_target(Gui CONDITION WASM SOURCES platform/wasm/qwasmlocalfileaccess.cpp platform/wasm/qwasmlocalfileaccess_p.h ) -extend_target(Gui CONDITION NOT GCC OR NOT QT_COMPILER_VERSION_MAJOR STREQUAL 5 +qt_extend_target(Gui CONDITION NOT GCC OR NOT QT_COMPILER_VERSION_MAJOR STREQUAL 5 SOURCES painting/qdrawhelper.cpp NO_PCH_SOURCES @@ -640,7 +640,7 @@ extend_target(Gui CONDITION NOT GCC OR NOT QT_COMPILER_VERSION_MAJOR STREQUAL 5 qt_create_tracepoints(Gui qtgui.tracepoints) -add_qt_docs(Gui +qt_add_docs(Gui doc/qtgui.qdocconf ) diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt index 711cc98ddc..9aab20bd9e 100644 --- a/src/gui/CMakeLists.txt +++ b/src/gui/CMakeLists.txt @@ -45,7 +45,7 @@ endif() # special case end -add_qt_module(Gui +qt_add_module(Gui PLUGIN_TYPES platforms platforms/darwin xcbglintegrations platformthemes platforminputcontexts generic iconengines imageformats egldeviceintegrations FEATURE_DEPENDENCIES # special case: Qt::Network # special case: @@ -279,7 +279,7 @@ set(qpdf_resource_files "qpdfa_metadata.xml" ) -add_qt_resource(Gui "qpdf" +qt_add_resource(Gui "qpdf" PREFIX "/qpdf/" BASE @@ -291,7 +291,7 @@ set(qmake_webgradients_resource_files "painting/webgradients.binaryjson" ) -add_qt_resource(Gui "qmake_webgradients" +qt_add_resource(Gui "qmake_webgradients" PREFIX "/qgradient/" # special case #BASE # special case remove @@ -303,14 +303,14 @@ add_qt_resource(Gui "qmake_webgradients" # special case begin # Replace arch_haswell with avx2 feature. That is what is used in the code requireing # this file, too! -add_qt_simd_part(Gui SIMD avx2 +qt_add_simd_part(Gui SIMD avx2 SOURCES painting/qdrawhelper_avx2.cpp ) # special case end # special case begin -extend_target(Gui CONDITION QT_FEATURE_standarditemmodel +qt_extend_target(Gui CONDITION QT_FEATURE_standarditemmodel SOURCES itemmodels/qstandarditemmodel.cpp itemmodels/qstandarditemmodel.h itemmodels/qstandarditemmodel_p.h ) @@ -331,7 +331,7 @@ extend_target(Gui CONDITION QT_FEATURE_standarditemmodel # on the opengl _feature_. This is done by hand now here (where the # feature is available). # DO NOT MOVE THIS TO THE BEGINNING OF THE FILE, the feature variables are not -# available until the add_qt_module call. +# available until the qt_add_module call. if(QT_FEATURE_opengl) if(QT_FEATURE_opengles2) find_package(GLESv2) @@ -343,7 +343,7 @@ if(QT_FEATURE_opengl) endif() # special case end -extend_target(Gui CONDITION QT_FEATURE_opengl +qt_extend_target(Gui CONDITION QT_FEATURE_opengl SOURCES kernel/qopenglcontext.cpp kernel/qopenglcontext.h kernel/qopenglcontext_p.h kernel/qopenglwindow.cpp kernel/qopenglwindow.h @@ -385,7 +385,7 @@ extend_target(Gui CONDITION QT_FEATURE_opengl #### Keys ignored in scope 3:.:.:gui.pro:QT_FEATURE_angle: # MODULE_AUX_INCLUDES = "\$\$QT_MODULE_INCLUDE_BASE/QtANGLE" -extend_target(Gui CONDITION APPLE_OSX +qt_extend_target(Gui CONDITION APPLE_OSX SOURCES rhi/qrhimetal.mm rhi/qrhimetal_p.h rhi/qrhimetal_p_p.h @@ -396,7 +396,7 @@ extend_target(Gui CONDITION APPLE_OSX ${FWMetal} ) -extend_target(Gui CONDITION APPLE +qt_extend_target(Gui CONDITION APPLE SOURCES image/qimage_darwin.mm painting/qcoregraphics.mm painting/qcoregraphics_p.h @@ -404,12 +404,12 @@ extend_target(Gui CONDITION APPLE ${FWCoreGraphics} ) -extend_target(Gui CONDITION QT_FEATURE_animation +qt_extend_target(Gui CONDITION QT_FEATURE_animation SOURCES animation/qguivariantanimation.cpp ) -extend_target(Gui CONDITION WIN32 +qt_extend_target(Gui CONDITION WIN32 SOURCES kernel/qwindowdefs_win.h rhi/qrhid3d11.cpp rhi/qrhid3d11_p.h @@ -461,7 +461,7 @@ extend_target(Gui CONDITION WIN32 #### Keys ignored in scope 22:.:.:gui.pro:QT_FEATURE_egl: # CMAKE_EGL_INCDIRS = "$$cmakePortablePaths($$QMAKE_INCDIR_EGL)" -extend_target(Gui CONDITION QT_FEATURE_accessibility +qt_extend_target(Gui CONDITION QT_FEATURE_accessibility SOURCES accessible/qaccessible.cpp accessible/qaccessible.h accessible/qaccessiblebridge.cpp accessible/qaccessiblebridge.h @@ -471,14 +471,14 @@ extend_target(Gui CONDITION QT_FEATURE_accessibility accessible/qplatformaccessibility.cpp accessible/qplatformaccessibility.h ) -extend_target(Gui CONDITION APPLE AND QT_FEATURE_accessibility +qt_extend_target(Gui CONDITION APPLE AND QT_FEATURE_accessibility SOURCES accessible/qaccessiblecache_mac.mm LIBRARIES ${FWFoundation} ) -extend_target(Gui CONDITION QT_FEATURE_draganddrop +qt_extend_target(Gui CONDITION QT_FEATURE_draganddrop SOURCES kernel/qdnd.cpp kernel/qdnd_p.h kernel/qdrag.cpp kernel/qdrag.h @@ -487,17 +487,17 @@ extend_target(Gui CONDITION QT_FEATURE_draganddrop kernel/qsimpledrag.cpp kernel/qsimpledrag_p.h ) -extend_target(Gui CONDITION QT_FEATURE_movie +qt_extend_target(Gui CONDITION QT_FEATURE_movie SOURCES image/qmovie.cpp image/qmovie.h ) -extend_target(Gui CONDITION WIN32 AND NOT WINRT +qt_extend_target(Gui CONDITION WIN32 AND NOT WINRT SOURCES image/qpixmap_win.cpp ) -extend_target(Gui CONDITION QT_FEATURE_png +qt_extend_target(Gui CONDITION QT_FEATURE_png SOURCES image/qpnghandler.cpp image/qpnghandler_p.h LIBRARIES @@ -505,58 +505,58 @@ extend_target(Gui CONDITION QT_FEATURE_png ) if(NOT ANDROID) - add_qt_simd_part(Gui SIMD sse2 + qt_add_simd_part(Gui SIMD sse2 SOURCES painting/qdrawhelper_sse2.cpp ) - add_qt_simd_part(Gui SIMD ssse3 + qt_add_simd_part(Gui SIMD ssse3 SOURCES image/qimage_ssse3.cpp painting/qdrawhelper_ssse3.cpp ) - add_qt_simd_part(Gui SIMD sse4_1 + qt_add_simd_part(Gui SIMD sse4_1 SOURCES painting/qdrawhelper_sse4.cpp painting/qimagescale_sse4.cpp ) - add_qt_simd_part(Gui SIMD neon + qt_add_simd_part(Gui SIMD neon SOURCES image/qimage_neon.cpp painting/qdrawhelper_neon.cpp painting/qdrawhelper_neon_p.h painting/qimagescale_neon.cpp ) - add_qt_simd_part(Gui SIMD mips_dsp + qt_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 ) - add_qt_simd_part(Gui SIMD mips_dspr2 + qt_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 ) - add_qt_simd_part(Gui SIMD arch_haswell + qt_add_simd_part(Gui SIMD arch_haswell SOURCES painting/qdrawhelper_avx2.cpp ) endif() -extend_target(Gui CONDITION ANDROID AND TEST_architecture_arch STREQUAL arm64 +qt_extend_target(Gui CONDITION ANDROID AND TEST_architecture_arch STREQUAL arm64 SOURCES image/qimage_neon.cpp painting/qdrawhelper_neon.cpp painting/qdrawhelper_neon_p.h painting/qimagescale_neon.cpp ) -extend_target(Gui CONDITION ANDROID AND (TEST_architecture_arch STREQUAL i386 OR TEST_architecture_arch STREQUAL x86_64) +qt_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 @@ -576,14 +576,14 @@ if (MINGW AND CMAKE_CXX_COMPILER_VERSION VERSION_EQUAL 8.1.0) endif() # special case end -extend_target(Gui CONDITION QT_FEATURE_harfbuzz +qt_extend_target(Gui CONDITION QT_FEATURE_harfbuzz SOURCES text/qharfbuzzng.cpp text/qharfbuzzng_p.h LIBRARIES harfbuzz::harfbuzz ) -extend_target(Gui CONDITION QT_FEATURE_textodfwriter +qt_extend_target(Gui CONDITION QT_FEATURE_textodfwriter SOURCES text/qtextodfwriter.cpp text/qtextodfwriter_p.h text/qzip.cpp @@ -591,48 +591,48 @@ extend_target(Gui CONDITION QT_FEATURE_textodfwriter text/qzipwriter_p.h ) -extend_target(Gui CONDITION QT_FEATURE_textmarkdownreader +qt_extend_target(Gui CONDITION QT_FEATURE_textmarkdownreader SOURCES text/qtextmarkdownimporter.cpp text/qtextmarkdownimporter_p.h ) -extend_target(Gui CONDITION QT_FEATURE_system_textmarkdownreader AND QT_FEATURE_textmarkdownreader +qt_extend_target(Gui CONDITION QT_FEATURE_system_textmarkdownreader AND QT_FEATURE_textmarkdownreader PUBLIC_LIBRARIES libmd4c ) -extend_target(Gui CONDITION QT_FEATURE_textmarkdownreader AND NOT QT_FEATURE_system_textmarkdownreader +qt_extend_target(Gui CONDITION QT_FEATURE_textmarkdownreader AND NOT QT_FEATURE_system_textmarkdownreader SOURCES ../3rdparty/md4c/md4c.c ../3rdparty/md4c/md4c.h INCLUDE_DIRECTORIES ../3rdparty/md4c ) -extend_target(Gui CONDITION QT_FEATURE_textmarkdownwriter +qt_extend_target(Gui CONDITION QT_FEATURE_textmarkdownwriter SOURCES text/qtextmarkdownwriter.cpp text/qtextmarkdownwriter_p.h ) -extend_target(Gui CONDITION QT_FEATURE_cssparser +qt_extend_target(Gui CONDITION QT_FEATURE_cssparser SOURCES painting/qcssutil.cpp text/qcssparser.cpp text/qcssparser_p.h ) -extend_target(Gui CONDITION UNIX AND NOT ANDROID AND NOT APPLE_UIKIT AND NOT INTEGRITY AND NOT (TEST_architecture_arch STREQUAL "arm64") +qt_extend_target(Gui CONDITION UNIX AND NOT ANDROID AND NOT APPLE_UIKIT AND NOT INTEGRITY AND NOT (TEST_architecture_arch STREQUAL "arm64") DEFINES ENABLE_PIXMAN_DRAWHELPERS ) if(UNIX AND NOT ANDROID AND NOT APPLE_UIKIT AND NOT INTEGRITY AND NOT (TEST_architecture_arch STREQUAL "arm64")) - add_qt_simd_part(Gui SIMD neon + qt_add_simd_part(Gui SIMD neon SOURCES ../3rdparty/pixman/pixman-arm-neon-asm.S painting/qdrawhelper_neon_asm.S ) endif() -extend_target(Gui CONDITION ANDROID AND TEST_architecture_arch STREQUAL x86_64 +qt_extend_target(Gui CONDITION ANDROID AND TEST_architecture_arch STREQUAL x86_64 SOURCES painting/qdrawhelper_sse4.cpp painting/qimagescale_sse4.cpp @@ -641,12 +641,12 @@ extend_target(Gui CONDITION ANDROID AND TEST_architecture_arch STREQUAL x86_64 QT_COMPILER_SUPPORTS_SSE4_2 ) -extend_target(Gui CONDITION QT_FEATURE_regularexpression +qt_extend_target(Gui CONDITION QT_FEATURE_regularexpression SOURCES util/qshadergenerator.cpp util/qshadergenerator_p.h ) -extend_target(Gui CONDITION QT_FEATURE_opengl AND NOT QT_FEATURE_opengles2 +qt_extend_target(Gui CONDITION QT_FEATURE_opengl AND NOT QT_FEATURE_opengles2 SOURCES opengl/qopenglfunctions_1_0.cpp opengl/qopenglfunctions_1_0.h opengl/qopenglfunctions_1_1.cpp opengl/qopenglfunctions_1_1.h @@ -678,7 +678,7 @@ extend_target(Gui CONDITION QT_FEATURE_opengl AND NOT QT_FEATURE_opengles2 opengl/qopengltimerquery.cpp opengl/qopengltimerquery.h ) -extend_target(Gui CONDITION QT_FEATURE_opengl AND QT_FEATURE_opengles2 +qt_extend_target(Gui CONDITION QT_FEATURE_opengl AND QT_FEATURE_opengles2 SOURCES opengl/qopenglfunctions_es2.cpp opengl/qopenglfunctions_es2.h ) @@ -691,7 +691,7 @@ if(TARGET Vulkan::Vulkan) endif() # special case end -extend_target(Gui CONDITION QT_FEATURE_vulkan +qt_extend_target(Gui CONDITION QT_FEATURE_vulkan SOURCES rhi/qrhivulkan.cpp rhi/qrhivulkan_p.h rhi/qrhivulkan_p_p.h @@ -752,12 +752,12 @@ endif() #### Keys ignored in scope 80:.:vulkan:vulkan/vulkan.pri:else: # qvkgen_h.CONFIG = "target_predeps" "no_link" -extend_target(Gui CONDITION WASM +qt_extend_target(Gui CONDITION WASM SOURCES platform/wasm/qwasmlocalfileaccess.cpp platform/wasm/qwasmlocalfileaccess_p.h ) -extend_target(Gui CONDITION NOT GCC OR NOT QT_COMPILER_VERSION_MAJOR STREQUAL 5 +qt_extend_target(Gui CONDITION NOT GCC OR NOT QT_COMPILER_VERSION_MAJOR STREQUAL 5 SOURCES painting/qdrawhelper.cpp NO_PCH_SOURCES @@ -766,7 +766,7 @@ extend_target(Gui CONDITION NOT GCC OR NOT QT_COMPILER_VERSION_MAJOR STREQUAL 5 qt_create_tracepoints(Gui qtgui.tracepoints) -add_qt_docs(Gui +qt_add_docs(Gui doc/qtgui.qdocconf ) diff --git a/src/network/.prev_CMakeLists.txt b/src/network/.prev_CMakeLists.txt index 7115a56c97..a9c892aedc 100644 --- a/src/network/.prev_CMakeLists.txt +++ b/src/network/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## Network Module: ##################################################################### -add_qt_module(Network +qt_add_module(Network PLUGIN_TYPES bearer SOURCES access/qabstractnetworkcache.cpp access/qabstractnetworkcache.h access/qabstractnetworkcache_p.h @@ -73,7 +73,7 @@ add_qt_module(Network ## Scopes: ##################################################################### -extend_target(Network CONDITION MSVC AND (TEST_architecture_arch STREQUAL "i386") +qt_extend_target(Network CONDITION MSVC AND (TEST_architecture_arch STREQUAL "i386") LINK_OPTIONS "/BASE:0x64000000" ) @@ -90,35 +90,35 @@ if(ANDROID AND (QT_FEATURE_bearermanagement)) ) endif() -extend_target(Network CONDITION QT_FEATURE_ftp +qt_extend_target(Network CONDITION QT_FEATURE_ftp SOURCES access/qftp.cpp access/qftp_p.h access/qnetworkaccessftpbackend.cpp access/qnetworkaccessftpbackend_p.h kernel/qurlinfo.cpp kernel/qurlinfo_p.h ) -extend_target(Network CONDITION QT_FEATURE_networkdiskcache +qt_extend_target(Network CONDITION QT_FEATURE_networkdiskcache SOURCES access/qnetworkdiskcache.cpp access/qnetworkdiskcache.h access/qnetworkdiskcache_p.h ) -extend_target(Network CONDITION QT_FEATURE_settings +qt_extend_target(Network CONDITION QT_FEATURE_settings SOURCES access/qhstsstore.cpp access/qhstsstore_p.h ) -extend_target(Network CONDITION APPLE +qt_extend_target(Network CONDITION APPLE LIBRARIES ${FWCoreFoundation} ${FWSecurity} ) -extend_target(Network CONDITION WASM +qt_extend_target(Network CONDITION WASM SOURCES access/qnetworkreplywasmimpl.cpp access/qnetworkreplywasmimpl_p.h ) -extend_target(Network CONDITION QT_FEATURE_http +qt_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 @@ -142,44 +142,44 @@ extend_target(Network CONDITION QT_FEATURE_http socket/qhttpsocketengine.cpp socket/qhttpsocketengine_p.h ) -extend_target(Network CONDITION QT_FEATURE_dnslookup +qt_extend_target(Network CONDITION QT_FEATURE_dnslookup SOURCES kernel/qdnslookup.cpp kernel/qdnslookup.h kernel/qdnslookup_p.h ) -extend_target(Network CONDITION UNIX +qt_extend_target(Network CONDITION UNIX SOURCES kernel/qhostinfo_unix.cpp socket/qnativesocketengine_unix.cpp socket/qnet_unix_p.h ) -extend_target(Network CONDITION QT_FEATURE_dlopen AND UNIX +qt_extend_target(Network CONDITION QT_FEATURE_dlopen AND UNIX LIBRARIES ${CMAKE_DL_LIBS} ) -extend_target(Network CONDITION QT_FEATURE_linux_netlink AND UNIX +qt_extend_target(Network CONDITION QT_FEATURE_linux_netlink AND UNIX SOURCES kernel/qnetworkinterface_linux.cpp ) -extend_target(Network CONDITION UNIX AND NOT QT_FEATURE_linux_netlink +qt_extend_target(Network CONDITION UNIX AND NOT QT_FEATURE_linux_netlink SOURCES kernel/qnetworkinterface_unix.cpp ) -extend_target(Network CONDITION ANDROID AND QT_FEATURE_dnslookup +qt_extend_target(Network CONDITION ANDROID AND QT_FEATURE_dnslookup SOURCES kernel/qdnslookup_android.cpp ) -extend_target(Network CONDITION WIN32 +qt_extend_target(Network CONDITION WIN32 SOURCES kernel/qhostinfo_win.cpp ) -extend_target(Network CONDITION WIN32 AND NOT WINRT +qt_extend_target(Network CONDITION WIN32 AND NOT WINRT SOURCES kernel/qnetworkinterface_win.cpp kernel/qnetworkproxy_win.cpp @@ -190,61 +190,61 @@ extend_target(Network CONDITION WIN32 AND NOT WINRT iphlpapi ) -extend_target(Network CONDITION QT_FEATURE_dnslookup AND WIN32 AND NOT WINRT +qt_extend_target(Network CONDITION QT_FEATURE_dnslookup AND WIN32 AND NOT WINRT SOURCES kernel/qdnslookup_win.cpp ) -extend_target(Network CONDITION WINRT +qt_extend_target(Network CONDITION WINRT SOURCES kernel/qnetworkinterface_winrt.cpp socket/qnativesocketengine_winrt.cpp socket/qnativesocketengine_winrt_p.h ) -extend_target(Network CONDITION QT_FEATURE_dnslookup AND WINRT +qt_extend_target(Network CONDITION QT_FEATURE_dnslookup AND WINRT SOURCES kernel/qdnslookup_winrt.cpp ) -extend_target(Network CONDITION APPLE AND NOT APPLE_UIKIT +qt_extend_target(Network CONDITION APPLE AND NOT APPLE_UIKIT LIBRARIES ${FWCoreServices} ${FWSystemConfiguration} ) -extend_target(Network CONDITION APPLE_IOS OR APPLE_OSX +qt_extend_target(Network CONDITION APPLE_IOS OR APPLE_OSX SOURCES kernel/qnetconmonitor_darwin.mm LIBRARIES ${FWSystemConfiguration} ) -extend_target(Network CONDITION QT_FEATURE_netlistmgr AND NOT APPLE_IOS AND NOT APPLE_OSX +qt_extend_target(Network CONDITION QT_FEATURE_netlistmgr AND NOT APPLE_IOS AND NOT APPLE_OSX SOURCES kernel/qnetconmonitor_win.cpp ) -extend_target(Network CONDITION NOT APPLE_IOS AND NOT APPLE_OSX AND NOT QT_FEATURE_netlistmgr +qt_extend_target(Network CONDITION NOT APPLE_IOS AND NOT APPLE_OSX AND NOT QT_FEATURE_netlistmgr SOURCES kernel/qnetconmonitor_stub.cpp ) -extend_target(Network CONDITION QT_FEATURE_gssapi +qt_extend_target(Network CONDITION QT_FEATURE_gssapi LIBRARIES GSSAPI::GSSAPI ) -extend_target(Network CONDITION APPLE_UIKIT +qt_extend_target(Network CONDITION APPLE_UIKIT SOURCES kernel/qnetworkinterface_uikit_p.h ) -extend_target(Network CONDITION APPLE_OSX +qt_extend_target(Network CONDITION APPLE_OSX SOURCES kernel/qnetworkproxy_mac.cpp ) -extend_target(Network CONDITION QT_FEATURE_libproxy AND NOT APPLE_OSX AND (UNIX OR WINRT) +qt_extend_target(Network CONDITION QT_FEATURE_libproxy AND NOT APPLE_OSX AND (UNIX OR WINRT) SOURCES kernel/qnetworkproxy_libproxy.cpp LIBRARIES @@ -252,39 +252,39 @@ extend_target(Network CONDITION QT_FEATURE_libproxy AND NOT APPLE_OSX AND (UNIX PkgConfig::Libproxy ) -extend_target(Network CONDITION NOT APPLE_OSX AND NOT QT_FEATURE_libproxy AND (UNIX OR WINRT) +qt_extend_target(Network CONDITION NOT APPLE_OSX AND NOT QT_FEATURE_libproxy AND (UNIX OR WINRT) SOURCES kernel/qnetworkproxy_generic.cpp ) -extend_target(Network CONDITION QT_FEATURE_socks5 +qt_extend_target(Network CONDITION QT_FEATURE_socks5 SOURCES socket/qsocks5socketengine.cpp socket/qsocks5socketengine_p.h ) -extend_target(Network CONDITION QT_FEATURE_sctp +qt_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 ) -extend_target(Network CONDITION NOT WINRT +qt_extend_target(Network CONDITION NOT WINRT SOURCES socket/qnativesocketengine.cpp socket/qnativesocketengine_p.h ) -extend_target(Network CONDITION MSVC +qt_extend_target(Network CONDITION MSVC MOC_OPTIONS "-D_WINSOCK_DEPRECATED_NO_WARNINGS" ) -extend_target(Network CONDITION QT_FEATURE_localserver +qt_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 ) -extend_target(Network CONDITION QT_FEATURE_localserver AND (INTEGRITY OR WINRT) +qt_extend_target(Network CONDITION QT_FEATURE_localserver AND (INTEGRITY OR WINRT) SOURCES socket/qlocalserver_tcp.cpp socket/qlocalsocket_tcp.cpp @@ -292,29 +292,29 @@ extend_target(Network CONDITION QT_FEATURE_localserver AND (INTEGRITY OR WINRT) QT_LOCALSOCKET_TCP ) -extend_target(Network CONDITION QT_FEATURE_localserver AND UNIX AND NOT INTEGRITY AND NOT WINRT +qt_extend_target(Network CONDITION QT_FEATURE_localserver AND UNIX AND NOT INTEGRITY AND NOT WINRT SOURCES socket/qlocalserver_unix.cpp socket/qlocalsocket_unix.cpp ) -extend_target(Network CONDITION QT_FEATURE_localserver AND WIN32 AND NOT WINRT +qt_extend_target(Network CONDITION QT_FEATURE_localserver AND WIN32 AND NOT WINRT SOURCES socket/qlocalserver_win.cpp socket/qlocalsocket_win.cpp ) -extend_target(Network CONDITION QT_FEATURE_system_proxies +qt_extend_target(Network CONDITION QT_FEATURE_system_proxies DEFINES QT_USE_SYSTEM_PROXIES ) -extend_target(Network CONDITION NOT QT_FEATURE_openssl +qt_extend_target(Network CONDITION NOT QT_FEATURE_openssl SOURCES ssl/qsslcertificate_qt.cpp ) -extend_target(Network CONDITION QT_FEATURE_ssl +qt_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 @@ extend_target(Network CONDITION QT_FEATURE_ssl ssl/qsslsocket.cpp ssl/qsslsocket.h ssl/qsslsocket_p.h ) -extend_target(Network CONDITION QT_FEATURE_ssl AND WINRT +qt_extend_target(Network CONDITION QT_FEATURE_ssl AND WINRT SOURCES ssl/qsslcertificate_winrt.cpp ssl/qssldiffiehellmanparameters_dummy.cpp @@ -337,7 +337,7 @@ extend_target(Network CONDITION QT_FEATURE_ssl AND WINRT ssl/qsslsocket_winrt.cpp ssl/qsslsocket_winrt_p.h ) -extend_target(Network CONDITION QT_FEATURE_schannel AND QT_FEATURE_ssl +qt_extend_target(Network CONDITION QT_FEATURE_schannel AND QT_FEATURE_ssl SOURCES ssl/qsslcertificate_schannel.cpp ssl/qssldiffiehellmanparameters_dummy.cpp @@ -353,7 +353,7 @@ extend_target(Network CONDITION QT_FEATURE_schannel AND QT_FEATURE_ssl ncrypt ) -extend_target(Network CONDITION QT_FEATURE_securetransport AND QT_FEATURE_ssl +qt_extend_target(Network CONDITION QT_FEATURE_securetransport AND QT_FEATURE_ssl SOURCES ssl/qssldiffiehellmanparameters_dummy.cpp ssl/qsslellipticcurve_dummy.cpp @@ -364,12 +364,12 @@ extend_target(Network CONDITION QT_FEATURE_securetransport AND QT_FEATURE_ssl ssl/qsslsocket_qt.cpp ) -extend_target(Network CONDITION QT_FEATURE_dtls AND QT_FEATURE_ssl +qt_extend_target(Network CONDITION QT_FEATURE_dtls AND QT_FEATURE_ssl SOURCES ssl/qdtls.cpp ssl/qdtls.h ssl/qdtls_p.h ) -extend_target(Network CONDITION QT_FEATURE_openssl AND QT_FEATURE_ssl +qt_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 @@ -380,17 +380,17 @@ extend_target(Network CONDITION QT_FEATURE_openssl AND QT_FEATURE_ssl ssl/qsslsocket_openssl_symbols.cpp ssl/qsslsocket_openssl_symbols_p.h ) -extend_target(Network CONDITION QT_FEATURE_dtls AND QT_FEATURE_openssl AND QT_FEATURE_ssl +qt_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 ) -extend_target(Network CONDITION QT_FEATURE_ocsp AND QT_FEATURE_openssl AND QT_FEATURE_ssl +qt_extend_target(Network CONDITION QT_FEATURE_ocsp AND QT_FEATURE_openssl AND QT_FEATURE_ssl SOURCES ssl/qocsp_p.h ) -extend_target(Network CONDITION QT_FEATURE_openssl AND QT_FEATURE_opensslv11 AND QT_FEATURE_ssl +qt_extend_target(Network CONDITION QT_FEATURE_openssl AND QT_FEATURE_opensslv11 AND QT_FEATURE_ssl SOURCES ssl/qsslcontext_openssl11.cpp ssl/qsslsocket_openssl11.cpp @@ -399,45 +399,45 @@ extend_target(Network CONDITION QT_FEATURE_openssl AND QT_FEATURE_opensslv11 AND OPENSSL_API_COMPAT=0x10100000L ) -extend_target(Network CONDITION QT_FEATURE_openssl AND QT_FEATURE_ssl AND NOT QT_FEATURE_opensslv11 +qt_extend_target(Network CONDITION QT_FEATURE_openssl AND QT_FEATURE_ssl AND NOT QT_FEATURE_opensslv11 SOURCES ssl/qsslcontext_opensslpre11.cpp ssl/qsslsocket_opensslpre11.cpp ssl/qsslsocket_opensslpre11_symbols_p.h ) -extend_target(Network CONDITION APPLE AND QT_FEATURE_openssl AND QT_FEATURE_ssl +qt_extend_target(Network CONDITION APPLE AND QT_FEATURE_openssl AND QT_FEATURE_ssl SOURCES ssl/qsslsocket_mac_shared.cpp ) -extend_target(Network CONDITION ANDROID AND QT_FEATURE_openssl AND QT_FEATURE_ssl AND NOT ANDROID_EMBEDDED +qt_extend_target(Network CONDITION ANDROID AND QT_FEATURE_openssl AND QT_FEATURE_ssl AND NOT ANDROID_EMBEDDED SOURCES ssl/qsslsocket_openssl_android.cpp ) -extend_target(Network CONDITION QT_FEATURE_openssl AND QT_FEATURE_openssl_linked AND QT_FEATURE_ssl +qt_extend_target(Network CONDITION QT_FEATURE_openssl AND QT_FEATURE_openssl_linked AND QT_FEATURE_ssl LIBRARIES OpenSSL::SSL ) -extend_target(Network CONDITION QT_FEATURE_openssl AND QT_FEATURE_ssl AND NOT QT_FEATURE_openssl_linked +qt_extend_target(Network CONDITION QT_FEATURE_openssl AND QT_FEATURE_ssl AND NOT QT_FEATURE_openssl_linked LIBRARIES OpenSSL::SSL_nolink ) -extend_target(Network CONDITION QT_FEATURE_openssl AND QT_FEATURE_ssl AND WIN32 +qt_extend_target(Network CONDITION QT_FEATURE_openssl AND QT_FEATURE_ssl AND WIN32 SOURCES ssl/qwindowscarootfetcher.cpp ssl/qwindowscarootfetcher_p.h LIBRARIES crypt32 ) -extend_target(Network CONDITION QT_FEATURE_dnslookup AND UNIX AND NOT ANDROID AND NOT INTEGRITY +qt_extend_target(Network CONDITION QT_FEATURE_dnslookup AND UNIX AND NOT ANDROID AND NOT INTEGRITY SOURCES kernel/qdnslookup_unix.cpp ) -add_qt_docs(Network +qt_add_docs(Network doc/qtnetwork.qdocconf ) diff --git a/src/network/CMakeLists.txt b/src/network/CMakeLists.txt index b1b7a1d2ae..facd95c9ec 100644 --- a/src/network/CMakeLists.txt +++ b/src/network/CMakeLists.txt @@ -4,7 +4,7 @@ ## Network Module: ##################################################################### -add_qt_module(Network +qt_add_module(Network PLUGIN_TYPES bearer SOURCES access/qabstractnetworkcache.cpp access/qabstractnetworkcache.h access/qabstractnetworkcache_p.h @@ -73,7 +73,7 @@ add_qt_module(Network ## Scopes: ##################################################################### -extend_target(Network CONDITION MSVC AND (TEST_architecture_arch STREQUAL "i386") +qt_extend_target(Network CONDITION MSVC AND (TEST_architecture_arch STREQUAL "i386") LINK_OPTIONS "/BASE:0x64000000" ) @@ -90,35 +90,35 @@ if(ANDROID AND (QT_FEATURE_bearermanagement)) ) endif() -extend_target(Network CONDITION QT_FEATURE_ftp +qt_extend_target(Network CONDITION QT_FEATURE_ftp SOURCES access/qftp.cpp access/qftp_p.h access/qnetworkaccessftpbackend.cpp access/qnetworkaccessftpbackend_p.h kernel/qurlinfo.cpp kernel/qurlinfo_p.h ) -extend_target(Network CONDITION QT_FEATURE_networkdiskcache +qt_extend_target(Network CONDITION QT_FEATURE_networkdiskcache SOURCES access/qnetworkdiskcache.cpp access/qnetworkdiskcache.h access/qnetworkdiskcache_p.h ) -extend_target(Network CONDITION QT_FEATURE_settings +qt_extend_target(Network CONDITION QT_FEATURE_settings SOURCES access/qhstsstore.cpp access/qhstsstore_p.h ) -extend_target(Network CONDITION APPLE +qt_extend_target(Network CONDITION APPLE LIBRARIES ${FWCoreFoundation} ${FWSecurity} ) -extend_target(Network CONDITION WASM +qt_extend_target(Network CONDITION WASM SOURCES access/qnetworkreplywasmimpl.cpp access/qnetworkreplywasmimpl_p.h ) -extend_target(Network CONDITION QT_FEATURE_http +qt_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 @@ -142,46 +142,44 @@ extend_target(Network CONDITION QT_FEATURE_http socket/qhttpsocketengine.cpp socket/qhttpsocketengine_p.h ) -extend_target(Network CONDITION QT_FEATURE_dnslookup +qt_extend_target(Network CONDITION QT_FEATURE_dnslookup SOURCES kernel/qdnslookup.cpp kernel/qdnslookup.h kernel/qdnslookup_p.h ) -extend_target(Network CONDITION UNIX +qt_extend_target(Network CONDITION UNIX SOURCES kernel/qhostinfo_unix.cpp socket/qnativesocketengine_unix.cpp socket/qnet_unix_p.h ) -extend_target(Network CONDITION QT_FEATURE_dlopen AND UNIX +qt_extend_target(Network CONDITION QT_FEATURE_dlopen AND UNIX LIBRARIES ${CMAKE_DL_LIBS} ) -# special case end - -extend_target(Network CONDITION QT_FEATURE_linux_netlink AND UNIX +qt_extend_target(Network CONDITION QT_FEATURE_linux_netlink AND UNIX SOURCES kernel/qnetworkinterface_linux.cpp ) -extend_target(Network CONDITION UNIX AND NOT QT_FEATURE_linux_netlink +qt_extend_target(Network CONDITION UNIX AND NOT QT_FEATURE_linux_netlink SOURCES kernel/qnetworkinterface_unix.cpp ) -extend_target(Network CONDITION ANDROID AND QT_FEATURE_dnslookup +qt_extend_target(Network CONDITION ANDROID AND QT_FEATURE_dnslookup SOURCES kernel/qdnslookup_android.cpp ) -extend_target(Network CONDITION WIN32 +qt_extend_target(Network CONDITION WIN32 SOURCES kernel/qhostinfo_win.cpp ) -extend_target(Network CONDITION WIN32 AND NOT WINRT +qt_extend_target(Network CONDITION WIN32 AND NOT WINRT SOURCES kernel/qnetworkinterface_win.cpp kernel/qnetworkproxy_win.cpp @@ -192,61 +190,61 @@ extend_target(Network CONDITION WIN32 AND NOT WINRT iphlpapi ) -extend_target(Network CONDITION QT_FEATURE_dnslookup AND WIN32 AND NOT WINRT +qt_extend_target(Network CONDITION QT_FEATURE_dnslookup AND WIN32 AND NOT WINRT SOURCES kernel/qdnslookup_win.cpp ) -extend_target(Network CONDITION WINRT +qt_extend_target(Network CONDITION WINRT SOURCES kernel/qnetworkinterface_winrt.cpp socket/qnativesocketengine_winrt.cpp socket/qnativesocketengine_winrt_p.h ) -extend_target(Network CONDITION QT_FEATURE_dnslookup AND WINRT +qt_extend_target(Network CONDITION QT_FEATURE_dnslookup AND WINRT SOURCES kernel/qdnslookup_winrt.cpp ) -extend_target(Network CONDITION APPLE AND NOT APPLE_UIKIT +qt_extend_target(Network CONDITION APPLE AND NOT APPLE_UIKIT LIBRARIES ${FWCoreServices} ${FWSystemConfiguration} ) -extend_target(Network CONDITION APPLE_IOS OR APPLE_OSX +qt_extend_target(Network CONDITION APPLE_IOS OR APPLE_OSX SOURCES kernel/qnetconmonitor_darwin.mm LIBRARIES ${FWSystemConfiguration} ) -extend_target(Network CONDITION QT_FEATURE_netlistmgr AND NOT APPLE_IOS AND NOT APPLE_OSX +qt_extend_target(Network CONDITION QT_FEATURE_netlistmgr AND NOT APPLE_IOS AND NOT APPLE_OSX SOURCES kernel/qnetconmonitor_win.cpp ) -extend_target(Network CONDITION NOT APPLE_IOS AND NOT APPLE_OSX AND NOT QT_FEATURE_netlistmgr +qt_extend_target(Network CONDITION NOT APPLE_IOS AND NOT APPLE_OSX AND NOT QT_FEATURE_netlistmgr SOURCES kernel/qnetconmonitor_stub.cpp ) -extend_target(Network CONDITION QT_FEATURE_gssapi +qt_extend_target(Network CONDITION QT_FEATURE_gssapi LIBRARIES GSSAPI::GSSAPI ) -extend_target(Network CONDITION APPLE_UIKIT +qt_extend_target(Network CONDITION APPLE_UIKIT SOURCES kernel/qnetworkinterface_uikit_p.h ) -extend_target(Network CONDITION APPLE_OSX +qt_extend_target(Network CONDITION APPLE_OSX SOURCES kernel/qnetworkproxy_mac.cpp ) -extend_target(Network CONDITION QT_FEATURE_libproxy AND NOT APPLE_OSX AND (UNIX OR WINRT) +qt_extend_target(Network CONDITION QT_FEATURE_libproxy AND NOT APPLE_OSX AND (UNIX OR WINRT) SOURCES kernel/qnetworkproxy_libproxy.cpp LIBRARIES @@ -254,39 +252,39 @@ extend_target(Network CONDITION QT_FEATURE_libproxy AND NOT APPLE_OSX AND (UNIX PkgConfig::Libproxy ) -extend_target(Network CONDITION NOT APPLE_OSX AND NOT QT_FEATURE_libproxy AND (UNIX OR WINRT) +qt_extend_target(Network CONDITION NOT APPLE_OSX AND NOT QT_FEATURE_libproxy AND (UNIX OR WINRT) SOURCES kernel/qnetworkproxy_generic.cpp ) -extend_target(Network CONDITION QT_FEATURE_socks5 +qt_extend_target(Network CONDITION QT_FEATURE_socks5 SOURCES socket/qsocks5socketengine.cpp socket/qsocks5socketengine_p.h ) -extend_target(Network CONDITION QT_FEATURE_sctp +qt_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 ) -extend_target(Network CONDITION NOT WINRT +qt_extend_target(Network CONDITION NOT WINRT SOURCES socket/qnativesocketengine.cpp socket/qnativesocketengine_p.h ) -extend_target(Network CONDITION MSVC +qt_extend_target(Network CONDITION MSVC MOC_OPTIONS "-D_WINSOCK_DEPRECATED_NO_WARNINGS" ) -extend_target(Network CONDITION QT_FEATURE_localserver +qt_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 ) -extend_target(Network CONDITION QT_FEATURE_localserver AND (INTEGRITY OR WINRT) +qt_extend_target(Network CONDITION QT_FEATURE_localserver AND (INTEGRITY OR WINRT) SOURCES socket/qlocalserver_tcp.cpp socket/qlocalsocket_tcp.cpp @@ -294,29 +292,29 @@ extend_target(Network CONDITION QT_FEATURE_localserver AND (INTEGRITY OR WINRT) QT_LOCALSOCKET_TCP ) -extend_target(Network CONDITION QT_FEATURE_localserver AND UNIX AND NOT INTEGRITY AND NOT WINRT +qt_extend_target(Network CONDITION QT_FEATURE_localserver AND UNIX AND NOT INTEGRITY AND NOT WINRT SOURCES socket/qlocalserver_unix.cpp socket/qlocalsocket_unix.cpp ) -extend_target(Network CONDITION QT_FEATURE_localserver AND WIN32 AND NOT WINRT +qt_extend_target(Network CONDITION QT_FEATURE_localserver AND WIN32 AND NOT WINRT SOURCES socket/qlocalserver_win.cpp socket/qlocalsocket_win.cpp ) -extend_target(Network CONDITION QT_FEATURE_system_proxies +qt_extend_target(Network CONDITION QT_FEATURE_system_proxies DEFINES QT_USE_SYSTEM_PROXIES ) -extend_target(Network CONDITION NOT QT_FEATURE_openssl +qt_extend_target(Network CONDITION NOT QT_FEATURE_openssl SOURCES ssl/qsslcertificate_qt.cpp ) -extend_target(Network CONDITION QT_FEATURE_ssl +qt_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 @@ -329,7 +327,7 @@ extend_target(Network CONDITION QT_FEATURE_ssl ssl/qsslsocket.cpp ssl/qsslsocket.h ssl/qsslsocket_p.h ) -extend_target(Network CONDITION QT_FEATURE_ssl AND WINRT +qt_extend_target(Network CONDITION QT_FEATURE_ssl AND WINRT SOURCES ssl/qsslcertificate_winrt.cpp ssl/qssldiffiehellmanparameters_dummy.cpp @@ -339,7 +337,7 @@ extend_target(Network CONDITION QT_FEATURE_ssl AND WINRT ssl/qsslsocket_winrt.cpp ssl/qsslsocket_winrt_p.h ) -extend_target(Network CONDITION QT_FEATURE_schannel AND QT_FEATURE_ssl +qt_extend_target(Network CONDITION QT_FEATURE_schannel AND QT_FEATURE_ssl SOURCES ssl/qsslcertificate_schannel.cpp ssl/qssldiffiehellmanparameters_dummy.cpp @@ -355,7 +353,7 @@ extend_target(Network CONDITION QT_FEATURE_schannel AND QT_FEATURE_ssl ncrypt ) -extend_target(Network CONDITION QT_FEATURE_securetransport AND QT_FEATURE_ssl +qt_extend_target(Network CONDITION QT_FEATURE_securetransport AND QT_FEATURE_ssl SOURCES ssl/qssldiffiehellmanparameters_dummy.cpp ssl/qsslellipticcurve_dummy.cpp @@ -366,12 +364,12 @@ extend_target(Network CONDITION QT_FEATURE_securetransport AND QT_FEATURE_ssl ssl/qsslsocket_qt.cpp ) -extend_target(Network CONDITION QT_FEATURE_dtls AND QT_FEATURE_ssl +qt_extend_target(Network CONDITION QT_FEATURE_dtls AND QT_FEATURE_ssl SOURCES ssl/qdtls.cpp ssl/qdtls.h ssl/qdtls_p.h ) -extend_target(Network CONDITION QT_FEATURE_openssl AND QT_FEATURE_ssl +qt_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 @@ -382,17 +380,17 @@ extend_target(Network CONDITION QT_FEATURE_openssl AND QT_FEATURE_ssl ssl/qsslsocket_openssl_symbols.cpp ssl/qsslsocket_openssl_symbols_p.h ) -extend_target(Network CONDITION QT_FEATURE_dtls AND QT_FEATURE_openssl AND QT_FEATURE_ssl +qt_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 ) -extend_target(Network CONDITION QT_FEATURE_ocsp AND QT_FEATURE_openssl AND QT_FEATURE_ssl +qt_extend_target(Network CONDITION QT_FEATURE_ocsp AND QT_FEATURE_openssl AND QT_FEATURE_ssl SOURCES ssl/qocsp_p.h ) -extend_target(Network CONDITION QT_FEATURE_openssl AND QT_FEATURE_opensslv11 AND QT_FEATURE_ssl +qt_extend_target(Network CONDITION QT_FEATURE_openssl AND QT_FEATURE_opensslv11 AND QT_FEATURE_ssl SOURCES ssl/qsslcontext_openssl11.cpp ssl/qsslsocket_openssl11.cpp @@ -401,47 +399,46 @@ extend_target(Network CONDITION QT_FEATURE_openssl AND QT_FEATURE_opensslv11 AND OPENSSL_API_COMPAT=0x10100000L ) -extend_target(Network CONDITION QT_FEATURE_openssl AND QT_FEATURE_ssl AND NOT QT_FEATURE_opensslv11 +qt_extend_target(Network CONDITION QT_FEATURE_openssl AND QT_FEATURE_ssl AND NOT QT_FEATURE_opensslv11 SOURCES ssl/qsslcontext_opensslpre11.cpp ssl/qsslsocket_opensslpre11.cpp ssl/qsslsocket_opensslpre11_symbols_p.h ) -extend_target(Network CONDITION APPLE AND QT_FEATURE_openssl AND QT_FEATURE_ssl +qt_extend_target(Network CONDITION APPLE AND QT_FEATURE_openssl AND QT_FEATURE_ssl SOURCES ssl/qsslsocket_mac_shared.cpp ) -extend_target(Network CONDITION ANDROID AND QT_FEATURE_openssl AND QT_FEATURE_ssl AND NOT ANDROID_EMBEDDED +qt_extend_target(Network CONDITION ANDROID AND QT_FEATURE_openssl AND QT_FEATURE_ssl AND NOT ANDROID_EMBEDDED SOURCES ssl/qsslsocket_openssl_android.cpp ) -extend_target(Network CONDITION QT_FEATURE_openssl AND QT_FEATURE_openssl_linked AND QT_FEATURE_ssl +qt_extend_target(Network CONDITION QT_FEATURE_openssl AND QT_FEATURE_openssl_linked AND QT_FEATURE_ssl LIBRARIES OpenSSL::SSL ) -extend_target(Network CONDITION QT_FEATURE_openssl AND QT_FEATURE_ssl AND NOT QT_FEATURE_openssl_linked +qt_extend_target(Network CONDITION QT_FEATURE_openssl AND QT_FEATURE_ssl AND NOT QT_FEATURE_openssl_linked LIBRARIES OpenSSL::SSL_nolink ) -extend_target(Network CONDITION QT_FEATURE_openssl AND QT_FEATURE_ssl AND WIN32 +qt_extend_target(Network CONDITION QT_FEATURE_openssl AND QT_FEATURE_ssl AND WIN32 SOURCES ssl/qwindowscarootfetcher.cpp ssl/qwindowscarootfetcher_p.h LIBRARIES crypt32 ) -extend_target(Network CONDITION QT_FEATURE_dnslookup AND UNIX AND NOT ANDROID AND NOT INTEGRITY +qt_extend_target(Network CONDITION QT_FEATURE_dnslookup AND UNIX AND NOT ANDROID AND NOT INTEGRITY SOURCES kernel/qdnslookup_unix.cpp ) - -add_qt_docs(Network +qt_add_docs(Network doc/qtnetwork.qdocconf ) -extend_target(Network CONDITION WIN32 PUBLIC_LIBRARIES ws2_32) # special case: mkspecs/common/msvc-desktop.conf +qt_extend_target(Network CONDITION WIN32 PUBLIC_LIBRARIES ws2_32) # special case: mkspecs/common/msvc-desktop.conf diff --git a/src/opengl/.prev_CMakeLists.txt b/src/opengl/.prev_CMakeLists.txt index 2844fac32d..85e382fa16 100644 --- a/src/opengl/.prev_CMakeLists.txt +++ b/src/opengl/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## OpenGL Module: ##################################################################### -add_qt_module(OpenGL +qt_add_module(OpenGL SOURCES gl2paintengineex/qgl2pexvertexarray.cpp gl2paintengineex/qgl2pexvertexarray_p.h gl2paintengineex/qglcustomshaderstage.cpp gl2paintengineex/qglcustomshaderstage_p.h @@ -36,13 +36,10 @@ add_qt_module(OpenGL Qt::Widgets ) -#### Keys ignored in scope 1:.:.:opengl.pro:<TRUE>: -# _LOADED = "qt_module" - ## Scopes: ##################################################################### -extend_target(OpenGL CONDITION MSVC AND (TEST_architecture_arch STREQUAL "i386") +qt_extend_target(OpenGL CONDITION MSVC AND (TEST_architecture_arch STREQUAL "i386") LINK_OPTIONS "/BASE:0x63000000" ) @@ -50,17 +47,11 @@ extend_target(OpenGL CONDITION MSVC AND (TEST_architecture_arch STREQUAL "i386") #### Keys ignored in scope 3:.:.:opengl.pro:solaris-cc_x_: # QMAKE_CXXFLAGS_RELEASE = "--O2" -#### Keys ignored in scope 4:.:.:opengl.pro:QT_FEATURE_opengl: -# CONFIG = "opengl" - -#### Keys ignored in scope 5:.:.:opengl.pro:QT_FEATURE_opengles2: -# CONFIG = "opengles2" - -extend_target(OpenGL CONDITION QT_FEATURE_graphicseffect +qt_extend_target(OpenGL CONDITION QT_FEATURE_graphicseffect SOURCES qgraphicsshadereffect.cpp qgraphicsshadereffect_p.h ) -add_qt_docs( +qt_add_docs(OpenGL doc/qtopengl.qdocconf ) diff --git a/src/opengl/CMakeLists.txt b/src/opengl/CMakeLists.txt index 3714e8705f..85e382fa16 100644 --- a/src/opengl/CMakeLists.txt +++ b/src/opengl/CMakeLists.txt @@ -4,7 +4,7 @@ ## OpenGL Module: ##################################################################### -add_qt_module(OpenGL +qt_add_module(OpenGL SOURCES gl2paintengineex/qgl2pexvertexarray.cpp gl2paintengineex/qgl2pexvertexarray_p.h gl2paintengineex/qglcustomshaderstage.cpp gl2paintengineex/qglcustomshaderstage_p.h @@ -39,7 +39,7 @@ add_qt_module(OpenGL ## Scopes: ##################################################################### -extend_target(OpenGL CONDITION MSVC AND (TEST_architecture_arch STREQUAL "i386") +qt_extend_target(OpenGL CONDITION MSVC AND (TEST_architecture_arch STREQUAL "i386") LINK_OPTIONS "/BASE:0x63000000" ) @@ -47,11 +47,11 @@ extend_target(OpenGL CONDITION MSVC AND (TEST_architecture_arch STREQUAL "i386") #### Keys ignored in scope 3:.:.:opengl.pro:solaris-cc_x_: # QMAKE_CXXFLAGS_RELEASE = "--O2" -extend_target(OpenGL CONDITION QT_FEATURE_graphicseffect +qt_extend_target(OpenGL CONDITION QT_FEATURE_graphicseffect SOURCES qgraphicsshadereffect.cpp qgraphicsshadereffect_p.h ) -add_qt_docs(OpenGL +qt_add_docs(OpenGL doc/qtopengl.qdocconf ) diff --git a/src/platformheaders/CMakeLists.txt b/src/platformheaders/CMakeLists.txt index bbbd1b76b5..820bbb71a5 100644 --- a/src/platformheaders/CMakeLists.txt +++ b/src/platformheaders/CMakeLists.txt @@ -4,9 +4,9 @@ # FIXME Add the rest of the stuff? I don't think any other stuff is needed? -add_qt_module(PlatformHeaders HEADER_MODULE) +qt_add_module(PlatformHeaders HEADER_MODULE) -add_qt_docs(PlatformHeaders +qt_add_docs(PlatformHeaders doc/qtplatformheaders.qdocconf ) diff --git a/src/platformsupport/accessibility/CMakeLists.txt b/src/platformsupport/accessibility/CMakeLists.txt index 43c8fa4487..35c1758b86 100644 --- a/src/platformsupport/accessibility/CMakeLists.txt +++ b/src/platformsupport/accessibility/CMakeLists.txt @@ -4,7 +4,7 @@ ## AccessibilitySupport Module: ##################################################################### -add_qt_module(AccessibilitySupport +qt_add_module(AccessibilitySupport STATIC INTERNAL_MODULE SOURCES diff --git a/src/platformsupport/clipboard/CMakeLists.txt b/src/platformsupport/clipboard/CMakeLists.txt index 394bb07b3a..e6eb577973 100644 --- a/src/platformsupport/clipboard/CMakeLists.txt +++ b/src/platformsupport/clipboard/CMakeLists.txt @@ -4,7 +4,7 @@ ## ClipboardSupport Module: ##################################################################### -add_qt_module(ClipboardSupport +qt_add_module(ClipboardSupport STATIC INTERNAL_MODULE SOURCES @@ -25,7 +25,7 @@ add_qt_module(ClipboardSupport ## Scopes: ##################################################################### -extend_target(ClipboardSupport CONDITION APPLE_OSX +qt_extend_target(ClipboardSupport CONDITION APPLE_OSX LIBRARIES ${FWAppKit} ) diff --git a/src/platformsupport/devicediscovery/CMakeLists.txt b/src/platformsupport/devicediscovery/CMakeLists.txt index 92803c9eab..47ce31a66a 100644 --- a/src/platformsupport/devicediscovery/CMakeLists.txt +++ b/src/platformsupport/devicediscovery/CMakeLists.txt @@ -4,7 +4,7 @@ ## DeviceDiscoverySupport Module: ##################################################################### -add_qt_module(DeviceDiscoverySupport +qt_add_module(DeviceDiscoverySupport STATIC INTERNAL_MODULE SOURCES @@ -24,19 +24,19 @@ add_qt_module(DeviceDiscoverySupport ## Scopes: ##################################################################### -extend_target(DeviceDiscoverySupport CONDITION QT_FEATURE_libudev +qt_extend_target(DeviceDiscoverySupport CONDITION QT_FEATURE_libudev SOURCES qdevicediscovery_udev.cpp qdevicediscovery_udev_p.h LIBRARIES PkgConfig::Libudev ) -extend_target(DeviceDiscoverySupport CONDITION QT_FEATURE_evdev AND NOT QT_FEATURE_libudev +qt_extend_target(DeviceDiscoverySupport CONDITION QT_FEATURE_evdev AND NOT QT_FEATURE_libudev SOURCES qdevicediscovery_static.cpp qdevicediscovery_static_p.h ) -extend_target(DeviceDiscoverySupport CONDITION NOT QT_FEATURE_evdev AND NOT QT_FEATURE_libudev +qt_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/edid/CMakeLists.txt b/src/platformsupport/edid/CMakeLists.txt index bafba7d84b..e27aa34335 100644 --- a/src/platformsupport/edid/CMakeLists.txt +++ b/src/platformsupport/edid/CMakeLists.txt @@ -4,7 +4,7 @@ ## EdidSupport Module: ##################################################################### -add_qt_module(EdidSupport +qt_add_module(EdidSupport STATIC INTERNAL_MODULE SOURCES diff --git a/src/platformsupport/eglconvenience/.prev_CMakeLists.txt b/src/platformsupport/eglconvenience/.prev_CMakeLists.txt index 5e4638b1ca..2d31b07cea 100644 --- a/src/platformsupport/eglconvenience/.prev_CMakeLists.txt +++ b/src/platformsupport/eglconvenience/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## EglSupport Module: ##################################################################### -add_qt_module(EglSupport +qt_add_module(EglSupport STATIC INTERNAL_MODULE SOURCES @@ -29,25 +29,25 @@ add_qt_module(EglSupport ## Scopes: ##################################################################### -extend_target(EglSupport CONDITION QT_FEATURE_opengl +qt_extend_target(EglSupport CONDITION QT_FEATURE_opengl SOURCES qeglpbuffer.cpp qeglpbuffer_p.h qeglplatformcontext.cpp qeglplatformcontext_p.h ) -extend_target(EglSupport CONDITION QT_FEATURE_egl_x11 +qt_extend_target(EglSupport CONDITION QT_FEATURE_egl_x11 SOURCES qxlibeglintegration.cpp qxlibeglintegration_p.h LIBRARIES X11::XCB ) -extend_target(EglSupport CONDITION NOT QT_FEATURE_egl_x11 +qt_extend_target(EglSupport CONDITION NOT QT_FEATURE_egl_x11 DEFINES QT_EGL_NO_X11 ) -extend_target(EglSupport CONDITION QT_FEATURE_dlopen +qt_extend_target(EglSupport CONDITION QT_FEATURE_dlopen PUBLIC_LIBRARIES ${CMAKE_DL_LIBS} ) diff --git a/src/platformsupport/eglconvenience/CMakeLists.txt b/src/platformsupport/eglconvenience/CMakeLists.txt index a0609c5a4d..0c56acd711 100644 --- a/src/platformsupport/eglconvenience/CMakeLists.txt +++ b/src/platformsupport/eglconvenience/CMakeLists.txt @@ -1,10 +1,12 @@ -qt_find_package(EGL) # special case +# Generated from eglconvenience.pro. ##################################################################### ## EglSupport Module: ##################################################################### -add_qt_module(EglSupport +qt_find_package(EGL) # special case + +qt_add_module(EglSupport STATIC INTERNAL_MODULE SOURCES @@ -13,9 +15,7 @@ add_qt_module(EglSupport qt_egl_p.h DEFINES QT_NO_CAST_FROM_ASCII - QT_EGL_NO_X11 LIBRARIES - ${CMAKE_DL_LIBS} Qt::CorePrivate Qt::GuiPrivate EGL::EGL # special case @@ -32,13 +32,25 @@ add_qt_module(EglSupport ## Scopes: ##################################################################### -extend_target(EglSupport CONDITION QT_FEATURE_opengl +qt_extend_target(EglSupport CONDITION QT_FEATURE_opengl SOURCES qeglpbuffer.cpp qeglpbuffer_p.h qeglplatformcontext.cpp qeglplatformcontext_p.h ) -extend_target(EglSupport CONDITION QT_FEATURE_xlib +qt_extend_target(EglSupport CONDITION QT_FEATURE_egl_x11 SOURCES qxlibeglintegration.cpp qxlibeglintegration_p.h + LIBRARIES + X11::XCB +) + +qt_extend_target(EglSupport CONDITION NOT QT_FEATURE_egl_x11 + DEFINES + QT_EGL_NO_X11 +) + +qt_extend_target(EglSupport CONDITION QT_FEATURE_dlopen + PUBLIC_LIBRARIES + ${CMAKE_DL_LIBS} ) diff --git a/src/platformsupport/eventdispatchers/.prev_CMakeLists.txt b/src/platformsupport/eventdispatchers/.prev_CMakeLists.txt index 229c1171ab..3a02b06bdd 100644 --- a/src/platformsupport/eventdispatchers/.prev_CMakeLists.txt +++ b/src/platformsupport/eventdispatchers/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## EventDispatcherSupport Module: ##################################################################### -add_qt_module(EventDispatcherSupport +qt_add_module(EventDispatcherSupport STATIC INTERNAL_MODULE DEFINES @@ -25,19 +25,19 @@ add_qt_module(EventDispatcherSupport ## Scopes: ##################################################################### -extend_target(EventDispatcherSupport CONDITION UNIX +qt_extend_target(EventDispatcherSupport CONDITION UNIX SOURCES qgenericunixeventdispatcher.cpp qgenericunixeventdispatcher_p.h qunixeventdispatcher.cpp qunixeventdispatcher_qpa_p.h ) -extend_target(EventDispatcherSupport CONDITION WIN32 +qt_extend_target(EventDispatcherSupport CONDITION WIN32 SOURCES qwindowsguieventdispatcher.cpp qwindowsguieventdispatcher_p.h ) -extend_target(EventDispatcherSupport CONDITION QT_FEATURE_glib +qt_extend_target(EventDispatcherSupport CONDITION QT_FEATURE_glib SOURCES qeventdispatcher_glib.cpp qeventdispatcher_glib_p.h LIBRARIES diff --git a/src/platformsupport/eventdispatchers/CMakeLists.txt b/src/platformsupport/eventdispatchers/CMakeLists.txt index add508b5b6..74ffbe5cbb 100644 --- a/src/platformsupport/eventdispatchers/CMakeLists.txt +++ b/src/platformsupport/eventdispatchers/CMakeLists.txt @@ -6,7 +6,7 @@ qt_find_package(GLIB2) # special case ## EventDispatcherSupport Module: ##################################################################### -add_qt_module(EventDispatcherSupport +qt_add_module(EventDispatcherSupport STATIC INTERNAL_MODULE DEFINES @@ -27,19 +27,19 @@ add_qt_module(EventDispatcherSupport ## Scopes: ##################################################################### -extend_target(EventDispatcherSupport CONDITION UNIX +qt_extend_target(EventDispatcherSupport CONDITION UNIX SOURCES qgenericunixeventdispatcher.cpp qgenericunixeventdispatcher_p.h qunixeventdispatcher.cpp qunixeventdispatcher_qpa_p.h ) -extend_target(EventDispatcherSupport CONDITION WIN32 +qt_extend_target(EventDispatcherSupport CONDITION WIN32 SOURCES qwindowsguieventdispatcher.cpp qwindowsguieventdispatcher_p.h ) -extend_target(EventDispatcherSupport CONDITION QT_FEATURE_glib +qt_extend_target(EventDispatcherSupport CONDITION QT_FEATURE_glib SOURCES qeventdispatcher_glib.cpp qeventdispatcher_glib_p.h LIBRARIES diff --git a/src/platformsupport/fbconvenience/CMakeLists.txt b/src/platformsupport/fbconvenience/CMakeLists.txt index eb854114db..458c169e76 100644 --- a/src/platformsupport/fbconvenience/CMakeLists.txt +++ b/src/platformsupport/fbconvenience/CMakeLists.txt @@ -4,7 +4,7 @@ ## FbSupport Module: ##################################################################### -add_qt_module(FbSupport +qt_add_module(FbSupport STATIC INTERNAL_MODULE SOURCES diff --git a/src/platformsupport/fontdatabases/.prev_CMakeLists.txt b/src/platformsupport/fontdatabases/.prev_CMakeLists.txt index 665d7b08e1..cdc85fc4c9 100644 --- a/src/platformsupport/fontdatabases/.prev_CMakeLists.txt +++ b/src/platformsupport/fontdatabases/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## FontDatabaseSupport Module: ##################################################################### -add_qt_module(FontDatabaseSupport +qt_add_module(FontDatabaseSupport STATIC INTERNAL_MODULE DEFINES @@ -25,7 +25,7 @@ add_qt_module(FontDatabaseSupport ## Scopes: ##################################################################### -extend_target(FontDatabaseSupport CONDITION APPLE +qt_extend_target(FontDatabaseSupport CONDITION APPLE SOURCES mac/qcoretextfontdatabase.mm mac/qcoretextfontdatabase_p.h mac/qfontengine_coretext.mm mac/qfontengine_coretext_p.h @@ -36,17 +36,17 @@ extend_target(FontDatabaseSupport CONDITION APPLE ${FWFoundation} ) -extend_target(FontDatabaseSupport CONDITION APPLE_OSX +qt_extend_target(FontDatabaseSupport CONDITION APPLE_OSX LIBRARIES ${FWAppKit} ) -extend_target(FontDatabaseSupport CONDITION APPLE AND NOT APPLE_OSX +qt_extend_target(FontDatabaseSupport CONDITION APPLE AND NOT APPLE_OSX LIBRARIES ${FWUIKit} ) -extend_target(FontDatabaseSupport CONDITION QT_FEATURE_freetype +qt_extend_target(FontDatabaseSupport CONDITION QT_FEATURE_freetype SOURCES freetype/qfontengine_ft.cpp freetype/qfontengine_ft_p.h freetype/qfreetypefontdatabase.cpp freetype/qfreetypefontdatabase_p.h @@ -54,12 +54,12 @@ extend_target(FontDatabaseSupport CONDITION QT_FEATURE_freetype WrapFreetype::WrapFreetype ) -extend_target(FontDatabaseSupport CONDITION UNIX +qt_extend_target(FontDatabaseSupport CONDITION UNIX SOURCES genericunix/qgenericunixfontdatabase_p.h ) -extend_target(FontDatabaseSupport CONDITION QT_FEATURE_fontconfig AND UNIX +qt_extend_target(FontDatabaseSupport CONDITION QT_FEATURE_fontconfig AND UNIX SOURCES fontconfig/qfontconfigdatabase.cpp fontconfig/qfontconfigdatabase_p.h fontconfig/qfontenginemultifontconfig.cpp fontconfig/qfontenginemultifontconfig_p.h @@ -67,7 +67,7 @@ extend_target(FontDatabaseSupport CONDITION QT_FEATURE_fontconfig AND UNIX Fontconfig::Fontconfig ) -extend_target(FontDatabaseSupport CONDITION WIN32 AND NOT WINRT +qt_extend_target(FontDatabaseSupport CONDITION WIN32 AND NOT WINRT SOURCES windows/qwindowsfontdatabase.cpp windows/qwindowsfontdatabase_p.h windows/qwindowsfontengine.cpp windows/qwindowsfontengine_p.h @@ -82,41 +82,41 @@ extend_target(FontDatabaseSupport CONDITION WIN32 AND NOT WINRT Qt::Gui ) -extend_target(FontDatabaseSupport CONDITION QT_FEATURE_freetype AND WIN32 AND NOT WINRT +qt_extend_target(FontDatabaseSupport CONDITION QT_FEATURE_freetype AND WIN32 AND NOT WINRT SOURCES windows/qwindowsfontdatabase_ft.cpp windows/qwindowsfontdatabase_ft_p.h ) -extend_target(FontDatabaseSupport CONDITION QT_FEATURE_direct2d AND QT_FEATURE_directwrite AND WIN32 AND NOT WINRT +qt_extend_target(FontDatabaseSupport CONDITION QT_FEATURE_direct2d AND QT_FEATURE_directwrite AND WIN32 AND NOT WINRT SOURCES windows/qwindowsfontenginedirectwrite.cpp windows/qwindowsfontenginedirectwrite_p.h LIBRARIES d2d1 ) -extend_target(FontDatabaseSupport CONDITION QT_FEATURE_direct2d AND QT_FEATURE_directwrite AND QT_FEATURE_directwrite2 AND WIN32 AND NOT WINRT +qt_extend_target(FontDatabaseSupport CONDITION QT_FEATURE_direct2d AND QT_FEATURE_directwrite AND QT_FEATURE_directwrite2 AND WIN32 AND NOT WINRT DEFINES QT_USE_DIRECTWRITE2 LIBRARIES dwrite_2 ) -extend_target(FontDatabaseSupport CONDITION QT_FEATURE_direct2d AND QT_FEATURE_directwrite AND WIN32 AND NOT QT_FEATURE_directwrite2 AND NOT WINRT +qt_extend_target(FontDatabaseSupport CONDITION QT_FEATURE_direct2d AND QT_FEATURE_directwrite AND WIN32 AND NOT QT_FEATURE_directwrite2 AND NOT WINRT LIBRARIES dwrite ) -extend_target(FontDatabaseSupport CONDITION WIN32 AND NOT WINRT AND (NOT QT_FEATURE_direct2d OR NOT QT_FEATURE_directwrite) +qt_extend_target(FontDatabaseSupport CONDITION WIN32 AND NOT WINRT AND (NOT QT_FEATURE_direct2d OR NOT QT_FEATURE_directwrite) DEFINES QT_NO_DIRECTWRITE ) -extend_target(FontDatabaseSupport CONDITION WIN32 AND mingw AND NOT WINRT +qt_extend_target(FontDatabaseSupport CONDITION WIN32 AND mingw AND NOT WINRT LIBRARIES uuid ) -extend_target(FontDatabaseSupport CONDITION WINRT +qt_extend_target(FontDatabaseSupport CONDITION WINRT SOURCES winrt/qwinrtfontdatabase.cpp winrt/qwinrtfontdatabase_p.h DEFINES diff --git a/src/platformsupport/fontdatabases/CMakeLists.txt b/src/platformsupport/fontdatabases/CMakeLists.txt index 322a909f29..e17abc3f3a 100644 --- a/src/platformsupport/fontdatabases/CMakeLists.txt +++ b/src/platformsupport/fontdatabases/CMakeLists.txt @@ -7,7 +7,7 @@ qt_find_package(Fontconfig) # special case ## FontDatabaseSupport Module: ##################################################################### -add_qt_module(FontDatabaseSupport +qt_add_module(FontDatabaseSupport STATIC INTERNAL_MODULE DEFINES @@ -28,7 +28,7 @@ add_qt_module(FontDatabaseSupport ## Scopes: ##################################################################### -extend_target(FontDatabaseSupport CONDITION APPLE +qt_extend_target(FontDatabaseSupport CONDITION APPLE SOURCES mac/qcoretextfontdatabase.mm mac/qcoretextfontdatabase_p.h mac/qfontengine_coretext.mm mac/qfontengine_coretext_p.h @@ -39,17 +39,17 @@ extend_target(FontDatabaseSupport CONDITION APPLE ${FWFoundation} ) -extend_target(FontDatabaseSupport CONDITION APPLE_OSX +qt_extend_target(FontDatabaseSupport CONDITION APPLE_OSX LIBRARIES ${FWAppKit} ) -extend_target(FontDatabaseSupport CONDITION APPLE AND NOT APPLE_OSX +qt_extend_target(FontDatabaseSupport CONDITION APPLE AND NOT APPLE_OSX LIBRARIES ${FWUIKit} ) -extend_target(FontDatabaseSupport CONDITION QT_FEATURE_freetype +qt_extend_target(FontDatabaseSupport CONDITION QT_FEATURE_freetype SOURCES freetype/qfontengine_ft.cpp freetype/qfontengine_ft_p.h freetype/qfreetypefontdatabase.cpp freetype/qfreetypefontdatabase_p.h @@ -57,12 +57,12 @@ extend_target(FontDatabaseSupport CONDITION QT_FEATURE_freetype WrapFreetype::WrapFreetype ) -extend_target(FontDatabaseSupport CONDITION UNIX +qt_extend_target(FontDatabaseSupport CONDITION UNIX SOURCES genericunix/qgenericunixfontdatabase_p.h ) -extend_target(FontDatabaseSupport CONDITION QT_FEATURE_fontconfig AND UNIX +qt_extend_target(FontDatabaseSupport CONDITION QT_FEATURE_fontconfig AND UNIX SOURCES fontconfig/qfontconfigdatabase.cpp fontconfig/qfontconfigdatabase_p.h fontconfig/qfontenginemultifontconfig.cpp fontconfig/qfontenginemultifontconfig_p.h @@ -70,7 +70,7 @@ extend_target(FontDatabaseSupport CONDITION QT_FEATURE_fontconfig AND UNIX Fontconfig::Fontconfig ) -extend_target(FontDatabaseSupport CONDITION WIN32 AND NOT WINRT +qt_extend_target(FontDatabaseSupport CONDITION WIN32 AND NOT WINRT SOURCES windows/qwindowsfontdatabase.cpp windows/qwindowsfontdatabase_p.h windows/qwindowsfontengine.cpp windows/qwindowsfontengine_p.h @@ -85,41 +85,41 @@ extend_target(FontDatabaseSupport CONDITION WIN32 AND NOT WINRT Qt::Gui ) -extend_target(FontDatabaseSupport CONDITION QT_FEATURE_freetype AND WIN32 AND NOT WINRT +qt_extend_target(FontDatabaseSupport CONDITION QT_FEATURE_freetype AND WIN32 AND NOT WINRT SOURCES windows/qwindowsfontdatabase_ft.cpp windows/qwindowsfontdatabase_ft_p.h ) -extend_target(FontDatabaseSupport CONDITION QT_FEATURE_direct2d AND QT_FEATURE_directwrite AND WIN32 AND NOT WINRT +qt_extend_target(FontDatabaseSupport CONDITION QT_FEATURE_direct2d AND QT_FEATURE_directwrite AND WIN32 AND NOT WINRT SOURCES windows/qwindowsfontenginedirectwrite.cpp windows/qwindowsfontenginedirectwrite_p.h LIBRARIES d2d1 ) -extend_target(FontDatabaseSupport CONDITION QT_FEATURE_direct2d AND QT_FEATURE_directwrite AND QT_FEATURE_directwrite2 AND WIN32 AND NOT WINRT +qt_extend_target(FontDatabaseSupport CONDITION QT_FEATURE_direct2d AND QT_FEATURE_directwrite AND QT_FEATURE_directwrite2 AND WIN32 AND NOT WINRT DEFINES QT_USE_DIRECTWRITE2 LIBRARIES dwrite_2 ) -extend_target(FontDatabaseSupport CONDITION QT_FEATURE_direct2d AND QT_FEATURE_directwrite AND WIN32 AND NOT QT_FEATURE_directwrite2 AND NOT WINRT +qt_extend_target(FontDatabaseSupport CONDITION QT_FEATURE_direct2d AND QT_FEATURE_directwrite AND WIN32 AND NOT QT_FEATURE_directwrite2 AND NOT WINRT LIBRARIES dwrite ) -extend_target(FontDatabaseSupport CONDITION WIN32 AND NOT WINRT AND (NOT QT_FEATURE_direct2d OR NOT QT_FEATURE_directwrite) +qt_extend_target(FontDatabaseSupport CONDITION WIN32 AND NOT WINRT AND (NOT QT_FEATURE_direct2d OR NOT QT_FEATURE_directwrite) DEFINES QT_NO_DIRECTWRITE ) -extend_target(FontDatabaseSupport CONDITION WIN32 AND mingw AND NOT WINRT +qt_extend_target(FontDatabaseSupport CONDITION WIN32 AND mingw AND NOT WINRT LIBRARIES uuid ) -extend_target(FontDatabaseSupport CONDITION WINRT +qt_extend_target(FontDatabaseSupport CONDITION WINRT SOURCES winrt/qwinrtfontdatabase.cpp winrt/qwinrtfontdatabase_p.h DEFINES diff --git a/src/platformsupport/glxconvenience/.prev_CMakeLists.txt b/src/platformsupport/glxconvenience/.prev_CMakeLists.txt index 1df82148e8..4e5e7378d4 100644 --- a/src/platformsupport/glxconvenience/.prev_CMakeLists.txt +++ b/src/platformsupport/glxconvenience/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## GlxSupport Module: ##################################################################### -add_qt_module(GlxSupport +qt_add_module(GlxSupport STATIC INTERNAL_MODULE SOURCES diff --git a/src/platformsupport/glxconvenience/CMakeLists.txt b/src/platformsupport/glxconvenience/CMakeLists.txt index 09ad8ed126..9d687f22a1 100644 --- a/src/platformsupport/glxconvenience/CMakeLists.txt +++ b/src/platformsupport/glxconvenience/CMakeLists.txt @@ -6,7 +6,7 @@ qt_find_package(X11) # special case ## GlxSupport Module: ##################################################################### -add_qt_module(GlxSupport +qt_add_module(GlxSupport STATIC INTERNAL_MODULE SOURCES diff --git a/src/platformsupport/graphics/CMakeLists.txt b/src/platformsupport/graphics/CMakeLists.txt index 059b3346dd..cbb9e0937b 100644 --- a/src/platformsupport/graphics/CMakeLists.txt +++ b/src/platformsupport/graphics/CMakeLists.txt @@ -4,7 +4,7 @@ ## GraphicsSupport Module: ##################################################################### -add_qt_module(GraphicsSupport +qt_add_module(GraphicsSupport STATIC INTERNAL_MODULE SOURCES diff --git a/src/platformsupport/input/CMakeLists.txt b/src/platformsupport/input/CMakeLists.txt index 3c5cbaa4ce..d9fa7f80fd 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: ##################################################################### -add_qt_module(InputSupport +qt_add_module(InputSupport STATIC INTERNAL_MODULE DEFINES @@ -33,7 +33,7 @@ add_qt_module(InputSupport ## Scopes: ##################################################################### -extend_target(InputSupport CONDITION QT_FEATURE_evdev +qt_extend_target(InputSupport CONDITION QT_FEATURE_evdev SOURCES evdevkeyboard/qevdevkeyboard_defaultmap_p.h evdevkeyboard/qevdevkeyboardhandler.cpp evdevkeyboard/qevdevkeyboardhandler_p.h @@ -46,35 +46,35 @@ extend_target(InputSupport CONDITION QT_FEATURE_evdev evdevtouch/../shared ) -extend_target(InputSupport CONDITION QT_FEATURE_evdev AND QT_FEATURE_tabletevent +qt_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 ) -extend_target(InputSupport CONDITION QT_FEATURE_evdev AND QT_FEATURE_libudev AND QT_FEATURE_tabletevent +qt_extend_target(InputSupport CONDITION QT_FEATURE_evdev AND QT_FEATURE_libudev AND QT_FEATURE_tabletevent LIBRARIES PkgConfig::Libudev ) -extend_target(InputSupport CONDITION QT_FEATURE_evdev AND QT_FEATURE_libudev +qt_extend_target(InputSupport CONDITION QT_FEATURE_evdev AND QT_FEATURE_libudev LIBRARIES PkgConfig::Libudev ) -extend_target(InputSupport CONDITION QT_FEATURE_evdev AND QT_FEATURE_mtdev +qt_extend_target(InputSupport CONDITION QT_FEATURE_evdev AND QT_FEATURE_mtdev LIBRARIES PkgConfig::Mtdev ) -extend_target(InputSupport CONDITION QT_FEATURE_tslib +qt_extend_target(InputSupport CONDITION QT_FEATURE_tslib SOURCES tslib/qtslib.cpp tslib/qtslib_p.h PUBLIC_LIBRARIES PkgConfig::Tslib ) -extend_target(InputSupport CONDITION QT_FEATURE_libinput +qt_extend_target(InputSupport CONDITION QT_FEATURE_libinput SOURCES libinput/qlibinputhandler.cpp libinput/qlibinputhandler_p.h libinput/qlibinputkeyboard.cpp libinput/qlibinputkeyboard_p.h @@ -87,7 +87,7 @@ extend_target(InputSupport CONDITION QT_FEATURE_libinput PkgConfig::Libudev ) -extend_target(InputSupport CONDITION QT_FEATURE_libinput AND QT_FEATURE_xkbcommon +qt_extend_target(InputSupport CONDITION QT_FEATURE_libinput AND QT_FEATURE_xkbcommon LIBRARIES Qt::XkbCommonSupportPrivate XKB::XKB @@ -95,14 +95,14 @@ extend_target(InputSupport CONDITION QT_FEATURE_libinput AND QT_FEATURE_xkbcommo Qt::XkbCommonSupport ) -extend_target(InputSupport CONDITION QT_FEATURE_evdev OR QT_FEATURE_libinput +qt_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 ) -extend_target(InputSupport CONDITION QT_FEATURE_integrityhid +qt_extend_target(InputSupport CONDITION QT_FEATURE_integrityhid SOURCES integrityhid/qintegrityhidmanager.cpp integrityhid/qintegrityhidmanager.h LIBRARIES diff --git a/src/platformsupport/input/xkbcommon/CMakeLists.txt b/src/platformsupport/input/xkbcommon/CMakeLists.txt index 74e43cd10e..18d07932d4 100644 --- a/src/platformsupport/input/xkbcommon/CMakeLists.txt +++ b/src/platformsupport/input/xkbcommon/CMakeLists.txt @@ -4,7 +4,7 @@ ## XkbCommonSupport Module: ##################################################################### -add_qt_module(XkbCommonSupport +qt_add_module(XkbCommonSupport STATIC INTERNAL_MODULE SOURCES @@ -29,7 +29,7 @@ add_qt_module(XkbCommonSupport ## Scopes: ##################################################################### -extend_target(XkbCommonSupport CONDITION CLANG AND NOT ICC +qt_extend_target(XkbCommonSupport CONDITION CLANG AND NOT ICC COMPILE_OPTIONS -ftemplate-depth=1024 ) diff --git a/src/platformsupport/kmsconvenience/.prev_CMakeLists.txt b/src/platformsupport/kmsconvenience/.prev_CMakeLists.txt index 0ed2ce57eb..500288db57 100644 --- a/src/platformsupport/kmsconvenience/.prev_CMakeLists.txt +++ b/src/platformsupport/kmsconvenience/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## KmsSupport Module: ##################################################################### -add_qt_module(KmsSupport +qt_add_module(KmsSupport STATIC INTERNAL_MODULE SOURCES diff --git a/src/platformsupport/kmsconvenience/CMakeLists.txt b/src/platformsupport/kmsconvenience/CMakeLists.txt index 7eecd97f26..08e89f5f07 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: ##################################################################### -add_qt_module(KmsSupport +qt_add_module(KmsSupport STATIC INTERNAL_MODULE SOURCES diff --git a/src/platformsupport/linuxaccessibility/.prev_CMakeLists.txt b/src/platformsupport/linuxaccessibility/.prev_CMakeLists.txt index cea4422465..6c9b8621ab 100644 --- a/src/platformsupport/linuxaccessibility/.prev_CMakeLists.txt +++ b/src/platformsupport/linuxaccessibility/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## LinuxAccessibilitySupport Module: ##################################################################### -add_qt_module(LinuxAccessibilitySupport +qt_add_module(LinuxAccessibilitySupport STATIC INTERNAL_MODULE SOURCES diff --git a/src/platformsupport/linuxaccessibility/CMakeLists.txt b/src/platformsupport/linuxaccessibility/CMakeLists.txt index 5676b28088..4ee93f4ca7 100644 --- a/src/platformsupport/linuxaccessibility/CMakeLists.txt +++ b/src/platformsupport/linuxaccessibility/CMakeLists.txt @@ -6,7 +6,7 @@ qt_find_package(ATSPI2) # special case ## LinuxAccessibilitySupport Module: ##################################################################### -add_qt_module(LinuxAccessibilitySupport +qt_add_module(LinuxAccessibilitySupport STATIC INTERNAL_MODULE SOURCES diff --git a/src/platformsupport/platformcompositor/CMakeLists.txt b/src/platformsupport/platformcompositor/CMakeLists.txt index ee8a47f084..b8b59a2723 100644 --- a/src/platformsupport/platformcompositor/CMakeLists.txt +++ b/src/platformsupport/platformcompositor/CMakeLists.txt @@ -4,7 +4,7 @@ ## PlatformCompositorSupport Module: ##################################################################### -add_qt_module(PlatformCompositorSupport +qt_add_module(PlatformCompositorSupport STATIC INTERNAL_MODULE SOURCES diff --git a/src/platformsupport/services/CMakeLists.txt b/src/platformsupport/services/CMakeLists.txt index 30b2020caa..4744455489 100644 --- a/src/platformsupport/services/CMakeLists.txt +++ b/src/platformsupport/services/CMakeLists.txt @@ -4,7 +4,7 @@ ## ServiceSupport Module: ##################################################################### -add_qt_module(ServiceSupport +qt_add_module(ServiceSupport STATIC INTERNAL_MODULE SOURCES @@ -27,7 +27,7 @@ add_qt_module(ServiceSupport ## Scopes: ##################################################################### -extend_target(ServiceSupport CONDITION QT_FEATURE_dbus +qt_extend_target(ServiceSupport CONDITION QT_FEATURE_dbus PUBLIC_LIBRARIES Qt::DBus ) diff --git a/src/platformsupport/themes/CMakeLists.txt b/src/platformsupport/themes/CMakeLists.txt index 6e13cae336..1c575a8bf1 100644 --- a/src/platformsupport/themes/CMakeLists.txt +++ b/src/platformsupport/themes/CMakeLists.txt @@ -4,7 +4,7 @@ ## ThemeSupport Module: ##################################################################### -add_qt_module(ThemeSupport +qt_add_module(ThemeSupport STATIC INTERNAL_MODULE SOURCES @@ -25,12 +25,12 @@ add_qt_module(ThemeSupport ## Scopes: ##################################################################### -extend_target(ThemeSupport CONDITION QT_FEATURE_xcb OR (UNIX AND NOT APPLE_UIKIT) +qt_extend_target(ThemeSupport CONDITION QT_FEATURE_xcb OR (UNIX AND NOT APPLE_UIKIT) SOURCES genericunix/qgenericunixthemes.cpp genericunix/qgenericunixthemes_p.h ) -extend_target(ThemeSupport CONDITION QT_FEATURE_dbus AND (QT_FEATURE_xcb OR UNIX) AND (QT_FEATURE_xcb OR NOT APPLE_UIKIT) +qt_extend_target(ThemeSupport CONDITION QT_FEATURE_dbus AND (QT_FEATURE_xcb OR UNIX) AND (QT_FEATURE_xcb OR NOT APPLE_UIKIT) SOURCES genericunix/dbusmenu/qdbusmenuadaptor.cpp genericunix/dbusmenu/qdbusmenuadaptor_p.h genericunix/dbusmenu/qdbusmenubar.cpp genericunix/dbusmenu/qdbusmenubar_p.h @@ -44,7 +44,7 @@ extend_target(ThemeSupport CONDITION QT_FEATURE_dbus AND (QT_FEATURE_xcb OR UNIX Qt::DBus ) -extend_target(ThemeSupport CONDITION QT_FEATURE_dbus AND QT_FEATURE_systemtrayicon AND (QT_FEATURE_xcb OR UNIX) AND (QT_FEATURE_xcb OR NOT APPLE_UIKIT) +qt_extend_target(ThemeSupport CONDITION QT_FEATURE_dbus AND QT_FEATURE_systemtrayicon AND (QT_FEATURE_xcb OR UNIX) AND (QT_FEATURE_xcb OR NOT APPLE_UIKIT) SOURCES genericunix/dbustray/qdbustrayicon.cpp genericunix/dbustray/qdbustrayicon_p.h genericunix/dbustray/qdbustraytypes.cpp genericunix/dbustray/qdbustraytypes_p.h diff --git a/src/platformsupport/vkconvenience/.prev_CMakeLists.txt b/src/platformsupport/vkconvenience/.prev_CMakeLists.txt index bfec090512..070a0ee35f 100644 --- a/src/platformsupport/vkconvenience/.prev_CMakeLists.txt +++ b/src/platformsupport/vkconvenience/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## VulkanSupport Module: ##################################################################### -add_qt_module(VulkanSupport +qt_add_module(VulkanSupport STATIC INTERNAL_MODULE SOURCES diff --git a/src/platformsupport/vkconvenience/CMakeLists.txt b/src/platformsupport/vkconvenience/CMakeLists.txt index 3d79bc5110..99435d1f55 100644 --- a/src/platformsupport/vkconvenience/CMakeLists.txt +++ b/src/platformsupport/vkconvenience/CMakeLists.txt @@ -6,7 +6,7 @@ qt_find_package(Vulkan) # special case ## VulkanSupport Module: ##################################################################### -add_qt_module(VulkanSupport +qt_add_module(VulkanSupport STATIC INTERNAL_MODULE SOURCES diff --git a/src/platformsupport/windowsuiautomation/CMakeLists.txt b/src/platformsupport/windowsuiautomation/CMakeLists.txt index c9166d0b6c..f4c29b8c3e 100644 --- a/src/platformsupport/windowsuiautomation/CMakeLists.txt +++ b/src/platformsupport/windowsuiautomation/CMakeLists.txt @@ -4,7 +4,7 @@ ## WindowsUIAutomationSupport Module: ##################################################################### -add_qt_module(WindowsUIAutomationSupport +qt_add_module(WindowsUIAutomationSupport STATIC INTERNAL_MODULE SOURCES diff --git a/src/plugins/bearer/android/src/CMakeLists.txt b/src/plugins/bearer/android/src/CMakeLists.txt index 28beab0bbd..8aee553d86 100644 --- a/src/plugins/bearer/android/src/CMakeLists.txt +++ b/src/plugins/bearer/android/src/CMakeLists.txt @@ -4,7 +4,7 @@ ## qandroidbearer Plugin: ##################################################################### -add_qt_plugin(qandroidbearer +qt_add_plugin(qandroidbearer TYPE bearer CLASS_NAME QAndroidBearerEnginePlugin SOURCES diff --git a/src/plugins/bearer/connman/.prev_CMakeLists.txt b/src/plugins/bearer/connman/.prev_CMakeLists.txt index c1940a1e16..d753919a2b 100644 --- a/src/plugins/bearer/connman/.prev_CMakeLists.txt +++ b/src/plugins/bearer/connman/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## qconnmanbearer Plugin: ##################################################################### -add_qt_plugin(qconnmanbearer +qt_add_plugin(qconnmanbearer TYPE bearer CLASS_NAME QConnmanEnginePlugin SOURCES diff --git a/src/plugins/bearer/connman/CMakeLists.txt b/src/plugins/bearer/connman/CMakeLists.txt index af2a599cb0..1ad024806b 100644 --- a/src/plugins/bearer/connman/CMakeLists.txt +++ b/src/plugins/bearer/connman/CMakeLists.txt @@ -4,7 +4,7 @@ ## qconnmanbearer Plugin: ##################################################################### -add_qt_plugin(qconnmanbearer +qt_add_plugin(qconnmanbearer TYPE bearer DEFAULT_IF False # special case QTBUG-78164 CLASS_NAME QConnmanEnginePlugin diff --git a/src/plugins/bearer/corewlan/CMakeLists.txt b/src/plugins/bearer/corewlan/CMakeLists.txt index f42f9cfb52..914f5ceae1 100644 --- a/src/plugins/bearer/corewlan/CMakeLists.txt +++ b/src/plugins/bearer/corewlan/CMakeLists.txt @@ -4,7 +4,7 @@ ## qcorewlanbearer Plugin: ##################################################################### -add_qt_plugin(qcorewlanbearer +qt_add_plugin(qcorewlanbearer TYPE bearer CLASS_NAME QCoreWlanEnginePlugin SOURCES @@ -26,7 +26,7 @@ add_qt_plugin(qcorewlanbearer ## Scopes: ##################################################################### -extend_target(qcorewlanbearer CONDITION QT_FEATURE_corewlan +qt_extend_target(qcorewlanbearer CONDITION QT_FEATURE_corewlan PUBLIC_LIBRARIES ${FWCoreWLAN} ${FWSecurity} diff --git a/src/plugins/bearer/generic/CMakeLists.txt b/src/plugins/bearer/generic/CMakeLists.txt index 9f02d5cd7f..c41688e82a 100644 --- a/src/plugins/bearer/generic/CMakeLists.txt +++ b/src/plugins/bearer/generic/CMakeLists.txt @@ -4,7 +4,7 @@ ## qgenericbearer Plugin: ##################################################################### -add_qt_plugin(qgenericbearer +qt_add_plugin(qgenericbearer TYPE bearer CLASS_NAME QGenericEnginePlugin SOURCES @@ -25,7 +25,7 @@ add_qt_plugin(qgenericbearer ## Scopes: ##################################################################### -extend_target(qgenericbearer CONDITION WIN32 AND NOT WINRT +qt_extend_target(qgenericbearer CONDITION WIN32 AND NOT WINRT PUBLIC_LIBRARIES iphlpapi ) diff --git a/src/plugins/bearer/networkmanager/.prev_CMakeLists.txt b/src/plugins/bearer/networkmanager/.prev_CMakeLists.txt index f0748bebde..993e4d7900 100644 --- a/src/plugins/bearer/networkmanager/.prev_CMakeLists.txt +++ b/src/plugins/bearer/networkmanager/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## qnmbearer Plugin: ##################################################################### -add_qt_plugin(qnmbearer +qt_add_plugin(qnmbearer TYPE bearer CLASS_NAME QNetworkManagerEnginePlugin SOURCES diff --git a/src/plugins/bearer/networkmanager/CMakeLists.txt b/src/plugins/bearer/networkmanager/CMakeLists.txt index bbb1650140..a6fb609e9d 100644 --- a/src/plugins/bearer/networkmanager/CMakeLists.txt +++ b/src/plugins/bearer/networkmanager/CMakeLists.txt @@ -4,7 +4,7 @@ ## qnmbearer Plugin: ##################################################################### -add_qt_plugin(qnmbearer +qt_add_plugin(qnmbearer TYPE bearer DEFAULT_IF False # special case QTBUG-78164 CLASS_NAME QNetworkManagerEnginePlugin diff --git a/src/plugins/generic/evdevkeyboard/CMakeLists.txt b/src/plugins/generic/evdevkeyboard/CMakeLists.txt index 2466339d83..e8adbd6d51 100644 --- a/src/plugins/generic/evdevkeyboard/CMakeLists.txt +++ b/src/plugins/generic/evdevkeyboard/CMakeLists.txt @@ -4,7 +4,7 @@ ## qevdevkeyboardplugin Plugin: ##################################################################### -add_qt_plugin(qevdevkeyboardplugin +qt_add_plugin(qevdevkeyboardplugin TYPE generic CLASS_NAME QEvdevKeyboardPlugin SOURCES diff --git a/src/plugins/generic/evdevmouse/CMakeLists.txt b/src/plugins/generic/evdevmouse/CMakeLists.txt index e65ca7d717..fc6b3d30c2 100644 --- a/src/plugins/generic/evdevmouse/CMakeLists.txt +++ b/src/plugins/generic/evdevmouse/CMakeLists.txt @@ -4,7 +4,7 @@ ## qevdevmouseplugin Plugin: ##################################################################### -add_qt_plugin(qevdevmouseplugin +qt_add_plugin(qevdevmouseplugin TYPE generic CLASS_NAME QEvdevMousePlugin SOURCES diff --git a/src/plugins/generic/evdevtablet/CMakeLists.txt b/src/plugins/generic/evdevtablet/CMakeLists.txt index 4d463fa929..1479a2f66b 100644 --- a/src/plugins/generic/evdevtablet/CMakeLists.txt +++ b/src/plugins/generic/evdevtablet/CMakeLists.txt @@ -4,7 +4,7 @@ ## qevdevtabletplugin Plugin: ##################################################################### -add_qt_plugin(qevdevtabletplugin +qt_add_plugin(qevdevtabletplugin TYPE generic CLASS_NAME QEvdevTabletPlugin SOURCES diff --git a/src/plugins/generic/evdevtouch/CMakeLists.txt b/src/plugins/generic/evdevtouch/CMakeLists.txt index 616759f49d..79e11d7969 100644 --- a/src/plugins/generic/evdevtouch/CMakeLists.txt +++ b/src/plugins/generic/evdevtouch/CMakeLists.txt @@ -4,7 +4,7 @@ ## qevdevtouchplugin Plugin: ##################################################################### -add_qt_plugin(qevdevtouchplugin +qt_add_plugin(qevdevtouchplugin TYPE generic CLASS_NAME QEvdevTouchScreenPlugin SOURCES diff --git a/src/plugins/generic/libinput/CMakeLists.txt b/src/plugins/generic/libinput/CMakeLists.txt index 1b07b0926c..d0a60938cd 100644 --- a/src/plugins/generic/libinput/CMakeLists.txt +++ b/src/plugins/generic/libinput/CMakeLists.txt @@ -4,7 +4,7 @@ ## qlibinputplugin Plugin: ##################################################################### -add_qt_plugin(qlibinputplugin +qt_add_plugin(qlibinputplugin TYPE generic CLASS_NAME QLibInputPlugin SOURCES diff --git a/src/plugins/generic/tslib/.prev_CMakeLists.txt b/src/plugins/generic/tslib/.prev_CMakeLists.txt index 7663c67a6d..fe71451ae4 100644 --- a/src/plugins/generic/tslib/.prev_CMakeLists.txt +++ b/src/plugins/generic/tslib/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## qtslibplugin Plugin: ##################################################################### -add_qt_plugin(qtslibplugin +qt_add_plugin(qtslibplugin TYPE generic CLASS_NAME QTsLibPlugin SOURCES diff --git a/src/plugins/generic/tslib/CMakeLists.txt b/src/plugins/generic/tslib/CMakeLists.txt index 2a26fcc2b3..e94f32cc04 100644 --- a/src/plugins/generic/tslib/CMakeLists.txt +++ b/src/plugins/generic/tslib/CMakeLists.txt @@ -6,7 +6,7 @@ qt_find_package(Tslib) # special case ## qtslibplugin Plugin: ##################################################################### -add_qt_plugin(qtslibplugin +qt_add_plugin(qtslibplugin TYPE generic CLASS_NAME QTsLibPlugin SOURCES diff --git a/src/plugins/generic/tuiotouch/CMakeLists.txt b/src/plugins/generic/tuiotouch/CMakeLists.txt index 2c7aa4fc90..0c577487a0 100644 --- a/src/plugins/generic/tuiotouch/CMakeLists.txt +++ b/src/plugins/generic/tuiotouch/CMakeLists.txt @@ -4,7 +4,7 @@ ## qtuiotouchplugin Plugin: ##################################################################### -add_qt_plugin(qtuiotouchplugin +qt_add_plugin(qtuiotouchplugin TYPE generic CLASS_NAME QTuioTouchPlugin SOURCES diff --git a/src/plugins/imageformats/gif/.prev_CMakeLists.txt b/src/plugins/imageformats/gif/.prev_CMakeLists.txt index 19c1d678c2..0dcdf2954d 100644 --- a/src/plugins/imageformats/gif/.prev_CMakeLists.txt +++ b/src/plugins/imageformats/gif/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## qgif Plugin: ##################################################################### -add_qt_plugin(qgif +qt_add_plugin(qgif TYPE imageformats CLASS_NAME QGifPlugin SOURCES diff --git a/src/plugins/imageformats/gif/CMakeLists.txt b/src/plugins/imageformats/gif/CMakeLists.txt index f3642a62e0..0255212201 100644 --- a/src/plugins/imageformats/gif/CMakeLists.txt +++ b/src/plugins/imageformats/gif/CMakeLists.txt @@ -4,7 +4,7 @@ ## qgif Plugin: ##################################################################### -add_qt_plugin(qgif +qt_add_plugin(qgif TYPE imageformats CLASS_NAME QGifPlugin SOURCES diff --git a/src/plugins/imageformats/ico/CMakeLists.txt b/src/plugins/imageformats/ico/CMakeLists.txt index 93d2f26bfe..a07eb59655 100644 --- a/src/plugins/imageformats/ico/CMakeLists.txt +++ b/src/plugins/imageformats/ico/CMakeLists.txt @@ -4,7 +4,7 @@ ## qico Plugin: ##################################################################### -add_qt_plugin(qico +qt_add_plugin(qico TYPE imageformats CLASS_NAME QICOPlugin SOURCES diff --git a/src/plugins/imageformats/jpeg/.prev_CMakeLists.txt b/src/plugins/imageformats/jpeg/.prev_CMakeLists.txt index ed3d7892fd..53239e923f 100644 --- a/src/plugins/imageformats/jpeg/.prev_CMakeLists.txt +++ b/src/plugins/imageformats/jpeg/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## qjpeg Plugin: ##################################################################### -add_qt_plugin(qjpeg +qt_add_plugin(qjpeg TYPE imageformats CLASS_NAME QJpegPlugin SOURCES diff --git a/src/plugins/imageformats/jpeg/CMakeLists.txt b/src/plugins/imageformats/jpeg/CMakeLists.txt index d4ccf1e584..b6a7c73ea6 100644 --- a/src/plugins/imageformats/jpeg/CMakeLists.txt +++ b/src/plugins/imageformats/jpeg/CMakeLists.txt @@ -6,7 +6,7 @@ qt_find_package(JPEG) # special case ## qjpeg Plugin: ##################################################################### -add_qt_plugin(qjpeg +qt_add_plugin(qjpeg TYPE imageformats CLASS_NAME QJpegPlugin SOURCES diff --git a/src/plugins/platforminputcontexts/compose/.prev_CMakeLists.txt b/src/plugins/platforminputcontexts/compose/.prev_CMakeLists.txt index 1e416554af..e5cc7cd766 100644 --- a/src/plugins/platforminputcontexts/compose/.prev_CMakeLists.txt +++ b/src/plugins/platforminputcontexts/compose/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## composeplatforminputcontextplugin Plugin: ##################################################################### -add_qt_plugin(composeplatforminputcontextplugin +qt_add_plugin(composeplatforminputcontextplugin TYPE platforminputcontexts CLASS_NAME QComposePlatformInputContextPlugin SOURCES diff --git a/src/plugins/platforminputcontexts/compose/CMakeLists.txt b/src/plugins/platforminputcontexts/compose/CMakeLists.txt index b1ba1d811e..d28722dc3b 100644 --- a/src/plugins/platforminputcontexts/compose/CMakeLists.txt +++ b/src/plugins/platforminputcontexts/compose/CMakeLists.txt @@ -7,7 +7,7 @@ qt_find_package(XKB) # special case pkg_get_variable(PKG_X11_PREFIX x11 prefix) # special case -add_qt_plugin(composeplatforminputcontextplugin +qt_add_plugin(composeplatforminputcontextplugin TYPE platforminputcontexts CLASS_NAME QComposePlatformInputContextPlugin SOURCES diff --git a/src/plugins/platforminputcontexts/ibus/CMakeLists.txt b/src/plugins/platforminputcontexts/ibus/CMakeLists.txt index 49bdc448d8..49f1c79820 100644 --- a/src/plugins/platforminputcontexts/ibus/CMakeLists.txt +++ b/src/plugins/platforminputcontexts/ibus/CMakeLists.txt @@ -4,7 +4,7 @@ ## ibusplatforminputcontextplugin Plugin: ##################################################################### -add_qt_plugin(ibusplatforminputcontextplugin +qt_add_plugin(ibusplatforminputcontextplugin TYPE platforminputcontexts CLASS_NAME QIbusPlatformInputContextPlugin SOURCES diff --git a/src/plugins/platforms/android/.prev_CMakeLists.txt b/src/plugins/platforms/android/.prev_CMakeLists.txt index 5c825c6b34..62d66746d8 100644 --- a/src/plugins/platforms/android/.prev_CMakeLists.txt +++ b/src/plugins/platforms/android/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## qtforandroid Plugin: ##################################################################### -add_qt_plugin(qtforandroid +qt_add_plugin(qtforandroid TYPE platforms CLASS_NAME QAndroidIntegrationPlugin SOURCES @@ -66,7 +66,7 @@ add_qt_plugin(qtforandroid ## Scopes: ##################################################################### -extend_target(qtforandroid CONDITION QT_FEATURE_vulkan +qt_extend_target(qtforandroid CONDITION QT_FEATURE_vulkan SOURCES qandroidplatformvulkaninstance.cpp qandroidplatformvulkaninstance.h qandroidplatformvulkanwindow.cpp qandroidplatformvulkanwindow.h @@ -76,12 +76,12 @@ extend_target(qtforandroid CONDITION QT_FEATURE_vulkan Qt::VulkanSupport ) -extend_target(qtforandroid CONDITION QT_FEATURE_android_style_assets +qt_extend_target(qtforandroid CONDITION QT_FEATURE_android_style_assets SOURCES extract.cpp ) -extend_target(qtforandroid CONDITION NOT QT_FEATURE_android_style_assets +qt_extend_target(qtforandroid CONDITION NOT QT_FEATURE_android_style_assets SOURCES extract-dummy.cpp ) diff --git a/src/plugins/platforms/android/CMakeLists.txt b/src/plugins/platforms/android/CMakeLists.txt index 536bb2635f..406cb54d72 100644 --- a/src/plugins/platforms/android/CMakeLists.txt +++ b/src/plugins/platforms/android/CMakeLists.txt @@ -4,7 +4,7 @@ ## qtforandroid Plugin: ##################################################################### -add_qt_plugin(qtforandroid +qt_add_plugin(qtforandroid TYPE platforms CLASS_NAME QAndroidIntegrationPlugin DEFAULT_IF ${QT_QPA_DEFAULT_PLATFORM} MATCHES android # special case @@ -75,7 +75,7 @@ add_qt_plugin(qtforandroid ## Scopes: ##################################################################### -extend_target(qtforandroid CONDITION QT_FEATURE_vulkan +qt_extend_target(qtforandroid CONDITION QT_FEATURE_vulkan SOURCES qandroidplatformvulkaninstance.cpp qandroidplatformvulkaninstance.h qandroidplatformvulkanwindow.cpp qandroidplatformvulkanwindow.h @@ -85,12 +85,12 @@ extend_target(qtforandroid CONDITION QT_FEATURE_vulkan Qt::VulkanSupport ) -extend_target(qtforandroid CONDITION QT_FEATURE_android_style_assets +qt_extend_target(qtforandroid CONDITION QT_FEATURE_android_style_assets SOURCES extract.cpp ) -extend_target(qtforandroid CONDITION NOT QT_FEATURE_android_style_assets +qt_extend_target(qtforandroid CONDITION NOT QT_FEATURE_android_style_assets SOURCES extract-dummy.cpp ) diff --git a/src/plugins/platforms/cocoa/.prev_CMakeLists.txt b/src/plugins/platforms/cocoa/.prev_CMakeLists.txt index d9d0dd7509..b590c4fb98 100644 --- a/src/plugins/platforms/cocoa/.prev_CMakeLists.txt +++ b/src/plugins/platforms/cocoa/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## qcocoa Plugin: ##################################################################### -add_qt_plugin(qcocoa +qt_add_plugin(qcocoa TYPE platforms CLASS_NAME QCocoaIntegrationPlugin SOURCES @@ -74,7 +74,7 @@ set(qcocoaresources_resource_files "images/waitcursor.png" ) -add_qt_resource(qcocoa "qcocoaresources" +qt_add_resource(qcocoa "qcocoaresources" PREFIX "/qt-project.org/mac/cursors" FILES @@ -88,12 +88,12 @@ add_qt_resource(qcocoa "qcocoaresources" ## Scopes: ##################################################################### -extend_target(qcocoa CONDITION QT_FEATURE_opengl +qt_extend_target(qcocoa CONDITION QT_FEATURE_opengl SOURCES qcocoaglcontext.h qcocoaglcontext.mm ) -extend_target(qcocoa CONDITION QT_FEATURE_vulkan +qt_extend_target(qcocoa CONDITION QT_FEATURE_vulkan SOURCES qcocoavulkaninstance.h qcocoavulkaninstance.mm LIBRARIES @@ -102,7 +102,7 @@ extend_target(qcocoa CONDITION QT_FEATURE_vulkan Qt::VulkanSupport ) -extend_target(qcocoa CONDITION QT_FEATURE_accessibility +qt_extend_target(qcocoa CONDITION QT_FEATURE_accessibility SOURCES qcocoaaccessibility.h qcocoaaccessibility.mm qcocoaaccessibilityelement.h qcocoaaccessibilityelement.mm @@ -112,7 +112,7 @@ extend_target(qcocoa CONDITION QT_FEATURE_accessibility Qt::AccessibilitySupport ) -extend_target(qcocoa CONDITION TARGET Qt::Widgets +qt_extend_target(qcocoa CONDITION TARGET Qt::Widgets SOURCES qpaintengine_mac.mm qpaintengine_mac_p.h LIBRARIES @@ -124,7 +124,7 @@ extend_target(qcocoa CONDITION TARGET Qt::Widgets #### Keys ignored in scope 6:.:.:cocoa.pro:TARGET Qt::Widgets: # QT_FOR_CONFIG = "widgets" -extend_target(qcocoa CONDITION TARGET Qt::PrintSupport AND TARGET Qt::Widgets +qt_extend_target(qcocoa CONDITION TARGET Qt::PrintSupport AND TARGET Qt::Widgets SOURCES qcocoaprintdevice.h qcocoaprintdevice.mm qcocoaprintersupport.h qcocoaprintersupport.mm @@ -135,17 +135,17 @@ extend_target(qcocoa CONDITION TARGET Qt::PrintSupport AND TARGET Qt::Widgets Qt::PrintSupport ) -extend_target(qcocoa CONDITION QT_FEATURE_colordialog AND TARGET Qt::Widgets +qt_extend_target(qcocoa CONDITION QT_FEATURE_colordialog AND TARGET Qt::Widgets SOURCES qcocoacolordialoghelper.h qcocoacolordialoghelper.mm ) -extend_target(qcocoa CONDITION QT_FEATURE_filedialog AND TARGET Qt::Widgets +qt_extend_target(qcocoa CONDITION QT_FEATURE_filedialog AND TARGET Qt::Widgets SOURCES qcocoafiledialoghelper.h qcocoafiledialoghelper.mm ) -extend_target(qcocoa CONDITION QT_FEATURE_fontdialog AND TARGET Qt::Widgets +qt_extend_target(qcocoa CONDITION QT_FEATURE_fontdialog AND TARGET Qt::Widgets SOURCES qcocoafontdialoghelper.h qcocoafontdialoghelper.mm ) diff --git a/src/plugins/platforms/cocoa/CMakeLists.txt b/src/plugins/platforms/cocoa/CMakeLists.txt index 68ae238334..0c76f99790 100644 --- a/src/plugins/platforms/cocoa/CMakeLists.txt +++ b/src/plugins/platforms/cocoa/CMakeLists.txt @@ -7,7 +7,7 @@ qt_find_package(Cups PROVIDED_TARGETS Cups::Cups) ## qcocoa Plugin: ##################################################################### -add_qt_plugin(qcocoa +qt_add_plugin(qcocoa TYPE platforms DEFAULT_IF ${QT_QPA_DEFAULT_PLATFORM} MATCHES cocoa # special case CLASS_NAME QCocoaIntegrationPlugin @@ -78,7 +78,7 @@ set(qcocoaresources_resource_files "images/waitcursor.png" ) -add_qt_resource(qcocoa "qcocoaresources" +qt_add_resource(qcocoa "qcocoaresources" PREFIX "/qt-project.org/mac/cursors" FILES @@ -92,12 +92,12 @@ add_qt_resource(qcocoa "qcocoaresources" ## Scopes: ##################################################################### -extend_target(qcocoa CONDITION QT_FEATURE_opengl +qt_extend_target(qcocoa CONDITION QT_FEATURE_opengl SOURCES qcocoaglcontext.h qcocoaglcontext.mm ) -extend_target(qcocoa CONDITION QT_FEATURE_vulkan +qt_extend_target(qcocoa CONDITION QT_FEATURE_vulkan SOURCES qcocoavulkaninstance.h qcocoavulkaninstance.mm LIBRARIES @@ -106,7 +106,7 @@ extend_target(qcocoa CONDITION QT_FEATURE_vulkan Qt::VulkanSupport ) -extend_target(qcocoa CONDITION QT_FEATURE_accessibility +qt_extend_target(qcocoa CONDITION QT_FEATURE_accessibility SOURCES qcocoaaccessibility.h qcocoaaccessibility.mm qcocoaaccessibilityelement.h qcocoaaccessibilityelement.mm @@ -116,7 +116,7 @@ extend_target(qcocoa CONDITION QT_FEATURE_accessibility Qt::AccessibilitySupport ) -extend_target(qcocoa CONDITION TARGET Qt::Widgets +qt_extend_target(qcocoa CONDITION TARGET Qt::Widgets SOURCES qpaintengine_mac.mm qpaintengine_mac_p.h LIBRARIES @@ -128,7 +128,7 @@ extend_target(qcocoa CONDITION TARGET Qt::Widgets #### Keys ignored in scope 6:.:.:cocoa.pro:TARGET Qt::Widgets: # QT_FOR_CONFIG = "widgets" -extend_target(qcocoa CONDITION TARGET Qt::PrintSupport AND TARGET Qt::Widgets +qt_extend_target(qcocoa CONDITION TARGET Qt::PrintSupport AND TARGET Qt::Widgets SOURCES qcocoaprintdevice.h qcocoaprintdevice.mm qcocoaprintersupport.h qcocoaprintersupport.mm @@ -139,17 +139,17 @@ extend_target(qcocoa CONDITION TARGET Qt::PrintSupport AND TARGET Qt::Widgets Qt::PrintSupport ) -extend_target(qcocoa CONDITION QT_FEATURE_colordialog AND TARGET Qt::Widgets +qt_extend_target(qcocoa CONDITION QT_FEATURE_colordialog AND TARGET Qt::Widgets SOURCES qcocoacolordialoghelper.h qcocoacolordialoghelper.mm ) -extend_target(qcocoa CONDITION QT_FEATURE_filedialog AND TARGET Qt::Widgets +qt_extend_target(qcocoa CONDITION QT_FEATURE_filedialog AND TARGET Qt::Widgets SOURCES qcocoafiledialoghelper.h qcocoafiledialoghelper.mm ) -extend_target(qcocoa CONDITION QT_FEATURE_fontdialog AND TARGET Qt::Widgets +qt_extend_target(qcocoa CONDITION QT_FEATURE_fontdialog AND TARGET Qt::Widgets SOURCES qcocoafontdialoghelper.h qcocoafontdialoghelper.mm ) diff --git a/src/plugins/platforms/directfb/.prev_CMakeLists.txt b/src/plugins/platforms/directfb/.prev_CMakeLists.txt index 6ac3ff6936..3bfdb81666 100644 --- a/src/plugins/platforms/directfb/.prev_CMakeLists.txt +++ b/src/plugins/platforms/directfb/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## qdirectfb Plugin: ##################################################################### -add_qt_plugin(qdirectfb +qt_add_plugin(qdirectfb TYPE platforms CLASS_NAME QDirectFbIntegrationPlugin SOURCES @@ -39,7 +39,7 @@ add_qt_plugin(qdirectfb ## Scopes: ##################################################################### -extend_target(qdirectfb CONDITION QT_CONFIG___contains___directfb_egl +qt_extend_target(qdirectfb CONDITION QT_CONFIG___contains___directfb_egl SOURCES qdirectfb_egl.cpp qdirectfb_egl.h DEFINES @@ -50,7 +50,7 @@ extend_target(qdirectfb CONDITION QT_CONFIG___contains___directfb_egl Qt::EglSupport ) -extend_target(qdirectfb CONDITION NOT DIRECTFB_PLATFORM_HOOKS_SOURCES_ISEMPTY +qt_extend_target(qdirectfb CONDITION NOT DIRECTFB_PLATFORM_HOOKS_SOURCES_ISEMPTY DEFINES DIRECTFB_PLATFORM_HOOKS ) @@ -58,7 +58,7 @@ extend_target(qdirectfb CONDITION NOT DIRECTFB_PLATFORM_HOOKS_SOURCES_ISEMPTY #### Keys ignored in scope 3:.:.:directfb.pro:NOT DIRECTFB_PLATFORM_HOOKS_SOURCES_ISEMPTY: # QMAKE_LIBDIR = "$$DIRECTFB_PLATFORM_HOOKS_LIBDIR" -extend_target(qdirectfb CONDITION DIRECTFB_PLATFORM_HOOKS_SOURCES_ISEMPTY +qt_extend_target(qdirectfb 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 2887ece53d..5629e79385 100644 --- a/src/plugins/platforms/directfb/CMakeLists.txt +++ b/src/plugins/platforms/directfb/CMakeLists.txt @@ -8,7 +8,7 @@ qt_find_package(DirectFB) ## qdirectfb Plugin: ##################################################################### -add_qt_plugin(qdirectfb +qt_add_plugin(qdirectfb TYPE platforms CLASS_NAME QDirectFbIntegrationPlugin SOURCES @@ -43,7 +43,7 @@ add_qt_plugin(qdirectfb ## Scopes: ##################################################################### -extend_target(qdirectfb CONDITION QT_CONFIG___contains___directfb_egl +qt_extend_target(qdirectfb CONDITION QT_CONFIG___contains___directfb_egl SOURCES qdirectfb_egl.cpp qdirectfb_egl.h DEFINES @@ -54,7 +54,7 @@ extend_target(qdirectfb CONDITION QT_CONFIG___contains___directfb_egl Qt::EglSupport ) -extend_target(qdirectfb CONDITION NOT DIRECTFB_PLATFORM_HOOKS_SOURCES_ISEMPTY +qt_extend_target(qdirectfb CONDITION NOT DIRECTFB_PLATFORM_HOOKS_SOURCES_ISEMPTY DEFINES DIRECTFB_PLATFORM_HOOKS ) @@ -62,7 +62,7 @@ extend_target(qdirectfb CONDITION NOT DIRECTFB_PLATFORM_HOOKS_SOURCES_ISEMPTY #### Keys ignored in scope 3:.:.:directfb.pro:NOT DIRECTFB_PLATFORM_HOOKS_SOURCES_ISEMPTY: # QMAKE_LIBDIR = "$$DIRECTFB_PLATFORM_HOOKS_LIBDIR" -extend_target(qdirectfb CONDITION DIRECTFB_PLATFORM_HOOKS_SOURCES_ISEMPTY +qt_extend_target(qdirectfb CONDITION DIRECTFB_PLATFORM_HOOKS_SOURCES_ISEMPTY SOURCES qdirectfbeglhooks_stub.cpp ) diff --git a/src/plugins/platforms/eglfs/CMakeLists.txt b/src/plugins/platforms/eglfs/CMakeLists.txt index 8a3c77a5ac..2dde32b0f3 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: ##################################################################### -add_qt_module(EglFSDeviceIntegration +qt_add_module(EglFSDeviceIntegration INTERNAL_MODULE SOURCES api/qeglfsdeviceintegration.cpp api/qeglfsdeviceintegration_p.h @@ -40,14 +40,14 @@ add_qt_module(EglFSDeviceIntegration ## Scopes: ##################################################################### -extend_target(EglFSDeviceIntegration CONDITION TARGET Qt::InputSupportPrivate +qt_extend_target(EglFSDeviceIntegration CONDITION TARGET Qt::InputSupportPrivate LIBRARIES Qt::InputSupportPrivate PUBLIC_LIBRARIES Qt::InputSupport ) -extend_target(EglFSDeviceIntegration CONDITION TARGET Qt::PlatformCompositorSupportPrivate +qt_extend_target(EglFSDeviceIntegration CONDITION TARGET Qt::PlatformCompositorSupportPrivate LIBRARIES Qt::PlatformCompositorSupportPrivate PUBLIC_LIBRARIES @@ -65,7 +65,7 @@ if(QT_FEATURE_cursor) # special case "cursor.json" ) - add_qt_resource(EglFSDeviceIntegration "cursor" + qt_add_resource(EglFSDeviceIntegration "cursor" PREFIX "/" FILES @@ -73,7 +73,7 @@ if(QT_FEATURE_cursor) # special case ) endif() -extend_target(EglFSDeviceIntegration CONDITION QT_FEATURE_opengl +qt_extend_target(EglFSDeviceIntegration CONDITION QT_FEATURE_opengl SOURCES api/qeglfscontext.cpp api/qeglfscontext_p.h api/qeglfscursor.cpp api/qeglfscursor_p.h @@ -82,7 +82,7 @@ extend_target(EglFSDeviceIntegration CONDITION QT_FEATURE_opengl ## qeglfs Plugin: ##################################################################### -add_qt_plugin(qeglfs +qt_add_plugin(qeglfs TYPE platforms CLASS_NAME QEglFSIntegrationPlugin DEFAULT_IF ${QT_QPA_DEFAULT_PLATFORM} MATCHES eglfs # special case diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_emu/CMakeLists.txt b/src/plugins/platforms/eglfs/deviceintegration/eglfs_emu/CMakeLists.txt index ebab7d35c3..320ef4f1d8 100644 --- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_emu/CMakeLists.txt +++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_emu/CMakeLists.txt @@ -4,7 +4,7 @@ ## qeglfs-emu-integration Plugin: ##################################################################### -add_qt_plugin(qeglfs-emu-integration +qt_add_plugin(qeglfs-emu-integration TYPE egldeviceintegrations CLASS_NAME QEglFSEmulatorIntegrationPlugin SOURCES diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/CMakeLists.txt b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/CMakeLists.txt index a8219604f1..656190e7a8 100644 --- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/CMakeLists.txt +++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/CMakeLists.txt @@ -4,7 +4,7 @@ ## qeglfs-kms-integration Plugin: ##################################################################### -add_qt_plugin(qeglfs-kms-integration +qt_add_plugin(qeglfs-kms-integration TYPE egldeviceintegrations CLASS_NAME QEglFSKmsGbmIntegrationPlugin SOURCES 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 08040e1c69..03a2de61eb 100644 --- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/CMakeLists.txt +++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/CMakeLists.txt @@ -4,7 +4,7 @@ ## qeglfs-kms-egldevice-integration Plugin: ##################################################################### -add_qt_plugin(qeglfs-kms-egldevice-integration +qt_add_plugin(qeglfs-kms-egldevice-integration TYPE egldeviceintegrations CLASS_NAME QEglFSKmsEglDeviceIntegrationPlugin 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 1a7a12eb90..2e8819182c 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: ##################################################################### -add_qt_module(EglFsKmsSupport +qt_add_module(EglFsKmsSupport INTERNAL_MODULE NO_MODULE_HEADERS SOURCES diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_x11/CMakeLists.txt b/src/plugins/platforms/eglfs/deviceintegration/eglfs_x11/CMakeLists.txt index d358d5c5c7..fc0bb6847f 100644 --- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_x11/CMakeLists.txt +++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_x11/CMakeLists.txt @@ -4,7 +4,7 @@ ## qeglfs-x11-integration Plugin: ##################################################################### -add_qt_plugin(qeglfs-x11-integration +qt_add_plugin(qeglfs-x11-integration TYPE egldeviceintegrations CLASS_NAME QEglFSX11IntegrationPlugin SOURCES diff --git a/src/plugins/platforms/linuxfb/.prev_CMakeLists.txt b/src/plugins/platforms/linuxfb/.prev_CMakeLists.txt index 8843776d27..76ec42f0ec 100644 --- a/src/plugins/platforms/linuxfb/.prev_CMakeLists.txt +++ b/src/plugins/platforms/linuxfb/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## qlinuxfb Plugin: ##################################################################### -add_qt_plugin(qlinuxfb +qt_add_plugin(qlinuxfb TYPE platforms CLASS_NAME QLinuxFbIntegrationPlugin SOURCES @@ -35,14 +35,14 @@ add_qt_plugin(qlinuxfb ## Scopes: ##################################################################### -extend_target(qlinuxfb CONDITION TARGET Qt::InputSupportPrivate +qt_extend_target(qlinuxfb CONDITION TARGET Qt::InputSupportPrivate LIBRARIES Qt::InputSupportPrivate PUBLIC_LIBRARIES Qt::InputSupport ) -extend_target(qlinuxfb CONDITION TARGET Qt::KmsSupportPrivate +qt_extend_target(qlinuxfb CONDITION TARGET Qt::KmsSupportPrivate SOURCES qlinuxfbdrmscreen.cpp qlinuxfbdrmscreen.h LIBRARIES diff --git a/src/plugins/platforms/linuxfb/CMakeLists.txt b/src/plugins/platforms/linuxfb/CMakeLists.txt index aabf698441..ac2c216130 100644 --- a/src/plugins/platforms/linuxfb/CMakeLists.txt +++ b/src/plugins/platforms/linuxfb/CMakeLists.txt @@ -4,7 +4,7 @@ ## qlinuxfb Plugin: ##################################################################### -add_qt_plugin(qlinuxfb +qt_add_plugin(qlinuxfb TYPE platforms CLASS_NAME QLinuxFbIntegrationPlugin DEFAULT_IF ${QT_QPA_DEFAULT_PLATFORM} MATCHES linuxfb # special case @@ -36,14 +36,14 @@ add_qt_plugin(qlinuxfb ## Scopes: ##################################################################### -extend_target(qlinuxfb CONDITION TARGET Qt::InputSupportPrivate +qt_extend_target(qlinuxfb CONDITION TARGET Qt::InputSupportPrivate LIBRARIES Qt::InputSupportPrivate PUBLIC_LIBRARIES Qt::InputSupport ) -extend_target(qlinuxfb CONDITION TARGET Qt::KmsSupportPrivate +qt_extend_target(qlinuxfb CONDITION TARGET Qt::KmsSupportPrivate SOURCES qlinuxfbdrmscreen.cpp qlinuxfbdrmscreen.h LIBRARIES diff --git a/src/plugins/platforms/minimal/.prev_CMakeLists.txt b/src/plugins/platforms/minimal/.prev_CMakeLists.txt index 94e57fc174..3ceb3e9ef1 100644 --- a/src/plugins/platforms/minimal/.prev_CMakeLists.txt +++ b/src/plugins/platforms/minimal/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## qminimal Plugin: ##################################################################### -add_qt_plugin(qminimal +qt_add_plugin(qminimal TYPE platforms CLASS_NAME QMinimalIntegrationPlugin SOURCES @@ -31,7 +31,7 @@ add_qt_plugin(qminimal ## Scopes: ##################################################################### -extend_target(qminimal CONDITION QT_FEATURE_freetype +qt_extend_target(qminimal CONDITION QT_FEATURE_freetype LIBRARIES WrapFreetype::WrapFreetype ) diff --git a/src/plugins/platforms/minimal/CMakeLists.txt b/src/plugins/platforms/minimal/CMakeLists.txt index 0a56eabd25..5a6307889b 100644 --- a/src/plugins/platforms/minimal/CMakeLists.txt +++ b/src/plugins/platforms/minimal/CMakeLists.txt @@ -4,7 +4,7 @@ ## qminimal Plugin: ##################################################################### -add_qt_plugin(qminimal +qt_add_plugin(qminimal TYPE platforms CLASS_NAME QMinimalIntegrationPlugin DEFAULT_IF ${QT_QPA_DEFAULT_PLATFORM} MATCHES minimal # special case @@ -32,7 +32,7 @@ add_qt_plugin(qminimal ## Scopes: ##################################################################### -extend_target(qminimal CONDITION QT_FEATURE_freetype +qt_extend_target(qminimal 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 56d52951b9..ab797ea67d 100644 --- a/src/plugins/platforms/minimalegl/.prev_CMakeLists.txt +++ b/src/plugins/platforms/minimalegl/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## qminimalegl Plugin: ##################################################################### -add_qt_plugin(qminimalegl +qt_add_plugin(qminimalegl TYPE platforms CLASS_NAME QMinimalEglIntegrationPlugin SOURCES @@ -34,7 +34,7 @@ add_qt_plugin(qminimalegl ## Scopes: ##################################################################### -extend_target(qminimalegl CONDITION QT_FEATURE_opengl +qt_extend_target(qminimalegl CONDITION QT_FEATURE_opengl SOURCES qminimaleglbackingstore.cpp qminimaleglbackingstore.h ) diff --git a/src/plugins/platforms/minimalegl/CMakeLists.txt b/src/plugins/platforms/minimalegl/CMakeLists.txt index 360043f22d..0d925fed68 100644 --- a/src/plugins/platforms/minimalegl/CMakeLists.txt +++ b/src/plugins/platforms/minimalegl/CMakeLists.txt @@ -4,7 +4,7 @@ ## qminimalegl Plugin: ##################################################################### -add_qt_plugin(qminimalegl +qt_add_plugin(qminimalegl TYPE platforms CLASS_NAME QMinimalEglIntegrationPlugin DEFAULT_IF ${QT_QPA_DEFAULT_PLATFORM} MATCHES minimalegl # special case @@ -35,7 +35,7 @@ add_qt_plugin(qminimalegl ## Scopes: ##################################################################### -extend_target(qminimalegl CONDITION QT_FEATURE_opengl +qt_extend_target(qminimalegl CONDITION QT_FEATURE_opengl SOURCES qminimaleglbackingstore.cpp qminimaleglbackingstore.h ) diff --git a/src/plugins/platforms/offscreen/.prev_CMakeLists.txt b/src/plugins/platforms/offscreen/.prev_CMakeLists.txt index 5944b24741..3980ab62f8 100644 --- a/src/plugins/platforms/offscreen/.prev_CMakeLists.txt +++ b/src/plugins/platforms/offscreen/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## qoffscreen Plugin: ##################################################################### -add_qt_plugin(qoffscreen +qt_add_plugin(qoffscreen TYPE platforms CLASS_NAME QOffscreenIntegrationPlugin SOURCES @@ -32,7 +32,7 @@ add_qt_plugin(qoffscreen ## Scopes: ##################################################################### -extend_target(qoffscreen CONDITION QT_FEATURE_opengl AND QT_FEATURE_xlib AND NOT QT_FEATURE_opengles2 +qt_extend_target(qoffscreen 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 adccec6efe..03576b898e 100644 --- a/src/plugins/platforms/offscreen/CMakeLists.txt +++ b/src/plugins/platforms/offscreen/CMakeLists.txt @@ -4,7 +4,7 @@ ## qoffscreen Plugin: ##################################################################### -add_qt_plugin(qoffscreen +qt_add_plugin(qoffscreen TYPE platforms CLASS_NAME QOffscreenIntegrationPlugin DEFAULT_IF ${QT_QPA_DEFAULT_PLATFORM} MATCHES offscreen # special case @@ -33,7 +33,7 @@ add_qt_plugin(qoffscreen ## Scopes: ##################################################################### -extend_target(qoffscreen CONDITION QT_FEATURE_opengl AND QT_FEATURE_xlib AND NOT QT_FEATURE_opengles2 +qt_extend_target(qoffscreen 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 246847b4fc..276730755a 100644 --- a/src/plugins/platforms/vnc/.prev_CMakeLists.txt +++ b/src/plugins/platforms/vnc/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## qvnc Plugin: ##################################################################### -add_qt_plugin(qvnc +qt_add_plugin(qvnc TYPE platforms CLASS_NAME QVncIntegrationPlugin SOURCES @@ -40,7 +40,7 @@ add_qt_plugin(qvnc ## Scopes: ##################################################################### -extend_target(qvnc CONDITION TARGET Qt::InputSupportPrivate +qt_extend_target(qvnc CONDITION TARGET Qt::InputSupportPrivate LIBRARIES Qt::InputSupportPrivate PUBLIC_LIBRARIES diff --git a/src/plugins/platforms/vnc/CMakeLists.txt b/src/plugins/platforms/vnc/CMakeLists.txt index c141eb3107..0b5295287b 100644 --- a/src/plugins/platforms/vnc/CMakeLists.txt +++ b/src/plugins/platforms/vnc/CMakeLists.txt @@ -4,7 +4,7 @@ ## qvnc Plugin: ##################################################################### -add_qt_plugin(qvnc +qt_add_plugin(qvnc TYPE platforms CLASS_NAME QVncIntegrationPlugin DEFAULT_IF ${QT_QPA_DEFAULT_PLATFORM} MATCHES vnc # special case @@ -41,7 +41,7 @@ add_qt_plugin(qvnc ## Scopes: ##################################################################### -extend_target(qvnc CONDITION TARGET Qt::InputSupportPrivate +qt_extend_target(qvnc CONDITION TARGET Qt::InputSupportPrivate LIBRARIES Qt::InputSupportPrivate PUBLIC_LIBRARIES diff --git a/src/plugins/platforms/windows/.prev_CMakeLists.txt b/src/plugins/platforms/windows/.prev_CMakeLists.txt index cce1a1c165..a23b1643de 100644 --- a/src/plugins/platforms/windows/.prev_CMakeLists.txt +++ b/src/plugins/platforms/windows/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## qwindows Plugin: ##################################################################### -add_qt_plugin(qwindows +qt_add_plugin(qwindows TYPE platforms CLASS_NAME QWindowsIntegrationPlugin SOURCES @@ -75,7 +75,7 @@ set(openglblacklists_resource_files "openglblacklists/default.json" ) -add_qt_resource(qwindows "openglblacklists" +qt_add_resource(qwindows "openglblacklists" PREFIX "/qt-project.org/windows/openglblacklists" FILES @@ -89,7 +89,7 @@ add_qt_resource(qwindows "openglblacklists" ## Scopes: ##################################################################### -extend_target(qwindows CONDITION QT_FEATURE_accessibility +qt_extend_target(qwindows CONDITION QT_FEATURE_accessibility SOURCES uiautomation/qwindowsuiaaccessibility.cpp uiautomation/qwindowsuiaaccessibility.h uiautomation/qwindowsuiabaseprovider.cpp uiautomation/qwindowsuiabaseprovider.h @@ -115,7 +115,7 @@ extend_target(qwindows CONDITION QT_FEATURE_accessibility Qt::AccessibilitySupport ) -extend_target(qwindows CONDITION QT_FEATURE_vulkan +qt_extend_target(qwindows CONDITION QT_FEATURE_vulkan SOURCES qwindowsvulkaninstance.cpp qwindowsvulkaninstance.h LIBRARIES @@ -127,59 +127,59 @@ extend_target(qwindows CONDITION QT_FEATURE_vulkan #### Keys ignored in scope 4:.:.:windows.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN: # PLUGIN_EXTENDS = "-" -extend_target(qwindows CONDITION QT_FEATURE_opengl AND NOT QT_FEATURE_dynamicgl AND NOT QT_FEATURE_opengles2 +qt_extend_target(qwindows CONDITION QT_FEATURE_opengl AND NOT QT_FEATURE_dynamicgl AND NOT QT_FEATURE_opengles2 PUBLIC_LIBRARIES opengl32 ) -extend_target(qwindows CONDITION mingw +qt_extend_target(qwindows CONDITION mingw PUBLIC_LIBRARIES uuid ) -extend_target(qwindows CONDITION QT_FEATURE_opengl +qt_extend_target(qwindows CONDITION QT_FEATURE_opengl SOURCES qwindowsopenglcontext.h ) -extend_target(qwindows CONDITION QT_FEATURE_opengles2 +qt_extend_target(qwindows CONDITION QT_FEATURE_opengles2 SOURCES qwindowseglcontext.cpp qwindowseglcontext.h ) -extend_target(qwindows CONDITION QT_FEATURE_opengl AND NOT QT_FEATURE_opengles2 +qt_extend_target(qwindows CONDITION QT_FEATURE_opengl AND NOT QT_FEATURE_opengles2 SOURCES qwindowsglcontext.cpp qwindowsglcontext.h ) -extend_target(qwindows CONDITION QT_FEATURE_dynamicgl +qt_extend_target(qwindows CONDITION QT_FEATURE_dynamicgl SOURCES qwindowseglcontext.cpp qwindowseglcontext.h ) -extend_target(qwindows CONDITION QT_FEATURE_systemtrayicon +qt_extend_target(qwindows CONDITION QT_FEATURE_systemtrayicon SOURCES qwindowssystemtrayicon.cpp qwindowssystemtrayicon.h ) -extend_target(qwindows CONDITION QT_FEATURE_clipboard +qt_extend_target(qwindows CONDITION QT_FEATURE_clipboard SOURCES qwindowsclipboard.cpp qwindowsclipboard.h ) -extend_target(qwindows CONDITION QT_FEATURE_clipboard AND QT_FEATURE_draganddrop +qt_extend_target(qwindows CONDITION QT_FEATURE_clipboard AND QT_FEATURE_draganddrop SOURCES qwindowsdrag.cpp qwindowsdrag.h ) -extend_target(qwindows CONDITION QT_FEATURE_tabletevent +qt_extend_target(qwindows CONDITION QT_FEATURE_tabletevent SOURCES qwindowstabletsupport.cpp qwindowstabletsupport.h INCLUDE_DIRECTORIES ${QT_SOURCE_TREE}/src/3rdparty/wintab ) -extend_target(qwindows CONDITION QT_FEATURE_sessionmanager +qt_extend_target(qwindows CONDITION QT_FEATURE_sessionmanager SOURCES qwindowssessionmanager.cpp qwindowssessionmanager.h ) @@ -210,7 +210,7 @@ if(QT_FEATURE_imageformat_png) "images/splitvcursor_64.png" ) - add_qt_resource(qwindows "cursors" + qt_add_resource(qwindows "cursors" PREFIX "/qt-project.org/windows/cursors" FILES @@ -218,25 +218,25 @@ if(QT_FEATURE_imageformat_png) ) endif() -extend_target(qwindows CONDITION QT_FEATURE_accessibility AND TARGET Qt::WindowsUIAutomationSupportPrivate +qt_extend_target(qwindows CONDITION QT_FEATURE_accessibility AND TARGET Qt::WindowsUIAutomationSupportPrivate LIBRARIES Qt::WindowsUIAutomationSupportPrivate PUBLIC_LIBRARIES Qt::WindowsUIAutomationSupport ) -extend_target(qwindows CONDITION QT_FEATURE_accessibility AND mingw +qt_extend_target(qwindows CONDITION QT_FEATURE_accessibility AND mingw PUBLIC_LIBRARIES uuid ) -extend_target(qwindows CONDITION QT_FEATURE_combined_angle_lib +qt_extend_target(qwindows CONDITION QT_FEATURE_combined_angle_lib DEFINES LIBEGL_NAME= LIBGLESV2_NAME= ) -extend_target(qwindows CONDITION NOT QT_FEATURE_combined_angle_lib +qt_extend_target(qwindows CONDITION NOT QT_FEATURE_combined_angle_lib DEFINES LIBEGL_NAME= LIBGLESV2_NAME= diff --git a/src/plugins/platforms/windows/CMakeLists.txt b/src/plugins/platforms/windows/CMakeLists.txt index 1d8349a35c..7b07bcf5de 100644 --- a/src/plugins/platforms/windows/CMakeLists.txt +++ b/src/plugins/platforms/windows/CMakeLists.txt @@ -4,7 +4,7 @@ ## qwindows Plugin: ##################################################################### -add_qt_plugin(qwindows +qt_add_plugin(qwindows TYPE platforms CLASS_NAME QWindowsIntegrationPlugin DEFAULT_IF ${QT_QPA_DEFAULT_PLATFORM} MATCHES windows # special case @@ -76,7 +76,7 @@ set(openglblacklists_resource_files "openglblacklists/default.json" ) -add_qt_resource(qwindows "openglblacklists" +qt_add_resource(qwindows "openglblacklists" PREFIX "/qt-project.org/windows/openglblacklists" FILES @@ -90,7 +90,7 @@ add_qt_resource(qwindows "openglblacklists" ## Scopes: ##################################################################### -extend_target(qwindows CONDITION QT_FEATURE_accessibility +qt_extend_target(qwindows CONDITION QT_FEATURE_accessibility SOURCES uiautomation/qwindowsuiaaccessibility.cpp uiautomation/qwindowsuiaaccessibility.h uiautomation/qwindowsuiabaseprovider.cpp uiautomation/qwindowsuiabaseprovider.h @@ -116,7 +116,7 @@ extend_target(qwindows CONDITION QT_FEATURE_accessibility Qt::AccessibilitySupport ) -extend_target(qwindows CONDITION QT_FEATURE_vulkan +qt_extend_target(qwindows CONDITION QT_FEATURE_vulkan SOURCES qwindowsvulkaninstance.cpp qwindowsvulkaninstance.h LIBRARIES @@ -128,59 +128,59 @@ extend_target(qwindows CONDITION QT_FEATURE_vulkan #### Keys ignored in scope 4:.:.:windows.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN: # PLUGIN_EXTENDS = "-" -extend_target(qwindows CONDITION QT_FEATURE_opengl AND NOT QT_FEATURE_dynamicgl AND NOT QT_FEATURE_opengles2 +qt_extend_target(qwindows CONDITION QT_FEATURE_opengl AND NOT QT_FEATURE_dynamicgl AND NOT QT_FEATURE_opengles2 PUBLIC_LIBRARIES opengl32 ) -extend_target(qwindows CONDITION mingw +qt_extend_target(qwindows CONDITION mingw PUBLIC_LIBRARIES uuid ) -extend_target(qwindows CONDITION QT_FEATURE_opengl +qt_extend_target(qwindows CONDITION QT_FEATURE_opengl SOURCES qwindowsopenglcontext.h ) -extend_target(qwindows CONDITION QT_FEATURE_opengles2 +qt_extend_target(qwindows CONDITION QT_FEATURE_opengles2 SOURCES qwindowseglcontext.cpp qwindowseglcontext.h ) -extend_target(qwindows CONDITION QT_FEATURE_opengl AND NOT QT_FEATURE_opengles2 +qt_extend_target(qwindows CONDITION QT_FEATURE_opengl AND NOT QT_FEATURE_opengles2 SOURCES qwindowsglcontext.cpp qwindowsglcontext.h ) -extend_target(qwindows CONDITION QT_FEATURE_dynamicgl +qt_extend_target(qwindows CONDITION QT_FEATURE_dynamicgl SOURCES qwindowseglcontext.cpp qwindowseglcontext.h ) -extend_target(qwindows CONDITION QT_FEATURE_systemtrayicon +qt_extend_target(qwindows CONDITION QT_FEATURE_systemtrayicon SOURCES qwindowssystemtrayicon.cpp qwindowssystemtrayicon.h ) -extend_target(qwindows CONDITION QT_FEATURE_clipboard +qt_extend_target(qwindows CONDITION QT_FEATURE_clipboard SOURCES qwindowsclipboard.cpp qwindowsclipboard.h ) -extend_target(qwindows CONDITION QT_FEATURE_clipboard AND QT_FEATURE_draganddrop +qt_extend_target(qwindows CONDITION QT_FEATURE_clipboard AND QT_FEATURE_draganddrop SOURCES qwindowsdrag.cpp qwindowsdrag.h ) -extend_target(qwindows CONDITION QT_FEATURE_tabletevent +qt_extend_target(qwindows CONDITION QT_FEATURE_tabletevent SOURCES qwindowstabletsupport.cpp qwindowstabletsupport.h INCLUDE_DIRECTORIES ${QT_SOURCE_TREE}/src/3rdparty/wintab ) -extend_target(qwindows CONDITION QT_FEATURE_sessionmanager +qt_extend_target(qwindows CONDITION QT_FEATURE_sessionmanager SOURCES qwindowssessionmanager.cpp qwindowssessionmanager.h ) @@ -211,7 +211,7 @@ if(QT_FEATURE_imageformat_png) "images/splitvcursor_64.png" ) - add_qt_resource(qwindows "cursors" + qt_add_resource(qwindows "cursors" PREFIX "/qt-project.org/windows/cursors" FILES @@ -219,14 +219,14 @@ if(QT_FEATURE_imageformat_png) ) endif() -extend_target(qwindows CONDITION QT_FEATURE_accessibility AND TARGET Qt::WindowsUIAutomationSupportPrivate +qt_extend_target(qwindows CONDITION QT_FEATURE_accessibility AND TARGET Qt::WindowsUIAutomationSupportPrivate LIBRARIES Qt::WindowsUIAutomationSupportPrivate PUBLIC_LIBRARIES Qt::WindowsUIAutomationSupport ) -extend_target(qwindows CONDITION QT_FEATURE_accessibility AND mingw +qt_extend_target(qwindows CONDITION QT_FEATURE_accessibility AND mingw PUBLIC_LIBRARIES uuid ) @@ -234,3 +234,4 @@ extend_target(qwindows CONDITION QT_FEATURE_accessibility AND mingw # special case: # extend_target(qwindows CONDITION QT_FEATURE_combined_angle_lib ... # extend_target(qwindows CONDITION NOT QT_FEATURE_combined_angle_lib ... + diff --git a/src/plugins/platforms/xcb/CMakeLists.txt b/src/plugins/platforms/xcb/CMakeLists.txt index 1706cdf713..6b82375e5a 100644 --- a/src/plugins/platforms/xcb/CMakeLists.txt +++ b/src/plugins/platforms/xcb/CMakeLists.txt @@ -26,7 +26,7 @@ qt_find_package(XKB_COMMON_X11 PROVIDED_TARGETS PkgConfig::XKB_COMMON_X11) ## XcbQpa Module: ##################################################################### -add_qt_module(XcbQpa +qt_add_module(XcbQpa INTERNAL_MODULE NO_MODULE_HEADERS SOURCES @@ -100,14 +100,14 @@ add_qt_module(XcbQpa ## Scopes: ##################################################################### -extend_target(XcbQpa CONDITION TARGET Qt::LinuxAccessibilitySupportPrivate +qt_extend_target(XcbQpa CONDITION TARGET Qt::LinuxAccessibilitySupportPrivate LIBRARIES Qt::LinuxAccessibilitySupportPrivate PUBLIC_LIBRARIES Qt::LinuxAccessibilitySupport ) -extend_target(XcbQpa CONDITION QT_FEATURE_vulkan +qt_extend_target(XcbQpa CONDITION QT_FEATURE_vulkan SOURCES qxcbvulkaninstance.cpp qxcbvulkaninstance.h qxcbvulkanwindow.cpp qxcbvulkanwindow.h @@ -117,40 +117,40 @@ extend_target(XcbQpa CONDITION QT_FEATURE_vulkan Qt::VulkanSupport ) -extend_target(XcbQpa CONDITION QT_FEATURE_glib +qt_extend_target(XcbQpa CONDITION QT_FEATURE_glib LIBRARIES GLIB2::GLIB2 ) -extend_target(XcbQpa CONDITION QT_FEATURE_draganddrop +qt_extend_target(XcbQpa CONDITION QT_FEATURE_draganddrop SOURCES qxcbdrag.cpp qxcbdrag.h ) -extend_target(XcbQpa CONDITION QT_FEATURE_xcb_xlib +qt_extend_target(XcbQpa CONDITION QT_FEATURE_xcb_xlib PUBLIC_LIBRARIES X11::XCB X11::X11 # special case ) -extend_target(XcbQpa CONDITION QT_FEATURE_xcb_sm +qt_extend_target(XcbQpa CONDITION QT_FEATURE_xcb_sm SOURCES qxcbsessionmanager.cpp qxcbsessionmanager.h PUBLIC_LIBRARIES ${X11_SM_LIB} ${X11_ICE_LIB} ) -extend_target(XcbQpa CONDITION QT_FEATURE_dlopen +qt_extend_target(XcbQpa CONDITION QT_FEATURE_dlopen PUBLIC_LIBRARIES ${CMAKE_DL_LIBS} ) -extend_target(XcbQpa CONDITION CLANG AND NOT ICC +qt_extend_target(XcbQpa CONDITION CLANG AND NOT ICC COMPILE_OPTIONS -ftemplate-depth=1024 ) -extend_target(XcbQpa CONDITION QT_FEATURE_xcb_native_painting +qt_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 @@ -163,12 +163,12 @@ extend_target(XcbQpa CONDITION QT_FEATURE_xcb_native_painting nativepainting ) -extend_target(XcbQpa CONDITION QT_FEATURE_xcb_native_painting AND QT_FEATURE_xrender +qt_extend_target(XcbQpa CONDITION QT_FEATURE_xcb_native_painting AND QT_FEATURE_xrender PUBLIC_LIBRARIES PkgConfig::XRender ) -extend_target(XcbQpa CONDITION QT_FEATURE_fontconfig AND QT_FEATURE_xcb_native_painting +qt_extend_target(XcbQpa CONDITION QT_FEATURE_fontconfig AND QT_FEATURE_xcb_native_painting LIBRARIES WrapFreetype::WrapFreetype ) @@ -191,7 +191,7 @@ endif() ## qxcb Plugin: ##################################################################### -add_qt_plugin(qxcb +qt_add_plugin(qxcb TYPE platforms CLASS_NAME QXcbIntegrationPlugin DEFAULT_IF ${QT_QPA_DEFAULT_PLATFORM} MATCHES xcb # special case diff --git a/src/plugins/platforms/xcb/gl_integrations/xcb_egl/CMakeLists.txt b/src/plugins/platforms/xcb/gl_integrations/xcb_egl/CMakeLists.txt index b9f7339a1d..1d1833450b 100644 --- a/src/plugins/platforms/xcb/gl_integrations/xcb_egl/CMakeLists.txt +++ b/src/plugins/platforms/xcb/gl_integrations/xcb_egl/CMakeLists.txt @@ -4,7 +4,7 @@ ## qxcb-egl-integration Plugin: ##################################################################### -add_qt_plugin(qxcb-egl-integration +qt_add_plugin(qxcb-egl-integration TYPE xcbglintegrations CLASS_NAME QXcbEglIntegrationPlugin SOURCES 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 ede38c9837..dfb74d7138 100644 --- a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/CMakeLists.txt +++ b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/CMakeLists.txt @@ -4,7 +4,7 @@ ## qxcb-glx-integration Plugin: ##################################################################### -add_qt_plugin(qxcb-glx-integration +qt_add_plugin(qxcb-glx-integration TYPE xcbglintegrations CLASS_NAME QXcbGlxIntegrationPlugin SOURCES @@ -33,12 +33,12 @@ add_qt_plugin(qxcb-glx-integration ## Scopes: ##################################################################### -extend_target(qxcb-glx-integration CONDITION QT_FEATURE_xcb_glx +qt_extend_target(qxcb-glx-integration CONDITION QT_FEATURE_xcb_glx PUBLIC_LIBRARIES XCB::GLX ) -extend_target(qxcb-glx-integration CONDITION QT_FEATURE_dlopen AND NOT static +qt_extend_target(qxcb-glx-integration CONDITION QT_FEATURE_dlopen AND NOT static PUBLIC_LIBRARIES ${CMAKE_DL_LIBS} ) diff --git a/src/plugins/platformthemes/gtk3/.prev_CMakeLists.txt b/src/plugins/platformthemes/gtk3/.prev_CMakeLists.txt index 9b42ba2c53..de76f45c26 100644 --- a/src/plugins/platformthemes/gtk3/.prev_CMakeLists.txt +++ b/src/plugins/platformthemes/gtk3/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## qgtk3 Plugin: ##################################################################### -add_qt_plugin(qgtk3 +qt_add_plugin(qgtk3 TYPE platformthemes CLASS_NAME QGtk3ThemePlugin SOURCES diff --git a/src/plugins/platformthemes/gtk3/CMakeLists.txt b/src/plugins/platformthemes/gtk3/CMakeLists.txt index 82a783f9e1..f467f48a9d 100644 --- a/src/plugins/platformthemes/gtk3/CMakeLists.txt +++ b/src/plugins/platformthemes/gtk3/CMakeLists.txt @@ -7,7 +7,7 @@ qt_find_package(X11) # special case ## qgtk3 Plugin: ##################################################################### -add_qt_plugin(qgtk3 +qt_add_plugin(qgtk3 TYPE platformthemes CLASS_NAME QGtk3ThemePlugin SOURCES diff --git a/src/plugins/platformthemes/xdgdesktopportal/CMakeLists.txt b/src/plugins/platformthemes/xdgdesktopportal/CMakeLists.txt index 47be2bf853..6939c8d9e4 100644 --- a/src/plugins/platformthemes/xdgdesktopportal/CMakeLists.txt +++ b/src/plugins/platformthemes/xdgdesktopportal/CMakeLists.txt @@ -4,7 +4,7 @@ ## qxdgdesktopportal Plugin: ##################################################################### -add_qt_plugin(qxdgdesktopportal +qt_add_plugin(qxdgdesktopportal TYPE platformthemes CLASS_NAME QXdgDesktopPortalThemePlugin SOURCES diff --git a/src/plugins/printsupport/cocoa/CMakeLists.txt b/src/plugins/printsupport/cocoa/CMakeLists.txt index 7cd7a92105..c8de1e76f6 100644 --- a/src/plugins/printsupport/cocoa/CMakeLists.txt +++ b/src/plugins/printsupport/cocoa/CMakeLists.txt @@ -4,7 +4,7 @@ ## cocoaprintersupport Plugin: ##################################################################### -add_qt_plugin(cocoaprintersupport +qt_add_plugin(cocoaprintersupport TYPE printsupport CLASS_NAME QCocoaPrinterSupportPlugin SOURCES diff --git a/src/plugins/printsupport/cups/.prev_CMakeLists.txt b/src/plugins/printsupport/cups/.prev_CMakeLists.txt index d615d58ef5..bbf8a60b3f 100644 --- a/src/plugins/printsupport/cups/.prev_CMakeLists.txt +++ b/src/plugins/printsupport/cups/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## cupsprintersupport Plugin: ##################################################################### -add_qt_plugin(cupsprintersupport +qt_add_plugin(cupsprintersupport TYPE printsupport CLASS_NAME QCupsPrinterSupportPlugin SOURCES diff --git a/src/plugins/printsupport/cups/CMakeLists.txt b/src/plugins/printsupport/cups/CMakeLists.txt index 4da73dfb07..6fc4efc941 100644 --- a/src/plugins/printsupport/cups/CMakeLists.txt +++ b/src/plugins/printsupport/cups/CMakeLists.txt @@ -6,7 +6,7 @@ qt_find_package(Cups PROVIDED_TARGETS Cups::Cups) # special case ## cupsprintersupport Plugin: ##################################################################### -add_qt_plugin(cupsprintersupport +qt_add_plugin(cupsprintersupport TYPE printsupport CLASS_NAME QCupsPrinterSupportPlugin SOURCES diff --git a/src/plugins/sqldrivers/db2/CMakeLists.txt b/src/plugins/sqldrivers/db2/CMakeLists.txt index 9fc1691bdf..d3d46bebbb 100644 --- a/src/plugins/sqldrivers/db2/CMakeLists.txt +++ b/src/plugins/sqldrivers/db2/CMakeLists.txt @@ -4,7 +4,7 @@ ## qsqldb2 Plugin: ##################################################################### -add_qt_plugin(qsqldb2 +qt_add_plugin(qsqldb2 TYPE sqldrivers CLASS_NAME QDB2DriverPlugin SOURCES @@ -28,7 +28,7 @@ add_qt_plugin(qsqldb2 ## Scopes: ##################################################################### -extend_target(qsqldb2 CONDITION (TEST_architecture_arch STREQUAL "x86_64") +qt_extend_target(qsqldb2 CONDITION (TEST_architecture_arch STREQUAL "x86_64") DEFINES ODBC64 ) diff --git a/src/plugins/sqldrivers/mysql/CMakeLists.txt b/src/plugins/sqldrivers/mysql/CMakeLists.txt index 49cb6bfc87..e55a062c9b 100644 --- a/src/plugins/sqldrivers/mysql/CMakeLists.txt +++ b/src/plugins/sqldrivers/mysql/CMakeLists.txt @@ -4,7 +4,7 @@ ## qsqlmysql Plugin: ##################################################################### -add_qt_plugin(qsqlmysql +qt_add_plugin(qsqlmysql TYPE sqldrivers CLASS_NAME QMYSQLDriverPlugin SOURCES diff --git a/src/plugins/sqldrivers/oci/CMakeLists.txt b/src/plugins/sqldrivers/oci/CMakeLists.txt index a2cfb11167..3215b87c46 100644 --- a/src/plugins/sqldrivers/oci/CMakeLists.txt +++ b/src/plugins/sqldrivers/oci/CMakeLists.txt @@ -4,7 +4,7 @@ ## qsqloci Plugin: ##################################################################### -add_qt_plugin(qsqloci +qt_add_plugin(qsqloci TYPE sqldrivers CLASS_NAME QOCIDriverPlugin SOURCES @@ -28,7 +28,7 @@ add_qt_plugin(qsqloci ## Scopes: ##################################################################### -extend_target(qsqloci CONDITION APPLE +qt_extend_target(qsqloci 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 ac3297eaaf..5eda5899cf 100644 --- a/src/plugins/sqldrivers/odbc/.prev_CMakeLists.txt +++ b/src/plugins/sqldrivers/odbc/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## qsqlodbc Plugin: ##################################################################### -add_qt_plugin(qsqlodbc +qt_add_plugin(qsqlodbc TYPE sqldrivers CLASS_NAME QODBCDriverPlugin SOURCES @@ -28,7 +28,7 @@ add_qt_plugin(qsqlodbc ## Scopes: ##################################################################### -extend_target(qsqlodbc CONDITION UNIX +qt_extend_target(qsqlodbc CONDITION UNIX DEFINES UNICODE ) diff --git a/src/plugins/sqldrivers/odbc/CMakeLists.txt b/src/plugins/sqldrivers/odbc/CMakeLists.txt index 542d3b9727..871e87a4c1 100644 --- a/src/plugins/sqldrivers/odbc/CMakeLists.txt +++ b/src/plugins/sqldrivers/odbc/CMakeLists.txt @@ -6,7 +6,7 @@ qt_find_package(ODBC) # special case -add_qt_plugin(qsqlodbc +qt_add_plugin(qsqlodbc TYPE sqldrivers CLASS_NAME QODBCDriverPlugin SOURCES @@ -30,7 +30,7 @@ add_qt_plugin(qsqlodbc ## Scopes: ##################################################################### -extend_target(qsqlodbc CONDITION UNIX +qt_extend_target(qsqlodbc CONDITION UNIX DEFINES UNICODE ) diff --git a/src/plugins/sqldrivers/psql/.prev_CMakeLists.txt b/src/plugins/sqldrivers/psql/.prev_CMakeLists.txt index 1d810767bf..4047c6b1f6 100644 --- a/src/plugins/sqldrivers/psql/.prev_CMakeLists.txt +++ b/src/plugins/sqldrivers/psql/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## qsqlpsql Plugin: ##################################################################### -add_qt_plugin(qsqlpsql +qt_add_plugin(qsqlpsql TYPE sqldrivers CLASS_NAME QPSQLDriverPlugin SOURCES diff --git a/src/plugins/sqldrivers/psql/CMakeLists.txt b/src/plugins/sqldrivers/psql/CMakeLists.txt index 54da39a51a..46ad12677e 100644 --- a/src/plugins/sqldrivers/psql/CMakeLists.txt +++ b/src/plugins/sqldrivers/psql/CMakeLists.txt @@ -9,7 +9,7 @@ qt_find_package(PostgreSQL) # special case ## qsqlpsql Plugin: ##################################################################### -add_qt_plugin(qsqlpsql +qt_add_plugin(qsqlpsql TYPE sqldrivers CLASS_NAME QPSQLDriverPlugin SOURCES diff --git a/src/plugins/sqldrivers/sqlite/.prev_CMakeLists.txt b/src/plugins/sqldrivers/sqlite/.prev_CMakeLists.txt index 45cf01fb1e..ae08f26cb9 100644 --- a/src/plugins/sqldrivers/sqlite/.prev_CMakeLists.txt +++ b/src/plugins/sqldrivers/sqlite/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## qsqlite Plugin: ##################################################################### -add_qt_plugin(qsqlite +qt_add_plugin(qsqlite TYPE sqldrivers CLASS_NAME QSQLiteDriverPlugin SOURCES @@ -28,12 +28,12 @@ add_qt_plugin(qsqlite ## Scopes: ##################################################################### -extend_target(qsqlite CONDITION QT_FEATURE_system_sqlite +qt_extend_target(qsqlite CONDITION QT_FEATURE_system_sqlite PUBLIC_LIBRARIES sqlite ) -extend_target(qsqlite CONDITION NOT QT_FEATURE_system_sqlite +qt_extend_target(qsqlite CONDITION NOT QT_FEATURE_system_sqlite SOURCES ../../../3rdparty/sqlite/sqlite3.c DEFINES @@ -48,22 +48,22 @@ extend_target(qsqlite CONDITION NOT QT_FEATURE_system_sqlite ../../../3rdparty/sqlite ) -extend_target(qsqlite CONDITION CMAKE_BUILD_TYPE STREQUAL Release AND NOT QT_FEATURE_system_sqlite +qt_extend_target(qsqlite CONDITION CMAKE_BUILD_TYPE STREQUAL Release AND NOT QT_FEATURE_system_sqlite DEFINES NDEBUG ) -extend_target(qsqlite CONDITION NOT CONFIG___contains___largefile AND NOT QT_FEATURE_system_sqlite +qt_extend_target(qsqlite CONDITION NOT CONFIG___contains___largefile AND NOT QT_FEATURE_system_sqlite DEFINES SQLITE_DISABLE_LFS ) -extend_target(qsqlite CONDITION QT_FEATURE_posix_fallocate AND NOT QT_FEATURE_system_sqlite +qt_extend_target(qsqlite CONDITION QT_FEATURE_posix_fallocate AND NOT QT_FEATURE_system_sqlite DEFINES HAVE_POSIX_FALLOCATE=1 ) -extend_target(qsqlite CONDITION WINRT AND NOT QT_FEATURE_system_sqlite +qt_extend_target(qsqlite CONDITION WINRT AND NOT QT_FEATURE_system_sqlite DEFINES SQLITE_OS_WINRT ) @@ -71,22 +71,22 @@ extend_target(qsqlite CONDITION WINRT AND NOT QT_FEATURE_system_sqlite #### Keys ignored in scope 8:.:../../../3rdparty:../../../3rdparty/sqlite.pri:WINRT: # QMAKE_CFLAGS = "-Gy" -extend_target(qsqlite CONDITION QNX AND NOT QT_FEATURE_system_sqlite +qt_extend_target(qsqlite CONDITION QNX AND NOT QT_FEATURE_system_sqlite DEFINES _QNX_SOURCE ) -extend_target(qsqlite CONDITION UNIX AND NOT QT_FEATURE_system_sqlite AND NOT WINRT AND NOT winphone +qt_extend_target(qsqlite CONDITION UNIX AND NOT QT_FEATURE_system_sqlite AND NOT WINRT AND NOT winphone DEFINES HAVE_USLEEP=1 ) -extend_target(qsqlite CONDITION QT_FEATURE_dlopen AND NOT QT_FEATURE_system_sqlite +qt_extend_target(qsqlite CONDITION QT_FEATURE_dlopen AND NOT QT_FEATURE_system_sqlite PUBLIC_LIBRARIES ${CMAKE_DL_LIBS} ) -extend_target(qsqlite CONDITION NOT QT_FEATURE_dlopen AND NOT QT_FEATURE_system_sqlite +qt_extend_target(qsqlite 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 50e3ba69ec..35fe8e69de 100644 --- a/src/plugins/sqldrivers/sqlite/CMakeLists.txt +++ b/src/plugins/sqldrivers/sqlite/CMakeLists.txt @@ -4,7 +4,7 @@ ## qsqlite Plugin: ##################################################################### -add_qt_plugin(qsqlite +qt_add_plugin(qsqlite TYPE sqldrivers CLASS_NAME QSQLiteDriverPlugin SOURCES @@ -31,5 +31,5 @@ add_qt_plugin(qsqlite # special case begin # Remove non-system-sqlite code -# extend_target(qsqlite CONDITION QT_FEATURE_system_sqlite +# qt_extend_target(qsqlite CONDITION QT_FEATURE_system_sqlite # special case end diff --git a/src/plugins/styles/mac/CMakeLists.txt b/src/plugins/styles/mac/CMakeLists.txt index fe4bb64280..89b9594ebe 100644 --- a/src/plugins/styles/mac/CMakeLists.txt +++ b/src/plugins/styles/mac/CMakeLists.txt @@ -4,7 +4,7 @@ ## qmacstyle Plugin: ##################################################################### -add_qt_plugin(qmacstyle +qt_add_plugin(qmacstyle TYPE styles CLASS_NAME QMacStylePlugin SOURCES diff --git a/src/printsupport/CMakeLists.txt b/src/printsupport/CMakeLists.txt index e8a77e90ec..b2d653125f 100644 --- a/src/printsupport/CMakeLists.txt +++ b/src/printsupport/CMakeLists.txt @@ -4,7 +4,7 @@ ## PrintSupport Module: ##################################################################### -add_qt_module(PrintSupport +qt_add_module(PrintSupport PLUGIN_TYPES printsupport SOURCES kernel/qpaintengine_alpha.cpp kernel/qpaintengine_alpha_p.h @@ -40,18 +40,18 @@ add_qt_module(PrintSupport ## Scopes: ##################################################################### -extend_target(PrintSupport CONDITION QT_FEATURE_printpreviewwidget +qt_extend_target(PrintSupport CONDITION QT_FEATURE_printpreviewwidget SOURCES kernel/qpaintengine_preview.cpp kernel/qpaintengine_preview_p.h widgets/qprintpreviewwidget.cpp widgets/qprintpreviewwidget.h ) -extend_target(PrintSupport CONDITION WIN32 +qt_extend_target(PrintSupport CONDITION WIN32 SOURCES kernel/qprintengine_win.cpp kernel/qprintengine_win_p.h ) -extend_target(PrintSupport CONDITION WIN32 AND NOT WINRT +qt_extend_target(PrintSupport CONDITION WIN32 AND NOT WINRT LIBRARIES comdlg32 gdi32 @@ -59,19 +59,19 @@ extend_target(PrintSupport CONDITION WIN32 AND NOT WINRT winspool ) -extend_target(PrintSupport CONDITION QT_FEATURE_cups AND UNIX AND NOT APPLE +qt_extend_target(PrintSupport CONDITION QT_FEATURE_cups AND UNIX AND NOT APPLE SOURCES kernel/qcups.cpp kernel/qcups_p.h ) -extend_target(PrintSupport CONDITION QT_FEATURE_cupsjobwidget AND UNIX AND NOT APPLE +qt_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 ) -extend_target(PrintSupport CONDITION QT_FEATURE_printdialog +qt_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 @@ -116,7 +116,7 @@ if(QT_FEATURE_printdialog) "images/zoom-out-32.png" ) - add_qt_resource(PrintSupport "qprintdialog" + qt_add_resource(PrintSupport "qprintdialog" PREFIX "/qt-project.org/dialogs/qprintpreviewdialog" BASE @@ -129,7 +129,7 @@ if(QT_FEATURE_printdialog) "images/status-gray-scale.png" ) - add_qt_resource(PrintSupport "qprintdialog1" + qt_add_resource(PrintSupport "qprintdialog1" PREFIX "/qt-project.org/dialogs/qprintdialog" BASE @@ -139,7 +139,7 @@ if(QT_FEATURE_printdialog) ) endif() -extend_target(PrintSupport CONDITION APPLE_OSX AND QT_FEATURE_printdialog +qt_extend_target(PrintSupport CONDITION APPLE_OSX AND QT_FEATURE_printdialog SOURCES dialogs/qpagesetupdialog_mac.mm dialogs/qprintdialog_mac.mm @@ -147,13 +147,13 @@ extend_target(PrintSupport CONDITION APPLE_OSX AND QT_FEATURE_printdialog ${FWAppKit} ) -extend_target(PrintSupport CONDITION QT_FEATURE_printdialog AND WIN32 +qt_extend_target(PrintSupport CONDITION QT_FEATURE_printdialog AND WIN32 SOURCES dialogs/qpagesetupdialog_win.cpp dialogs/qprintdialog_win.cpp ) -extend_target(PrintSupport CONDITION QT_FEATURE_printdialog AND UNIX AND NOT APPLE +qt_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 @@ -166,11 +166,11 @@ extend_target(PrintSupport CONDITION QT_FEATURE_printdialog AND UNIX AND NOT APP uic ) -extend_target(PrintSupport CONDITION QT_FEATURE_printpreviewdialog +qt_extend_target(PrintSupport CONDITION QT_FEATURE_printpreviewdialog SOURCES dialogs/qprintpreviewdialog.cpp dialogs/qprintpreviewdialog.h ) -add_qt_docs(PrintSupport +qt_add_docs(PrintSupport doc/qtprintsupport.qdocconf ) diff --git a/src/sql/CMakeLists.txt b/src/sql/CMakeLists.txt index 7b31ae4e62..49a1df0fdb 100644 --- a/src/sql/CMakeLists.txt +++ b/src/sql/CMakeLists.txt @@ -4,7 +4,7 @@ ## Sql Module: ##################################################################### -add_qt_module(Sql +qt_add_module(Sql PLUGIN_TYPES sqldrivers SOURCES kernel/qsqlcachedresult.cpp kernel/qsqlcachedresult_p.h @@ -37,19 +37,19 @@ add_qt_module(Sql ## Scopes: ##################################################################### -extend_target(Sql CONDITION MSVC AND (TEST_architecture_arch STREQUAL "i386") +qt_extend_target(Sql CONDITION MSVC AND (TEST_architecture_arch STREQUAL "i386") LINK_OPTIONS "/BASE:0x62000000" ) -extend_target(Sql CONDITION QT_FEATURE_sqlmodel +qt_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 ) -add_qt_docs(Sql +qt_add_docs(Sql doc/qtsql.qdocconf ) diff --git a/src/testlib/.prev_CMakeLists.txt b/src/testlib/.prev_CMakeLists.txt index 56b5538072..5859ae18fa 100644 --- a/src/testlib/.prev_CMakeLists.txt +++ b/src/testlib/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## Test Module: ##################################################################### -add_qt_module(Test +qt_add_module(Test QMAKE_MODULE_CONFIG console testlib_defines EXCEPTIONS SOURCES @@ -77,29 +77,29 @@ add_qt_module(Test #### Keys ignored in scope 2:.:.:testlib.pro:UNIX AND NOT embedded: # QMAKE_PKGCONFIG_DESCRIPTION = "Qt" "Unit" "Testing" "Library" -extend_target(Test CONDITION QT_FEATURE_itemmodeltester +qt_extend_target(Test CONDITION QT_FEATURE_itemmodeltester SOURCES qabstractitemmodeltester.cpp qabstractitemmodeltester.h ) -extend_target(Test CONDITION QT_FEATURE_valgrind +qt_extend_target(Test CONDITION QT_FEATURE_valgrind SOURCES qbenchmarkvalgrind.cpp qbenchmarkvalgrind_p.h ) -extend_target(Test CONDITION embedded +qt_extend_target(Test CONDITION embedded COMPILE_OPTIONS -fno-rtti ) -extend_target(Test CONDITION APPLE +qt_extend_target(Test CONDITION APPLE SOURCES qappletestlogger.cpp qappletestlogger_p.h PUBLIC_LIBRARIES ${FWSecurity} ) -extend_target(Test CONDITION APPLE_OSX +qt_extend_target(Test CONDITION APPLE_OSX SOURCES qtestutil_macos.mm qtestutil_macos_p.h PUBLIC_LIBRARIES @@ -108,7 +108,7 @@ extend_target(Test CONDITION APPLE_OSX ${FWIOKit} ) -extend_target(Test CONDITION (APPLE) AND (OFF AND NOT lessThan(QMAKE_XCODE_VERSION, "6.0")) +qt_extend_target(Test CONDITION (APPLE) AND (OFF AND NOT lessThan(QMAKE_XCODE_VERSION, "6.0")) SOURCES qxctestlogger.mm qxctestlogger_p.h DEFINES @@ -117,7 +117,7 @@ extend_target(Test CONDITION (APPLE) AND (OFF AND NOT lessThan(QMAKE_XCODE_VERSI ${FWFoundation} ) -extend_target(Test CONDITION ((APPLE) AND (OFF AND NOT lessThan(QMAKE_XCODE_VERSION, "6.0"))) AND (NOT QMAKE_MAC_SDK_PLATFORM_PATH_ISEMPTY) +qt_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 @@ -137,7 +137,7 @@ extend_target(Test CONDITION ((APPLE) AND (OFF AND NOT lessThan(QMAKE_XCODE_VERS #### Keys ignored in scope 12:.:.:testlib.pro:NOT TARGET Qt::Network: # HEADERSCLEAN_EXCLUDE = "qtest_network.h" -add_qt_docs(Test +qt_add_docs(Test doc/qttestlib.qdocconf ) diff --git a/src/testlib/CMakeLists.txt b/src/testlib/CMakeLists.txt index 836c0e21f4..8d8b09beba 100644 --- a/src/testlib/CMakeLists.txt +++ b/src/testlib/CMakeLists.txt @@ -4,7 +4,7 @@ ## Test Module: ##################################################################### -add_qt_module(Test +qt_add_module(Test CONFIG_MODULE_NAME testlib # special case EXCEPTIONS SOURCES @@ -75,29 +75,29 @@ add_qt_module(Test #### Keys ignored in scope 2:.:.:testlib.pro:UNIX AND NOT embedded: # QMAKE_PKGCONFIG_DESCRIPTION = "Qt" "Unit" "Testing" "Library" -extend_target(Test CONDITION QT_FEATURE_itemmodeltester +qt_extend_target(Test CONDITION QT_FEATURE_itemmodeltester SOURCES qabstractitemmodeltester.cpp qabstractitemmodeltester.h ) -extend_target(Test CONDITION QT_FEATURE_valgrind +qt_extend_target(Test CONDITION QT_FEATURE_valgrind SOURCES qbenchmarkvalgrind.cpp qbenchmarkvalgrind_p.h ) -extend_target(Test CONDITION embedded +qt_extend_target(Test CONDITION embedded COMPILE_OPTIONS -fno-rtti ) -extend_target(Test CONDITION APPLE +qt_extend_target(Test CONDITION APPLE SOURCES qappletestlogger.cpp qappletestlogger_p.h PUBLIC_LIBRARIES ${FWSecurity} ) -extend_target(Test CONDITION APPLE_OSX +qt_extend_target(Test CONDITION APPLE_OSX SOURCES qtestutil_macos.mm qtestutil_macos_p.h PUBLIC_LIBRARIES @@ -123,7 +123,7 @@ extend_target(Test CONDITION APPLE_OSX #### Keys ignored in scope 12:.:.:testlib.pro:NOT TARGET Qt::Network: # HEADERSCLEAN_EXCLUDE = "qtest_network.h" -add_qt_docs(Test +qt_add_docs(Test doc/qttestlib.qdocconf ) diff --git a/src/tools/androiddeployqt/.prev_CMakeLists.txt b/src/tools/androiddeployqt/.prev_CMakeLists.txt index 53c3fbd22e..e445201b82 100644 --- a/src/tools/androiddeployqt/.prev_CMakeLists.txt +++ b/src/tools/androiddeployqt/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## androiddeployqt Binary: ##################################################################### -add_qt_executable(androiddeployqt +qt_add_executable(androiddeployqt SOURCES main.cpp DEFINES @@ -21,7 +21,7 @@ add_qt_executable(androiddeployqt ## Scopes: ##################################################################### -extend_target(androiddeployqt CONDITION windows +qt_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 30410f7532..d47e10efd2 100644 --- a/src/tools/androiddeployqt/CMakeLists.txt +++ b/src/tools/androiddeployqt/CMakeLists.txt @@ -4,7 +4,7 @@ ## androiddeployqt Binary: ##################################################################### -add_qt_executable(androiddeployqt +qt_add_executable(androiddeployqt SOURCES main.cpp DEFINES @@ -21,7 +21,7 @@ add_qt_executable(androiddeployqt ## Scopes: ##################################################################### -extend_target(androiddeployqt CONDITION windows +qt_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 1ae3218662..d7ec4a66fa 100644 --- a/src/tools/androidtestrunner/CMakeLists.txt +++ b/src/tools/androidtestrunner/CMakeLists.txt @@ -4,7 +4,7 @@ ## androidtestrunner Binary: ##################################################################### -add_qt_executable(androidtestrunner +qt_add_executable(androidtestrunner SOURCES main.cpp DEFINES @@ -21,7 +21,7 @@ add_qt_executable(androidtestrunner ## Scopes: ##################################################################### -extend_target(androidtestrunner CONDITION windows +qt_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 1f3bf0b98f..811b7d2fb3 100644 --- a/src/tools/bootstrap/.prev_CMakeLists.txt +++ b/src/tools/bootstrap/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## Bootstrap Module: ##################################################################### -add_qt_module(Bootstrap +qt_add_module(Bootstrap STATIC INTERNAL_MODULE NO_SYNC_QT @@ -117,7 +117,7 @@ add_qt_module(Bootstrap ## Scopes: ##################################################################### -extend_target(Bootstrap CONDITION UNIX +qt_extend_target(Bootstrap CONDITION UNIX SOURCES ../../corelib/io/qfilesystemengine_unix.cpp ../../corelib/io/qfilesystemiterator_unix.cpp @@ -131,7 +131,7 @@ extend_target(Bootstrap CONDITION UNIX ../../corelib/kernel/qsystemsemaphore_unix.cpp ) -extend_target(Bootstrap CONDITION WIN32 +qt_extend_target(Bootstrap CONDITION WIN32 SOURCES ../../corelib/global/qoperatingsystemversion_win.cpp ../../corelib/io/qfilesystemengine_win.cpp @@ -151,7 +151,7 @@ extend_target(Bootstrap CONDITION WIN32 user32 ) -extend_target(Bootstrap CONDITION APPLE +qt_extend_target(Bootstrap CONDITION APPLE SOURCES ../../corelib/global/qoperatingsystemversion_darwin.mm ../../corelib/kernel/qcore_foundation.mm @@ -162,24 +162,24 @@ extend_target(Bootstrap CONDITION APPLE ${FWFoundation} ) -extend_target(Bootstrap CONDITION APPLE_OSX +qt_extend_target(Bootstrap CONDITION APPLE_OSX SOURCES ../../corelib/io/qstandardpaths_mac.mm LIBRARIES ${FWCoreServices} ) -extend_target(Bootstrap CONDITION APPLE_UIKIT +qt_extend_target(Bootstrap CONDITION APPLE_UIKIT LIBRARIES ${FWUIKit} ) -extend_target(Bootstrap CONDITION UNIX AND NOT APPLE_OSX +qt_extend_target(Bootstrap CONDITION UNIX AND NOT APPLE_OSX SOURCES ../../corelib/io/qstandardpaths_unix.cpp ) -extend_target(Bootstrap CONDITION cross_compile +qt_extend_target(Bootstrap CONDITION cross_compile SOURCES ../../3rdparty/zlib/src/adler32.c ../../3rdparty/zlib/src/compress.c @@ -200,12 +200,12 @@ extend_target(Bootstrap CONDITION cross_compile ../../3rdparty/zlib/src ) -extend_target(Bootstrap CONDITION NOT cross_compile +qt_extend_target(Bootstrap CONDITION NOT cross_compile LIBRARIES ZLIB::ZLIB ) -extend_target(Bootstrap CONDITION WIN32 AND mingw +qt_extend_target(Bootstrap CONDITION WIN32 AND mingw PUBLIC_LIBRARIES uuid ) diff --git a/src/tools/bootstrap/CMakeLists.txt b/src/tools/bootstrap/CMakeLists.txt index 7c9071e20b..d4350da373 100644 --- a/src/tools/bootstrap/CMakeLists.txt +++ b/src/tools/bootstrap/CMakeLists.txt @@ -6,7 +6,7 @@ # special case: add_library(Bootstrap STATIC) -extend_target(Bootstrap +qt_extend_target(Bootstrap SOURCES ../../corelib/codecs/qlatincodec.cpp ../../corelib/codecs/qtextcodec.cpp @@ -122,7 +122,7 @@ extend_target(Bootstrap ## Scopes: ##################################################################### -extend_target(Bootstrap CONDITION UNIX +qt_extend_target(Bootstrap CONDITION UNIX SOURCES ../../corelib/io/qfilesystemengine_unix.cpp ../../corelib/io/qfilesystemiterator_unix.cpp @@ -136,7 +136,7 @@ extend_target(Bootstrap CONDITION UNIX ../../corelib/kernel/qsystemsemaphore_unix.cpp ) -extend_target(Bootstrap CONDITION WIN32 +qt_extend_target(Bootstrap CONDITION WIN32 SOURCES ../../corelib/global/qoperatingsystemversion_win.cpp ../../corelib/io/qfilesystemengine_win.cpp @@ -156,7 +156,7 @@ extend_target(Bootstrap CONDITION WIN32 user32 ) -extend_target(Bootstrap CONDITION APPLE +qt_extend_target(Bootstrap CONDITION APPLE SOURCES ../../corelib/global/qoperatingsystemversion_darwin.mm ../../corelib/kernel/qcore_foundation.mm @@ -167,19 +167,19 @@ extend_target(Bootstrap CONDITION APPLE ${FWFoundation} ) -extend_target(Bootstrap CONDITION APPLE_OSX +qt_extend_target(Bootstrap CONDITION APPLE_OSX SOURCES ../../corelib/io/qstandardpaths_mac.mm LIBRARIES ${FWCoreServices} ) -extend_target(Bootstrap CONDITION APPLE_UIKIT +qt_extend_target(Bootstrap CONDITION APPLE_UIKIT LIBRARIES ${FWUIKit} ) -extend_target(Bootstrap CONDITION UNIX AND NOT APPLE_OSX +qt_extend_target(Bootstrap CONDITION UNIX AND NOT APPLE_OSX SOURCES ../../corelib/io/qstandardpaths_unix.cpp ) @@ -188,7 +188,7 @@ extend_target(Bootstrap CONDITION UNIX AND NOT APPLE_OSX # extend_target(Bootstrap CONDITION cross_compile [...]) # extend_target(Bootstrap CONDITION NOT cross_compile [...]) -extend_target(Bootstrap CONDITION WIN32 AND mingw +qt_extend_target(Bootstrap CONDITION WIN32 AND mingw PUBLIC_LIBRARIES uuid ) diff --git a/src/tools/moc/.prev_CMakeLists.txt b/src/tools/moc/.prev_CMakeLists.txt index 4948963636..ffadd2e2be 100644 --- a/src/tools/moc/.prev_CMakeLists.txt +++ b/src/tools/moc/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## moc Tool: ##################################################################### -add_qt_tool(moc +qt_add_tool(moc BOOTSTRAP SOURCES cbordevice.h diff --git a/src/tools/moc/CMakeLists.txt b/src/tools/moc/CMakeLists.txt index 75f5a46163..c9786674f1 100644 --- a/src/tools/moc/CMakeLists.txt +++ b/src/tools/moc/CMakeLists.txt @@ -4,7 +4,7 @@ ## moc Tool: ##################################################################### -add_qt_tool(moc +qt_add_tool(moc BOOTSTRAP TOOLS_TARGET Core # special case SOURCES diff --git a/src/tools/qdbuscpp2xml/.prev_CMakeLists.txt b/src/tools/qdbuscpp2xml/.prev_CMakeLists.txt index 04553a4852..9d51b4eac9 100644 --- a/src/tools/qdbuscpp2xml/.prev_CMakeLists.txt +++ b/src/tools/qdbuscpp2xml/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## qdbuscpp2xml Tool: ##################################################################### -add_qt_tool(qdbuscpp2xml +qt_add_tool(qdbuscpp2xml SOURCES ../moc/cbordevice.h ../moc/collectjson.cpp ../moc/collectjson.h @@ -34,14 +34,14 @@ add_qt_tool(qdbuscpp2xml ## Scopes: ##################################################################### -extend_target(qdbuscpp2xml CONDITION force_bootstrap +qt_extend_target(qdbuscpp2xml CONDITION force_bootstrap LIBRARIES bootstrap_dbusPrivate PUBLIC_LIBRARIES bootstrap_dbus ) -extend_target(qdbuscpp2xml CONDITION NOT force_bootstrap +qt_extend_target(qdbuscpp2xml CONDITION NOT force_bootstrap LIBRARIES Qt::DBusPrivate PUBLIC_LIBRARIES diff --git a/src/tools/qdbuscpp2xml/CMakeLists.txt b/src/tools/qdbuscpp2xml/CMakeLists.txt index 30e53ee475..499e5fb6ae 100644 --- a/src/tools/qdbuscpp2xml/CMakeLists.txt +++ b/src/tools/qdbuscpp2xml/CMakeLists.txt @@ -4,7 +4,7 @@ ## qdbuscpp2xml Tool: ##################################################################### -add_qt_tool(qdbuscpp2xml +qt_add_tool(qdbuscpp2xml TOOLS_TARGET DBus # special case SOURCES ../moc/cbordevice.h diff --git a/src/tools/qdbusxml2cpp/.prev_CMakeLists.txt b/src/tools/qdbusxml2cpp/.prev_CMakeLists.txt index 9b4112a73f..202e751727 100644 --- a/src/tools/qdbusxml2cpp/.prev_CMakeLists.txt +++ b/src/tools/qdbusxml2cpp/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## qdbusxml2cpp Tool: ##################################################################### -add_qt_tool(qdbusxml2cpp +qt_add_tool(qdbusxml2cpp SOURCES qdbusxml2cpp.cpp DEFINES @@ -21,14 +21,14 @@ add_qt_tool(qdbusxml2cpp ## Scopes: ##################################################################### -extend_target(qdbusxml2cpp CONDITION NOT force_bootstrap +qt_extend_target(qdbusxml2cpp CONDITION NOT force_bootstrap LIBRARIES Qt::DBusPrivate PUBLIC_LIBRARIES Qt::DBus ) -extend_target(qdbusxml2cpp CONDITION force_bootstrap +qt_extend_target(qdbusxml2cpp CONDITION force_bootstrap LIBRARIES bootstrap_dbusPrivate PUBLIC_LIBRARIES diff --git a/src/tools/qdbusxml2cpp/CMakeLists.txt b/src/tools/qdbusxml2cpp/CMakeLists.txt index f2a9a60e68..f97cbb1180 100644 --- a/src/tools/qdbusxml2cpp/CMakeLists.txt +++ b/src/tools/qdbusxml2cpp/CMakeLists.txt @@ -4,7 +4,7 @@ ## qdbusxml2cpp Tool: ##################################################################### -add_qt_tool(qdbusxml2cpp +qt_add_tool(qdbusxml2cpp TOOLS_TARGET DBus # special case SOURCES qdbusxml2cpp.cpp diff --git a/src/tools/qlalr/.prev_CMakeLists.txt b/src/tools/qlalr/.prev_CMakeLists.txt index 435f776ed3..9ff8a54ce4 100644 --- a/src/tools/qlalr/.prev_CMakeLists.txt +++ b/src/tools/qlalr/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## qlalr Tool: ##################################################################### -add_qt_tool(qlalr +qt_add_tool(qlalr SOURCES compress.cpp compress.h cppgenerator.cpp cppgenerator.h diff --git a/src/tools/qlalr/CMakeLists.txt b/src/tools/qlalr/CMakeLists.txt index 876f5147f5..437c8d918f 100644 --- a/src/tools/qlalr/CMakeLists.txt +++ b/src/tools/qlalr/CMakeLists.txt @@ -4,7 +4,7 @@ ## qlalr Tool: ##################################################################### -add_qt_tool(qlalr +qt_add_tool(qlalr TOOLS_TARGET Core # special case SOURCES compress.cpp compress.h diff --git a/src/tools/qvkgen/.prev_CMakeLists.txt b/src/tools/qvkgen/.prev_CMakeLists.txt index 79d30d2599..994b97a9f1 100644 --- a/src/tools/qvkgen/.prev_CMakeLists.txt +++ b/src/tools/qvkgen/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## qvkgen Tool: ##################################################################### -add_qt_tool(qvkgen +qt_add_tool(qvkgen SOURCES qvkgen.cpp PUBLIC_LIBRARIES diff --git a/src/tools/qvkgen/CMakeLists.txt b/src/tools/qvkgen/CMakeLists.txt index b6cb8609da..0f72a8b633 100644 --- a/src/tools/qvkgen/CMakeLists.txt +++ b/src/tools/qvkgen/CMakeLists.txt @@ -4,7 +4,7 @@ ## qvkgen Tool: ##################################################################### -add_qt_tool(qvkgen +qt_add_tool(qvkgen TOOLS_TARGET Gui # special case SOURCES qvkgen.cpp diff --git a/src/tools/rcc/.prev_CMakeLists.txt b/src/tools/rcc/.prev_CMakeLists.txt index 31a9492e5f..f7b790ee5a 100644 --- a/src/tools/rcc/.prev_CMakeLists.txt +++ b/src/tools/rcc/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## rcc Tool: ##################################################################### -add_qt_tool(rcc +qt_add_tool(rcc BOOTSTRAP SOURCES main.cpp @@ -24,14 +24,14 @@ add_qt_tool(rcc ## Scopes: ##################################################################### -extend_target(rcc CONDITION QT_FEATURE_zstd AND NOT cross_compile +qt_extend_target(rcc CONDITION QT_FEATURE_zstd AND NOT cross_compile DEFINES QT_FEATURE_zstd=1 LIBRARIES ZSTD::ZSTD ) -extend_target(rcc CONDITION cross_compile OR NOT QT_FEATURE_zstd +qt_extend_target(rcc CONDITION cross_compile 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 49f6228701..64610dd991 100644 --- a/src/tools/rcc/CMakeLists.txt +++ b/src/tools/rcc/CMakeLists.txt @@ -4,7 +4,7 @@ ## rcc Tool: ##################################################################### -add_qt_tool(rcc +qt_add_tool(rcc BOOTSTRAP TOOLS_TARGET Core # special case SOURCES @@ -25,14 +25,14 @@ add_qt_tool(rcc ## Scopes: ##################################################################### -extend_target(rcc CONDITION QT_FEATURE_zstd AND NOT cross_compile +qt_extend_target(rcc CONDITION QT_FEATURE_zstd AND NOT cross_compile DEFINES QT_FEATURE_zstd=1 LIBRARIES ZSTD::ZSTD ) -extend_target(rcc CONDITION cross_compile OR NOT QT_FEATURE_zstd +qt_extend_target(rcc CONDITION cross_compile 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 e94caeb634..87bcf362d6 100644 --- a/src/tools/tracegen/.prev_CMakeLists.txt +++ b/src/tools/tracegen/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## tracegen Tool: ##################################################################### -add_qt_tool(tracegen +qt_add_tool(tracegen BOOTSTRAP SOURCES etw.cpp etw.h diff --git a/src/tools/tracegen/CMakeLists.txt b/src/tools/tracegen/CMakeLists.txt index 5231fe676e..0f12f823c4 100644 --- a/src/tools/tracegen/CMakeLists.txt +++ b/src/tools/tracegen/CMakeLists.txt @@ -4,7 +4,7 @@ ## tracegen Tool: ##################################################################### -add_qt_tool(tracegen +qt_add_tool(tracegen BOOTSTRAP TOOLS_TARGET Core # special case SOURCES diff --git a/src/tools/uic/.prev_CMakeLists.txt b/src/tools/uic/.prev_CMakeLists.txt index b35d54f3fd..4cd28d7070 100644 --- a/src/tools/uic/.prev_CMakeLists.txt +++ b/src/tools/uic/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## uic Tool: ##################################################################### -add_qt_tool(uic +qt_add_tool(uic SOURCES cpp/cppwritedeclaration.cpp cpp/cppwritedeclaration.h cpp/cppwriteincludes.cpp cpp/cppwriteincludes.h diff --git a/src/tools/uic/CMakeLists.txt b/src/tools/uic/CMakeLists.txt index 2dd5011b3e..21fd232349 100644 --- a/src/tools/uic/CMakeLists.txt +++ b/src/tools/uic/CMakeLists.txt @@ -4,7 +4,7 @@ ## uic Tool: ##################################################################### -add_qt_tool(uic +qt_add_tool(uic TOOLS_TARGET Widgets # special case SOURCES cpp/cppwritedeclaration.cpp cpp/cppwritedeclaration.h diff --git a/src/widgets/.prev_CMakeLists.txt b/src/widgets/.prev_CMakeLists.txt index 952e4dcb99..a08b329581 100644 --- a/src/widgets/.prev_CMakeLists.txt +++ b/src/widgets/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## Widgets Module: ##################################################################### -add_qt_module(Widgets +qt_add_module(Widgets QMAKE_MODULE_CONFIG uic PLUGIN_TYPES styles SOURCES @@ -235,7 +235,7 @@ set(qstyle_resource_files "images/viewlist-32.png" ) -add_qt_resource(Widgets "qstyle" +qt_add_resource(Widgets "qstyle" PREFIX "/qt-project.org/styles/commonstyle" BASE @@ -270,7 +270,7 @@ set(qstyle1_resource_files "images/toolbar-ext-macstyle@2x.png" ) -add_qt_resource(Widgets "qstyle1" +qt_add_resource(Widgets "qstyle1" PREFIX "/qt-project.org/styles/macstyle" BASE @@ -288,12 +288,12 @@ add_qt_resource(Widgets "qstyle1" ## Scopes: ##################################################################### -extend_target(Widgets CONDITION MSVC AND (TEST_architecture_arch STREQUAL "i386") +qt_extend_target(Widgets CONDITION MSVC AND (TEST_architecture_arch STREQUAL "i386") LINK_OPTIONS "/BASE:0x65000000" ) -extend_target(Widgets CONDITION APPLE_OSX +qt_extend_target(Widgets CONDITION APPLE_OSX SOURCES kernel/qmacgesturerecognizer.cpp kernel/qmacgesturerecognizer_p.h widgets/qmaccocoaviewcontainer_mac.h widgets/qmaccocoaviewcontainer_mac.mm @@ -303,268 +303,268 @@ extend_target(Widgets CONDITION APPLE_OSX z ) -extend_target(Widgets CONDITION WIN32 +qt_extend_target(Widgets CONDITION WIN32 INCLUDE_DIRECTORIES ../3rdparty/wintab ) -extend_target(Widgets CONDITION WIN32 AND NOT WINRT +qt_extend_target(Widgets CONDITION WIN32 AND NOT WINRT LIBRARIES dwmapi shell32 uxtheme ) -extend_target(Widgets CONDITION QT_FEATURE_graphicseffect +qt_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 ) -extend_target(Widgets CONDITION QT_FEATURE_opengl +qt_extend_target(Widgets CONDITION QT_FEATURE_opengl SOURCES kernel/qopenglwidget.cpp kernel/qopenglwidget.h ) -extend_target(Widgets CONDITION QT_FEATURE_formlayout +qt_extend_target(Widgets CONDITION QT_FEATURE_formlayout SOURCES kernel/qformlayout.cpp kernel/qformlayout.h ) -extend_target(Widgets CONDITION QT_FEATURE_tooltip +qt_extend_target(Widgets CONDITION QT_FEATURE_tooltip SOURCES kernel/qtooltip.cpp kernel/qtooltip.h ) -extend_target(Widgets CONDITION QT_FEATURE_whatsthis +qt_extend_target(Widgets CONDITION QT_FEATURE_whatsthis SOURCES kernel/qwhatsthis.cpp kernel/qwhatsthis.h ) -extend_target(Widgets CONDITION QT_FEATURE_animation +qt_extend_target(Widgets CONDITION QT_FEATURE_animation SOURCES styles/qstyleanimation.cpp styles/qstyleanimation_p.h ) -extend_target(Widgets CONDITION QT_FEATURE_style_windows +qt_extend_target(Widgets CONDITION QT_FEATURE_style_windows SOURCES styles/qwindowsstyle.cpp styles/qwindowsstyle_p.h styles/qwindowsstyle_p_p.h ) -extend_target(Widgets CONDITION QT_FEATURE_style_fusion +qt_extend_target(Widgets CONDITION QT_FEATURE_style_fusion SOURCES styles/qfusionstyle.cpp styles/qfusionstyle_p.h styles/qfusionstyle_p_p.h ) -extend_target(Widgets CONDITION QT_FEATURE_abstractbutton +qt_extend_target(Widgets CONDITION QT_FEATURE_abstractbutton SOURCES widgets/qabstractbutton.cpp widgets/qabstractbutton.h widgets/qabstractbutton_p.h ) -extend_target(Widgets CONDITION QT_FEATURE_abstractslider +qt_extend_target(Widgets CONDITION QT_FEATURE_abstractslider SOURCES widgets/qabstractslider.cpp widgets/qabstractslider.h widgets/qabstractslider_p.h ) -extend_target(Widgets CONDITION QT_FEATURE_buttongroup +qt_extend_target(Widgets CONDITION QT_FEATURE_buttongroup SOURCES widgets/qbuttongroup.cpp widgets/qbuttongroup.h widgets/qbuttongroup_p.h ) -extend_target(Widgets CONDITION QT_FEATURE_calendarwidget +qt_extend_target(Widgets CONDITION QT_FEATURE_calendarwidget SOURCES widgets/qcalendarwidget.cpp widgets/qcalendarwidget.h ) -extend_target(Widgets CONDITION QT_FEATURE_checkbox +qt_extend_target(Widgets CONDITION QT_FEATURE_checkbox SOURCES widgets/qcheckbox.cpp widgets/qcheckbox.h ) -extend_target(Widgets CONDITION QT_FEATURE_combobox +qt_extend_target(Widgets CONDITION QT_FEATURE_combobox SOURCES widgets/qcombobox.cpp widgets/qcombobox.h widgets/qcombobox_p.h ) -extend_target(Widgets CONDITION QT_FEATURE_commandlinkbutton +qt_extend_target(Widgets CONDITION QT_FEATURE_commandlinkbutton SOURCES widgets/qcommandlinkbutton.cpp widgets/qcommandlinkbutton.h ) -extend_target(Widgets CONDITION QT_FEATURE_datetimeedit +qt_extend_target(Widgets CONDITION QT_FEATURE_datetimeedit SOURCES widgets/qdatetimeedit.cpp widgets/qdatetimeedit.h widgets/qdatetimeedit_p.h ) -extend_target(Widgets CONDITION QT_FEATURE_dial +qt_extend_target(Widgets CONDITION QT_FEATURE_dial SOURCES widgets/qdial.cpp widgets/qdial.h ) -extend_target(Widgets CONDITION QT_FEATURE_dockwidget +qt_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 ) -extend_target(Widgets CONDITION QT_FEATURE_effects +qt_extend_target(Widgets CONDITION QT_FEATURE_effects SOURCES widgets/qeffects.cpp widgets/qeffects_p.h ) -extend_target(Widgets CONDITION QT_FEATURE_fontcombobox +qt_extend_target(Widgets CONDITION QT_FEATURE_fontcombobox SOURCES widgets/qfontcombobox.cpp widgets/qfontcombobox.h ) -extend_target(Widgets CONDITION QT_FEATURE_groupbox +qt_extend_target(Widgets CONDITION QT_FEATURE_groupbox SOURCES widgets/qgroupbox.cpp widgets/qgroupbox.h ) -extend_target(Widgets CONDITION QT_FEATURE_keysequenceedit +qt_extend_target(Widgets CONDITION QT_FEATURE_keysequenceedit SOURCES widgets/qkeysequenceedit.cpp widgets/qkeysequenceedit.h widgets/qkeysequenceedit_p.h ) -extend_target(Widgets CONDITION QT_FEATURE_label +qt_extend_target(Widgets CONDITION QT_FEATURE_label SOURCES widgets/qlabel.cpp widgets/qlabel.h widgets/qlabel_p.h ) -extend_target(Widgets CONDITION QT_FEATURE_lcdnumber +qt_extend_target(Widgets CONDITION QT_FEATURE_lcdnumber SOURCES widgets/qlcdnumber.cpp widgets/qlcdnumber.h ) -extend_target(Widgets CONDITION QT_FEATURE_lineedit +qt_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 ) -extend_target(Widgets CONDITION QT_FEATURE_mainwindow +qt_extend_target(Widgets CONDITION QT_FEATURE_mainwindow SOURCES widgets/qmainwindow.cpp widgets/qmainwindow.h widgets/qmainwindowlayout.cpp widgets/qmainwindowlayout_p.h ) -extend_target(Widgets CONDITION QT_FEATURE_mdiarea +qt_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 ) -extend_target(Widgets CONDITION QT_FEATURE_menu +qt_extend_target(Widgets CONDITION QT_FEATURE_menu SOURCES widgets/qmenu.cpp widgets/qmenu.h widgets/qmenu_p.h ) -extend_target(Widgets CONDITION QT_FEATURE_menubar +qt_extend_target(Widgets CONDITION QT_FEATURE_menubar SOURCES widgets/qmenubar.cpp widgets/qmenubar.h widgets/qmenubar_p.h ) -extend_target(Widgets CONDITION QT_FEATURE_progressbar +qt_extend_target(Widgets CONDITION QT_FEATURE_progressbar SOURCES widgets/qprogressbar.cpp widgets/qprogressbar.h ) -extend_target(Widgets CONDITION QT_FEATURE_pushbutton +qt_extend_target(Widgets CONDITION QT_FEATURE_pushbutton SOURCES widgets/qpushbutton.cpp widgets/qpushbutton.h widgets/qpushbutton_p.h ) -extend_target(Widgets CONDITION QT_FEATURE_radiobutton +qt_extend_target(Widgets CONDITION QT_FEATURE_radiobutton SOURCES widgets/qradiobutton.cpp widgets/qradiobutton.h ) -extend_target(Widgets CONDITION QT_FEATURE_resizehandler +qt_extend_target(Widgets CONDITION QT_FEATURE_resizehandler SOURCES widgets/qwidgetresizehandler.cpp widgets/qwidgetresizehandler_p.h ) -extend_target(Widgets CONDITION QT_FEATURE_dialogbuttonbox +qt_extend_target(Widgets CONDITION QT_FEATURE_dialogbuttonbox SOURCES widgets/qdialogbuttonbox.cpp widgets/qdialogbuttonbox.h ) -extend_target(Widgets CONDITION QT_FEATURE_rubberband +qt_extend_target(Widgets CONDITION QT_FEATURE_rubberband SOURCES widgets/qrubberband.cpp widgets/qrubberband.h ) -extend_target(Widgets CONDITION QT_FEATURE_scrollarea +qt_extend_target(Widgets CONDITION QT_FEATURE_scrollarea SOURCES widgets/qscrollarea.cpp widgets/qscrollarea.h widgets/qscrollarea_p.h ) -extend_target(Widgets CONDITION QT_FEATURE_scrollbar +qt_extend_target(Widgets CONDITION QT_FEATURE_scrollbar SOURCES widgets/qscrollbar.cpp widgets/qscrollbar.h widgets/qscrollbar_p.h ) -extend_target(Widgets CONDITION QT_FEATURE_sizegrip +qt_extend_target(Widgets CONDITION QT_FEATURE_sizegrip SOURCES widgets/qsizegrip.cpp widgets/qsizegrip.h ) -extend_target(Widgets CONDITION QT_FEATURE_slider +qt_extend_target(Widgets CONDITION QT_FEATURE_slider SOURCES widgets/qslider.cpp widgets/qslider.h ) -extend_target(Widgets CONDITION QT_FEATURE_spinbox +qt_extend_target(Widgets CONDITION QT_FEATURE_spinbox SOURCES widgets/qabstractspinbox.cpp widgets/qabstractspinbox.h widgets/qabstractspinbox_p.h widgets/qspinbox.cpp widgets/qspinbox.h ) -extend_target(Widgets CONDITION QT_FEATURE_splashscreen +qt_extend_target(Widgets CONDITION QT_FEATURE_splashscreen SOURCES widgets/qsplashscreen.cpp widgets/qsplashscreen.h ) -extend_target(Widgets CONDITION QT_FEATURE_splitter +qt_extend_target(Widgets CONDITION QT_FEATURE_splitter SOURCES widgets/qsplitter.cpp widgets/qsplitter.h widgets/qsplitter_p.h ) -extend_target(Widgets CONDITION QT_FEATURE_stackedwidget +qt_extend_target(Widgets CONDITION QT_FEATURE_stackedwidget SOURCES widgets/qstackedwidget.cpp widgets/qstackedwidget.h ) -extend_target(Widgets CONDITION QT_FEATURE_statusbar +qt_extend_target(Widgets CONDITION QT_FEATURE_statusbar SOURCES widgets/qstatusbar.cpp widgets/qstatusbar.h ) -extend_target(Widgets CONDITION QT_FEATURE_tabbar +qt_extend_target(Widgets CONDITION QT_FEATURE_tabbar SOURCES widgets/qtabbar.cpp widgets/qtabbar.h widgets/qtabbar_p.h ) -extend_target(Widgets CONDITION QT_FEATURE_textedit +qt_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 ) -extend_target(Widgets CONDITION QT_FEATURE_textbrowser +qt_extend_target(Widgets CONDITION QT_FEATURE_textbrowser SOURCES widgets/qtextbrowser.cpp widgets/qtextbrowser.h ) -extend_target(Widgets CONDITION QT_FEATURE_tabwidget +qt_extend_target(Widgets CONDITION QT_FEATURE_tabwidget SOURCES widgets/qtabwidget.cpp widgets/qtabwidget.h ) -extend_target(Widgets CONDITION QT_FEATURE_toolbar +qt_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 @@ -572,44 +572,44 @@ extend_target(Widgets CONDITION QT_FEATURE_toolbar widgets/qtoolbarseparator.cpp widgets/qtoolbarseparator_p.h ) -extend_target(Widgets CONDITION QT_FEATURE_toolbox +qt_extend_target(Widgets CONDITION QT_FEATURE_toolbox SOURCES widgets/qtoolbox.cpp widgets/qtoolbox.h ) -extend_target(Widgets CONDITION QT_FEATURE_toolbutton +qt_extend_target(Widgets CONDITION QT_FEATURE_toolbutton SOURCES widgets/qtoolbarextension.cpp widgets/qtoolbarextension_p.h widgets/qtoolbutton.cpp widgets/qtoolbutton.h ) -extend_target(Widgets CONDITION QT_FEATURE_widgettextcontrol +qt_extend_target(Widgets CONDITION QT_FEATURE_widgettextcontrol SOURCES widgets/qwidgettextcontrol.cpp widgets/qwidgettextcontrol_p.h widgets/qwidgettextcontrol_p_p.h ) -extend_target(Widgets CONDITION APPLE_OSX AND (QT_FEATURE_menu OR QT_FEATURE_menubar) +qt_extend_target(Widgets CONDITION APPLE_OSX AND (QT_FEATURE_menu OR QT_FEATURE_menubar) SOURCES widgets/qmenu_mac.mm ) -extend_target(Widgets CONDITION QT_FEATURE_colordialog +qt_extend_target(Widgets CONDITION QT_FEATURE_colordialog SOURCES dialogs/qcolordialog.cpp dialogs/qcolordialog.h ) -extend_target(Widgets CONDITION QT_FEATURE_dialog +qt_extend_target(Widgets CONDITION QT_FEATURE_dialog SOURCES dialogs/qdialog.cpp dialogs/qdialog.h dialogs/qdialog_p.h ) -extend_target(Widgets CONDITION QT_FEATURE_errormessage +qt_extend_target(Widgets CONDITION QT_FEATURE_errormessage SOURCES dialogs/qerrormessage.cpp dialogs/qerrormessage.h ) -extend_target(Widgets CONDITION QT_FEATURE_filedialog +qt_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 @@ -617,28 +617,28 @@ extend_target(Widgets CONDITION QT_FEATURE_filedialog uic ) -extend_target(Widgets CONDITION QT_FEATURE_filesystemmodel +qt_extend_target(Widgets CONDITION QT_FEATURE_filesystemmodel SOURCES dialogs/qfileinfogatherer.cpp dialogs/qfileinfogatherer_p.h dialogs/qfilesystemmodel.cpp dialogs/qfilesystemmodel.h dialogs/qfilesystemmodel_p.h ) -extend_target(Widgets CONDITION QT_FEATURE_fontdialog +qt_extend_target(Widgets CONDITION QT_FEATURE_fontdialog SOURCES dialogs/qfontdialog.cpp dialogs/qfontdialog.h dialogs/qfontdialog_p.h ) -extend_target(Widgets CONDITION QT_FEATURE_fscompleter +qt_extend_target(Widgets CONDITION QT_FEATURE_fscompleter SOURCES dialogs/qfscompleter_p.h ) -extend_target(Widgets CONDITION QT_FEATURE_inputdialog +qt_extend_target(Widgets CONDITION QT_FEATURE_inputdialog SOURCES dialogs/qinputdialog.cpp dialogs/qinputdialog.h ) -extend_target(Widgets CONDITION QT_FEATURE_messagebox +qt_extend_target(Widgets CONDITION QT_FEATURE_messagebox SOURCES dialogs/qmessagebox.cpp dialogs/qmessagebox.h ) @@ -649,7 +649,7 @@ if(QT_FEATURE_messagebox) "images/qtlogo-64.png" ) - add_qt_resource(Widgets "qmessagebox" + qt_add_resource(Widgets "qmessagebox" PREFIX "/qt-project.org/qmessagebox" BASE @@ -659,22 +659,22 @@ if(QT_FEATURE_messagebox) ) endif() -extend_target(Widgets CONDITION QT_FEATURE_progressdialog +qt_extend_target(Widgets CONDITION QT_FEATURE_progressdialog SOURCES dialogs/qprogressdialog.cpp dialogs/qprogressdialog.h ) -extend_target(Widgets CONDITION QT_FEATURE_wizard +qt_extend_target(Widgets CONDITION QT_FEATURE_wizard SOURCES dialogs/qwizard.cpp dialogs/qwizard.h ) -extend_target(Widgets CONDITION QT_FEATURE_wizard AND WIN32 +qt_extend_target(Widgets CONDITION QT_FEATURE_wizard AND WIN32 SOURCES dialogs/qwizard_win.cpp dialogs/qwizard_win_p.h ) -extend_target(Widgets CONDITION QT_FEATURE_accessibility +qt_extend_target(Widgets CONDITION QT_FEATURE_accessibility SOURCES accessible/complexwidgets.cpp accessible/complexwidgets_p.h accessible/qaccessiblemenu.cpp accessible/qaccessiblemenu_p.h @@ -685,12 +685,12 @@ extend_target(Widgets CONDITION QT_FEATURE_accessibility accessible/simplewidgets.cpp accessible/simplewidgets_p.h ) -extend_target(Widgets CONDITION QT_FEATURE_accessibility AND QT_FEATURE_itemviews +qt_extend_target(Widgets CONDITION QT_FEATURE_accessibility AND QT_FEATURE_itemviews SOURCES accessible/itemviews.cpp accessible/itemviews_p.h ) -extend_target(Widgets CONDITION QT_FEATURE_itemviews +qt_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 @@ -702,54 +702,54 @@ extend_target(Widgets CONDITION QT_FEATURE_itemviews itemviews/qwidgetitemdata_p.h ) -extend_target(Widgets CONDITION QT_FEATURE_columnview +qt_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 ) -extend_target(Widgets CONDITION QT_FEATURE_datawidgetmapper +qt_extend_target(Widgets CONDITION QT_FEATURE_datawidgetmapper SOURCES itemviews/qdatawidgetmapper.cpp itemviews/qdatawidgetmapper.h ) -extend_target(Widgets CONDITION QT_FEATURE_dirmodel +qt_extend_target(Widgets CONDITION QT_FEATURE_dirmodel SOURCES itemviews/qdirmodel.cpp itemviews/qdirmodel.h ) -extend_target(Widgets CONDITION QT_FEATURE_listview +qt_extend_target(Widgets CONDITION QT_FEATURE_listview SOURCES itemviews/qlistview.cpp itemviews/qlistview.h itemviews/qlistview_p.h ) -extend_target(Widgets CONDITION QT_FEATURE_listwidget +qt_extend_target(Widgets CONDITION QT_FEATURE_listwidget SOURCES itemviews/qlistwidget.cpp itemviews/qlistwidget.h itemviews/qlistwidget_p.h ) -extend_target(Widgets CONDITION QT_FEATURE_tableview +qt_extend_target(Widgets CONDITION QT_FEATURE_tableview SOURCES itemviews/qtableview.cpp itemviews/qtableview.h itemviews/qtableview_p.h ) -extend_target(Widgets CONDITION QT_FEATURE_tablewidget +qt_extend_target(Widgets CONDITION QT_FEATURE_tablewidget SOURCES itemviews/qtablewidget.cpp itemviews/qtablewidget.h itemviews/qtablewidget_p.h ) -extend_target(Widgets CONDITION QT_FEATURE_treeview +qt_extend_target(Widgets CONDITION QT_FEATURE_treeview SOURCES itemviews/qtreeview.cpp itemviews/qtreeview.h itemviews/qtreeview_p.h ) -extend_target(Widgets CONDITION QT_FEATURE_treewidget +qt_extend_target(Widgets CONDITION QT_FEATURE_treewidget SOURCES itemviews/qtreewidget.cpp itemviews/qtreewidget.h itemviews/qtreewidget_p.h itemviews/qtreewidgetitemiterator.cpp itemviews/qtreewidgetitemiterator.h ) -extend_target(Widgets CONDITION QT_FEATURE_graphicsview +qt_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 @@ -773,54 +773,54 @@ extend_target(Widgets CONDITION QT_FEATURE_graphicsview graphicsview/qsimplex_p.cpp graphicsview/qsimplex_p.h ) -extend_target(Widgets CONDITION QT_FEATURE_easingcurve AND QT_FEATURE_graphicsview +qt_extend_target(Widgets CONDITION QT_FEATURE_easingcurve AND QT_FEATURE_graphicsview SOURCES graphicsview/qgraphicsitemanimation.cpp graphicsview/qgraphicsitemanimation.h ) -extend_target(Widgets CONDITION QT_FEATURE_completer +qt_extend_target(Widgets CONDITION QT_FEATURE_completer SOURCES util/qcompleter.cpp util/qcompleter.h util/qcompleter_p.h ) -extend_target(Widgets CONDITION QT_FEATURE_scroller +qt_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 ) -extend_target(Widgets CONDITION QT_FEATURE_undocommand +qt_extend_target(Widgets CONDITION QT_FEATURE_undocommand SOURCES util/qundostack.cpp util/qundostack.h util/qundostack_p.h ) -extend_target(Widgets CONDITION QT_FEATURE_undogroup +qt_extend_target(Widgets CONDITION QT_FEATURE_undogroup SOURCES util/qundogroup.cpp util/qundogroup.h ) -extend_target(Widgets CONDITION QT_FEATURE_undoview +qt_extend_target(Widgets CONDITION QT_FEATURE_undoview SOURCES util/qundoview.cpp util/qundoview.h ) -extend_target(Widgets CONDITION QT_FEATURE_xcb +qt_extend_target(Widgets CONDITION QT_FEATURE_xcb SOURCES util/qsystemtrayicon_x11.cpp ) -extend_target(Widgets CONDITION NOT QT_FEATURE_xcb +qt_extend_target(Widgets CONDITION NOT QT_FEATURE_xcb SOURCES util/qsystemtrayicon_qpa.cpp ) -extend_target(Widgets CONDITION QT_FEATURE_statemachine +qt_extend_target(Widgets CONDITION QT_FEATURE_statemachine SOURCES statemachine/qguistatemachine.cpp ) -extend_target(Widgets CONDITION QT_FEATURE_qeventtransition +qt_extend_target(Widgets CONDITION QT_FEATURE_qeventtransition SOURCES statemachine/qbasickeyeventtransition.cpp statemachine/qbasickeyeventtransition_p.h statemachine/qbasicmouseeventtransition.cpp statemachine/qbasicmouseeventtransition_p.h @@ -830,7 +830,7 @@ extend_target(Widgets CONDITION QT_FEATURE_qeventtransition qt_create_tracepoints(Widgets qtwidgets.tracepoints) -add_qt_docs(Widgets +qt_add_docs(Widgets doc/qtwidgets.qdocconf ) diff --git a/src/widgets/CMakeLists.txt b/src/widgets/CMakeLists.txt index 7f6b68e851..0395c41222 100644 --- a/src/widgets/CMakeLists.txt +++ b/src/widgets/CMakeLists.txt @@ -4,7 +4,7 @@ ## Widgets Module: ##################################################################### -add_qt_module(Widgets +qt_add_module(Widgets QMAKE_MODULE_CONFIG uic PLUGIN_TYPES styles SOURCES @@ -237,7 +237,7 @@ set(qstyle_resource_files "images/viewlist-32.png" ) -add_qt_resource(Widgets "qstyle" +qt_add_resource(Widgets "qstyle" PREFIX "/qt-project.org/styles/commonstyle" BASE @@ -272,7 +272,7 @@ set(qstyle1_resource_files "images/toolbar-ext-macstyle@2x.png" ) -add_qt_resource(Widgets "qstyle1" +qt_add_resource(Widgets "qstyle1" PREFIX "/qt-project.org/styles/macstyle" BASE @@ -290,12 +290,12 @@ add_qt_resource(Widgets "qstyle1" ## Scopes: ##################################################################### -extend_target(Widgets CONDITION MSVC AND (TEST_architecture_arch STREQUAL "i386") +qt_extend_target(Widgets CONDITION MSVC AND (TEST_architecture_arch STREQUAL "i386") LINK_OPTIONS "/BASE:0x65000000" ) -extend_target(Widgets CONDITION APPLE_OSX +qt_extend_target(Widgets CONDITION APPLE_OSX SOURCES kernel/qmacgesturerecognizer.cpp kernel/qmacgesturerecognizer_p.h widgets/qmaccocoaviewcontainer_mac.h widgets/qmaccocoaviewcontainer_mac.mm @@ -305,270 +305,268 @@ extend_target(Widgets CONDITION APPLE_OSX z ) -# extend_target(Widgets CONDITION ((APPLE_OSX) AND (APPLE_OSX)) AND (_x_-mwerks) # special case - -extend_target(Widgets CONDITION WIN32 +qt_extend_target(Widgets CONDITION WIN32 INCLUDE_DIRECTORIES ../3rdparty/wintab ) -extend_target(Widgets CONDITION WIN32 AND NOT WINRT +qt_extend_target(Widgets CONDITION WIN32 AND NOT WINRT LIBRARIES dwmapi shell32 uxtheme ) -extend_target(Widgets CONDITION QT_FEATURE_graphicseffect +qt_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 ) -extend_target(Widgets CONDITION QT_FEATURE_opengl +qt_extend_target(Widgets CONDITION QT_FEATURE_opengl SOURCES kernel/qopenglwidget.cpp kernel/qopenglwidget.h ) -extend_target(Widgets CONDITION QT_FEATURE_formlayout +qt_extend_target(Widgets CONDITION QT_FEATURE_formlayout SOURCES kernel/qformlayout.cpp kernel/qformlayout.h ) -extend_target(Widgets CONDITION QT_FEATURE_tooltip +qt_extend_target(Widgets CONDITION QT_FEATURE_tooltip SOURCES kernel/qtooltip.cpp kernel/qtooltip.h ) -extend_target(Widgets CONDITION QT_FEATURE_whatsthis +qt_extend_target(Widgets CONDITION QT_FEATURE_whatsthis SOURCES kernel/qwhatsthis.cpp kernel/qwhatsthis.h ) -extend_target(Widgets CONDITION QT_FEATURE_animation +qt_extend_target(Widgets CONDITION QT_FEATURE_animation SOURCES styles/qstyleanimation.cpp styles/qstyleanimation_p.h ) -extend_target(Widgets CONDITION QT_FEATURE_style_windows +qt_extend_target(Widgets CONDITION QT_FEATURE_style_windows SOURCES styles/qwindowsstyle.cpp styles/qwindowsstyle_p.h styles/qwindowsstyle_p_p.h ) -extend_target(Widgets CONDITION QT_FEATURE_style_fusion +qt_extend_target(Widgets CONDITION QT_FEATURE_style_fusion SOURCES styles/qfusionstyle.cpp styles/qfusionstyle_p.h styles/qfusionstyle_p_p.h ) -extend_target(Widgets CONDITION QT_FEATURE_abstractbutton +qt_extend_target(Widgets CONDITION QT_FEATURE_abstractbutton SOURCES widgets/qabstractbutton.cpp widgets/qabstractbutton.h widgets/qabstractbutton_p.h ) -extend_target(Widgets CONDITION QT_FEATURE_abstractslider +qt_extend_target(Widgets CONDITION QT_FEATURE_abstractslider SOURCES widgets/qabstractslider.cpp widgets/qabstractslider.h widgets/qabstractslider_p.h ) -extend_target(Widgets CONDITION QT_FEATURE_buttongroup +qt_extend_target(Widgets CONDITION QT_FEATURE_buttongroup SOURCES widgets/qbuttongroup.cpp widgets/qbuttongroup.h widgets/qbuttongroup_p.h ) -extend_target(Widgets CONDITION QT_FEATURE_calendarwidget +qt_extend_target(Widgets CONDITION QT_FEATURE_calendarwidget SOURCES widgets/qcalendarwidget.cpp widgets/qcalendarwidget.h ) -extend_target(Widgets CONDITION QT_FEATURE_checkbox +qt_extend_target(Widgets CONDITION QT_FEATURE_checkbox SOURCES widgets/qcheckbox.cpp widgets/qcheckbox.h ) -extend_target(Widgets CONDITION QT_FEATURE_combobox +qt_extend_target(Widgets CONDITION QT_FEATURE_combobox SOURCES widgets/qcombobox.cpp widgets/qcombobox.h widgets/qcombobox_p.h ) -extend_target(Widgets CONDITION QT_FEATURE_commandlinkbutton +qt_extend_target(Widgets CONDITION QT_FEATURE_commandlinkbutton SOURCES widgets/qcommandlinkbutton.cpp widgets/qcommandlinkbutton.h ) -extend_target(Widgets CONDITION QT_FEATURE_datetimeedit +qt_extend_target(Widgets CONDITION QT_FEATURE_datetimeedit SOURCES widgets/qdatetimeedit.cpp widgets/qdatetimeedit.h widgets/qdatetimeedit_p.h ) -extend_target(Widgets CONDITION QT_FEATURE_dial +qt_extend_target(Widgets CONDITION QT_FEATURE_dial SOURCES widgets/qdial.cpp widgets/qdial.h ) -extend_target(Widgets CONDITION QT_FEATURE_dockwidget +qt_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 ) -extend_target(Widgets CONDITION QT_FEATURE_effects +qt_extend_target(Widgets CONDITION QT_FEATURE_effects SOURCES widgets/qeffects.cpp widgets/qeffects_p.h ) -extend_target(Widgets CONDITION QT_FEATURE_fontcombobox +qt_extend_target(Widgets CONDITION QT_FEATURE_fontcombobox SOURCES widgets/qfontcombobox.cpp widgets/qfontcombobox.h ) -extend_target(Widgets CONDITION QT_FEATURE_groupbox +qt_extend_target(Widgets CONDITION QT_FEATURE_groupbox SOURCES widgets/qgroupbox.cpp widgets/qgroupbox.h ) -extend_target(Widgets CONDITION QT_FEATURE_keysequenceedit +qt_extend_target(Widgets CONDITION QT_FEATURE_keysequenceedit SOURCES widgets/qkeysequenceedit.cpp widgets/qkeysequenceedit.h widgets/qkeysequenceedit_p.h ) -extend_target(Widgets CONDITION QT_FEATURE_label +qt_extend_target(Widgets CONDITION QT_FEATURE_label SOURCES widgets/qlabel.cpp widgets/qlabel.h widgets/qlabel_p.h ) -extend_target(Widgets CONDITION QT_FEATURE_lcdnumber +qt_extend_target(Widgets CONDITION QT_FEATURE_lcdnumber SOURCES widgets/qlcdnumber.cpp widgets/qlcdnumber.h ) -extend_target(Widgets CONDITION QT_FEATURE_lineedit +qt_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 ) -extend_target(Widgets CONDITION QT_FEATURE_mainwindow +qt_extend_target(Widgets CONDITION QT_FEATURE_mainwindow SOURCES widgets/qmainwindow.cpp widgets/qmainwindow.h widgets/qmainwindowlayout.cpp widgets/qmainwindowlayout_p.h ) -extend_target(Widgets CONDITION QT_FEATURE_mdiarea +qt_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 ) -extend_target(Widgets CONDITION QT_FEATURE_menu +qt_extend_target(Widgets CONDITION QT_FEATURE_menu SOURCES widgets/qmenu.cpp widgets/qmenu.h widgets/qmenu_p.h ) -extend_target(Widgets CONDITION QT_FEATURE_menubar +qt_extend_target(Widgets CONDITION QT_FEATURE_menubar SOURCES widgets/qmenubar.cpp widgets/qmenubar.h widgets/qmenubar_p.h ) -extend_target(Widgets CONDITION QT_FEATURE_progressbar +qt_extend_target(Widgets CONDITION QT_FEATURE_progressbar SOURCES widgets/qprogressbar.cpp widgets/qprogressbar.h ) -extend_target(Widgets CONDITION QT_FEATURE_pushbutton +qt_extend_target(Widgets CONDITION QT_FEATURE_pushbutton SOURCES widgets/qpushbutton.cpp widgets/qpushbutton.h widgets/qpushbutton_p.h ) -extend_target(Widgets CONDITION QT_FEATURE_radiobutton +qt_extend_target(Widgets CONDITION QT_FEATURE_radiobutton SOURCES widgets/qradiobutton.cpp widgets/qradiobutton.h ) -extend_target(Widgets CONDITION QT_FEATURE_resizehandler +qt_extend_target(Widgets CONDITION QT_FEATURE_resizehandler SOURCES widgets/qwidgetresizehandler.cpp widgets/qwidgetresizehandler_p.h ) -extend_target(Widgets CONDITION QT_FEATURE_dialogbuttonbox +qt_extend_target(Widgets CONDITION QT_FEATURE_dialogbuttonbox SOURCES widgets/qdialogbuttonbox.cpp widgets/qdialogbuttonbox.h ) -extend_target(Widgets CONDITION QT_FEATURE_rubberband +qt_extend_target(Widgets CONDITION QT_FEATURE_rubberband SOURCES widgets/qrubberband.cpp widgets/qrubberband.h ) -extend_target(Widgets CONDITION QT_FEATURE_scrollarea +qt_extend_target(Widgets CONDITION QT_FEATURE_scrollarea SOURCES widgets/qscrollarea.cpp widgets/qscrollarea.h widgets/qscrollarea_p.h ) -extend_target(Widgets CONDITION QT_FEATURE_scrollbar +qt_extend_target(Widgets CONDITION QT_FEATURE_scrollbar SOURCES widgets/qscrollbar.cpp widgets/qscrollbar.h widgets/qscrollbar_p.h ) -extend_target(Widgets CONDITION QT_FEATURE_sizegrip +qt_extend_target(Widgets CONDITION QT_FEATURE_sizegrip SOURCES widgets/qsizegrip.cpp widgets/qsizegrip.h ) -extend_target(Widgets CONDITION QT_FEATURE_slider +qt_extend_target(Widgets CONDITION QT_FEATURE_slider SOURCES widgets/qslider.cpp widgets/qslider.h ) -extend_target(Widgets CONDITION QT_FEATURE_spinbox +qt_extend_target(Widgets CONDITION QT_FEATURE_spinbox SOURCES widgets/qabstractspinbox.cpp widgets/qabstractspinbox.h widgets/qabstractspinbox_p.h widgets/qspinbox.cpp widgets/qspinbox.h ) -extend_target(Widgets CONDITION QT_FEATURE_splashscreen +qt_extend_target(Widgets CONDITION QT_FEATURE_splashscreen SOURCES widgets/qsplashscreen.cpp widgets/qsplashscreen.h ) -extend_target(Widgets CONDITION QT_FEATURE_splitter +qt_extend_target(Widgets CONDITION QT_FEATURE_splitter SOURCES widgets/qsplitter.cpp widgets/qsplitter.h widgets/qsplitter_p.h ) -extend_target(Widgets CONDITION QT_FEATURE_stackedwidget +qt_extend_target(Widgets CONDITION QT_FEATURE_stackedwidget SOURCES widgets/qstackedwidget.cpp widgets/qstackedwidget.h ) -extend_target(Widgets CONDITION QT_FEATURE_statusbar +qt_extend_target(Widgets CONDITION QT_FEATURE_statusbar SOURCES widgets/qstatusbar.cpp widgets/qstatusbar.h ) -extend_target(Widgets CONDITION QT_FEATURE_tabbar +qt_extend_target(Widgets CONDITION QT_FEATURE_tabbar SOURCES widgets/qtabbar.cpp widgets/qtabbar.h widgets/qtabbar_p.h ) -extend_target(Widgets CONDITION QT_FEATURE_textedit +qt_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 ) -extend_target(Widgets CONDITION QT_FEATURE_textbrowser +qt_extend_target(Widgets CONDITION QT_FEATURE_textbrowser SOURCES widgets/qtextbrowser.cpp widgets/qtextbrowser.h ) -extend_target(Widgets CONDITION QT_FEATURE_tabwidget +qt_extend_target(Widgets CONDITION QT_FEATURE_tabwidget SOURCES widgets/qtabwidget.cpp widgets/qtabwidget.h ) -extend_target(Widgets CONDITION QT_FEATURE_toolbar +qt_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 @@ -576,44 +574,44 @@ extend_target(Widgets CONDITION QT_FEATURE_toolbar widgets/qtoolbarseparator.cpp widgets/qtoolbarseparator_p.h ) -extend_target(Widgets CONDITION QT_FEATURE_toolbox +qt_extend_target(Widgets CONDITION QT_FEATURE_toolbox SOURCES widgets/qtoolbox.cpp widgets/qtoolbox.h ) -extend_target(Widgets CONDITION QT_FEATURE_toolbutton +qt_extend_target(Widgets CONDITION QT_FEATURE_toolbutton SOURCES widgets/qtoolbarextension.cpp widgets/qtoolbarextension_p.h widgets/qtoolbutton.cpp widgets/qtoolbutton.h ) -extend_target(Widgets CONDITION QT_FEATURE_widgettextcontrol +qt_extend_target(Widgets CONDITION QT_FEATURE_widgettextcontrol SOURCES widgets/qwidgettextcontrol.cpp widgets/qwidgettextcontrol_p.h widgets/qwidgettextcontrol_p_p.h ) -extend_target(Widgets CONDITION APPLE_OSX AND (QT_FEATURE_menu OR QT_FEATURE_menubar) +qt_extend_target(Widgets CONDITION APPLE_OSX AND (QT_FEATURE_menu OR QT_FEATURE_menubar) SOURCES widgets/qmenu_mac.mm ) -extend_target(Widgets CONDITION QT_FEATURE_colordialog +qt_extend_target(Widgets CONDITION QT_FEATURE_colordialog SOURCES dialogs/qcolordialog.cpp dialogs/qcolordialog.h ) -extend_target(Widgets CONDITION QT_FEATURE_dialog +qt_extend_target(Widgets CONDITION QT_FEATURE_dialog SOURCES dialogs/qdialog.cpp dialogs/qdialog.h dialogs/qdialog_p.h ) -extend_target(Widgets CONDITION QT_FEATURE_errormessage +qt_extend_target(Widgets CONDITION QT_FEATURE_errormessage SOURCES dialogs/qerrormessage.cpp dialogs/qerrormessage.h ) -extend_target(Widgets CONDITION QT_FEATURE_filedialog +qt_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 @@ -621,28 +619,28 @@ extend_target(Widgets CONDITION QT_FEATURE_filedialog uic ) -extend_target(Widgets CONDITION QT_FEATURE_filesystemmodel +qt_extend_target(Widgets CONDITION QT_FEATURE_filesystemmodel SOURCES dialogs/qfileinfogatherer.cpp dialogs/qfileinfogatherer_p.h dialogs/qfilesystemmodel.cpp dialogs/qfilesystemmodel.h dialogs/qfilesystemmodel_p.h ) -extend_target(Widgets CONDITION QT_FEATURE_fontdialog +qt_extend_target(Widgets CONDITION QT_FEATURE_fontdialog SOURCES dialogs/qfontdialog.cpp dialogs/qfontdialog.h dialogs/qfontdialog_p.h ) -extend_target(Widgets CONDITION QT_FEATURE_fscompleter +qt_extend_target(Widgets CONDITION QT_FEATURE_fscompleter SOURCES dialogs/qfscompleter_p.h ) -extend_target(Widgets CONDITION QT_FEATURE_inputdialog +qt_extend_target(Widgets CONDITION QT_FEATURE_inputdialog SOURCES dialogs/qinputdialog.cpp dialogs/qinputdialog.h ) -extend_target(Widgets CONDITION QT_FEATURE_messagebox +qt_extend_target(Widgets CONDITION QT_FEATURE_messagebox SOURCES dialogs/qmessagebox.cpp dialogs/qmessagebox.h ) @@ -653,7 +651,7 @@ if(QT_FEATURE_messagebox) "images/qtlogo-64.png" ) - add_qt_resource(Widgets "qmessagebox" + qt_add_resource(Widgets "qmessagebox" PREFIX "/qt-project.org/qmessagebox" BASE @@ -663,22 +661,22 @@ if(QT_FEATURE_messagebox) ) endif() -extend_target(Widgets CONDITION QT_FEATURE_progressdialog +qt_extend_target(Widgets CONDITION QT_FEATURE_progressdialog SOURCES dialogs/qprogressdialog.cpp dialogs/qprogressdialog.h ) -extend_target(Widgets CONDITION QT_FEATURE_wizard +qt_extend_target(Widgets CONDITION QT_FEATURE_wizard SOURCES dialogs/qwizard.cpp dialogs/qwizard.h ) -extend_target(Widgets CONDITION QT_FEATURE_wizard AND WIN32 +qt_extend_target(Widgets CONDITION QT_FEATURE_wizard AND WIN32 SOURCES dialogs/qwizard_win.cpp dialogs/qwizard_win_p.h ) -extend_target(Widgets CONDITION QT_FEATURE_accessibility +qt_extend_target(Widgets CONDITION QT_FEATURE_accessibility SOURCES accessible/complexwidgets.cpp accessible/complexwidgets_p.h accessible/qaccessiblemenu.cpp accessible/qaccessiblemenu_p.h @@ -689,12 +687,12 @@ extend_target(Widgets CONDITION QT_FEATURE_accessibility accessible/simplewidgets.cpp accessible/simplewidgets_p.h ) -extend_target(Widgets CONDITION QT_FEATURE_accessibility AND QT_FEATURE_itemviews +qt_extend_target(Widgets CONDITION QT_FEATURE_accessibility AND QT_FEATURE_itemviews SOURCES accessible/itemviews.cpp accessible/itemviews_p.h ) -extend_target(Widgets CONDITION QT_FEATURE_itemviews +qt_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 @@ -706,54 +704,54 @@ extend_target(Widgets CONDITION QT_FEATURE_itemviews itemviews/qwidgetitemdata_p.h ) -extend_target(Widgets CONDITION QT_FEATURE_columnview +qt_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 ) -extend_target(Widgets CONDITION QT_FEATURE_datawidgetmapper +qt_extend_target(Widgets CONDITION QT_FEATURE_datawidgetmapper SOURCES itemviews/qdatawidgetmapper.cpp itemviews/qdatawidgetmapper.h ) -extend_target(Widgets CONDITION QT_FEATURE_dirmodel +qt_extend_target(Widgets CONDITION QT_FEATURE_dirmodel SOURCES itemviews/qdirmodel.cpp itemviews/qdirmodel.h ) -extend_target(Widgets CONDITION QT_FEATURE_listview +qt_extend_target(Widgets CONDITION QT_FEATURE_listview SOURCES itemviews/qlistview.cpp itemviews/qlistview.h itemviews/qlistview_p.h ) -extend_target(Widgets CONDITION QT_FEATURE_listwidget +qt_extend_target(Widgets CONDITION QT_FEATURE_listwidget SOURCES itemviews/qlistwidget.cpp itemviews/qlistwidget.h itemviews/qlistwidget_p.h ) -extend_target(Widgets CONDITION QT_FEATURE_tableview +qt_extend_target(Widgets CONDITION QT_FEATURE_tableview SOURCES itemviews/qtableview.cpp itemviews/qtableview.h itemviews/qtableview_p.h ) -extend_target(Widgets CONDITION QT_FEATURE_tablewidget +qt_extend_target(Widgets CONDITION QT_FEATURE_tablewidget SOURCES itemviews/qtablewidget.cpp itemviews/qtablewidget.h itemviews/qtablewidget_p.h ) -extend_target(Widgets CONDITION QT_FEATURE_treeview +qt_extend_target(Widgets CONDITION QT_FEATURE_treeview SOURCES itemviews/qtreeview.cpp itemviews/qtreeview.h itemviews/qtreeview_p.h ) -extend_target(Widgets CONDITION QT_FEATURE_treewidget +qt_extend_target(Widgets CONDITION QT_FEATURE_treewidget SOURCES itemviews/qtreewidget.cpp itemviews/qtreewidget.h itemviews/qtreewidget_p.h itemviews/qtreewidgetitemiterator.cpp itemviews/qtreewidgetitemiterator.h ) -extend_target(Widgets CONDITION QT_FEATURE_graphicsview +qt_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 @@ -777,54 +775,54 @@ extend_target(Widgets CONDITION QT_FEATURE_graphicsview graphicsview/qsimplex_p.cpp graphicsview/qsimplex_p.h ) -extend_target(Widgets CONDITION QT_FEATURE_easingcurve AND QT_FEATURE_graphicsview +qt_extend_target(Widgets CONDITION QT_FEATURE_easingcurve AND QT_FEATURE_graphicsview SOURCES graphicsview/qgraphicsitemanimation.cpp graphicsview/qgraphicsitemanimation.h ) -extend_target(Widgets CONDITION QT_FEATURE_completer +qt_extend_target(Widgets CONDITION QT_FEATURE_completer SOURCES util/qcompleter.cpp util/qcompleter.h util/qcompleter_p.h ) -extend_target(Widgets CONDITION QT_FEATURE_scroller +qt_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 ) -extend_target(Widgets CONDITION QT_FEATURE_undocommand +qt_extend_target(Widgets CONDITION QT_FEATURE_undocommand SOURCES util/qundostack.cpp util/qundostack.h util/qundostack_p.h ) -extend_target(Widgets CONDITION QT_FEATURE_undogroup +qt_extend_target(Widgets CONDITION QT_FEATURE_undogroup SOURCES util/qundogroup.cpp util/qundogroup.h ) -extend_target(Widgets CONDITION QT_FEATURE_undoview +qt_extend_target(Widgets CONDITION QT_FEATURE_undoview SOURCES util/qundoview.cpp util/qundoview.h ) -extend_target(Widgets CONDITION QT_FEATURE_xcb +qt_extend_target(Widgets CONDITION QT_FEATURE_xcb SOURCES util/qsystemtrayicon_x11.cpp ) -extend_target(Widgets CONDITION NOT QT_FEATURE_xcb +qt_extend_target(Widgets CONDITION NOT QT_FEATURE_xcb SOURCES util/qsystemtrayicon_qpa.cpp ) -extend_target(Widgets CONDITION QT_FEATURE_statemachine +qt_extend_target(Widgets CONDITION QT_FEATURE_statemachine SOURCES statemachine/qguistatemachine.cpp ) -extend_target(Widgets CONDITION QT_FEATURE_qeventtransition +qt_extend_target(Widgets CONDITION QT_FEATURE_qeventtransition SOURCES statemachine/qbasickeyeventtransition.cpp statemachine/qbasickeyeventtransition_p.h statemachine/qbasicmouseeventtransition.cpp statemachine/qbasicmouseeventtransition_p.h @@ -834,7 +832,7 @@ extend_target(Widgets CONDITION QT_FEATURE_qeventtransition qt_create_tracepoints(Widgets qtwidgets.tracepoints) -add_qt_docs(Widgets +qt_add_docs(Widgets doc/qtwidgets.qdocconf ) diff --git a/src/winmain/CMakeLists.txt b/src/winmain/CMakeLists.txt index 92e22dc231..fb48fec5a3 100644 --- a/src/winmain/CMakeLists.txt +++ b/src/winmain/CMakeLists.txt @@ -4,7 +4,7 @@ if (NOT WIN32) return() endif() -add_qt_module(WinMain +qt_add_module(WinMain STATIC NO_SYNC_QT NO_MODULE_HEADERS @@ -14,15 +14,15 @@ add_qt_module(WinMain $<TARGET_PROPERTY:Qt::Core,INTERFACE_INCLUDE_DIRECTORIES> ) -extend_target(WinMain CONDITION WINRT +qt_extend_target(WinMain CONDITION WINRT SOURCES qtmain_winrt.cpp ) -extend_target(WinMain CONDITION NOT WINRT +qt_extend_target(WinMain CONDITION NOT WINRT SOURCES qtmain_win.cpp ) -extend_target(WinMain CONDITION MINGW +qt_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 891e2c61ec..a8b766a0dc 100644 --- a/src/xml/CMakeLists.txt +++ b/src/xml/CMakeLists.txt @@ -4,7 +4,7 @@ ## Xml Module: ##################################################################### -add_qt_module(Xml +qt_add_module(Xml SOURCES dom/qdom.cpp dom/qdom.h qtxmlglobal.h @@ -21,11 +21,11 @@ add_qt_module(Xml ## Scopes: ##################################################################### -extend_target(Xml CONDITION MSVC AND (TEST_architecture_arch STREQUAL "i386") +qt_extend_target(Xml CONDITION MSVC AND (TEST_architecture_arch STREQUAL "i386") LINK_OPTIONS "/BASE:0x61000000" ) -add_qt_docs(Xml +qt_add_docs(Xml doc/qtxml.qdocconf ) |