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/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 +- 68 files changed, 255 insertions(+), 518 deletions(-) (limited to 'src/plugins') 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:: -- cgit v1.2.3