From 465949420a877099247d94dd4db54d19ca5a9a7c Mon Sep 17 00:00:00 2001 From: Leander Beernaert Date: Fri, 31 Jan 2020 14:44:52 +0100 Subject: Update add_custom_command and add_custom_target dependencies If we don't add the executable used by the custom_target and/or custom_command to list of the command's/target's dependencies (DEPENDS) the generated file will not update should the executable change. Change-Id: Idce30f3dd4f756d9e8f6848c5e16f5dd6c7c8f0a Reviewed-by: Qt CMake Build Bot Reviewed-by: Alexandru Croitor --- src/corelib/Qt6CoreMacros.cmake | 20 +++++++++++++++----- src/dbus/Qt6DBusMacros.cmake | 13 +++++++++---- src/widgets/Qt6WidgetsMacros.cmake | 1 + 3 files changed, 25 insertions(+), 9 deletions(-) (limited to 'src') diff --git a/src/corelib/Qt6CoreMacros.cmake b/src/corelib/Qt6CoreMacros.cmake index 446926cd73..21910078ea 100644 --- a/src/corelib/Qt6CoreMacros.cmake +++ b/src/corelib/Qt6CoreMacros.cmake @@ -270,9 +270,16 @@ function(qt6_add_binary_resources target ) endforeach() add_custom_command(OUTPUT ${rcc_destination} + DEPENDS ${QT_CMAKE_EXPORT_NAMESPACE}::rcc COMMAND ${QT_CMAKE_EXPORT_NAMESPACE}::rcc ARGS ${rcc_options} --binary --name ${target} --output ${rcc_destination} ${infiles} - DEPENDS ${rc_depends} ${out_depends} ${infiles} VERBATIM) + DEPENDS + ${QT_CMAKE_EXPORT_NAMESPACE}::rcc + ${rc_depends} + ${out_depends} + ${infiles} + VERBATIM) + add_custom_target(${target} ALL DEPENDS ${rcc_destination}) endfunction() @@ -324,7 +331,8 @@ function(qt6_add_resources outfiles ) COMMAND ${QT_CMAKE_EXPORT_NAMESPACE}::rcc ARGS ${rcc_options} --name ${outfilename} --output ${outfile} ${infile} MAIN_DEPENDENCY ${infile} - DEPENDS ${_rc_depends} "${_out_depends}" VERBATIM) + DEPENDS ${_rc_depends} "${_out_depends}" ${QT_CMAKE_EXPORT_NAMESPACE}::rcc + VERBATIM) set_source_files_properties(${outfile} PROPERTIES SKIP_AUTOMOC ON) set_source_files_properties(${outfile} PROPERTIES SKIP_AUTOUIC ON) list(APPEND ${outfiles} ${outfile}) @@ -377,7 +385,8 @@ function(qt6_add_big_resources outfiles ) set_source_files_properties(${infile} PROPERTIES SKIP_AUTORCC ON) add_custom_command(OUTPUT ${tmpoutfile} COMMAND ${QT_CMAKE_EXPORT_NAMESPACE}::rcc ${rcc_options} --name ${outfilename} --pass 1 --output ${tmpoutfile} ${infile} - DEPENDS ${infile} ${_rc_depends} "${out_depends}" VERBATIM) + DEPENDS ${infile} ${_rc_depends} "${out_depends}" ${QT_CMAKE_EXPORT_NAMESPACE}::rcc + VERBATIM) add_custom_target(big_resources_${outfilename} ALL DEPENDS ${tmpoutfile}) add_library(rcc_object_${outfilename} OBJECT ${tmpoutfile}) set_target_properties(rcc_object_${outfilename} PROPERTIES AUTOMOC OFF) @@ -388,7 +397,7 @@ function(qt6_add_big_resources outfiles ) add_custom_command(OUTPUT ${outfile} COMMAND ${QT_CMAKE_EXPORT_NAMESPACE}::rcc ARGS ${rcc_options} --name ${outfilename} --pass 2 --temp $ --output ${outfile} ${infile} - DEPENDS rcc_object_${outfilename} + DEPENDS rcc_object_${outfilename} ${QT_CMAKE_EXPORT_NAMESPACE}::rcc VERBATIM) list(APPEND ${outfiles} ${outfile}) endforeach() @@ -745,6 +754,7 @@ function(qt6_generate_meta_types_json_file target) set(type_list_file "${target_binary_dir}/meta_types/json_file_list.txt") add_custom_target(${target}_automoc_json_extraction + DEPENDS ${QT_CMAKE_EXPORT_NAMESPACE}::cmake_automoc_parser BYPRODUCTS ${type_list_file} COMMAND ${QT_CMAKE_EXPORT_NAMESPACE}::cmake_automoc_parser @@ -771,7 +781,7 @@ function(qt6_generate_meta_types_json_file target) set(metatypes_dep_file "${target_binary_dir}/meta_types/${metatypes_dep_file_name}") add_custom_command(OUTPUT ${metatypes_file} - DEPENDS ${type_list_file} + DEPENDS ${type_list_file} ${QT_CMAKE_EXPORT_NAMESPACE}::moc COMMAND ${QT_CMAKE_EXPORT_NAMESPACE}::moc -o ${metatypes_file} --collect-json "@${type_list_file}" diff --git a/src/dbus/Qt6DBusMacros.cmake b/src/dbus/Qt6DBusMacros.cmake index 85de817a0b..d7bba30148 100644 --- a/src/dbus/Qt6DBusMacros.cmake +++ b/src/dbus/Qt6DBusMacros.cmake @@ -59,7 +59,9 @@ function(qt6_add_dbus_interface _sources _interface _basename) add_custom_command(OUTPUT "${_impl}" "${_header}" COMMAND ${QT_CMAKE_EXPORT_NAMESPACE}::qdbusxml2cpp ${_params} -p ${_basename} ${_infile} - DEPENDS ${_infile} VERBATIM) + DEPENDS ${_infile} ${QT_CMAKE_EXPORT_NAMESPACE}::qdbuscpp2xml + VERBATIM + ) set_source_files_properties("${_impl}" "${_header}" PROPERTIES SKIP_AUTOMOC TRUE) @@ -134,7 +136,8 @@ function(qt6_generate_dbus_interface _header) # _customName OPTIONS -some -optio add_custom_command(OUTPUT ${_target} COMMAND ${QT_CMAKE_EXPORT_NAMESPACE}::qdbuscpp2xml ${_DBUS_INTERFACE_OPTIONS} ${_in_file} -o ${_target} - DEPENDS ${_in_file} VERBATIM + DEPENDS ${_in_file} ${QT_CMAKE_EXPORT_NAMESPACE}::qdbuscpp2xml + VERBATIM ) endfunction() @@ -168,12 +171,14 @@ function(qt6_add_dbus_adaptor _sources _xml_file _include _parentClass) # _optio if(_optionalClassName) add_custom_command(OUTPUT "${_impl}" "${_header}" COMMAND ${QT_CMAKE_EXPORT_NAMESPACE}::qdbusxml2cpp -m -a ${_basename} -c ${_optionalClassName} -i ${_include} -l ${_parentClass} ${_infile} - DEPENDS ${_infile} VERBATIM + DEPENDS ${_infile} ${QT_CMAKE_EXPORT_NAMESPACE}::qdbuscpp2xml + VERBATIM ) else() add_custom_command(OUTPUT "${_impl}" "${_header}" COMMAND ${QT_CMAKE_EXPORT_NAMESPACE}::qdbusxml2cpp -m -a ${_basename} -i ${_include} -l ${_parentClass} ${_infile} - DEPENDS ${_infile} VERBATIM + DEPENDS ${_infile} ${QT_CMAKE_EXPORT_NAMESPACE}::qdbuscpp2xml + VERBATIM ) endif() diff --git a/src/widgets/Qt6WidgetsMacros.cmake b/src/widgets/Qt6WidgetsMacros.cmake index 5b0f2e700f..aa8133ba47 100644 --- a/src/widgets/Qt6WidgetsMacros.cmake +++ b/src/widgets/Qt6WidgetsMacros.cmake @@ -56,6 +56,7 @@ function(qt6_wrap_ui outfiles ) get_filename_component(infile ${it} ABSOLUTE) set(outfile ${CMAKE_CURRENT_BINARY_DIR}/ui_${outfile}.h) add_custom_command(OUTPUT ${outfile} + DEPENDS ${QT_CMAKE_EXPORT_NAMESPACE}::uic COMMAND ${QT_CMAKE_EXPORT_NAMESPACE}::uic ARGS ${ui_options} -o ${outfile} ${infile} MAIN_DEPENDENCY ${infile} VERBATIM) -- cgit v1.2.3 From ac38fa11823f4cf020a9481c9de3d61caa8fccdc Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Mon, 3 Feb 2020 19:44:27 +0100 Subject: Regenerate projects to correctly handle private dependencies Change-Id: I7d84bc9962bff5c89a90367ae704974c6ce2ec89 Reviewed-by: Qt CMake Build Bot Reviewed-by: Leander Beernaert Reviewed-by: Alexandru Croitor --- src/concurrent/CMakeLists.txt | 2 ++ src/dbus/.prev_CMakeLists.txt | 2 ++ src/dbus/CMakeLists.txt | 2 ++ src/gui/.prev_CMakeLists.txt | 2 ++ src/gui/CMakeLists.txt | 2 ++ src/network/.prev_CMakeLists.txt | 2 ++ src/network/CMakeLists.txt | 2 ++ src/opengl/.prev_CMakeLists.txt | 5 +++ src/opengl/CMakeLists.txt | 5 +++ src/platformsupport/accessibility/CMakeLists.txt | 5 +-- src/platformsupport/clipboard/CMakeLists.txt | 4 +-- src/platformsupport/devicediscovery/CMakeLists.txt | 4 +-- src/platformsupport/edid/CMakeLists.txt | 4 +-- .../eglconvenience/.prev_CMakeLists.txt | 5 +-- src/platformsupport/eglconvenience/CMakeLists.txt | 5 +-- .../eventdispatchers/.prev_CMakeLists.txt | 5 +-- .../eventdispatchers/CMakeLists.txt | 5 +-- src/platformsupport/fbconvenience/CMakeLists.txt | 5 +-- .../fontdatabases/.prev_CMakeLists.txt | 11 ++---- src/platformsupport/fontdatabases/CMakeLists.txt | 11 ++---- .../glxconvenience/.prev_CMakeLists.txt | 5 +-- src/platformsupport/glxconvenience/CMakeLists.txt | 5 +-- src/platformsupport/graphics/CMakeLists.txt | 5 +-- src/platformsupport/input/.prev_CMakeLists.txt | 9 ++--- src/platformsupport/input/CMakeLists.txt | 9 ++--- src/platformsupport/input/xkbcommon/CMakeLists.txt | 5 +-- .../kmsconvenience/.prev_CMakeLists.txt | 7 ++-- src/platformsupport/kmsconvenience/CMakeLists.txt | 7 ++-- .../linuxaccessibility/.prev_CMakeLists.txt | 10 ++---- .../linuxaccessibility/CMakeLists.txt | 10 ++---- .../platformcompositor/CMakeLists.txt | 5 +-- src/platformsupport/services/CMakeLists.txt | 5 +-- src/platformsupport/themes/CMakeLists.txt | 5 +-- .../vkconvenience/.prev_CMakeLists.txt | 5 +-- src/platformsupport/vkconvenience/CMakeLists.txt | 5 +-- .../windowsuiautomation/CMakeLists.txt | 5 +-- src/plugins/bearer/android/src/CMakeLists.txt | 5 +-- src/plugins/bearer/connman/CMakeLists.txt | 7 ++-- src/plugins/bearer/corewlan/CMakeLists.txt | 7 ++-- src/plugins/bearer/generic/CMakeLists.txt | 5 +-- src/plugins/bearer/networkmanager/CMakeLists.txt | 7 ++-- src/plugins/generic/evdevkeyboard/CMakeLists.txt | 8 ++--- src/plugins/generic/evdevmouse/CMakeLists.txt | 8 ++--- src/plugins/generic/evdevtablet/CMakeLists.txt | 8 ++--- src/plugins/generic/evdevtouch/CMakeLists.txt | 8 ++--- src/plugins/generic/libinput/CMakeLists.txt | 8 ++--- src/plugins/generic/tslib/.prev_CMakeLists.txt | 8 ++--- src/plugins/generic/tslib/CMakeLists.txt | 8 ++--- src/plugins/generic/tuiotouch/CMakeLists.txt | 5 ++- src/plugins/imageformats/ico/CMakeLists.txt | 3 +- src/plugins/imageformats/jpeg/.prev_CMakeLists.txt | 5 ++- src/plugins/imageformats/jpeg/CMakeLists.txt | 5 ++- .../compose/.prev_CMakeLists.txt | 4 +-- .../platforminputcontexts/compose/CMakeLists.txt | 4 +-- .../platforminputcontexts/ibus/CMakeLists.txt | 6 ++-- src/plugins/platforms/android/.prev_CMakeLists.txt | 15 +++----- src/plugins/platforms/android/CMakeLists.txt | 15 +++----- src/plugins/platforms/cocoa/.prev_CMakeLists.txt | 33 ++++++------------ src/plugins/platforms/cocoa/CMakeLists.txt | 33 ++++++------------ .../platforms/directfb/.prev_CMakeLists.txt | 16 +++------ src/plugins/platforms/directfb/CMakeLists.txt | 16 +++------ src/plugins/platforms/eglfs/.prev_CMakeLists.txt | 40 +++++++++------------- src/plugins/platforms/eglfs/CMakeLists.txt | 28 ++++++++------- .../deviceintegration/eglfs_emu/CMakeLists.txt | 8 ++--- .../deviceintegration/eglfs_kms/CMakeLists.txt | 13 +++---- .../eglfs_kms_egldevice/CMakeLists.txt | 13 +++---- .../eglfs_kms_support/CMakeLists.txt | 12 +++---- .../deviceintegration/eglfs_x11/CMakeLists.txt | 8 ++--- src/plugins/platforms/ios/CMakeLists.txt | 30 +++++----------- src/plugins/platforms/ios/optional/CMakeLists.txt | 1 - .../optional/nsphotolibrarysupport/CMakeLists.txt | 3 +- src/plugins/platforms/linuxfb/.prev_CMakeLists.txt | 19 +++------- src/plugins/platforms/linuxfb/CMakeLists.txt | 19 +++------- src/plugins/platforms/minimal/.prev_CMakeLists.txt | 9 ++--- src/plugins/platforms/minimal/CMakeLists.txt | 9 ++--- .../platforms/minimalegl/.prev_CMakeLists.txt | 10 ++---- src/plugins/platforms/minimalegl/CMakeLists.txt | 10 ++---- .../platforms/offscreen/.prev_CMakeLists.txt | 13 +++---- src/plugins/platforms/offscreen/CMakeLists.txt | 13 +++---- src/plugins/platforms/vnc/.prev_CMakeLists.txt | 18 +++------- src/plugins/platforms/vnc/CMakeLists.txt | 18 +++------- src/plugins/platforms/windows/.prev_CMakeLists.txt | 25 +++++--------- src/plugins/platforms/windows/CMakeLists.txt | 25 +++++--------- src/plugins/platforms/xcb/.prev_CMakeLists.txt | 30 ++++------------ src/plugins/platforms/xcb/CMakeLists.txt | 30 ++++------------ .../xcb/gl_integrations/xcb_egl/CMakeLists.txt | 9 ++--- .../xcb/gl_integrations/xcb_glx/CMakeLists.txt | 9 ++--- .../platformthemes/gtk3/.prev_CMakeLists.txt | 8 ++--- src/plugins/platformthemes/gtk3/CMakeLists.txt | 9 +++-- .../platformthemes/xdgdesktopportal/CMakeLists.txt | 8 ++--- src/plugins/printsupport/cocoa/CMakeLists.txt | 6 ++-- src/plugins/printsupport/cups/.prev_CMakeLists.txt | 6 ++-- src/plugins/printsupport/cups/CMakeLists.txt | 6 ++-- src/plugins/sqldrivers/db2/CMakeLists.txt | 6 ++-- src/plugins/sqldrivers/mysql/CMakeLists.txt | 6 ++-- src/plugins/sqldrivers/oci/CMakeLists.txt | 6 ++-- src/plugins/sqldrivers/odbc/.prev_CMakeLists.txt | 6 ++-- src/plugins/sqldrivers/odbc/CMakeLists.txt | 6 ++-- src/plugins/sqldrivers/psql/.prev_CMakeLists.txt | 6 ++-- src/plugins/sqldrivers/psql/CMakeLists.txt | 6 ++-- src/plugins/sqldrivers/sqlite/.prev_CMakeLists.txt | 6 ++-- src/plugins/sqldrivers/sqlite/CMakeLists.txt | 7 ++-- src/plugins/styles/mac/CMakeLists.txt | 3 +- src/plugins/styles/windowsvista/CMakeLists.txt | 3 +- src/printsupport/CMakeLists.txt | 4 +++ src/sql/CMakeLists.txt | 2 ++ src/testlib/.prev_CMakeLists.txt | 2 ++ src/testlib/CMakeLists.txt | 2 ++ src/tools/qdbuscpp2xml/.prev_CMakeLists.txt | 10 ++---- src/tools/qdbuscpp2xml/CMakeLists.txt | 2 +- src/tools/qdbusxml2cpp/.prev_CMakeLists.txt | 10 ++---- src/tools/qdbusxml2cpp/CMakeLists.txt | 2 +- src/widgets/.prev_CMakeLists.txt | 3 ++ src/widgets/CMakeLists.txt | 3 ++ src/xml/CMakeLists.txt | 2 ++ 115 files changed, 344 insertions(+), 661 deletions(-) (limited to 'src') diff --git a/src/concurrent/CMakeLists.txt b/src/concurrent/CMakeLists.txt index b908ef90a1..f46261f3b2 100644 --- a/src/concurrent/CMakeLists.txt +++ b/src/concurrent/CMakeLists.txt @@ -29,6 +29,8 @@ qt_add_module(Concurrent Qt::CorePrivate PUBLIC_LIBRARIES Qt::Core + PRIVATE_MODULE_INTERFACE + Qt::CorePrivate PRECOMPILED_HEADER "../corelib/global/qt_pch.h" ) diff --git a/src/dbus/.prev_CMakeLists.txt b/src/dbus/.prev_CMakeLists.txt index 45e1e11a25..1136ebe19b 100644 --- a/src/dbus/.prev_CMakeLists.txt +++ b/src/dbus/.prev_CMakeLists.txt @@ -46,6 +46,8 @@ qt_add_module(DBus Qt::CorePrivate PUBLIC_LIBRARIES Qt::Core + PRIVATE_MODULE_INTERFACE + Qt::CorePrivate ) #### Keys ignored in scope 1:.:.:dbus.pro:: diff --git a/src/dbus/CMakeLists.txt b/src/dbus/CMakeLists.txt index d6b6d95798..ea1d7abaa1 100644 --- a/src/dbus/CMakeLists.txt +++ b/src/dbus/CMakeLists.txt @@ -46,6 +46,8 @@ qt_add_module(DBus Qt::CorePrivate PUBLIC_LIBRARIES Qt::Core + PRIVATE_MODULE_INTERFACE + Qt::CorePrivate ) set_source_files_properties(qdbusmarshaller.cpp diff --git a/src/gui/.prev_CMakeLists.txt b/src/gui/.prev_CMakeLists.txt index 14f17d832e..3a218eb3a6 100644 --- a/src/gui/.prev_CMakeLists.txt +++ b/src/gui/.prev_CMakeLists.txt @@ -218,6 +218,8 @@ qt_add_module(Gui ZLIB::ZLIB PUBLIC_LIBRARIES Qt::Core + PRIVATE_MODULE_INTERFACE + Qt::CorePrivate PRECOMPILED_HEADER "kernel/qt_gui_pch.h" ) diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt index c5d7c73a49..c93b43fdf2 100644 --- a/src/gui/CMakeLists.txt +++ b/src/gui/CMakeLists.txt @@ -262,6 +262,8 @@ qt_add_module(Gui ZLIB::ZLIB PUBLIC_LIBRARIES Qt::Core + PRIVATE_MODULE_INTERFACE + Qt::CorePrivate NO_PCH_SOURCES # special case "painting/qdrawhelper.cpp" # special case PRECOMPILED_HEADER diff --git a/src/network/.prev_CMakeLists.txt b/src/network/.prev_CMakeLists.txt index a26fb735db..107ef7178f 100644 --- a/src/network/.prev_CMakeLists.txt +++ b/src/network/.prev_CMakeLists.txt @@ -62,6 +62,8 @@ qt_add_module(Network ZLIB::ZLIB PUBLIC_LIBRARIES Qt::Core + PRIVATE_MODULE_INTERFACE + Qt::CorePrivate PRECOMPILED_HEADER "../corelib/global/qt_pch.h" ) diff --git a/src/network/CMakeLists.txt b/src/network/CMakeLists.txt index 7ebe37c064..7bd04d5c9f 100644 --- a/src/network/CMakeLists.txt +++ b/src/network/CMakeLists.txt @@ -75,6 +75,8 @@ qt_add_module(Network ZLIB::ZLIB PUBLIC_LIBRARIES Qt::Core + PRIVATE_MODULE_INTERFACE + Qt::CorePrivate PRECOMPILED_HEADER "../corelib/global/qt_pch.h" ) diff --git a/src/opengl/.prev_CMakeLists.txt b/src/opengl/.prev_CMakeLists.txt index fdd0ff7beb..eb125273bc 100644 --- a/src/opengl/.prev_CMakeLists.txt +++ b/src/opengl/.prev_CMakeLists.txt @@ -32,6 +32,9 @@ qt_add_module(OpenGL PUBLIC_LIBRARIES Qt::Core Qt::Gui + PRIVATE_MODULE_INTERFACE + Qt::CorePrivate + Qt::GuiPrivate ) ## Scopes: @@ -44,6 +47,8 @@ qt_extend_target(OpenGL CONDITION QT_FEATURE_widgets Qt::WidgetsPrivate PUBLIC_LIBRARIES Qt::Widgets + PRIVATE_MODULE_INTERFACE + Qt::WidgetsPrivate ) qt_extend_target(OpenGL CONDITION NOT QT_FEATURE_opengles2 diff --git a/src/opengl/CMakeLists.txt b/src/opengl/CMakeLists.txt index fdd0ff7beb..eb125273bc 100644 --- a/src/opengl/CMakeLists.txt +++ b/src/opengl/CMakeLists.txt @@ -32,6 +32,9 @@ qt_add_module(OpenGL PUBLIC_LIBRARIES Qt::Core Qt::Gui + PRIVATE_MODULE_INTERFACE + Qt::CorePrivate + Qt::GuiPrivate ) ## Scopes: @@ -44,6 +47,8 @@ qt_extend_target(OpenGL CONDITION QT_FEATURE_widgets Qt::WidgetsPrivate PUBLIC_LIBRARIES Qt::Widgets + PRIVATE_MODULE_INTERFACE + Qt::WidgetsPrivate ) qt_extend_target(OpenGL CONDITION NOT QT_FEATURE_opengles2 diff --git a/src/platformsupport/accessibility/CMakeLists.txt b/src/platformsupport/accessibility/CMakeLists.txt index 35c1758b86..4757b123af 100644 --- a/src/platformsupport/accessibility/CMakeLists.txt +++ b/src/platformsupport/accessibility/CMakeLists.txt @@ -11,12 +11,9 @@ qt_add_module(AccessibilitySupport qaccessiblebridgeutils.cpp qaccessiblebridgeutils_p.h DEFINES QT_NO_CAST_FROM_ASCII - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate Qt::GuiPrivate - PUBLIC_LIBRARIES - Qt::Core - Qt::Gui ) #### Keys ignored in scope 1:.:.:accessibility.pro:: diff --git a/src/platformsupport/clipboard/CMakeLists.txt b/src/platformsupport/clipboard/CMakeLists.txt index e6eb577973..52022903aa 100644 --- a/src/platformsupport/clipboard/CMakeLists.txt +++ b/src/platformsupport/clipboard/CMakeLists.txt @@ -11,11 +11,9 @@ qt_add_module(ClipboardSupport qmacmime.mm qmacmime_p.h DEFINES QT_NO_CAST_FROM_ASCII - LIBRARIES - Qt::CorePrivate PUBLIC_LIBRARIES ${FWImageIO} - Qt::Core + Qt::CorePrivate Qt::Gui ) diff --git a/src/platformsupport/devicediscovery/CMakeLists.txt b/src/platformsupport/devicediscovery/CMakeLists.txt index 47ce31a66a..8ecabb4a1b 100644 --- a/src/platformsupport/devicediscovery/CMakeLists.txt +++ b/src/platformsupport/devicediscovery/CMakeLists.txt @@ -11,10 +11,8 @@ qt_add_module(DeviceDiscoverySupport qdevicediscovery_p.h DEFINES QT_NO_CAST_FROM_ASCII - LIBRARIES - Qt::CorePrivate PUBLIC_LIBRARIES - Qt::Core + Qt::CorePrivate ) #### Keys ignored in scope 1:.:.:devicediscovery.pro:: diff --git a/src/platformsupport/edid/CMakeLists.txt b/src/platformsupport/edid/CMakeLists.txt index e27aa34335..aaea30448e 100644 --- a/src/platformsupport/edid/CMakeLists.txt +++ b/src/platformsupport/edid/CMakeLists.txt @@ -11,10 +11,8 @@ qt_add_module(EdidSupport qedidparser.cpp qedidparser_p.h DEFINES QT_NO_CAST_FROM_ASCII - LIBRARIES - Qt::CorePrivate PUBLIC_LIBRARIES - Qt::Core + Qt::CorePrivate PRECOMPILED_HEADER "../../corelib/global/qt_pch.h" ) diff --git a/src/platformsupport/eglconvenience/.prev_CMakeLists.txt b/src/platformsupport/eglconvenience/.prev_CMakeLists.txt index 2d31b07cea..f8efacd7cb 100644 --- a/src/platformsupport/eglconvenience/.prev_CMakeLists.txt +++ b/src/platformsupport/eglconvenience/.prev_CMakeLists.txt @@ -13,12 +13,9 @@ qt_add_module(EglSupport qt_egl_p.h DEFINES QT_NO_CAST_FROM_ASCII - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate Qt::GuiPrivate - PUBLIC_LIBRARIES - Qt::Core - Qt::Gui PRECOMPILED_HEADER "../../corelib/global/qt_pch.h" ) diff --git a/src/platformsupport/eglconvenience/CMakeLists.txt b/src/platformsupport/eglconvenience/CMakeLists.txt index 0c56acd711..b18a1470ec 100644 --- a/src/platformsupport/eglconvenience/CMakeLists.txt +++ b/src/platformsupport/eglconvenience/CMakeLists.txt @@ -15,13 +15,10 @@ qt_add_module(EglSupport qt_egl_p.h DEFINES QT_NO_CAST_FROM_ASCII - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate Qt::GuiPrivate EGL::EGL # special case - PUBLIC_LIBRARIES - Qt::Core - Qt::Gui PRECOMPILED_HEADER "../../corelib/global/qt_pch.h" ) diff --git a/src/platformsupport/eventdispatchers/.prev_CMakeLists.txt b/src/platformsupport/eventdispatchers/.prev_CMakeLists.txt index 3a02b06bdd..2e25d6cfd6 100644 --- a/src/platformsupport/eventdispatchers/.prev_CMakeLists.txt +++ b/src/platformsupport/eventdispatchers/.prev_CMakeLists.txt @@ -9,12 +9,9 @@ qt_add_module(EventDispatcherSupport INTERNAL_MODULE DEFINES QT_NO_CAST_FROM_ASCII - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate Qt::GuiPrivate - PUBLIC_LIBRARIES - Qt::Core - Qt::Gui PRECOMPILED_HEADER "../../corelib/global/qt_pch.h" ) diff --git a/src/platformsupport/eventdispatchers/CMakeLists.txt b/src/platformsupport/eventdispatchers/CMakeLists.txt index 74ffbe5cbb..72b873423b 100644 --- a/src/platformsupport/eventdispatchers/CMakeLists.txt +++ b/src/platformsupport/eventdispatchers/CMakeLists.txt @@ -11,12 +11,9 @@ qt_add_module(EventDispatcherSupport INTERNAL_MODULE DEFINES QT_NO_CAST_FROM_ASCII - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate Qt::GuiPrivate - PUBLIC_LIBRARIES - Qt::Core - Qt::Gui PRECOMPILED_HEADER "../../corelib/global/qt_pch.h" ) diff --git a/src/platformsupport/fbconvenience/CMakeLists.txt b/src/platformsupport/fbconvenience/CMakeLists.txt index 458c169e76..804b2c15ec 100644 --- a/src/platformsupport/fbconvenience/CMakeLists.txt +++ b/src/platformsupport/fbconvenience/CMakeLists.txt @@ -15,12 +15,9 @@ qt_add_module(FbSupport qfbwindow.cpp qfbwindow_p.h DEFINES QT_NO_CAST_FROM_ASCII - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate Qt::GuiPrivate - PUBLIC_LIBRARIES - Qt::Core - Qt::Gui PRECOMPILED_HEADER "../../corelib/global/qt_pch.h" ) diff --git a/src/platformsupport/fontdatabases/.prev_CMakeLists.txt b/src/platformsupport/fontdatabases/.prev_CMakeLists.txt index f6ee30269d..ae7d22260c 100644 --- a/src/platformsupport/fontdatabases/.prev_CMakeLists.txt +++ b/src/platformsupport/fontdatabases/.prev_CMakeLists.txt @@ -9,12 +9,9 @@ qt_add_module(FontDatabaseSupport INTERNAL_MODULE DEFINES QT_NO_CAST_FROM_ASCII - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate Qt::GuiPrivate - PUBLIC_LIBRARIES - Qt::Core - Qt::Gui PRECOMPILED_HEADER "../../corelib/global/qt_pch.h" ) @@ -73,13 +70,12 @@ qt_extend_target(FontDatabaseSupport CONDITION WIN32 AND NOT WINRT windows/qwindowsfontengine.cpp windows/qwindowsfontengine_p.h windows/qwindowsnativeimage.cpp windows/qwindowsnativeimage_p.h LIBRARIES - Qt::GuiPrivate advapi32 gdi32 ole32 user32 PUBLIC_LIBRARIES - Qt::Gui + Qt::GuiPrivate ) qt_extend_target(FontDatabaseSupport CONDITION QT_FEATURE_freetype AND WIN32 AND NOT WINRT @@ -122,9 +118,8 @@ qt_extend_target(FontDatabaseSupport CONDITION WINRT DEFINES __WRL_NO_DEFAULT_LIB__ LIBRARIES - Qt::GuiPrivate dwrite_1 ws2_32 PUBLIC_LIBRARIES - Qt::Gui + Qt::GuiPrivate ) diff --git a/src/platformsupport/fontdatabases/CMakeLists.txt b/src/platformsupport/fontdatabases/CMakeLists.txt index 271cdde5d4..dd836c1e6d 100644 --- a/src/platformsupport/fontdatabases/CMakeLists.txt +++ b/src/platformsupport/fontdatabases/CMakeLists.txt @@ -12,12 +12,9 @@ qt_add_module(FontDatabaseSupport INTERNAL_MODULE DEFINES QT_NO_CAST_FROM_ASCII - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate Qt::GuiPrivate - PUBLIC_LIBRARIES - Qt::Core - Qt::Gui PRECOMPILED_HEADER "../../corelib/global/qt_pch.h" ) @@ -76,13 +73,12 @@ qt_extend_target(FontDatabaseSupport CONDITION WIN32 AND NOT WINRT windows/qwindowsfontengine.cpp windows/qwindowsfontengine_p.h windows/qwindowsnativeimage.cpp windows/qwindowsnativeimage_p.h LIBRARIES - Qt::GuiPrivate advapi32 gdi32 ole32 user32 PUBLIC_LIBRARIES - Qt::Gui + Qt::GuiPrivate ) qt_extend_target(FontDatabaseSupport CONDITION QT_FEATURE_freetype AND WIN32 AND NOT WINRT @@ -125,9 +121,8 @@ qt_extend_target(FontDatabaseSupport CONDITION WINRT DEFINES __WRL_NO_DEFAULT_LIB__ LIBRARIES - Qt::GuiPrivate dwrite_1 ws2_32 PUBLIC_LIBRARIES - Qt::Gui + Qt::GuiPrivate ) diff --git a/src/platformsupport/glxconvenience/.prev_CMakeLists.txt b/src/platformsupport/glxconvenience/.prev_CMakeLists.txt index 4e5e7378d4..f9a2fed5b2 100644 --- a/src/platformsupport/glxconvenience/.prev_CMakeLists.txt +++ b/src/platformsupport/glxconvenience/.prev_CMakeLists.txt @@ -11,12 +11,9 @@ qt_add_module(GlxSupport qglxconvenience.cpp qglxconvenience_p.h DEFINES QT_NO_CAST_FROM_ASCII - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate Qt::GuiPrivate - PUBLIC_LIBRARIES - Qt::Core - Qt::Gui X11::XCB ) diff --git a/src/platformsupport/glxconvenience/CMakeLists.txt b/src/platformsupport/glxconvenience/CMakeLists.txt index 9d687f22a1..00bc78d429 100644 --- a/src/platformsupport/glxconvenience/CMakeLists.txt +++ b/src/platformsupport/glxconvenience/CMakeLists.txt @@ -13,13 +13,10 @@ qt_add_module(GlxSupport qglxconvenience.cpp qglxconvenience_p.h DEFINES QT_NO_CAST_FROM_ASCII - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate Qt::GuiPrivate X11::X11 # special case - PUBLIC_LIBRARIES - Qt::Core - Qt::Gui ) #### Keys ignored in scope 1:.:.:glxconvenience.pro:: diff --git a/src/platformsupport/graphics/CMakeLists.txt b/src/platformsupport/graphics/CMakeLists.txt index cbb9e0937b..e9f0245dbe 100644 --- a/src/platformsupport/graphics/CMakeLists.txt +++ b/src/platformsupport/graphics/CMakeLists.txt @@ -11,12 +11,9 @@ qt_add_module(GraphicsSupport qrasterbackingstore.cpp qrasterbackingstore_p.h DEFINES QT_NO_CAST_FROM_ASCII - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate Qt::GuiPrivate - PUBLIC_LIBRARIES - Qt::Core - Qt::Gui ) #### Keys ignored in scope 1:.:.:graphics.pro:: diff --git a/src/platformsupport/input/.prev_CMakeLists.txt b/src/platformsupport/input/.prev_CMakeLists.txt index 15ce6207f2..f8c05e9f97 100644 --- a/src/platformsupport/input/.prev_CMakeLists.txt +++ b/src/platformsupport/input/.prev_CMakeLists.txt @@ -9,14 +9,10 @@ qt_add_module(InputSupport INTERNAL_MODULE DEFINES QT_NO_CAST_FROM_ASCII - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate Qt::DeviceDiscoverySupportPrivate Qt::GuiPrivate - PUBLIC_LIBRARIES - Qt::Core - Qt::DeviceDiscoverySupport - Qt::Gui PRECOMPILED_HEADER "../../corelib/global/qt_pch.h" ) @@ -83,10 +79,9 @@ qt_extend_target(InputSupport CONDITION QT_FEATURE_libinput qt_extend_target(InputSupport CONDITION QT_FEATURE_libinput AND QT_FEATURE_xkbcommon LIBRARIES - Qt::XkbCommonSupportPrivate XKB::XKB PUBLIC_LIBRARIES - Qt::XkbCommonSupport + Qt::XkbCommonSupportPrivate ) qt_extend_target(InputSupport CONDITION QT_FEATURE_evdev OR QT_FEATURE_libinput diff --git a/src/platformsupport/input/CMakeLists.txt b/src/platformsupport/input/CMakeLists.txt index d19363b6a3..7ab93df062 100644 --- a/src/platformsupport/input/CMakeLists.txt +++ b/src/platformsupport/input/CMakeLists.txt @@ -14,14 +14,10 @@ qt_add_module(InputSupport INTERNAL_MODULE DEFINES QT_NO_CAST_FROM_ASCII - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate Qt::DeviceDiscoverySupportPrivate Qt::GuiPrivate - PUBLIC_LIBRARIES - Qt::Core - Qt::DeviceDiscoverySupport - Qt::Gui PRECOMPILED_HEADER "../../corelib/global/qt_pch.h" ) @@ -88,10 +84,9 @@ qt_extend_target(InputSupport CONDITION QT_FEATURE_libinput qt_extend_target(InputSupport CONDITION QT_FEATURE_libinput AND QT_FEATURE_xkbcommon LIBRARIES - Qt::XkbCommonSupportPrivate XKB::XKB PUBLIC_LIBRARIES - Qt::XkbCommonSupport + Qt::XkbCommonSupportPrivate ) qt_extend_target(InputSupport CONDITION QT_FEATURE_evdev OR QT_FEATURE_libinput diff --git a/src/platformsupport/input/xkbcommon/CMakeLists.txt b/src/platformsupport/input/xkbcommon/CMakeLists.txt index 18d07932d4..86d132d912 100644 --- a/src/platformsupport/input/xkbcommon/CMakeLists.txt +++ b/src/platformsupport/input/xkbcommon/CMakeLists.txt @@ -12,12 +12,9 @@ qt_add_module(XkbCommonSupport qxkbcommon_3rdparty.cpp DEFINES QT_NO_CAST_FROM_ASCII - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate Qt::GuiPrivate - PUBLIC_LIBRARIES - Qt::Core - Qt::Gui XKB::XKB PRECOMPILED_HEADER "../../../corelib/global/qt_pch.h" diff --git a/src/platformsupport/kmsconvenience/.prev_CMakeLists.txt b/src/platformsupport/kmsconvenience/.prev_CMakeLists.txt index 500288db57..5b0fd00566 100644 --- a/src/platformsupport/kmsconvenience/.prev_CMakeLists.txt +++ b/src/platformsupport/kmsconvenience/.prev_CMakeLists.txt @@ -11,13 +11,10 @@ qt_add_module(KmsSupport qkmsdevice.cpp qkmsdevice_p.h DEFINES QT_NO_CAST_FROM_ASCII - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate PUBLIC_LIBRARIES Libdrm::Libdrm - Qt::Core - Qt::Gui + Qt::CorePrivate + Qt::GuiPrivate ) #### Keys ignored in scope 1:.:.:kmsconvenience.pro:: diff --git a/src/platformsupport/kmsconvenience/CMakeLists.txt b/src/platformsupport/kmsconvenience/CMakeLists.txt index 08e89f5f07..8001ee27de 100644 --- a/src/platformsupport/kmsconvenience/CMakeLists.txt +++ b/src/platformsupport/kmsconvenience/CMakeLists.txt @@ -13,13 +13,10 @@ qt_add_module(KmsSupport qkmsdevice.cpp qkmsdevice_p.h DEFINES QT_NO_CAST_FROM_ASCII - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate PUBLIC_LIBRARIES Libdrm::Libdrm - Qt::Core - Qt::Gui + Qt::CorePrivate + Qt::GuiPrivate ) #### Keys ignored in scope 1:.:.:kmsconvenience.pro:: diff --git a/src/platformsupport/linuxaccessibility/.prev_CMakeLists.txt b/src/platformsupport/linuxaccessibility/.prev_CMakeLists.txt index 6c9b8621ab..38d3d2831f 100644 --- a/src/platformsupport/linuxaccessibility/.prev_CMakeLists.txt +++ b/src/platformsupport/linuxaccessibility/.prev_CMakeLists.txt @@ -27,16 +27,12 @@ qt_add_module(LinuxAccessibilitySupport "-i" "struct_marshallers_p.h" DEFINES QT_NO_CAST_FROM_ASCII - LIBRARIES - Qt::AccessibilitySupportPrivate - Qt::CorePrivate - Qt::GuiPrivate PUBLIC_LIBRARIES PkgConfig::ATSPI2_nolink - Qt::AccessibilitySupport - Qt::Core + Qt::AccessibilitySupportPrivate + Qt::CorePrivate Qt::DBus - Qt::Gui + Qt::GuiPrivate PRECOMPILED_HEADER "../../corelib/global/qt_pch.h" ) diff --git a/src/platformsupport/linuxaccessibility/CMakeLists.txt b/src/platformsupport/linuxaccessibility/CMakeLists.txt index 4ee93f4ca7..35bfdabf5f 100644 --- a/src/platformsupport/linuxaccessibility/CMakeLists.txt +++ b/src/platformsupport/linuxaccessibility/CMakeLists.txt @@ -29,16 +29,12 @@ qt_add_module(LinuxAccessibilitySupport "-i" "struct_marshallers_p.h" DEFINES QT_NO_CAST_FROM_ASCII - LIBRARIES - Qt::AccessibilitySupportPrivate - Qt::CorePrivate - Qt::GuiPrivate PUBLIC_LIBRARIES PkgConfig::ATSPI2_nolink - Qt::AccessibilitySupport - Qt::Core + Qt::AccessibilitySupportPrivate + Qt::CorePrivate Qt::DBus - Qt::Gui + Qt::GuiPrivate PRECOMPILED_HEADER "../../corelib/global/qt_pch.h" ) diff --git a/src/platformsupport/platformcompositor/CMakeLists.txt b/src/platformsupport/platformcompositor/CMakeLists.txt index b8b59a2723..8acba0503f 100644 --- a/src/platformsupport/platformcompositor/CMakeLists.txt +++ b/src/platformsupport/platformcompositor/CMakeLists.txt @@ -12,12 +12,9 @@ qt_add_module(PlatformCompositorSupport qopenglcompositorbackingstore.cpp qopenglcompositorbackingstore_p.h DEFINES QT_NO_CAST_FROM_ASCII - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate Qt::GuiPrivate - PUBLIC_LIBRARIES - Qt::Core - Qt::Gui ) #### Keys ignored in scope 1:.:.:platformcompositor.pro:: diff --git a/src/platformsupport/services/CMakeLists.txt b/src/platformsupport/services/CMakeLists.txt index 4744455489..602dd40305 100644 --- a/src/platformsupport/services/CMakeLists.txt +++ b/src/platformsupport/services/CMakeLists.txt @@ -11,12 +11,9 @@ qt_add_module(ServiceSupport genericunix/qgenericunixservices.cpp genericunix/qgenericunixservices_p.h DEFINES QT_NO_CAST_FROM_ASCII - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate Qt::GuiPrivate - PUBLIC_LIBRARIES - Qt::Core - Qt::Gui PRECOMPILED_HEADER "../../corelib/global/qt_pch.h" ) diff --git a/src/platformsupport/themes/CMakeLists.txt b/src/platformsupport/themes/CMakeLists.txt index 1c575a8bf1..a7be78d0e0 100644 --- a/src/platformsupport/themes/CMakeLists.txt +++ b/src/platformsupport/themes/CMakeLists.txt @@ -11,12 +11,9 @@ qt_add_module(ThemeSupport qabstractfileiconengine.cpp qabstractfileiconengine_p.h DEFINES QT_NO_CAST_FROM_ASCII - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate Qt::GuiPrivate - PUBLIC_LIBRARIES - Qt::Core - Qt::Gui ) #### Keys ignored in scope 1:.:.:themes.pro:: diff --git a/src/platformsupport/vkconvenience/.prev_CMakeLists.txt b/src/platformsupport/vkconvenience/.prev_CMakeLists.txt index b283b6df4d..6f17cfa306 100644 --- a/src/platformsupport/vkconvenience/.prev_CMakeLists.txt +++ b/src/platformsupport/vkconvenience/.prev_CMakeLists.txt @@ -12,12 +12,9 @@ qt_add_module(VulkanSupport qvkconvenience.cpp qvkconvenience_p.h DEFINES QT_NO_CAST_FROM_ASCII - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate Qt::GuiPrivate - PUBLIC_LIBRARIES - Qt::Core - Qt::Gui PRECOMPILED_HEADER "../../corelib/global/qt_pch.h" ) diff --git a/src/platformsupport/vkconvenience/CMakeLists.txt b/src/platformsupport/vkconvenience/CMakeLists.txt index 521fa098ea..6ec2574375 100644 --- a/src/platformsupport/vkconvenience/CMakeLists.txt +++ b/src/platformsupport/vkconvenience/CMakeLists.txt @@ -14,12 +14,9 @@ qt_add_module(VulkanSupport qvkconvenience.cpp qvkconvenience_p.h DEFINES QT_NO_CAST_FROM_ASCII - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate Qt::GuiPrivate - PUBLIC_LIBRARIES - Qt::Core - Qt::Gui PRECOMPILED_HEADER "../../corelib/global/qt_pch.h" ) diff --git a/src/platformsupport/windowsuiautomation/CMakeLists.txt b/src/platformsupport/windowsuiautomation/CMakeLists.txt index f4c29b8c3e..c610b97fd6 100644 --- a/src/platformsupport/windowsuiautomation/CMakeLists.txt +++ b/src/platformsupport/windowsuiautomation/CMakeLists.txt @@ -19,12 +19,9 @@ qt_add_module(WindowsUIAutomationSupport uiapropertyids_p.h uiaserverinterfaces_p.h uiatypes_p.h - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate Qt::GuiPrivate - PUBLIC_LIBRARIES - Qt::Core - Qt::Gui ) #### Keys ignored in scope 1:.:.:windowsuiautomation.pro:: diff --git a/src/plugins/bearer/android/src/CMakeLists.txt b/src/plugins/bearer/android/src/CMakeLists.txt index d3471f4e63..5be89e316b 100644 --- a/src/plugins/bearer/android/src/CMakeLists.txt +++ b/src/plugins/bearer/android/src/CMakeLists.txt @@ -13,10 +13,7 @@ qt_add_plugin(QAndroidBearerEnginePlugin wrappers/androidconnectivitymanager.cpp wrappers/androidconnectivitymanager.h INCLUDE_DIRECTORIES wrappers - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate Qt::NetworkPrivate - PUBLIC_LIBRARIES - Qt::Core - Qt::Network ) diff --git a/src/plugins/bearer/connman/CMakeLists.txt b/src/plugins/bearer/connman/CMakeLists.txt index 6e5f34f6a4..745f48b6e0 100644 --- a/src/plugins/bearer/connman/CMakeLists.txt +++ b/src/plugins/bearer/connman/CMakeLists.txt @@ -11,14 +11,11 @@ qt_add_plugin(QConnmanEnginePlugin main.cpp qconnmanengine.cpp qconnmanengine.h qconnmanservice_linux.cpp qconnmanservice_linux_p.h - LIBRARIES - Qt::LinuxOfonoSupportPrivate - Qt::NetworkPrivate PUBLIC_LIBRARIES Qt::Core Qt::DBus - Qt::LinuxOfonoSupport - Qt::Network + Qt::LinuxOfonoSupportPrivate + Qt::NetworkPrivate ) #### Keys ignored in scope 1:.:.:connman.pro:: diff --git a/src/plugins/bearer/corewlan/CMakeLists.txt b/src/plugins/bearer/corewlan/CMakeLists.txt index eda3b85499..31e70cc938 100644 --- a/src/plugins/bearer/corewlan/CMakeLists.txt +++ b/src/plugins/bearer/corewlan/CMakeLists.txt @@ -10,14 +10,11 @@ qt_add_plugin(QCoreWlanEnginePlugin SOURCES main.cpp qcorewlanengine.h qcorewlanengine.mm - LIBRARIES - Qt::CorePrivate - Qt::NetworkPrivate PUBLIC_LIBRARIES ${FWFoundation} ${FWSystemConfiguration} - Qt::Core - Qt::Network + Qt::CorePrivate + Qt::NetworkPrivate ) #### Keys ignored in scope 1:.:.:corewlan.pro:: diff --git a/src/plugins/bearer/generic/CMakeLists.txt b/src/plugins/bearer/generic/CMakeLists.txt index 0717b83dd3..6d65346b57 100644 --- a/src/plugins/bearer/generic/CMakeLists.txt +++ b/src/plugins/bearer/generic/CMakeLists.txt @@ -11,12 +11,9 @@ qt_add_plugin(QGenericEnginePlugin ../platformdefs_win.h main.cpp qgenericengine.cpp qgenericengine.h - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate Qt::NetworkPrivate - PUBLIC_LIBRARIES - Qt::Core - Qt::Network ) #### Keys ignored in scope 1:.:.:generic.pro:: diff --git a/src/plugins/bearer/networkmanager/CMakeLists.txt b/src/plugins/bearer/networkmanager/CMakeLists.txt index 9c9721cca7..8f26a4c86d 100644 --- a/src/plugins/bearer/networkmanager/CMakeLists.txt +++ b/src/plugins/bearer/networkmanager/CMakeLists.txt @@ -11,14 +11,11 @@ qt_add_plugin(QNetworkManagerEnginePlugin main.cpp qnetworkmanagerengine.cpp qnetworkmanagerengine.h qnetworkmanagerservice.cpp qnetworkmanagerservice.h - LIBRARIES - Qt::LinuxOfonoSupportPrivate - Qt::NetworkPrivate PUBLIC_LIBRARIES Qt::Core Qt::DBus - Qt::LinuxOfonoSupport - Qt::Network + Qt::LinuxOfonoSupportPrivate + Qt::NetworkPrivate ) #### Keys ignored in scope 1:.:.:networkmanager.pro:: diff --git a/src/plugins/generic/evdevkeyboard/CMakeLists.txt b/src/plugins/generic/evdevkeyboard/CMakeLists.txt index 735d01de40..86f5c36124 100644 --- a/src/plugins/generic/evdevkeyboard/CMakeLists.txt +++ b/src/plugins/generic/evdevkeyboard/CMakeLists.txt @@ -9,14 +9,12 @@ qt_add_plugin(QEvdevKeyboardPlugin TYPE generic SOURCES main.cpp - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate - Qt::InputSupportPrivate PUBLIC_LIBRARIES Qt::Core + Qt::CorePrivate Qt::Gui - Qt::InputSupport + Qt::GuiPrivate + Qt::InputSupportPrivate ) #### Keys ignored in scope 1:.:.:evdevkeyboard.pro:: diff --git a/src/plugins/generic/evdevmouse/CMakeLists.txt b/src/plugins/generic/evdevmouse/CMakeLists.txt index 328d815cdf..2ed6c1b6d4 100644 --- a/src/plugins/generic/evdevmouse/CMakeLists.txt +++ b/src/plugins/generic/evdevmouse/CMakeLists.txt @@ -9,14 +9,12 @@ qt_add_plugin(QEvdevMousePlugin TYPE generic SOURCES main.cpp - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate - Qt::InputSupportPrivate PUBLIC_LIBRARIES Qt::Core + Qt::CorePrivate Qt::Gui - Qt::InputSupport + Qt::GuiPrivate + Qt::InputSupportPrivate ) #### Keys ignored in scope 1:.:.:evdevmouse.pro:: diff --git a/src/plugins/generic/evdevtablet/CMakeLists.txt b/src/plugins/generic/evdevtablet/CMakeLists.txt index e7d6fbb527..93dd10a0e1 100644 --- a/src/plugins/generic/evdevtablet/CMakeLists.txt +++ b/src/plugins/generic/evdevtablet/CMakeLists.txt @@ -9,14 +9,12 @@ qt_add_plugin(QEvdevTabletPlugin TYPE generic SOURCES main.cpp - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate - Qt::InputSupportPrivate PUBLIC_LIBRARIES Qt::Core + Qt::CorePrivate Qt::Gui - Qt::InputSupport + Qt::GuiPrivate + Qt::InputSupportPrivate ) #### Keys ignored in scope 1:.:.:evdevtablet.pro:: diff --git a/src/plugins/generic/evdevtouch/CMakeLists.txt b/src/plugins/generic/evdevtouch/CMakeLists.txt index b6c2131f33..e4a4d40c2a 100644 --- a/src/plugins/generic/evdevtouch/CMakeLists.txt +++ b/src/plugins/generic/evdevtouch/CMakeLists.txt @@ -9,14 +9,12 @@ qt_add_plugin(QEvdevTouchScreenPlugin TYPE generic SOURCES main.cpp - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate - Qt::InputSupportPrivate PUBLIC_LIBRARIES Qt::Core + Qt::CorePrivate Qt::Gui - Qt::InputSupport + Qt::GuiPrivate + Qt::InputSupportPrivate ) #### Keys ignored in scope 1:.:.:evdevtouch.pro:: diff --git a/src/plugins/generic/libinput/CMakeLists.txt b/src/plugins/generic/libinput/CMakeLists.txt index 30fa36aa85..b772623307 100644 --- a/src/plugins/generic/libinput/CMakeLists.txt +++ b/src/plugins/generic/libinput/CMakeLists.txt @@ -9,14 +9,12 @@ qt_add_plugin(QLibInputPlugin TYPE generic SOURCES main.cpp - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate - Qt::InputSupportPrivate PUBLIC_LIBRARIES Qt::Core + Qt::CorePrivate Qt::Gui - Qt::InputSupport + Qt::GuiPrivate + Qt::InputSupportPrivate ) #### Keys ignored in scope 1:.:.:libinput.pro:: diff --git a/src/plugins/generic/tslib/.prev_CMakeLists.txt b/src/plugins/generic/tslib/.prev_CMakeLists.txt index 83ca4f264b..3e82a077c3 100644 --- a/src/plugins/generic/tslib/.prev_CMakeLists.txt +++ b/src/plugins/generic/tslib/.prev_CMakeLists.txt @@ -9,15 +9,13 @@ qt_add_plugin(QTsLibPlugin TYPE generic SOURCES main.cpp - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate - Qt::InputSupportPrivate PUBLIC_LIBRARIES PkgConfig::Tslib Qt::Core + Qt::CorePrivate Qt::Gui - Qt::InputSupport + Qt::GuiPrivate + Qt::InputSupportPrivate ) #### Keys ignored in scope 1:.:.:tslib.pro:: diff --git a/src/plugins/generic/tslib/CMakeLists.txt b/src/plugins/generic/tslib/CMakeLists.txt index 54afe0cbe7..964e322a55 100644 --- a/src/plugins/generic/tslib/CMakeLists.txt +++ b/src/plugins/generic/tslib/CMakeLists.txt @@ -11,15 +11,13 @@ qt_add_plugin(QTsLibPlugin TYPE generic SOURCES main.cpp - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate - Qt::InputSupportPrivate PUBLIC_LIBRARIES PkgConfig::Tslib Qt::Core + Qt::CorePrivate Qt::Gui - Qt::InputSupport + Qt::GuiPrivate + Qt::InputSupportPrivate ) #### Keys ignored in scope 1:.:.:tslib.pro:: diff --git a/src/plugins/generic/tuiotouch/CMakeLists.txt b/src/plugins/generic/tuiotouch/CMakeLists.txt index d17b6dae3a..82db49d4c3 100644 --- a/src/plugins/generic/tuiotouch/CMakeLists.txt +++ b/src/plugins/generic/tuiotouch/CMakeLists.txt @@ -16,12 +16,11 @@ qt_add_plugin(QTuioTouchPlugin qtuiotoken_p.h DEFINES QT_NO_FOREACH - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate PUBLIC_LIBRARIES Qt::Core + Qt::CorePrivate Qt::Gui + Qt::GuiPrivate Qt::Network ) diff --git a/src/plugins/imageformats/ico/CMakeLists.txt b/src/plugins/imageformats/ico/CMakeLists.txt index 6151d6fd07..1174848d5e 100644 --- a/src/plugins/imageformats/ico/CMakeLists.txt +++ b/src/plugins/imageformats/ico/CMakeLists.txt @@ -10,10 +10,9 @@ qt_add_plugin(QICOPlugin SOURCES main.cpp main.h qicohandler.cpp qicohandler.h - LIBRARIES - Qt::CorePrivate PUBLIC_LIBRARIES Qt::Core + Qt::CorePrivate Qt::Gui ) diff --git a/src/plugins/imageformats/jpeg/.prev_CMakeLists.txt b/src/plugins/imageformats/jpeg/.prev_CMakeLists.txt index 8a470e3e01..25b5861122 100644 --- a/src/plugins/imageformats/jpeg/.prev_CMakeLists.txt +++ b/src/plugins/imageformats/jpeg/.prev_CMakeLists.txt @@ -10,13 +10,12 @@ qt_add_plugin(QJpegPlugin SOURCES main.cpp main.h qjpeghandler.cpp qjpeghandler_p.h - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate PUBLIC_LIBRARIES JPEG::JPEG Qt::Core + Qt::CorePrivate Qt::Gui + Qt::GuiPrivate ) #### Keys ignored in scope 1:.:.:jpeg.pro:: diff --git a/src/plugins/imageformats/jpeg/CMakeLists.txt b/src/plugins/imageformats/jpeg/CMakeLists.txt index 18ebf12d65..6aaa6538ec 100644 --- a/src/plugins/imageformats/jpeg/CMakeLists.txt +++ b/src/plugins/imageformats/jpeg/CMakeLists.txt @@ -12,13 +12,12 @@ qt_add_plugin(QJpegPlugin SOURCES main.cpp main.h qjpeghandler.cpp qjpeghandler_p.h - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate PUBLIC_LIBRARIES JPEG::JPEG Qt::Core + Qt::CorePrivate Qt::Gui + Qt::GuiPrivate ) #### Keys ignored in scope 1:.:.:jpeg.pro:: diff --git a/src/plugins/platforminputcontexts/compose/.prev_CMakeLists.txt b/src/plugins/platforminputcontexts/compose/.prev_CMakeLists.txt index f553093fc5..ff09314303 100644 --- a/src/plugins/platforminputcontexts/compose/.prev_CMakeLists.txt +++ b/src/plugins/platforminputcontexts/compose/.prev_CMakeLists.txt @@ -11,12 +11,12 @@ qt_add_plugin(QComposePlatformInputContextPlugin qcomposeplatforminputcontext.cpp qcomposeplatforminputcontext.h qcomposeplatforminputcontextmain.cpp LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate XKB::XKB PUBLIC_LIBRARIES Qt::Core + Qt::CorePrivate Qt::Gui + Qt::GuiPrivate ) #### Keys ignored in scope 1:.:.:compose.pro:: diff --git a/src/plugins/platforminputcontexts/compose/CMakeLists.txt b/src/plugins/platforminputcontexts/compose/CMakeLists.txt index 21e33432f6..fe4e3b8b80 100644 --- a/src/plugins/platforminputcontexts/compose/CMakeLists.txt +++ b/src/plugins/platforminputcontexts/compose/CMakeLists.txt @@ -13,12 +13,12 @@ qt_add_plugin(QComposePlatformInputContextPlugin qcomposeplatforminputcontext.cpp qcomposeplatforminputcontext.h qcomposeplatforminputcontextmain.cpp LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate XKB::XKB PUBLIC_LIBRARIES Qt::Core + Qt::CorePrivate Qt::Gui + Qt::GuiPrivate ) #### Keys ignored in scope 1:.:.:compose.pro:: diff --git a/src/plugins/platforminputcontexts/ibus/CMakeLists.txt b/src/plugins/platforminputcontexts/ibus/CMakeLists.txt index a7e3156c9d..1017407342 100644 --- a/src/plugins/platforminputcontexts/ibus/CMakeLists.txt +++ b/src/plugins/platforminputcontexts/ibus/CMakeLists.txt @@ -14,14 +14,12 @@ qt_add_plugin(QIbusPlatformInputContextPlugin qibusproxy.cpp qibusproxy.h qibusproxyportal.cpp qibusproxyportal.h qibustypes.cpp qibustypes.h - LIBRARIES - Qt::GuiPrivate - Qt::XkbCommonSupportPrivate PUBLIC_LIBRARIES Qt::Core Qt::DBus Qt::Gui - Qt::XkbCommonSupport + Qt::GuiPrivate + Qt::XkbCommonSupportPrivate ) #### Keys ignored in scope 1:.:.:ibus.pro:: diff --git a/src/plugins/platforms/android/.prev_CMakeLists.txt b/src/plugins/platforms/android/.prev_CMakeLists.txt index 047abff880..4cb966004e 100644 --- a/src/plugins/platforms/android/.prev_CMakeLists.txt +++ b/src/plugins/platforms/android/.prev_CMakeLists.txt @@ -42,20 +42,15 @@ qt_add_plugin(QAndroidIntegrationPlugin INCLUDE_DIRECTORIES ${CMAKE_CURRENT_SOURCE_DIR} ${QT_SOURCE_TREE}/src/3rdparty/android - LIBRARIES + PUBLIC_LIBRARIES Qt::AccessibilitySupportPrivate + Qt::Core Qt::CorePrivate Qt::EglSupportPrivate Qt::EventDispatcherSupportPrivate Qt::FontDatabaseSupportPrivate - Qt::GuiPrivate - PUBLIC_LIBRARIES - Qt::AccessibilitySupport - Qt::Core - Qt::EglSupport - Qt::EventDispatcherSupport - Qt::FontDatabaseSupport Qt::Gui + Qt::GuiPrivate android jnigraphics ) @@ -70,10 +65,8 @@ qt_extend_target(QAndroidIntegrationPlugin CONDITION QT_FEATURE_vulkan SOURCES qandroidplatformvulkaninstance.cpp qandroidplatformvulkaninstance.h qandroidplatformvulkanwindow.cpp qandroidplatformvulkanwindow.h - LIBRARIES - Qt::VulkanSupportPrivate PUBLIC_LIBRARIES - Qt::VulkanSupport + Qt::VulkanSupportPrivate ) qt_extend_target(QAndroidIntegrationPlugin CONDITION QT_FEATURE_android_style_assets diff --git a/src/plugins/platforms/android/CMakeLists.txt b/src/plugins/platforms/android/CMakeLists.txt index d66fb239d7..970c0de870 100644 --- a/src/plugins/platforms/android/CMakeLists.txt +++ b/src/plugins/platforms/android/CMakeLists.txt @@ -43,20 +43,15 @@ qt_add_plugin(QAndroidIntegrationPlugin INCLUDE_DIRECTORIES ${CMAKE_CURRENT_SOURCE_DIR} ${QT_SOURCE_TREE}/src/3rdparty/android - LIBRARIES + PUBLIC_LIBRARIES Qt::AccessibilitySupportPrivate + Qt::Core Qt::CorePrivate Qt::EglSupportPrivate Qt::EventDispatcherSupportPrivate Qt::FontDatabaseSupportPrivate - Qt::GuiPrivate - PUBLIC_LIBRARIES - Qt::AccessibilitySupport - Qt::Core - Qt::EglSupport - Qt::EventDispatcherSupport - Qt::FontDatabaseSupport Qt::Gui + Qt::GuiPrivate android jnigraphics # special case begin @@ -79,10 +74,8 @@ qt_extend_target(QAndroidIntegrationPlugin CONDITION QT_FEATURE_vulkan SOURCES qandroidplatformvulkaninstance.cpp qandroidplatformvulkaninstance.h qandroidplatformvulkanwindow.cpp qandroidplatformvulkanwindow.h - LIBRARIES - Qt::VulkanSupportPrivate PUBLIC_LIBRARIES - Qt::VulkanSupport + Qt::VulkanSupportPrivate ) qt_extend_target(QAndroidIntegrationPlugin CONDITION QT_FEATURE_android_style_assets diff --git a/src/plugins/platforms/cocoa/.prev_CMakeLists.txt b/src/plugins/platforms/cocoa/.prev_CMakeLists.txt index d557a510d7..27cace4eb9 100644 --- a/src/plugins/platforms/cocoa/.prev_CMakeLists.txt +++ b/src/plugins/platforms/cocoa/.prev_CMakeLists.txt @@ -41,13 +41,6 @@ qt_add_plugin(QCocoaIntegrationPlugin qnsview.h qnsview.mm qnswindow.h qnswindow.mm qnswindowdelegate.h qnswindowdelegate.mm - LIBRARIES - Qt::ClipboardSupportPrivate - Qt::CorePrivate - Qt::FontDatabaseSupportPrivate - Qt::GraphicsSupportPrivate - Qt::GuiPrivate - Qt::ThemeSupportPrivate PUBLIC_LIBRARIES ${FWAppKit} ${FWCarbon} @@ -58,12 +51,14 @@ qt_add_plugin(QCocoaIntegrationPlugin ${FWMetal} ${FWQuartzCore} Cups::Cups - Qt::ClipboardSupport + Qt::ClipboardSupportPrivate Qt::Core - Qt::FontDatabaseSupport - Qt::GraphicsSupport + Qt::CorePrivate + Qt::FontDatabaseSupportPrivate + Qt::GraphicsSupportPrivate Qt::Gui - Qt::ThemeSupport + Qt::GuiPrivate + Qt::ThemeSupportPrivate ) # Resources: @@ -95,20 +90,16 @@ qt_extend_target(QCocoaIntegrationPlugin CONDITION QT_FEATURE_opengl qt_extend_target(QCocoaIntegrationPlugin CONDITION QT_FEATURE_vulkan SOURCES qcocoavulkaninstance.h qcocoavulkaninstance.mm - LIBRARIES - Qt::VulkanSupportPrivate PUBLIC_LIBRARIES - Qt::VulkanSupport + Qt::VulkanSupportPrivate ) qt_extend_target(QCocoaIntegrationPlugin CONDITION QT_FEATURE_accessibility SOURCES qcocoaaccessibility.h qcocoaaccessibility.mm qcocoaaccessibilityelement.h qcocoaaccessibilityelement.mm - LIBRARIES - Qt::AccessibilitySupportPrivate PUBLIC_LIBRARIES - Qt::AccessibilitySupport + Qt::AccessibilitySupportPrivate ) qt_extend_target(QCocoaIntegrationPlugin CONDITION QT_FEATURE_sessionmanager @@ -119,10 +110,8 @@ qt_extend_target(QCocoaIntegrationPlugin CONDITION QT_FEATURE_sessionmanager qt_extend_target(QCocoaIntegrationPlugin CONDITION TARGET Qt::Widgets SOURCES qpaintengine_mac.mm qpaintengine_mac_p.h - LIBRARIES - Qt::WidgetsPrivate PUBLIC_LIBRARIES - Qt::Widgets + Qt::WidgetsPrivate ) #### Keys ignored in scope 7:.:.:cocoa.pro:TARGET Qt::Widgets: @@ -133,10 +122,8 @@ qt_extend_target(QCocoaIntegrationPlugin CONDITION TARGET Qt::PrintSupport AND T qcocoaprintdevice.h qcocoaprintdevice.mm qcocoaprintersupport.h qcocoaprintersupport.mm qprintengine_mac.mm qprintengine_mac_p.h - LIBRARIES - Qt::PrintSupportPrivate PUBLIC_LIBRARIES - Qt::PrintSupport + Qt::PrintSupportPrivate ) qt_extend_target(QCocoaIntegrationPlugin CONDITION QT_FEATURE_colordialog AND TARGET Qt::Widgets diff --git a/src/plugins/platforms/cocoa/CMakeLists.txt b/src/plugins/platforms/cocoa/CMakeLists.txt index 7ed2a8ffdb..27b646d293 100644 --- a/src/plugins/platforms/cocoa/CMakeLists.txt +++ b/src/plugins/platforms/cocoa/CMakeLists.txt @@ -45,13 +45,6 @@ qt_add_plugin(QCocoaIntegrationPlugin qnsview.h qnsview.mm qnswindow.h qnswindow.mm qnswindowdelegate.h qnswindowdelegate.mm - LIBRARIES - Qt::ClipboardSupportPrivate - Qt::CorePrivate - Qt::FontDatabaseSupportPrivate - Qt::GraphicsSupportPrivate - Qt::GuiPrivate - Qt::ThemeSupportPrivate PUBLIC_LIBRARIES ${FWAppKit} ${FWCarbon} @@ -62,12 +55,14 @@ qt_add_plugin(QCocoaIntegrationPlugin ${FWMetal} ${FWQuartzCore} Cups::Cups - Qt::ClipboardSupport + Qt::ClipboardSupportPrivate Qt::Core - Qt::FontDatabaseSupport - Qt::GraphicsSupport + Qt::CorePrivate + Qt::FontDatabaseSupportPrivate + Qt::GraphicsSupportPrivate Qt::Gui - Qt::ThemeSupport + Qt::GuiPrivate + Qt::ThemeSupportPrivate ) # Resources: @@ -99,20 +94,16 @@ qt_extend_target(QCocoaIntegrationPlugin CONDITION QT_FEATURE_opengl qt_extend_target(QCocoaIntegrationPlugin CONDITION QT_FEATURE_vulkan SOURCES qcocoavulkaninstance.h qcocoavulkaninstance.mm - LIBRARIES - Qt::VulkanSupportPrivate PUBLIC_LIBRARIES - Qt::VulkanSupport + Qt::VulkanSupportPrivate ) qt_extend_target(QCocoaIntegrationPlugin CONDITION QT_FEATURE_accessibility SOURCES qcocoaaccessibility.h qcocoaaccessibility.mm qcocoaaccessibilityelement.h qcocoaaccessibilityelement.mm - LIBRARIES - Qt::AccessibilitySupportPrivate PUBLIC_LIBRARIES - Qt::AccessibilitySupport + Qt::AccessibilitySupportPrivate ) qt_extend_target(QCocoaIntegrationPlugin CONDITION QT_FEATURE_sessionmanager @@ -123,10 +114,8 @@ qt_extend_target(QCocoaIntegrationPlugin CONDITION QT_FEATURE_sessionmanager qt_extend_target(QCocoaIntegrationPlugin CONDITION TARGET Qt::Widgets SOURCES qpaintengine_mac.mm qpaintengine_mac_p.h - LIBRARIES - Qt::WidgetsPrivate PUBLIC_LIBRARIES - Qt::Widgets + Qt::WidgetsPrivate ) #### Keys ignored in scope 7:.:.:cocoa.pro:TARGET Qt::Widgets: @@ -137,10 +126,8 @@ qt_extend_target(QCocoaIntegrationPlugin CONDITION TARGET Qt::PrintSupport AND T qcocoaprintdevice.h qcocoaprintdevice.mm qcocoaprintersupport.h qcocoaprintersupport.mm qprintengine_mac.mm qprintengine_mac_p.h - LIBRARIES - Qt::PrintSupportPrivate PUBLIC_LIBRARIES - Qt::PrintSupport + Qt::PrintSupportPrivate ) qt_extend_target(QCocoaIntegrationPlugin CONDITION QT_FEATURE_colordialog AND TARGET Qt::Widgets diff --git a/src/plugins/platforms/directfb/.prev_CMakeLists.txt b/src/plugins/platforms/directfb/.prev_CMakeLists.txt index b16e7cb9bd..33beaa3da4 100644 --- a/src/plugins/platforms/directfb/.prev_CMakeLists.txt +++ b/src/plugins/platforms/directfb/.prev_CMakeLists.txt @@ -18,19 +18,15 @@ qt_add_plugin(QDirectFbIntegrationPlugin qdirectfbintegration.cpp qdirectfbintegration.h qdirectfbscreen.cpp qdirectfbscreen.h qdirectfbwindow.cpp qdirectfbwindow.h - LIBRARIES + PUBLIC_LIBRARIES + PkgConfig::DirectFB + Qt::Core Qt::CorePrivate Qt::EventDispatcherSupportPrivate Qt::FontDatabaseSupportPrivate + Qt::Gui Qt::GuiPrivate Qt::ServiceSupportPrivate - PUBLIC_LIBRARIES - PkgConfig::DirectFB - Qt::Core - Qt::EventDispatcherSupport - Qt::FontDatabaseSupport - Qt::Gui - Qt::ServiceSupport ) #### Keys ignored in scope 1:.:.:directfb.pro:: @@ -44,10 +40,8 @@ qt_extend_target(QDirectFbIntegrationPlugin CONDITION QT_CONFIG___contains___dir qdirectfb_egl.cpp qdirectfb_egl.h DEFINES DIRECTFB_GL_EGL - LIBRARIES - Qt::EglSupportPrivate PUBLIC_LIBRARIES - Qt::EglSupport + Qt::EglSupportPrivate ) qt_extend_target(QDirectFbIntegrationPlugin CONDITION NOT DIRECTFB_PLATFORM_HOOKS_SOURCES_ISEMPTY diff --git a/src/plugins/platforms/directfb/CMakeLists.txt b/src/plugins/platforms/directfb/CMakeLists.txt index b696943257..c723ca75f4 100644 --- a/src/plugins/platforms/directfb/CMakeLists.txt +++ b/src/plugins/platforms/directfb/CMakeLists.txt @@ -22,19 +22,15 @@ qt_add_plugin(QDirectFbIntegrationPlugin qdirectfbintegration.cpp qdirectfbintegration.h qdirectfbscreen.cpp qdirectfbscreen.h qdirectfbwindow.cpp qdirectfbwindow.h - LIBRARIES + PUBLIC_LIBRARIES + PkgConfig::DirectFB + Qt::Core Qt::CorePrivate Qt::EventDispatcherSupportPrivate Qt::FontDatabaseSupportPrivate + Qt::Gui Qt::GuiPrivate Qt::ServiceSupportPrivate - PUBLIC_LIBRARIES - PkgConfig::DirectFB - Qt::Core - Qt::EventDispatcherSupport - Qt::FontDatabaseSupport - Qt::Gui - Qt::ServiceSupport ) #### Keys ignored in scope 1:.:.:directfb.pro:: @@ -48,10 +44,8 @@ qt_extend_target(QDirectFbIntegrationPlugin CONDITION QT_CONFIG___contains___dir qdirectfb_egl.cpp qdirectfb_egl.h DEFINES DIRECTFB_GL_EGL - LIBRARIES - Qt::EglSupportPrivate PUBLIC_LIBRARIES - Qt::EglSupport + Qt::EglSupportPrivate ) qt_extend_target(QDirectFbIntegrationPlugin CONDITION NOT DIRECTFB_PLATFORM_HOOKS_SOURCES_ISEMPTY diff --git a/src/plugins/platforms/eglfs/.prev_CMakeLists.txt b/src/plugins/platforms/eglfs/.prev_CMakeLists.txt index 6f3309ea3c..4fed525392 100644 --- a/src/plugins/platforms/eglfs/.prev_CMakeLists.txt +++ b/src/plugins/platforms/eglfs/.prev_CMakeLists.txt @@ -19,7 +19,7 @@ qt_add_module(EglFSDeviceIntegration QT_EGL_NO_X11 INCLUDE_DIRECTORIES api - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate Qt::DeviceDiscoverySupportPrivate Qt::EglSupportPrivate @@ -29,16 +29,6 @@ qt_add_module(EglFSDeviceIntegration Qt::GuiPrivate Qt::ServiceSupportPrivate Qt::ThemeSupportPrivate - PUBLIC_LIBRARIES - Qt::Core - Qt::DeviceDiscoverySupport - Qt::EglSupport - Qt::EventDispatcherSupport - Qt::FbSupport - Qt::FontDatabaseSupport - Qt::Gui - Qt::ServiceSupport - Qt::ThemeSupport ) #### Keys ignored in scope 2:.:.:eglfsdeviceintegration.pro:: @@ -48,17 +38,21 @@ qt_add_module(EglFSDeviceIntegration ##################################################################### qt_extend_target(EglFSDeviceIntegration CONDITION TARGET Qt::InputSupportPrivate - LIBRARIES - Qt::InputSupportPrivate PUBLIC_LIBRARIES - Qt::InputSupport + Qt::InputSupportPrivate ) qt_extend_target(EglFSDeviceIntegration CONDITION TARGET Qt::PlatformCompositorSupportPrivate - LIBRARIES + PUBLIC_LIBRARIES Qt::PlatformCompositorSupportPrivate +) + +qt_extend_target(EglFSDeviceIntegration CONDITION QT_FEATURE_vulkan + SOURCES + api/vulkan/qeglfsvulkaninstance.cpp api/vulkan/qeglfsvulkaninstance_p.h + api/vulkan/qeglfsvulkanwindow.cpp api/vulkan/qeglfsvulkanwindow_p.h PUBLIC_LIBRARIES - Qt::PlatformCompositorSupport + Qt::VulkanSupportPrivate ) qt_extend_target(EglFSDeviceIntegration CONDITION NOT EGLFS_PLATFORM_HOOKS_SOURCES_ISEMPTY @@ -92,30 +86,28 @@ qt_extend_target(EglFSDeviceIntegration CONDITION QT_FEATURE_opengl api/qeglfscursor.cpp api/qeglfscursor_p.h ) ##################################################################### -## qeglfs Plugin: +## QEglFSIntegrationPlugin Plugin: ##################################################################### -qt_add_plugin(qeglfs +qt_add_plugin(QEglFSIntegrationPlugin + OUTPUT_NAME qeglfs TYPE platforms - CLASS_NAME QEglFSIntegrationPlugin SOURCES qeglfsmain.cpp DEFINES QT_EGL_NO_X11 INCLUDE_DIRECTORIES api - LIBRARIES - Qt::EglFSDeviceIntegrationPrivate PUBLIC_LIBRARIES - Qt::EglFSDeviceIntegration + Qt::EglFSDeviceIntegrationPrivate ) -#### Keys ignored in scope 11:.:.:eglfs-plugin.pro:: +#### Keys ignored in scope 13:.:.:eglfs-plugin.pro:: # OTHER_FILES = "$$PWD/eglfs.json" ## Scopes: ##################################################################### -#### Keys ignored in scope 12:.:.:eglfs-plugin.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN: +#### Keys ignored in scope 14:.:.:eglfs-plugin.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN: # PLUGIN_EXTENDS = "-" add_subdirectory(deviceintegration) diff --git a/src/plugins/platforms/eglfs/CMakeLists.txt b/src/plugins/platforms/eglfs/CMakeLists.txt index 01949586bc..03de79d6f0 100644 --- a/src/plugins/platforms/eglfs/CMakeLists.txt +++ b/src/plugins/platforms/eglfs/CMakeLists.txt @@ -20,7 +20,7 @@ qt_add_module(EglFSDeviceIntegration QT_EGL_NO_X11 INCLUDE_DIRECTORIES api - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate Qt::DeviceDiscoverySupportPrivate Qt::EglSupportPrivate @@ -40,17 +40,21 @@ qt_add_module(EglFSDeviceIntegration ##################################################################### qt_extend_target(EglFSDeviceIntegration CONDITION TARGET Qt::InputSupportPrivate - LIBRARIES - Qt::InputSupportPrivate PUBLIC_LIBRARIES - Qt::InputSupport + Qt::InputSupportPrivate ) qt_extend_target(EglFSDeviceIntegration CONDITION TARGET Qt::PlatformCompositorSupportPrivate - LIBRARIES + PUBLIC_LIBRARIES Qt::PlatformCompositorSupportPrivate +) + +qt_extend_target(EglFSDeviceIntegration CONDITION QT_FEATURE_vulkan + SOURCES + api/vulkan/qeglfsvulkaninstance.cpp api/vulkan/qeglfsvulkaninstance_p.h + api/vulkan/qeglfsvulkanwindow.cpp api/vulkan/qeglfsvulkanwindow_p.h PUBLIC_LIBRARIES - Qt::PlatformCompositorSupport + Qt::VulkanSupportPrivate ) # special case: @@ -78,12 +82,12 @@ qt_extend_target(EglFSDeviceIntegration CONDITION QT_FEATURE_opengl api/qeglfscursor.cpp api/qeglfscursor_p.h ) ##################################################################### -## qeglfs Plugin: +## QEglFSIntegrationPlugin Plugin: ##################################################################### -qt_add_plugin(qeglfs +qt_add_plugin(QEglFSIntegrationPlugin + OUTPUT_NAME qeglfs TYPE platforms - CLASS_NAME QEglFSIntegrationPlugin DEFAULT_IF ${QT_QPA_DEFAULT_PLATFORM} MATCHES eglfs # special case SOURCES qeglfsmain.cpp @@ -91,18 +95,18 @@ qt_add_plugin(qeglfs QT_EGL_NO_X11 INCLUDE_DIRECTORIES api - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate # special case Qt::EglFSDeviceIntegrationPrivate EGL::EGL # special case ) -#### Keys ignored in scope 11:.:.:eglfs-plugin.pro:: +#### Keys ignored in scope 13:.:.:eglfs-plugin.pro:: # OTHER_FILES = "$$PWD/eglfs.json" ## Scopes: ##################################################################### -#### Keys ignored in scope 12:.:.:eglfs-plugin.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN: +#### Keys ignored in scope 14:.:.:eglfs-plugin.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN: # PLUGIN_EXTENDS = "-" add_subdirectory(deviceintegration) diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_emu/CMakeLists.txt b/src/plugins/platforms/eglfs/deviceintegration/eglfs_emu/CMakeLists.txt index fa6623ee50..a62b8bbb2b 100644 --- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_emu/CMakeLists.txt +++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_emu/CMakeLists.txt @@ -15,14 +15,12 @@ qt_add_plugin(QEglFSEmulatorIntegrationPlugin QT_EGL_NO_X11 INCLUDE_DIRECTORIES ../../api - LIBRARIES - Qt::CorePrivate - Qt::EglFSDeviceIntegrationPrivate - Qt::GuiPrivate PUBLIC_LIBRARIES Qt::Core - Qt::EglFSDeviceIntegration + Qt::CorePrivate + Qt::EglFSDeviceIntegrationPrivate Qt::Gui + Qt::GuiPrivate ) #### Keys ignored in scope 1:.:.:eglfs_emu.pro:: diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/CMakeLists.txt b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/CMakeLists.txt index d2a2b9699d..55a1d71c07 100644 --- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/CMakeLists.txt +++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/CMakeLists.txt @@ -19,21 +19,16 @@ qt_add_plugin(QEglFSKmsGbmIntegrationPlugin INCLUDE_DIRECTORIES ../../api ../eglfs_kms_support - LIBRARIES + PUBLIC_LIBRARIES + Libdrm::Libdrm + Qt::Core Qt::CorePrivate Qt::EdidSupportPrivate Qt::EglFSDeviceIntegrationPrivate Qt::EglFsKmsSupportPrivate + Qt::Gui Qt::GuiPrivate Qt::KmsSupportPrivate - PUBLIC_LIBRARIES - Libdrm::Libdrm - Qt::Core - Qt::EdidSupport - Qt::EglFSDeviceIntegration - Qt::EglFsKmsSupport - Qt::Gui - Qt::KmsSupport gbm::gbm ) 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 63335ced92..a0b405c90c 100644 --- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/CMakeLists.txt +++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/CMakeLists.txt @@ -17,21 +17,16 @@ qt_add_plugin(QEglFSKmsEglDeviceIntegrationPlugin INCLUDE_DIRECTORIES ../../api ../eglfs_kms_support - LIBRARIES + PUBLIC_LIBRARIES + Libdrm::Libdrm + Qt::Core Qt::CorePrivate Qt::EdidSupportPrivate Qt::EglFSDeviceIntegrationPrivate Qt::EglFsKmsSupportPrivate + Qt::Gui Qt::GuiPrivate Qt::KmsSupportPrivate - PUBLIC_LIBRARIES - Libdrm::Libdrm - Qt::Core - Qt::EdidSupport - Qt::EglFSDeviceIntegration - Qt::EglFsKmsSupport - Qt::Gui - Qt::KmsSupport ) #### Keys ignored in scope 1:.:.:eglfs_kms_egldevice.pro:: 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 51b3327345..abaad3930d 100644 --- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/CMakeLists.txt +++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/CMakeLists.txt @@ -17,17 +17,13 @@ qt_add_module(EglFsKmsSupport QT_EGL_NO_X11 INCLUDE_DIRECTORIES ../../api - LIBRARIES + PUBLIC_LIBRARIES + Libdrm::Libdrm + Qt::Core Qt::CorePrivate Qt::EdidSupportPrivate Qt::EglFSDeviceIntegrationPrivate + Qt::Gui Qt::GuiPrivate Qt::KmsSupportPrivate - PUBLIC_LIBRARIES - Libdrm::Libdrm - Qt::Core - Qt::EdidSupport - Qt::EglFSDeviceIntegration - Qt::Gui - Qt::KmsSupport ) diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_x11/CMakeLists.txt b/src/plugins/platforms/eglfs/deviceintegration/eglfs_x11/CMakeLists.txt index cad49366c8..29dcd0dab7 100644 --- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_x11/CMakeLists.txt +++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_x11/CMakeLists.txt @@ -14,14 +14,12 @@ qt_add_plugin(QEglFSX11IntegrationPlugin QT_EGL_NO_X11 INCLUDE_DIRECTORIES ../../api - LIBRARIES - Qt::CorePrivate - Qt::EglFSDeviceIntegrationPrivate - Qt::GuiPrivate PUBLIC_LIBRARIES Qt::Core - Qt::EglFSDeviceIntegration + Qt::CorePrivate + Qt::EglFSDeviceIntegrationPrivate Qt::Gui + Qt::GuiPrivate X11::XCB XCB::XCB ) diff --git a/src/plugins/platforms/ios/CMakeLists.txt b/src/plugins/platforms/ios/CMakeLists.txt index 4c9cac2bee..d8912866b0 100644 --- a/src/plugins/platforms/ios/CMakeLists.txt +++ b/src/plugins/platforms/ios/CMakeLists.txt @@ -1,12 +1,12 @@ # Generated from ios.pro. ##################################################################### -## qios Plugin: +## QIOSIntegrationPlugin Plugin: ##################################################################### -add_qt_plugin(qios +add_qt_plugin(QIOSIntegrationPlugin + OUTPUT_NAME qios TYPE platforms - CLASS_NAME QIOSIntegrationPlugin SOURCES plugin.mm qiosapplicationdelegate.h qiosapplicationdelegate.mm @@ -26,37 +26,25 @@ add_qt_plugin(qios qioswindow.h qioswindow.mm quiaccessibilityelement.h quiaccessibilityelement.mm quiview.h quiview.mm - LIBRARIES - Qt::ClipboardSupportPrivate - Qt::CorePrivate - Qt::FontDatabaseSupportPrivate - Qt::GraphicsSupportPrivate - Qt::GuiPrivate PUBLIC_LIBRARIES ${FWAudioToolbox} ${FWFoundation} ${FWQuartzCore} ${FWUIKit} - Qt::ClipboardSupport - Qt::Core - Qt::FontDatabaseSupport - Qt::GraphicsSupport - Qt::Gui + Qt::ClipboardSupportPrivate + Qt::CorePrivate + Qt::FontDatabaseSupportPrivate + Qt::GraphicsSupportPrivate + Qt::GuiPrivate ) #### Keys ignored in scope 2:.:.:kernel.pro:: # OTHER_FILES = "quiview_textinput.mm" "quiview_accessibility.mm" -# PLUGIN_CLASS_NAME = "QIOSIntegrationPlugin" -# PLUGIN_TYPE = "platforms" -# _LOADED = "qt_plugin" ## Scopes: ##################################################################### -#### Keys ignored in scope 3:.:.:kernel.pro:QT_FEATURE_shared: -# CONFIG = "static" - -extend_target(qios CONDITION NOT APPLE_TVOS +extend_target(QIOSIntegrationPlugin CONDITION NOT APPLE_TVOS SOURCES qiosclipboard.h qiosclipboard.mm qiosfiledialog.h qiosfiledialog.mm diff --git a/src/plugins/platforms/ios/optional/CMakeLists.txt b/src/plugins/platforms/ios/optional/CMakeLists.txt index a3807bee6c..3c84e61f26 100644 --- a/src/plugins/platforms/ios/optional/CMakeLists.txt +++ b/src/plugins/platforms/ios/optional/CMakeLists.txt @@ -1,6 +1,5 @@ # Generated from optional.pro. - if(APPLE_IOS) add_subdirectory(nsphotolibrarysupport) endif() diff --git a/src/plugins/platforms/ios/optional/nsphotolibrarysupport/CMakeLists.txt b/src/plugins/platforms/ios/optional/nsphotolibrarysupport/CMakeLists.txt index 0f9128c6f7..0fbb0fdbd8 100644 --- a/src/plugins/platforms/ios/optional/nsphotolibrarysupport/CMakeLists.txt +++ b/src/plugins/platforms/ios/optional/nsphotolibrarysupport/CMakeLists.txt @@ -12,14 +12,13 @@ add_qt_plugin(QIosOptionalPlugin_NSPhotoLibrary qiosfileengineassetslibrary.h qiosfileengineassetslibrary.mm qiosfileenginefactory.h qiosimagepickercontroller.h qiosimagepickercontroller.mm - LIBRARIES - Qt::GuiPrivate PUBLIC_LIBRARIES ${FWAssetsLibrary} ${FWFoundation} ${FWUIKit} Qt::Core Qt::Gui + Qt::GuiPrivate ) #### Keys ignored in scope 1:.:.:nsphotolibrarysupport.pro:: diff --git a/src/plugins/platforms/linuxfb/.prev_CMakeLists.txt b/src/plugins/platforms/linuxfb/.prev_CMakeLists.txt index 0586e393ec..bcec98e1de 100644 --- a/src/plugins/platforms/linuxfb/.prev_CMakeLists.txt +++ b/src/plugins/platforms/linuxfb/.prev_CMakeLists.txt @@ -13,20 +13,15 @@ qt_add_plugin(QLinuxFbIntegrationPlugin qlinuxfbscreen.cpp qlinuxfbscreen.h DEFINES QT_NO_FOREACH - LIBRARIES + PUBLIC_LIBRARIES + Qt::Core Qt::CorePrivate Qt::EventDispatcherSupportPrivate Qt::FbSupportPrivate Qt::FontDatabaseSupportPrivate + Qt::Gui Qt::GuiPrivate Qt::ServiceSupportPrivate - PUBLIC_LIBRARIES - Qt::Core - Qt::EventDispatcherSupport - Qt::FbSupport - Qt::FontDatabaseSupport - Qt::Gui - Qt::ServiceSupport ) #### Keys ignored in scope 1:.:.:linuxfb.pro:: @@ -36,19 +31,15 @@ qt_add_plugin(QLinuxFbIntegrationPlugin ##################################################################### qt_extend_target(QLinuxFbIntegrationPlugin CONDITION TARGET Qt::InputSupportPrivate - LIBRARIES - Qt::InputSupportPrivate PUBLIC_LIBRARIES - Qt::InputSupport + Qt::InputSupportPrivate ) qt_extend_target(QLinuxFbIntegrationPlugin CONDITION TARGET Qt::KmsSupportPrivate SOURCES qlinuxfbdrmscreen.cpp qlinuxfbdrmscreen.h - LIBRARIES - Qt::KmsSupportPrivate PUBLIC_LIBRARIES - Qt::KmsSupport + Qt::KmsSupportPrivate ) #### Keys ignored in scope 4:.:.:linuxfb.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN: diff --git a/src/plugins/platforms/linuxfb/CMakeLists.txt b/src/plugins/platforms/linuxfb/CMakeLists.txt index b54d4e2c6f..8747894100 100644 --- a/src/plugins/platforms/linuxfb/CMakeLists.txt +++ b/src/plugins/platforms/linuxfb/CMakeLists.txt @@ -14,20 +14,15 @@ qt_add_plugin(QLinuxFbIntegrationPlugin qlinuxfbscreen.cpp qlinuxfbscreen.h DEFINES QT_NO_FOREACH - LIBRARIES + PUBLIC_LIBRARIES + Qt::Core Qt::CorePrivate Qt::EventDispatcherSupportPrivate Qt::FbSupportPrivate Qt::FontDatabaseSupportPrivate + Qt::Gui Qt::GuiPrivate Qt::ServiceSupportPrivate - PUBLIC_LIBRARIES - Qt::Core - Qt::EventDispatcherSupport - Qt::FbSupport - Qt::FontDatabaseSupport - Qt::Gui - Qt::ServiceSupport ) #### Keys ignored in scope 1:.:.:linuxfb.pro:: @@ -37,19 +32,15 @@ qt_add_plugin(QLinuxFbIntegrationPlugin ##################################################################### qt_extend_target(QLinuxFbIntegrationPlugin CONDITION TARGET Qt::InputSupportPrivate - LIBRARIES - Qt::InputSupportPrivate PUBLIC_LIBRARIES - Qt::InputSupport + Qt::InputSupportPrivate ) qt_extend_target(QLinuxFbIntegrationPlugin CONDITION TARGET Qt::KmsSupportPrivate SOURCES qlinuxfbdrmscreen.cpp qlinuxfbdrmscreen.h - LIBRARIES - Qt::KmsSupportPrivate PUBLIC_LIBRARIES - Qt::KmsSupport + Qt::KmsSupportPrivate ) #### Keys ignored in scope 4:.:.:linuxfb.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN: diff --git a/src/plugins/platforms/minimal/.prev_CMakeLists.txt b/src/plugins/platforms/minimal/.prev_CMakeLists.txt index e8fb16fdb0..764c684932 100644 --- a/src/plugins/platforms/minimal/.prev_CMakeLists.txt +++ b/src/plugins/platforms/minimal/.prev_CMakeLists.txt @@ -13,16 +13,13 @@ qt_add_plugin(QMinimalIntegrationPlugin qminimalintegration.cpp qminimalintegration.h DEFINES QT_NO_FOREACH - LIBRARIES + PUBLIC_LIBRARIES + Qt::Core Qt::CorePrivate Qt::EventDispatcherSupportPrivate Qt::FontDatabaseSupportPrivate - Qt::GuiPrivate - PUBLIC_LIBRARIES - Qt::Core - Qt::EventDispatcherSupport - Qt::FontDatabaseSupport Qt::Gui + Qt::GuiPrivate ) #### Keys ignored in scope 1:.:.:minimal.pro:: diff --git a/src/plugins/platforms/minimal/CMakeLists.txt b/src/plugins/platforms/minimal/CMakeLists.txt index acc097c4c8..4f4638b640 100644 --- a/src/plugins/platforms/minimal/CMakeLists.txt +++ b/src/plugins/platforms/minimal/CMakeLists.txt @@ -14,16 +14,13 @@ qt_add_plugin(QMinimalIntegrationPlugin qminimalintegration.cpp qminimalintegration.h DEFINES QT_NO_FOREACH - LIBRARIES + PUBLIC_LIBRARIES + Qt::Core Qt::CorePrivate Qt::EventDispatcherSupportPrivate Qt::FontDatabaseSupportPrivate - Qt::GuiPrivate - PUBLIC_LIBRARIES - Qt::Core - Qt::EventDispatcherSupport - Qt::FontDatabaseSupport Qt::Gui + Qt::GuiPrivate ) #### Keys ignored in scope 1:.:.:minimal.pro:: diff --git a/src/plugins/platforms/minimalegl/.prev_CMakeLists.txt b/src/plugins/platforms/minimalegl/.prev_CMakeLists.txt index 8f04c3fba0..7a08af79a9 100644 --- a/src/plugins/platforms/minimalegl/.prev_CMakeLists.txt +++ b/src/plugins/platforms/minimalegl/.prev_CMakeLists.txt @@ -14,18 +14,14 @@ qt_add_plugin(QMinimalEglIntegrationPlugin qminimaleglwindow.cpp qminimaleglwindow.h DEFINES QT_EGL_NO_X11 - LIBRARIES + PUBLIC_LIBRARIES + Qt::Core Qt::CorePrivate Qt::EglSupportPrivate Qt::EventDispatcherSupportPrivate Qt::FontDatabaseSupportPrivate - Qt::GuiPrivate - PUBLIC_LIBRARIES - Qt::Core - Qt::EglSupport - Qt::EventDispatcherSupport - Qt::FontDatabaseSupport Qt::Gui + Qt::GuiPrivate ) #### Keys ignored in scope 1:.:.:minimalegl.pro:: diff --git a/src/plugins/platforms/minimalegl/CMakeLists.txt b/src/plugins/platforms/minimalegl/CMakeLists.txt index 79cc6bddc6..4c8856e35d 100644 --- a/src/plugins/platforms/minimalegl/CMakeLists.txt +++ b/src/plugins/platforms/minimalegl/CMakeLists.txt @@ -15,18 +15,14 @@ qt_add_plugin(QMinimalEglIntegrationPlugin qminimaleglwindow.cpp qminimaleglwindow.h DEFINES QT_EGL_NO_X11 - LIBRARIES + PUBLIC_LIBRARIES + Qt::Core Qt::CorePrivate Qt::EglSupportPrivate Qt::EventDispatcherSupportPrivate Qt::FontDatabaseSupportPrivate - Qt::GuiPrivate - PUBLIC_LIBRARIES - Qt::Core - Qt::EglSupport - Qt::EventDispatcherSupport - Qt::FontDatabaseSupport Qt::Gui + Qt::GuiPrivate ) #### Keys ignored in scope 1:.:.:minimalegl.pro:: diff --git a/src/plugins/platforms/offscreen/.prev_CMakeLists.txt b/src/plugins/platforms/offscreen/.prev_CMakeLists.txt index b3fca1bd47..62d36ec449 100644 --- a/src/plugins/platforms/offscreen/.prev_CMakeLists.txt +++ b/src/plugins/platforms/offscreen/.prev_CMakeLists.txt @@ -14,16 +14,13 @@ qt_add_plugin(QOffscreenIntegrationPlugin qoffscreenwindow.cpp qoffscreenwindow.h DEFINES QT_NO_FOREACH - LIBRARIES + PUBLIC_LIBRARIES + Qt::Core Qt::CorePrivate Qt::EventDispatcherSupportPrivate Qt::FontDatabaseSupportPrivate - Qt::GuiPrivate - PUBLIC_LIBRARIES - Qt::Core - Qt::EventDispatcherSupport - Qt::FontDatabaseSupport Qt::Gui + Qt::GuiPrivate ) #### Keys ignored in scope 1:.:.:offscreen.pro:: @@ -35,10 +32,8 @@ qt_add_plugin(QOffscreenIntegrationPlugin qt_extend_target(QOffscreenIntegrationPlugin CONDITION QT_FEATURE_opengl AND QT_FEATURE_xlib AND NOT QT_FEATURE_opengles2 SOURCES qoffscreenintegration_x11.cpp qoffscreenintegration_x11.h - LIBRARIES - Qt::GlxSupportPrivate PUBLIC_LIBRARIES - Qt::GlxSupport + Qt::GlxSupportPrivate ) #### Keys ignored in scope 3:.:.:offscreen.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN: diff --git a/src/plugins/platforms/offscreen/CMakeLists.txt b/src/plugins/platforms/offscreen/CMakeLists.txt index 971f4c888d..63474c3760 100644 --- a/src/plugins/platforms/offscreen/CMakeLists.txt +++ b/src/plugins/platforms/offscreen/CMakeLists.txt @@ -15,16 +15,13 @@ qt_add_plugin(QOffscreenIntegrationPlugin qoffscreenwindow.cpp qoffscreenwindow.h DEFINES QT_NO_FOREACH - LIBRARIES + PUBLIC_LIBRARIES + Qt::Core Qt::CorePrivate Qt::EventDispatcherSupportPrivate Qt::FontDatabaseSupportPrivate - Qt::GuiPrivate - PUBLIC_LIBRARIES - Qt::Core - Qt::EventDispatcherSupport - Qt::FontDatabaseSupport Qt::Gui + Qt::GuiPrivate ) #### Keys ignored in scope 1:.:.:offscreen.pro:: @@ -36,10 +33,8 @@ qt_add_plugin(QOffscreenIntegrationPlugin qt_extend_target(QOffscreenIntegrationPlugin CONDITION QT_FEATURE_opengl AND QT_FEATURE_xlib AND NOT QT_FEATURE_opengles2 SOURCES qoffscreenintegration_x11.cpp qoffscreenintegration_x11.h - LIBRARIES - Qt::GlxSupportPrivate PUBLIC_LIBRARIES - Qt::GlxSupport + Qt::GlxSupportPrivate ) #### Keys ignored in scope 3:.:.:offscreen.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN: diff --git a/src/plugins/platforms/vnc/.prev_CMakeLists.txt b/src/plugins/platforms/vnc/.prev_CMakeLists.txt index 28031bb7d1..a26cc0be2b 100644 --- a/src/plugins/platforms/vnc/.prev_CMakeLists.txt +++ b/src/plugins/platforms/vnc/.prev_CMakeLists.txt @@ -15,23 +15,17 @@ qt_add_plugin(QVncIntegrationPlugin qvncscreen.cpp qvncscreen.h DEFINES QT_NO_FOREACH - LIBRARIES + PUBLIC_LIBRARIES + Qt::Core Qt::CorePrivate Qt::EventDispatcherSupportPrivate Qt::FbSupportPrivate Qt::FontDatabaseSupportPrivate + Qt::Gui Qt::GuiPrivate + Qt::Network Qt::ServiceSupportPrivate Qt::ThemeSupportPrivate - PUBLIC_LIBRARIES - Qt::Core - Qt::EventDispatcherSupport - Qt::FbSupport - Qt::FontDatabaseSupport - Qt::Gui - Qt::Network - Qt::ServiceSupport - Qt::ThemeSupport ) #### Keys ignored in scope 1:.:.:vnc.pro:: @@ -41,10 +35,8 @@ qt_add_plugin(QVncIntegrationPlugin ##################################################################### qt_extend_target(QVncIntegrationPlugin CONDITION TARGET Qt::InputSupportPrivate - LIBRARIES - Qt::InputSupportPrivate PUBLIC_LIBRARIES - Qt::InputSupport + Qt::InputSupportPrivate ) #### Keys ignored in scope 3:.:.:vnc.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN: diff --git a/src/plugins/platforms/vnc/CMakeLists.txt b/src/plugins/platforms/vnc/CMakeLists.txt index 502cff06db..cb84355d81 100644 --- a/src/plugins/platforms/vnc/CMakeLists.txt +++ b/src/plugins/platforms/vnc/CMakeLists.txt @@ -16,23 +16,17 @@ qt_add_plugin(QVncIntegrationPlugin qvncscreen.cpp qvncscreen.h DEFINES QT_NO_FOREACH - LIBRARIES + PUBLIC_LIBRARIES + Qt::Core Qt::CorePrivate Qt::EventDispatcherSupportPrivate Qt::FbSupportPrivate Qt::FontDatabaseSupportPrivate + Qt::Gui Qt::GuiPrivate + Qt::Network Qt::ServiceSupportPrivate Qt::ThemeSupportPrivate - PUBLIC_LIBRARIES - Qt::Core - Qt::EventDispatcherSupport - Qt::FbSupport - Qt::FontDatabaseSupport - Qt::Gui - Qt::Network - Qt::ServiceSupport - Qt::ThemeSupport ) #### Keys ignored in scope 1:.:.:vnc.pro:: @@ -42,10 +36,8 @@ qt_add_plugin(QVncIntegrationPlugin ##################################################################### qt_extend_target(QVncIntegrationPlugin CONDITION TARGET Qt::InputSupportPrivate - LIBRARIES - Qt::InputSupportPrivate PUBLIC_LIBRARIES - Qt::InputSupport + Qt::InputSupportPrivate ) #### Keys ignored in scope 3:.:.:vnc.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN: diff --git a/src/plugins/platforms/windows/.prev_CMakeLists.txt b/src/plugins/platforms/windows/.prev_CMakeLists.txt index fcac46588d..462e83ac56 100644 --- a/src/plugins/platforms/windows/.prev_CMakeLists.txt +++ b/src/plugins/platforms/windows/.prev_CMakeLists.txt @@ -41,11 +41,6 @@ qt_add_plugin(QWindowsIntegrationPlugin INCLUDE_DIRECTORIES ${CMAKE_CURRENT_SOURCE_DIR} LIBRARIES - Qt::CorePrivate - Qt::EventDispatcherSupportPrivate - Qt::FontDatabaseSupportPrivate - Qt::GuiPrivate - Qt::ThemeSupportPrivate advapi32 d3d9 gdi32 @@ -55,10 +50,12 @@ qt_add_plugin(QWindowsIntegrationPlugin winmm PUBLIC_LIBRARIES Qt::Core - Qt::EventDispatcherSupport - Qt::FontDatabaseSupport + Qt::CorePrivate + Qt::EventDispatcherSupportPrivate + Qt::FontDatabaseSupportPrivate Qt::Gui - Qt::ThemeSupport + Qt::GuiPrivate + Qt::ThemeSupportPrivate dwmapi imm32 oleaut32 @@ -109,19 +106,15 @@ qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_accessibility uiautomation/qwindowsuiautils.cpp uiautomation/qwindowsuiautils.h uiautomation/qwindowsuiavalueprovider.cpp uiautomation/qwindowsuiavalueprovider.h uiautomation/qwindowsuiawindowprovider.cpp uiautomation/qwindowsuiawindowprovider.h - LIBRARIES - Qt::AccessibilitySupportPrivate PUBLIC_LIBRARIES - Qt::AccessibilitySupport + Qt::AccessibilitySupportPrivate ) qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_vulkan SOURCES qwindowsvulkaninstance.cpp qwindowsvulkaninstance.h - LIBRARIES - Qt::VulkanSupportPrivate PUBLIC_LIBRARIES - Qt::VulkanSupport + Qt::VulkanSupportPrivate ) #### Keys ignored in scope 4:.:.:windows.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN: @@ -219,10 +212,8 @@ if(QT_FEATURE_imageformat_png) endif() qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_accessibility AND TARGET Qt::WindowsUIAutomationSupportPrivate - LIBRARIES - Qt::WindowsUIAutomationSupportPrivate PUBLIC_LIBRARIES - Qt::WindowsUIAutomationSupport + Qt::WindowsUIAutomationSupportPrivate ) qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_accessibility AND mingw diff --git a/src/plugins/platforms/windows/CMakeLists.txt b/src/plugins/platforms/windows/CMakeLists.txt index 1c017ed2e5..0481246384 100644 --- a/src/plugins/platforms/windows/CMakeLists.txt +++ b/src/plugins/platforms/windows/CMakeLists.txt @@ -42,11 +42,6 @@ qt_add_plugin(QWindowsIntegrationPlugin INCLUDE_DIRECTORIES ${CMAKE_CURRENT_SOURCE_DIR} LIBRARIES - Qt::CorePrivate - Qt::EventDispatcherSupportPrivate - Qt::FontDatabaseSupportPrivate - Qt::GuiPrivate - Qt::ThemeSupportPrivate advapi32 d3d9 gdi32 @@ -56,10 +51,12 @@ qt_add_plugin(QWindowsIntegrationPlugin winmm PUBLIC_LIBRARIES Qt::Core - Qt::EventDispatcherSupport - Qt::FontDatabaseSupport + Qt::CorePrivate + Qt::EventDispatcherSupportPrivate + Qt::FontDatabaseSupportPrivate Qt::Gui - Qt::ThemeSupport + Qt::GuiPrivate + Qt::ThemeSupportPrivate dwmapi imm32 oleaut32 @@ -110,19 +107,15 @@ qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_accessibility uiautomation/qwindowsuiautils.cpp uiautomation/qwindowsuiautils.h uiautomation/qwindowsuiavalueprovider.cpp uiautomation/qwindowsuiavalueprovider.h uiautomation/qwindowsuiawindowprovider.cpp uiautomation/qwindowsuiawindowprovider.h - LIBRARIES - Qt::AccessibilitySupportPrivate PUBLIC_LIBRARIES - Qt::AccessibilitySupport + Qt::AccessibilitySupportPrivate ) qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_vulkan SOURCES qwindowsvulkaninstance.cpp qwindowsvulkaninstance.h - LIBRARIES - Qt::VulkanSupportPrivate PUBLIC_LIBRARIES - Qt::VulkanSupport + Qt::VulkanSupportPrivate ) #### Keys ignored in scope 4:.:.:windows.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN: @@ -220,10 +213,8 @@ if(QT_FEATURE_imageformat_png) endif() qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_accessibility AND TARGET Qt::WindowsUIAutomationSupportPrivate - LIBRARIES - Qt::WindowsUIAutomationSupportPrivate PUBLIC_LIBRARIES - Qt::WindowsUIAutomationSupport + Qt::WindowsUIAutomationSupportPrivate ) qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_accessibility AND mingw diff --git a/src/plugins/platforms/xcb/.prev_CMakeLists.txt b/src/plugins/platforms/xcb/.prev_CMakeLists.txt index c504bbc64d..e15d45aa63 100644 --- a/src/plugins/platforms/xcb/.prev_CMakeLists.txt +++ b/src/plugins/platforms/xcb/.prev_CMakeLists.txt @@ -38,7 +38,7 @@ qt_add_module(XcbQpa QT_NO_FOREACH INCLUDE_DIRECTORIES gl_integrations - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate Qt::EdidSupportPrivate Qt::FontDatabaseSupportPrivate @@ -46,14 +46,6 @@ qt_add_module(XcbQpa Qt::ServiceSupportPrivate Qt::ThemeSupportPrivate Qt::XkbCommonSupportPrivate - PUBLIC_LIBRARIES - Qt::Core - Qt::EdidSupport - Qt::FontDatabaseSupport - Qt::Gui - Qt::ServiceSupport - Qt::ThemeSupport - Qt::XkbCommonSupport XCB::ICCCM XCB::IMAGE XCB::KEYSYMS @@ -75,20 +67,16 @@ qt_add_module(XcbQpa ##################################################################### qt_extend_target(XcbQpa CONDITION TARGET Qt::LinuxAccessibilitySupportPrivate - LIBRARIES - Qt::LinuxAccessibilitySupportPrivate PUBLIC_LIBRARIES - Qt::LinuxAccessibilitySupport + Qt::LinuxAccessibilitySupportPrivate ) qt_extend_target(XcbQpa CONDITION QT_FEATURE_vulkan SOURCES qxcbvulkaninstance.cpp qxcbvulkaninstance.h qxcbvulkanwindow.cpp qxcbvulkanwindow.h - LIBRARIES - Qt::VulkanSupportPrivate PUBLIC_LIBRARIES - Qt::VulkanSupport + Qt::VulkanSupportPrivate ) qt_extend_target(XcbQpa CONDITION QT_FEATURE_glib @@ -146,24 +134,20 @@ qt_extend_target(XcbQpa CONDITION QT_FEATURE_fontconfig AND QT_FEATURE_xcb_nativ WrapFreetype::WrapFreetype ) ##################################################################### -## qxcb Plugin: +## QXcbIntegrationPlugin Plugin: ##################################################################### -qt_add_plugin(qxcb +qt_add_plugin(QXcbIntegrationPlugin + OUTPUT_NAME qxcb TYPE platforms - CLASS_NAME QXcbIntegrationPlugin SOURCES qxcbmain.cpp DEFINES QT_NO_FOREACH - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate Qt::GuiPrivate Qt::XcbQpaPrivate - PUBLIC_LIBRARIES - Qt::Core - Qt::Gui - Qt::XcbQpa ) #### Keys ignored in scope 19:.:.:xcb-plugin.pro:: diff --git a/src/plugins/platforms/xcb/CMakeLists.txt b/src/plugins/platforms/xcb/CMakeLists.txt index c74e33e31a..1bb8d7f53f 100644 --- a/src/plugins/platforms/xcb/CMakeLists.txt +++ b/src/plugins/platforms/xcb/CMakeLists.txt @@ -60,7 +60,7 @@ qt_add_module(XcbQpa QT_NO_FOREACH INCLUDE_DIRECTORIES gl_integrations - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate Qt::EdidSupportPrivate Qt::FontDatabaseSupportPrivate @@ -69,14 +69,6 @@ qt_add_module(XcbQpa Qt::ThemeSupportPrivate Qt::XkbCommonSupportPrivate PkgConfig::XKB_COMMON_X11 # special case - PUBLIC_LIBRARIES - Qt::Core - Qt::EdidSupport - Qt::FontDatabaseSupport - Qt::Gui - Qt::ServiceSupport - Qt::ThemeSupport - Qt::XkbCommonSupport XCB::ICCCM XCB::IMAGE XCB::KEYSYMS @@ -98,20 +90,16 @@ qt_add_module(XcbQpa ##################################################################### qt_extend_target(XcbQpa CONDITION TARGET Qt::LinuxAccessibilitySupportPrivate - LIBRARIES - Qt::LinuxAccessibilitySupportPrivate PUBLIC_LIBRARIES - Qt::LinuxAccessibilitySupport + Qt::LinuxAccessibilitySupportPrivate ) qt_extend_target(XcbQpa CONDITION QT_FEATURE_vulkan SOURCES qxcbvulkaninstance.cpp qxcbvulkaninstance.h qxcbvulkanwindow.cpp qxcbvulkanwindow.h - LIBRARIES - Qt::VulkanSupportPrivate PUBLIC_LIBRARIES - Qt::VulkanSupport + Qt::VulkanSupportPrivate ) qt_extend_target(XcbQpa CONDITION QT_FEATURE_glib @@ -185,25 +173,21 @@ endif() # special case end ##################################################################### -## qxcb Plugin: +## QXcbIntegrationPlugin Plugin: ##################################################################### -qt_add_plugin(qxcb +qt_add_plugin(QXcbIntegrationPlugin + OUTPUT_NAME qxcb TYPE platforms - CLASS_NAME QXcbIntegrationPlugin DEFAULT_IF ${QT_QPA_DEFAULT_PLATFORM} MATCHES xcb # special case SOURCES qxcbmain.cpp DEFINES QT_NO_FOREACH - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate Qt::GuiPrivate Qt::XcbQpaPrivate - PUBLIC_LIBRARIES - Qt::Core - Qt::Gui - Qt::XcbQpa ) #### Keys ignored in scope 19:.:.:xcb-plugin.pro:: 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 14d91295aa..a78d01ec87 100644 --- a/src/plugins/platforms/xcb/gl_integrations/xcb_egl/CMakeLists.txt +++ b/src/plugins/platforms/xcb/gl_integrations/xcb_egl/CMakeLists.txt @@ -18,14 +18,11 @@ qt_add_plugin(QXcbEglIntegrationPlugin INCLUDE_DIRECTORIES .. ../.. - LIBRARIES + PUBLIC_LIBRARIES + Qt::Core Qt::CorePrivate Qt::EglSupportPrivate + Qt::Gui Qt::GuiPrivate Qt::XcbQpaPrivate - PUBLIC_LIBRARIES - Qt::Core - Qt::EglSupport - Qt::Gui - Qt::XcbQpa ) 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 494392ad1a..b3361dbd99 100644 --- a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/CMakeLists.txt +++ b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/CMakeLists.txt @@ -18,16 +18,13 @@ qt_add_plugin(QXcbGlxIntegrationPlugin INCLUDE_DIRECTORIES .. ../.. - LIBRARIES + PUBLIC_LIBRARIES + Qt::Core Qt::CorePrivate Qt::GlxSupportPrivate + Qt::Gui Qt::GuiPrivate Qt::XcbQpaPrivate - PUBLIC_LIBRARIES - Qt::Core - Qt::GlxSupport - Qt::Gui - Qt::XcbQpa ) ## Scopes: diff --git a/src/plugins/platformthemes/gtk3/.prev_CMakeLists.txt b/src/plugins/platformthemes/gtk3/.prev_CMakeLists.txt index d5cfb31507..0784de2ca8 100644 --- a/src/plugins/platformthemes/gtk3/.prev_CMakeLists.txt +++ b/src/plugins/platformthemes/gtk3/.prev_CMakeLists.txt @@ -14,15 +14,13 @@ qt_add_plugin(QGtk3ThemePlugin qgtk3theme.cpp qgtk3theme.h DEFINES GDK_VERSION_MIN_REQUIRED=GDK_VERSION_3_6 - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate - Qt::ThemeSupportPrivate PUBLIC_LIBRARIES PkgConfig::GTK3 Qt::Core + Qt::CorePrivate Qt::Gui - Qt::ThemeSupport + Qt::GuiPrivate + Qt::ThemeSupportPrivate ) #### Keys ignored in scope 1:.:.:gtk3.pro:: diff --git a/src/plugins/platformthemes/gtk3/CMakeLists.txt b/src/plugins/platformthemes/gtk3/CMakeLists.txt index 9b1ed2242e..4e56e4a6b3 100644 --- a/src/plugins/platformthemes/gtk3/CMakeLists.txt +++ b/src/plugins/platformthemes/gtk3/CMakeLists.txt @@ -17,16 +17,15 @@ qt_add_plugin(QGtk3ThemePlugin qgtk3theme.cpp qgtk3theme.h DEFINES GDK_VERSION_MIN_REQUIRED=GDK_VERSION_3_6 - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate - Qt::ThemeSupportPrivate + LIBRARIES # special case X11::X11 # special case PUBLIC_LIBRARIES PkgConfig::GTK3 Qt::Core + Qt::CorePrivate Qt::Gui - Qt::ThemeSupport + Qt::GuiPrivate + Qt::ThemeSupportPrivate ) #### Keys ignored in scope 1:.:.:gtk3.pro:: diff --git a/src/plugins/platformthemes/xdgdesktopportal/CMakeLists.txt b/src/plugins/platformthemes/xdgdesktopportal/CMakeLists.txt index f41e041729..a9062f695f 100644 --- a/src/plugins/platformthemes/xdgdesktopportal/CMakeLists.txt +++ b/src/plugins/platformthemes/xdgdesktopportal/CMakeLists.txt @@ -11,15 +11,13 @@ qt_add_plugin(QXdgDesktopPortalThemePlugin main.cpp qxdgdesktopportalfiledialog.cpp qxdgdesktopportalfiledialog_p.h qxdgdesktopportaltheme.cpp qxdgdesktopportaltheme.h - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate - Qt::ThemeSupportPrivate PUBLIC_LIBRARIES Qt::Core + Qt::CorePrivate Qt::DBus Qt::Gui - Qt::ThemeSupport + Qt::GuiPrivate + Qt::ThemeSupportPrivate ) #### Keys ignored in scope 1:.:.:xdgdesktopportal.pro:: diff --git a/src/plugins/printsupport/cocoa/CMakeLists.txt b/src/plugins/printsupport/cocoa/CMakeLists.txt index 3821150fdc..72660dc173 100644 --- a/src/plugins/printsupport/cocoa/CMakeLists.txt +++ b/src/plugins/printsupport/cocoa/CMakeLists.txt @@ -9,14 +9,12 @@ qt_add_plugin(QCocoaPrinterSupportPlugin TYPE printsupport SOURCES main.cpp - LIBRARIES - Qt::GuiPrivate - Qt::PrintSupportPrivate PUBLIC_LIBRARIES ${FWAppKit} Qt::Core Qt::Gui - Qt::PrintSupport + Qt::GuiPrivate + Qt::PrintSupportPrivate ) #### Keys ignored in scope 1:.:.:cocoa.pro:: diff --git a/src/plugins/printsupport/cups/.prev_CMakeLists.txt b/src/plugins/printsupport/cups/.prev_CMakeLists.txt index 9967b8138e..c65ffb89c7 100644 --- a/src/plugins/printsupport/cups/.prev_CMakeLists.txt +++ b/src/plugins/printsupport/cups/.prev_CMakeLists.txt @@ -16,13 +16,13 @@ qt_add_plugin(QCupsPrinterSupportPlugin ../../../printsupport/kernel LIBRARIES Cups::Cups - Qt::CorePrivate - Qt::GuiPrivate - Qt::PrintSupportPrivate PUBLIC_LIBRARIES Qt::Core + Qt::CorePrivate Qt::Gui + Qt::GuiPrivate Qt::PrintSupport + Qt::PrintSupportPrivate ) #### Keys ignored in scope 1:.:.:cups.pro:: diff --git a/src/plugins/printsupport/cups/CMakeLists.txt b/src/plugins/printsupport/cups/CMakeLists.txt index deba344c54..5c920443ea 100644 --- a/src/plugins/printsupport/cups/CMakeLists.txt +++ b/src/plugins/printsupport/cups/CMakeLists.txt @@ -18,13 +18,13 @@ qt_add_plugin(QCupsPrinterSupportPlugin ../../../printsupport/kernel LIBRARIES Cups::Cups - Qt::CorePrivate - Qt::GuiPrivate - Qt::PrintSupportPrivate PUBLIC_LIBRARIES Qt::Core + Qt::CorePrivate Qt::Gui + Qt::GuiPrivate Qt::PrintSupport + Qt::PrintSupportPrivate ) #### Keys ignored in scope 1:.:.:cups.pro:: diff --git a/src/plugins/sqldrivers/db2/CMakeLists.txt b/src/plugins/sqldrivers/db2/CMakeLists.txt index a75d28e19d..637461e168 100644 --- a/src/plugins/sqldrivers/db2/CMakeLists.txt +++ b/src/plugins/sqldrivers/db2/CMakeLists.txt @@ -13,13 +13,11 @@ qt_add_plugin(QDB2DriverPlugin DEFINES QT_NO_CAST_FROM_ASCII QT_NO_CAST_TO_ASCII - LIBRARIES - Qt::CorePrivate - Qt::SqlPrivate PUBLIC_LIBRARIES DB2::DB2 Qt::Core - Qt::Sql + Qt::CorePrivate + Qt::SqlPrivate ) #### Keys ignored in scope 1:.:.:db2.pro:: diff --git a/src/plugins/sqldrivers/mysql/CMakeLists.txt b/src/plugins/sqldrivers/mysql/CMakeLists.txt index 7a55786300..c99f322dfb 100644 --- a/src/plugins/sqldrivers/mysql/CMakeLists.txt +++ b/src/plugins/sqldrivers/mysql/CMakeLists.txt @@ -13,13 +13,11 @@ qt_add_plugin(QMYSQLDriverPlugin DEFINES QT_NO_CAST_FROM_ASCII QT_NO_CAST_TO_ASCII - LIBRARIES - Qt::CorePrivate - Qt::SqlPrivate PUBLIC_LIBRARIES MySQL::MySQL Qt::Core - Qt::Sql + Qt::CorePrivate + Qt::SqlPrivate ) #### Keys ignored in scope 1:.:.:mysql.pro:: diff --git a/src/plugins/sqldrivers/oci/CMakeLists.txt b/src/plugins/sqldrivers/oci/CMakeLists.txt index d3c1d0c74c..713c9fc871 100644 --- a/src/plugins/sqldrivers/oci/CMakeLists.txt +++ b/src/plugins/sqldrivers/oci/CMakeLists.txt @@ -13,13 +13,11 @@ qt_add_plugin(QOCIDriverPlugin DEFINES QT_NO_CAST_FROM_ASCII QT_NO_CAST_TO_ASCII - LIBRARIES - Qt::CorePrivate - Qt::SqlPrivate PUBLIC_LIBRARIES Oracle::OCI Qt::Core - Qt::Sql + Qt::CorePrivate + Qt::SqlPrivate ) #### Keys ignored in scope 1:.:.:oci.pro:: diff --git a/src/plugins/sqldrivers/odbc/.prev_CMakeLists.txt b/src/plugins/sqldrivers/odbc/.prev_CMakeLists.txt index 2452d50989..692d1fc294 100644 --- a/src/plugins/sqldrivers/odbc/.prev_CMakeLists.txt +++ b/src/plugins/sqldrivers/odbc/.prev_CMakeLists.txt @@ -13,13 +13,11 @@ qt_add_plugin(QODBCDriverPlugin DEFINES QT_NO_CAST_FROM_ASCII QT_NO_CAST_TO_ASCII - LIBRARIES - Qt::CorePrivate - Qt::SqlPrivate PUBLIC_LIBRARIES ODBC::ODBC Qt::Core - Qt::Sql + Qt::CorePrivate + Qt::SqlPrivate ) #### Keys ignored in scope 1:.:.:odbc.pro:: diff --git a/src/plugins/sqldrivers/odbc/CMakeLists.txt b/src/plugins/sqldrivers/odbc/CMakeLists.txt index 0e19306786..5c163181c5 100644 --- a/src/plugins/sqldrivers/odbc/CMakeLists.txt +++ b/src/plugins/sqldrivers/odbc/CMakeLists.txt @@ -14,13 +14,11 @@ qt_add_plugin(QODBCDriverPlugin DEFINES QT_NO_CAST_FROM_ASCII QT_NO_CAST_TO_ASCII - LIBRARIES - Qt::CorePrivate - Qt::SqlPrivate PUBLIC_LIBRARIES ODBC::ODBC Qt::Core - Qt::Sql + Qt::CorePrivate + Qt::SqlPrivate ) #### Keys ignored in scope 1:.:.:odbc.pro:: diff --git a/src/plugins/sqldrivers/psql/.prev_CMakeLists.txt b/src/plugins/sqldrivers/psql/.prev_CMakeLists.txt index 7df66eeb51..f3cec6d302 100644 --- a/src/plugins/sqldrivers/psql/.prev_CMakeLists.txt +++ b/src/plugins/sqldrivers/psql/.prev_CMakeLists.txt @@ -13,13 +13,11 @@ qt_add_plugin(QPSQLDriverPlugin DEFINES QT_NO_CAST_FROM_ASCII QT_NO_CAST_TO_ASCII - LIBRARIES - Qt::CorePrivate - Qt::SqlPrivate PUBLIC_LIBRARIES PostgreSQL::PostgreSQL Qt::Core - Qt::Sql + Qt::CorePrivate + Qt::SqlPrivate ) #### Keys ignored in scope 1:.:.:psql.pro:: diff --git a/src/plugins/sqldrivers/psql/CMakeLists.txt b/src/plugins/sqldrivers/psql/CMakeLists.txt index e4f794f523..03a2dc69c3 100644 --- a/src/plugins/sqldrivers/psql/CMakeLists.txt +++ b/src/plugins/sqldrivers/psql/CMakeLists.txt @@ -18,13 +18,11 @@ qt_add_plugin(QPSQLDriverPlugin DEFINES QT_NO_CAST_FROM_ASCII QT_NO_CAST_TO_ASCII - LIBRARIES - Qt::CorePrivate - Qt::SqlPrivate PUBLIC_LIBRARIES PostgreSQL::PostgreSQL Qt::Core - Qt::Sql + Qt::CorePrivate + Qt::SqlPrivate ) #### Keys ignored in scope 1:.:.:psql.pro:: diff --git a/src/plugins/sqldrivers/sqlite/.prev_CMakeLists.txt b/src/plugins/sqldrivers/sqlite/.prev_CMakeLists.txt index 6e17dfe302..d258c23821 100644 --- a/src/plugins/sqldrivers/sqlite/.prev_CMakeLists.txt +++ b/src/plugins/sqldrivers/sqlite/.prev_CMakeLists.txt @@ -13,12 +13,10 @@ qt_add_plugin(QSQLiteDriverPlugin DEFINES QT_NO_CAST_FROM_ASCII QT_NO_CAST_TO_ASCII - LIBRARIES - Qt::CorePrivate - Qt::SqlPrivate PUBLIC_LIBRARIES Qt::Core - Qt::Sql + Qt::CorePrivate + Qt::SqlPrivate ) #### Keys ignored in scope 1:.:.:sqlite.pro:: diff --git a/src/plugins/sqldrivers/sqlite/CMakeLists.txt b/src/plugins/sqldrivers/sqlite/CMakeLists.txt index 98c94a426a..d1453638b3 100644 --- a/src/plugins/sqldrivers/sqlite/CMakeLists.txt +++ b/src/plugins/sqldrivers/sqlite/CMakeLists.txt @@ -13,13 +13,12 @@ qt_add_plugin(QSQLiteDriverPlugin DEFINES QT_NO_CAST_FROM_ASCII QT_NO_CAST_TO_ASCII - LIBRARIES - Qt::CorePrivate - Qt::SqlPrivate + LIBRARIES # special case SQLite::SQLite3 # special case PUBLIC_LIBRARIES Qt::Core - Qt::Sql + Qt::CorePrivate + Qt::SqlPrivate ) #### Keys ignored in scope 1:.:.:sqlite.pro:: diff --git a/src/plugins/styles/mac/CMakeLists.txt b/src/plugins/styles/mac/CMakeLists.txt index 6b039c0ddc..140d4e4c93 100644 --- a/src/plugins/styles/mac/CMakeLists.txt +++ b/src/plugins/styles/mac/CMakeLists.txt @@ -13,11 +13,10 @@ qt_add_plugin(QMacStylePlugin qmacstyle_mac_p_p.h LIBRARIES ${FWAppKit} - Qt::WidgetsPrivate PUBLIC_LIBRARIES Qt::Core Qt::Gui - Qt::Widgets + Qt::WidgetsPrivate ) #### Keys ignored in scope 1:.:.:mac.pro:: diff --git a/src/plugins/styles/windowsvista/CMakeLists.txt b/src/plugins/styles/windowsvista/CMakeLists.txt index 4030344f06..008fa624fe 100644 --- a/src/plugins/styles/windowsvista/CMakeLists.txt +++ b/src/plugins/styles/windowsvista/CMakeLists.txt @@ -14,14 +14,13 @@ qt_add_plugin(QWindowsVistaStylePlugin qwindowsxpstyle.cpp qwindowsxpstyle_p.h qwindowsxpstyle_p_p.h LIBRARIES - Qt::WidgetsPrivate gdi32 user32 uxtheme PUBLIC_LIBRARIES Qt::Core Qt::Gui - Qt::Widgets + Qt::WidgetsPrivate ) #### Keys ignored in scope 1:.:.:windowsvista.pro:: diff --git a/src/printsupport/CMakeLists.txt b/src/printsupport/CMakeLists.txt index b2d653125f..c11b9d8b15 100644 --- a/src/printsupport/CMakeLists.txt +++ b/src/printsupport/CMakeLists.txt @@ -32,6 +32,10 @@ qt_add_module(PrintSupport Qt::Core Qt::Gui Qt::Widgets + PRIVATE_MODULE_INTERFACE + Qt::CorePrivate + Qt::GuiPrivate + Qt::WidgetsPrivate ) #### Keys ignored in scope 1:.:.:printsupport.pro:: diff --git a/src/sql/CMakeLists.txt b/src/sql/CMakeLists.txt index 49a1df0fdb..1bf3a3df2a 100644 --- a/src/sql/CMakeLists.txt +++ b/src/sql/CMakeLists.txt @@ -27,6 +27,8 @@ qt_add_module(Sql Qt::CorePrivate PUBLIC_LIBRARIES Qt::Core + PRIVATE_MODULE_INTERFACE + Qt::CorePrivate PRECOMPILED_HEADER "../corelib/global/qt_pch.h" ) diff --git a/src/testlib/.prev_CMakeLists.txt b/src/testlib/.prev_CMakeLists.txt index 5859ae18fa..29c73d597e 100644 --- a/src/testlib/.prev_CMakeLists.txt +++ b/src/testlib/.prev_CMakeLists.txt @@ -59,6 +59,8 @@ qt_add_module(Test Qt::CorePrivate PUBLIC_LIBRARIES Qt::Core + PRIVATE_MODULE_INTERFACE + Qt::CorePrivate COMPILE_OPTIONS --cs-exclude-file-abs-wildcard=${QT_SOURCE_TREE}/* --cs-include-file-abs-wildcard=*/src/testlib/* diff --git a/src/testlib/CMakeLists.txt b/src/testlib/CMakeLists.txt index 8d8b09beba..79138707e3 100644 --- a/src/testlib/CMakeLists.txt +++ b/src/testlib/CMakeLists.txt @@ -60,6 +60,8 @@ qt_add_module(Test Qt::CorePrivate PUBLIC_LIBRARIES Qt::Core + PRIVATE_MODULE_INTERFACE + Qt::CorePrivate # special case begin # remove COMPILE_OPTIONS, LINK_OPTIONS, COVERAGE_OPTIONS # figure out how it should be handled. diff --git a/src/tools/qdbuscpp2xml/.prev_CMakeLists.txt b/src/tools/qdbuscpp2xml/.prev_CMakeLists.txt index 9d51b4eac9..58a8ea2b08 100644 --- a/src/tools/qdbuscpp2xml/.prev_CMakeLists.txt +++ b/src/tools/qdbuscpp2xml/.prev_CMakeLists.txt @@ -23,7 +23,7 @@ qt_add_tool(qdbuscpp2xml INCLUDE_DIRECTORIES ../moc ../moc/../../3rdparty/tinycbor/src - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate ) @@ -35,15 +35,11 @@ qt_add_tool(qdbuscpp2xml ##################################################################### qt_extend_target(qdbuscpp2xml CONDITION force_bootstrap - LIBRARIES - bootstrap_dbusPrivate PUBLIC_LIBRARIES - bootstrap_dbus + bootstrap_dbusPrivate ) qt_extend_target(qdbuscpp2xml CONDITION NOT force_bootstrap - LIBRARIES - Qt::DBusPrivate PUBLIC_LIBRARIES - Qt::DBus + Qt::DBusPrivate ) diff --git a/src/tools/qdbuscpp2xml/CMakeLists.txt b/src/tools/qdbuscpp2xml/CMakeLists.txt index 499e5fb6ae..46582793a1 100644 --- a/src/tools/qdbuscpp2xml/CMakeLists.txt +++ b/src/tools/qdbuscpp2xml/CMakeLists.txt @@ -24,7 +24,7 @@ qt_add_tool(qdbuscpp2xml INCLUDE_DIRECTORIES ../moc ../moc/../../3rdparty/tinycbor/src - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate Qt::DBusPrivate # COMPILE_OPTIONS # special case diff --git a/src/tools/qdbusxml2cpp/.prev_CMakeLists.txt b/src/tools/qdbusxml2cpp/.prev_CMakeLists.txt index 202e751727..ce9438b207 100644 --- a/src/tools/qdbusxml2cpp/.prev_CMakeLists.txt +++ b/src/tools/qdbusxml2cpp/.prev_CMakeLists.txt @@ -10,7 +10,7 @@ qt_add_tool(qdbusxml2cpp DEFINES QT_NO_CAST_FROM_ASCII QT_NO_FOREACH - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate ) @@ -22,15 +22,11 @@ qt_add_tool(qdbusxml2cpp ##################################################################### qt_extend_target(qdbusxml2cpp CONDITION NOT force_bootstrap - LIBRARIES - Qt::DBusPrivate PUBLIC_LIBRARIES - Qt::DBus + Qt::DBusPrivate ) qt_extend_target(qdbusxml2cpp CONDITION force_bootstrap - LIBRARIES - bootstrap_dbusPrivate PUBLIC_LIBRARIES - bootstrap_dbus + bootstrap_dbusPrivate ) diff --git a/src/tools/qdbusxml2cpp/CMakeLists.txt b/src/tools/qdbusxml2cpp/CMakeLists.txt index f97cbb1180..63700f0b6b 100644 --- a/src/tools/qdbusxml2cpp/CMakeLists.txt +++ b/src/tools/qdbusxml2cpp/CMakeLists.txt @@ -11,7 +11,7 @@ qt_add_tool(qdbusxml2cpp DEFINES QT_NO_CAST_FROM_ASCII QT_NO_FOREACH - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate Qt::DBusPrivate # COMPILE_OPTIONS # special case diff --git a/src/widgets/.prev_CMakeLists.txt b/src/widgets/.prev_CMakeLists.txt index e8b01ff99c..db39f84104 100644 --- a/src/widgets/.prev_CMakeLists.txt +++ b/src/widgets/.prev_CMakeLists.txt @@ -60,6 +60,9 @@ qt_add_module(Widgets PUBLIC_LIBRARIES Qt::Core Qt::Gui + PRIVATE_MODULE_INTERFACE + Qt::CorePrivate + Qt::GuiPrivate PRECOMPILED_HEADER "kernel/qt_widgets_pch.h" ) diff --git a/src/widgets/CMakeLists.txt b/src/widgets/CMakeLists.txt index a7ba83bde8..e756b27bee 100644 --- a/src/widgets/CMakeLists.txt +++ b/src/widgets/CMakeLists.txt @@ -60,6 +60,9 @@ qt_add_module(Widgets PUBLIC_LIBRARIES Qt::Core Qt::Gui + PRIVATE_MODULE_INTERFACE + Qt::CorePrivate + Qt::GuiPrivate PRECOMPILED_HEADER "kernel/qt_widgets_pch.h" ) diff --git a/src/xml/CMakeLists.txt b/src/xml/CMakeLists.txt index 52bca5c3c4..8b79b9df45 100644 --- a/src/xml/CMakeLists.txt +++ b/src/xml/CMakeLists.txt @@ -17,6 +17,8 @@ qt_add_module(Xml Qt::CorePrivate PUBLIC_LIBRARIES Qt::Core + PRIVATE_MODULE_INTERFACE + Qt::CorePrivate ) ## Scopes: -- cgit v1.2.3 From 20bb59ca61e6e40e04092771d8f1116dc011f9bc Mon Sep 17 00:00:00 2001 From: Leander Beernaert Date: Mon, 3 Feb 2020 16:52:18 +0100 Subject: Allow manually specification of moc.json files for metatype generation qt6_generate_meta_types_json_file() has been extended to allow the generated moc_....cpp.json files to be manually specified. This now enabled the metatype generation to be used without resorting to AUTOMOC. Additionally, Core_qobject declaration order has been temporarily moved as it otherwise does not produce the correct metatypes dependency file for Core. This will be fixed in a follow up patch. Change-Id: I3266ab3073db478458a0c1dbc8b9fbab16622a64 Reviewed-by: Qt CMake Build Bot Reviewed-by: Alexandru Croitor --- src/corelib/CMakeLists.txt | 21 ++++++- src/corelib/Qt6CoreMacros.cmake | 136 ++++++++++++++++++++++++++-------------- 2 files changed, 108 insertions(+), 49 deletions(-) (limited to 'src') diff --git a/src/corelib/CMakeLists.txt b/src/corelib/CMakeLists.txt index ca53e47ac3..1ec6eb5029 100644 --- a/src/corelib/CMakeLists.txt +++ b/src/corelib/CMakeLists.txt @@ -26,6 +26,10 @@ file(RELATIVE_PATH QT_INVERSE_CONFIG_INSTALL_DIR ${_clean_prefix} ${CMAKE_INSTAL ## Core Module: ##################################################################### +# special case begin +add_library(Core_qobject OBJECT) +# special case end + qt_add_module(Core GENERATE_METATYPES QMAKE_MODULE_CONFIG moc resources @@ -112,7 +116,7 @@ qt_add_module(Core kernel/qmetatype.cpp kernel/qmetatype.h kernel/qmetatype_p.h kernel/qmetatypeswitcher_p.h kernel/qmimedata.cpp kernel/qmimedata.h - # kernel/qobject.cpp kernel/qobject.h kernel/qobject_p.h # special case + # kernel/qobject.cpp kernel/qobject.h kernel/qobject_p.h # special case kernel/qobject_impl.h kernel/qobjectcleanuphandler.cpp kernel/qobjectcleanuphandler.h kernel/qobjectdefs.h @@ -260,6 +264,7 @@ qt_add_module(Core QtHarfBuzz # special case Threads::Threads # special case WrapDoubleConversion::WrapDoubleConversion # special case + Core_qobject PUBLIC_LIBRARIES # special case: Qt::Platform # special case: # special case begin @@ -284,8 +289,8 @@ qt_generate_qconfig_cpp() # Handle QObject: Automoc does not work for this as it would # require to spill internals into users: -add_library(Core_qobject OBJECT) -qt_manual_moc(qobject_moc_files kernel/qobject.h global/qnamespace.h) +set_target_properties(Core_qobject PROPERTIES AUTOMOC OFF) +qt_manual_moc(qobject_moc_files OUTPUT_MOC_JSON_FILES core_qobject_metatypes_json_list kernel/qobject.h global/qnamespace.h) set_source_files_properties(${qobject_moc_files} PROPERTIES HEADER_FILE_ONLY ON) target_sources(Core_qobject PRIVATE global/qnamespace.h @@ -299,6 +304,16 @@ target_include_directories(Core_qobject PRIVATE "${CMAKE_CURRENT_BINARY_DIR}/ker target_link_libraries(Core_qobject PRIVATE Qt::Platform Qt::GlobalConfig) target_link_libraries(Core PRIVATE Core_qobject) +set(core_qobject_metatypes_json_args) +if (NOT QT_WILL_INSTALL) + set(core_qobject_metatypes_json_args INSTALL_DIR "${QT_BUILD_DIR}/${INSTALL_LIBDIR}/metatypes") +endif() + +qt6_generate_meta_types_json_file(Core_qobject + MANUAL_MOC_JSON_FILES ${core_qobject_metatypes_json_list} + ${core_qobject_metatypes_json_args} +) + if(NOT BUILD_SHARED_LIBS) install( TARGETS Core_qobject diff --git a/src/corelib/Qt6CoreMacros.cmake b/src/corelib/Qt6CoreMacros.cmake index 21910078ea..1810fdeb65 100644 --- a/src/corelib/Qt6CoreMacros.cmake +++ b/src/corelib/Qt6CoreMacros.cmake @@ -691,14 +691,23 @@ function(qt6_generate_meta_types_dep_file target dep_file dep_file_install) endfunction() # -# Generate Qt metatypes.json for a target +# Generate Qt metatypes.json for a target. By default we check whether AUTOMOC +# has been enabled and we extract the information from that target. Should you +# not wish to use automoc you need to pass in all the generated json files via the +# MANUAL_MOC_JSON_FILES parameter. The latter can be obtained by running moc with +# the --output-json parameter. # Params: # INSTALL_DIR: Location where to install the metatypes file (Optional) # COPY_OVER_INSTALL: When present will install the file via a post build step # copy rather than using install function(qt6_generate_meta_types_json_file target) - cmake_parse_arguments(arg "COPY_OVER_INSTALL" "INSTALL_DIR" "" ${ARGN}) + get_target_property(existing_meta_types_file ${target} INTERFACE_QT_META_TYPES_BUILD_FILE) + if (existing_meta_types_file) + return() + endif() + + cmake_parse_arguments(arg "COPY_OVER_INSTALL" "INSTALL_DIR" "MANUAL_MOC_JSON_FILES" ${ARGN}) if (NOT QT_BUILDING_QT) if (NOT arg_INSTALL_DIR) @@ -716,57 +725,80 @@ function(qt6_generate_meta_types_json_file target) endif() endif() - # Tell automoc to output json files - set_property(TARGET "${target}" APPEND PROPERTY - AUTOMOC_MOC_OPTIONS "--output-json" - ) - get_target_property(target_type ${target} TYPE) - if (target_type STREQUAL "INTERFACE_LIBRARY" OR CMAKE_VERSION VERSION_LESS "3.16.0") - # interface libraries not supported or cmake version is not high enough - message(WARNING "Meta types generation requires CMake >= 3.16") + if (target_type STREQUAL "INTERFACE_LIBRARY") + message(FATAL_ERROR "Meta types generation does not work on interface libraries") return() endif() - get_target_property(existing_meta_types_file ${target} INTERFACE_QT_META_TYPES_BUILD_FILE) - if (existing_meta_types_file) + if (CMAKE_VERSION VERSION_LESS "3.16.0") + message(FATAL_ERROR "Meta types generation requires CMake >= 3.16") return() endif() get_target_property(target_binary_dir ${target} BINARY_DIR) + set(type_list_file "${target_binary_dir}/meta_types/${target}_json_file_list.txt") + set(type_list_file_manual "${target_binary_dir}/meta_types/${target}_json_file_list_manual.txt") + + get_target_property(uses_automoc ${target} AUTOMOC) + set(automoc_args) + set(automoc_dependencies) + #Handle automoc generated data + if (uses_automoc) + # Tell automoc to output json files) + set_property(TARGET "${target}" APPEND PROPERTY + AUTOMOC_MOC_OPTIONS "--output-json" + ) - if(CMAKE_BUILD_TYPE) - set(cmake_autogen_cache_file - "${target_binary_dir}/CMakeFiles/${target}_autogen.dir/ParseCache.txt") - set(mutli_config_args - --cmake-autogen-include-dir-path "${target_binary_dir}/${target}_autogen/include" + if(CMAKE_BUILD_TYPE) + set(cmake_autogen_cache_file + "${target_binary_dir}/CMakeFiles/${target}_autogen.dir/ParseCache.txt") + set(mutli_config_args + --cmake-autogen-include-dir-path "${target_binary_dir}/${target}_autogen/include" + ) + else() + set(cmake_autogen_cache_file + "${target_binary_dir}/CMakeFiles/${target}_autogen.dir/ParseCache_$.txt") + set(mutli_config_args + --cmake-autogen-include-dir-path "${target_binary_dir}/${target}_autogen/include_$" + "--cmake-multi-config") + endif() + + set(cmake_autogen_info_file + "${target_binary_dir}/CMakeFiles/${target}_autogen.dir/AutogenInfo.json") + + add_custom_target(${target}_automoc_json_extraction + DEPENDS ${QT_CMAKE_EXPORT_NAMESPACE}::cmake_automoc_parser + BYPRODUCTS ${type_list_file} + COMMAND + ${QT_CMAKE_EXPORT_NAMESPACE}::cmake_automoc_parser + --cmake-autogen-cache-file "${cmake_autogen_cache_file}" + --cmake-autogen-info-file "${cmake_autogen_info_file}" + --output-file-path "${type_list_file}" + ${mutli_config_args} + COMMENT "Running Automoc file extraction" + COMMAND_EXPAND_LISTS ) - else() - set(cmake_autogen_cache_file - "${target_binary_dir}/CMakeFiles/${target}_autogen.dir/ParseCache_$.txt") - set(mutli_config_args - --cmake-autogen-include-dir-path "${target_binary_dir}/${target}_autogen/include_$" - "--cmake-multi-config") - endif() - - set(cmake_autogen_info_file - "${target_binary_dir}/CMakeFiles/${target}_autogen.dir/AutogenInfo.json") - set(type_list_file "${target_binary_dir}/meta_types/json_file_list.txt") - - add_custom_target(${target}_automoc_json_extraction - DEPENDS ${QT_CMAKE_EXPORT_NAMESPACE}::cmake_automoc_parser - BYPRODUCTS ${type_list_file} - COMMAND - ${QT_CMAKE_EXPORT_NAMESPACE}::cmake_automoc_parser - --cmake-autogen-cache-file "${cmake_autogen_cache_file}" - --cmake-autogen-info-file "${cmake_autogen_info_file}" - --output-file-path "${type_list_file}" - ${mutli_config_args} - COMMENT "Running Automoc file extraction" - COMMAND_EXPAND_LISTS - ) + add_dependencies(${target}_automoc_json_extraction ${target}_autogen) + set(automoc_args "@${type_list_file}") + set(automoc_dependencies "${type_list_file}") + endif() + + set(manual_args) + set(manual_dependencies) + if(arg_MANUAL_MOC_JSON_FILES) + list(REMOVE_DUPLICATES arg_MANUAL_MOC_JSON_FILES) + file(GENERATE + OUTPUT ${type_list_file_manual} + CONTENT "$,\n>" + ) + list(APPEND manual_dependencies ${arg_MANUAL_MOC_JSON_FILES} ${type_list_file_manual}) + set(manual_args "@${type_list_file_manual}") + endif() - add_dependencies(${target}_automoc_json_extraction ${target}_autogen) + if (NOT manual_args AND NOT automoc_args) + message(FATAL_ERROR "Metatype generation requires either the use of AUTOMOC or a manual list of generated json files") + endif() if (CMAKE_BUILD_TYPE) string(TOLOWER ${target}_${CMAKE_BUILD_TYPE} target_lowercase) @@ -781,10 +813,10 @@ function(qt6_generate_meta_types_json_file target) set(metatypes_dep_file "${target_binary_dir}/meta_types/${metatypes_dep_file_name}") add_custom_command(OUTPUT ${metatypes_file} - DEPENDS ${type_list_file} ${QT_CMAKE_EXPORT_NAMESPACE}::moc + DEPENDS ${QT_CMAKE_EXPORT_NAMESPACE}::moc ${automoc_dependencies} ${manual_dependencies} COMMAND ${QT_CMAKE_EXPORT_NAMESPACE}::moc -o ${metatypes_file} - --collect-json "@${type_list_file}" + --collect-json ${automoc_args} ${manual_args} COMMENT "Runing automoc with --collect-json" ) @@ -808,14 +840,26 @@ function(qt6_generate_meta_types_json_file target) ) if (arg_COPY_OVER_INSTALL) - add_custom_command(TARGET ${target} POST_BUILD + get_target_property(target_type ${target} TYPE) + set(command_args COMMAND ${CMAKE_COMMAND} -E copy_if_different "${metatypes_file}" "${arg_INSTALL_DIR}/${metatypes_file_name}" COMMAND ${CMAKE_COMMAND} -E copy_if_different "${metatypes_dep_file}.install" "${arg_INSTALL_DIR}/${metatypes_dep_file_name}" - ) + ) + if (target_type STREQUAL "OBJECT_LIBRARY") + add_custom_target(${target}_metatypes_copy + DEPENDS "${metatypes_file}" "${metatypes_dep_file}" + ${command_args} + ) + add_dependencies(${target} ${target}_metatypes_copy) + else() + add_custom_command(TARGET ${target} POST_BUILD + ${command_args} + ) + endif() else() install(FILES "${metatypes_file}" DESTINATION "${arg_INSTALL_DIR}" -- cgit v1.2.3 From c431e2d33c2b13dee8b43a08c267c20ec1ae9654 Mon Sep 17 00:00:00 2001 From: Leander Beernaert Date: Fri, 7 Feb 2020 14:12:27 +0100 Subject: Refactor Metatypes dependency propagation Every metatypes.json files is now added as an INTERFACE source file to a target. This enables us later to correctly collect all the metatypes.json files from dependent targets. This information is also correctly exported via export()/install(). To avoid the metatypes.json appearing in every target's source list, the file path is wrapped in a generator expression which will only be evaluated when the consuming target has the property QT_CONSUMES_METATYPES set to true. At the moment this is limited to targets which need to interact with qmltyperegistrar. Change-Id: I0ffebcd069a923383f7ed11cde2c94ecf2fb13f3 Reviewed-by: Alexandru Croitor --- src/corelib/CMakeLists.txt | 9 +++ src/corelib/Qt6CoreMacros.cmake | 156 +++++++++++----------------------------- 2 files changed, 49 insertions(+), 116 deletions(-) (limited to 'src') diff --git a/src/corelib/CMakeLists.txt b/src/corelib/CMakeLists.txt index 1ec6eb5029..64c993fe9f 100644 --- a/src/corelib/CMakeLists.txt +++ b/src/corelib/CMakeLists.txt @@ -321,6 +321,15 @@ if(NOT BUILD_SHARED_LIBS) ) endif() +# Core_qobject is never exported so we need to duplicate the metatypes file +# interface on Core +get_target_property(core_qobject_metatypes_file_genex_build Core_qobject QT_MODULE_META_TYPES_FILE_GENEX_BUILD) +get_target_property(core_qobject_metatypes_file_genex_install Core_qobject QT_MODULE_META_TYPES_FILE_GENEX_INSTALL) +target_sources(Core INTERFACE + ${core_qobject_metatypes_file_genex_build} + ${core_qobject_metatypes_file_genex_install} +) + set_property(TARGET Core APPEND PROPERTY PUBLIC_HEADER "${CMAKE_CURRENT_BINARY_DIR}/global/qconfig.h") set_property(TARGET Core APPEND PROPERTY diff --git a/src/corelib/Qt6CoreMacros.cmake b/src/corelib/Qt6CoreMacros.cmake index 1810fdeb65..2bc97c6d12 100644 --- a/src/corelib/Qt6CoreMacros.cmake +++ b/src/corelib/Qt6CoreMacros.cmake @@ -595,102 +595,7 @@ if(NOT QT_NO_CREATE_VERSIONLESS_FUNCTIONS) endfunction() endif() -# Generate metatypes dependency file. This function extracts the list of -# metatypes files as well as the dependency file from the direct library -# dependencies of a target via generator expressions. -# Parameters: -# dep_file: Location where to generate the dependency file for build time -# dependencies. -# dep_file_install: Location where to generate the dependency file which -# is expected to be installed. -function(qt6_generate_meta_types_dep_file target dep_file dep_file_install) - # Due to generator expressions it is not possible to recursively evaluate - # the LINK_LIBRARIES of target. Therefore we generate a dependency file for - # every module with metatypes which can be evaluated at build time. - # When generating this file we need to take into account that there are two - # levels at which dependencies can be expressed: build and install. - # Build dependencies refer to targets which are being built along side the - # original target. These targets' install dependencies are not available - # at this point in time. We set a special property on these targets that's - # only available at build time. - # Install dependencies refer to targets which are found via a find_package() - # call. - # Both install and build targets have the - # INTERFACE_QT_META_TYPES_INSTALL_[DEP_FILE|FILE]. When building the target, - # INTERFACE_QT_META_TYPES_INSTALL_... refer to the expected install - # directory to be appended to CMAKE_INSTALL_PREFIX. - # Only build target have the INTERFACE_QT_META_TYPES_[DEP_FILE|FILE] which - # point to the files that have been produced during build time. - # Finally, to make sure the targets actually have a metatypes files, we - # check if they have the INTERFACE_QT_MODULE_HAS_META_TYPES property. - # - # Note: All properties start with INTERFACE_ since it is the only way to - # set properties on interface targets that get generated in the - # QtModuleConfig.in - # - get_target_property(link_dependencies ${target} LINK_LIBRARIES) - set(prop_dep "INTERFACE_QT_META_TYPES_BUILD_DEP_FILE") - set(prop_file "INTERFACE_QT_META_TYPES_BUILD_FILE") - set(prop_file_install "INTERFACE_QT_META_TYPES_INSTALL_FILE") - set(prop_dep_install "INTERFACE_QT_META_TYPES_INSTALL_DEP_FILE") - set(prop_is_local "INTERFACE_QT_MODULE_META_TYPES_FROM_BUILD") - set(prop_has_metatypes "INTERFACE_QT_MODULE_HAS_META_TYPES") - - set(gen_exp "") - set(gen_exp_install "") - foreach(dep IN LISTS link_dependencies) - # Skip over any flags starting with -, like -framework or -lboo. - if("${dep}" MATCHES "^-") - continue() - endif() - # replace LINK_ONLY with true, or we will get an error evaluating that - # generator expression - string(REPLACE "$") - string(REPLACE "$>" - ) - set(genex_is_target "$,${genex_target},-NOTFOUND>>") - set(genex_has_metatypes - "$>" - ) - set(genex_get_metatypes - "$>" - ) - set(genex_get_metatypes_dep - "$>" - ) - set(genex_get_metatypes_install - "$>" - ) - set(genex_get_metatypes_install_dep - "$>" - ) - set(get_local_or_install - "$,${genex_get_metatypes}=${genex_get_metatypes_dep},${genex_get_metatypes_install}=${genex_get_metatypes_install_dep}>" - ) - - list(APPEND gen_exp - "$<$,$>:${get_local_or_install}>" - ) - - list(APPEND gen_exp_install - "$<$,$>:${genex_get_metatypes_install}=${genex_get_metatypes_install_dep}>" - ) - endforeach() - - file(GENERATE - OUTPUT "${dep_file}" - CONTENT "$,\n>" - ) - file(GENERATE - OUTPUT "${dep_file_install}" - CONTENT "$,\n>" - ) -endfunction() - -# # Generate Qt metatypes.json for a target. By default we check whether AUTOMOC # has been enabled and we extract the information from that target. Should you # not wish to use automoc you need to pass in all the generated json files via the @@ -808,36 +713,62 @@ function(qt6_generate_meta_types_json_file target) set(metatypes_file_name "qt6${target_lowercase}_metatypes.json") set(metatypes_file "${target_binary_dir}/meta_types/${metatypes_file_name}") + set(metatypes_file_gen "${target_binary_dir}/meta_types/${metatypes_file_name}.gen") set(metatypes_dep_file_name "qt6${target_lowercase}_metatypes_dep.txt") set(metatypes_dep_file "${target_binary_dir}/meta_types/${metatypes_dep_file_name}") - add_custom_command(OUTPUT ${metatypes_file} + # Due to generated source file dependency rules being tied to the directory + # scope in which they are created it is not possible for other targets which + # are defined in a separate scope to see these rules. This leads to failures + # in locating the generated source files. + # To work around this we write a dummy file to disk to make sure targets + # which link against the current target do not produce the error. This dummy + # file is then replaced with the contents of the generated file during + # build. + if (NOT EXISTS ${metatypes_file}) + file(MAKE_DIRECTORY "${target_binary_dir}/meta_types") + file(TOUCH ${metatypes_file}) + endif() + add_custom_command(OUTPUT ${metatypes_file_gen} ${metatypes_file} DEPENDS ${QT_CMAKE_EXPORT_NAMESPACE}::moc ${automoc_dependencies} ${manual_dependencies} COMMAND ${QT_CMAKE_EXPORT_NAMESPACE}::moc - -o ${metatypes_file} + -o ${metatypes_file_gen} --collect-json ${automoc_args} ${manual_args} + COMMAND ${CMAKE_COMMAND} -E copy_if_different + ${metatypes_file_gen} + ${metatypes_file} COMMENT "Runing automoc with --collect-json" ) - target_sources(${target} PRIVATE ${metatypes_file}) + # We still need to add this file as a source of Core, otherwise the file + # rule above is not triggered. INTERFACE_SOURCES do not properly register + # as dependencies to build the current target. + target_sources(${target} PRIVATE ${metatypes_file_gen}) + set(metatypes_file_genex_build) + set(metatypes_file_genex_install) + if (arg_COPY_OVER_INSTALL) + set(metatypes_file_genex_build + "$>:${arg_INSTALL_DIR}/${metatypes_file_name}>>" + ) + else() + set(metatypes_file_genex_build + "$>:${metatypes_file}>>" + ) + set(metatypes_file_genex_install + "$>:$/${arg_INSTALL_DIR}/${metatypes_file_name}>>" + ) + endif() set_source_files_properties(${metatypes_file} PROPERTIES HEADER_FILE_ONLY TRUE) - # Set the required properties. See documentation of - # qt6_generate_meta_types_dep_file() set_target_properties(${target} PROPERTIES INTERFACE_QT_MODULE_HAS_META_TYPES YES INTERFACE_QT_MODULE_META_TYPES_FROM_BUILD YES INTERFACE_QT_META_TYPES_BUILD_FILE ${metatypes_file} - INTERFACE_QT_META_TYPES_BUILD_DEP_FILE ${metatypes_dep_file} - INTERFACE_QT_META_TYPES_INSTALL_FILE "${arg_INSTALL_DIR}/${metatypes_file_name}" - INTERFACE_QT_META_TYPES_INSTALL_DEP_FILE "${arg_INSTALL_DIR}/${metatypes_dep_file_name}" + QT_MODULE_META_TYPES_FILE_GENEX_BUILD "${metatypes_file_genex_build}" + QT_MODULE_META_TYPES_FILE_GENEX_INSTALL "${metatypes_file_genex_install}" ) - - qt6_generate_meta_types_dep_file(${target} - "${metatypes_dep_file}" - "${metatypes_dep_file}.install" - ) + target_sources(${target} INTERFACE ${metatypes_file_genex_build} ${metatypes_file_genex_install}) if (arg_COPY_OVER_INSTALL) get_target_property(target_type ${target} TYPE) @@ -845,13 +776,10 @@ function(qt6_generate_meta_types_json_file target) COMMAND ${CMAKE_COMMAND} -E copy_if_different "${metatypes_file}" "${arg_INSTALL_DIR}/${metatypes_file_name}" - COMMAND ${CMAKE_COMMAND} -E copy_if_different - "${metatypes_dep_file}.install" - "${arg_INSTALL_DIR}/${metatypes_dep_file_name}" ) if (target_type STREQUAL "OBJECT_LIBRARY") add_custom_target(${target}_metatypes_copy - DEPENDS "${metatypes_file}" "${metatypes_dep_file}" + DEPENDS "${metatypes_file}" ${command_args} ) add_dependencies(${target} ${target}_metatypes_copy) @@ -864,10 +792,6 @@ function(qt6_generate_meta_types_json_file target) install(FILES "${metatypes_file}" DESTINATION "${arg_INSTALL_DIR}" ) - install(FILES "${metatypes_dep_file}.install" - DESTINATION "${arg_INSTALL_DIR}" - RENAME "${metatypes_dep_file_name}" - ) endif() endfunction() -- cgit v1.2.3