From 77771116a4d43e4832494785bc0abde8f3d8fd58 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Fri, 29 May 2020 18:07:31 +0200 Subject: CMake: Regenerate src/plugins Change-Id: Icceceeb42023e7fa5edf320bb21f03d11bd357b7 Reviewed-by: Joerg Bornemann --- src/plugins/platforms/minimal/.prev_CMakeLists.txt | 8 ++++++-- src/plugins/platforms/minimal/CMakeLists.txt | 8 ++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) (limited to 'src/plugins/platforms/minimal') diff --git a/src/plugins/platforms/minimal/.prev_CMakeLists.txt b/src/plugins/platforms/minimal/.prev_CMakeLists.txt index e33bbc6815..e0ecf464cf 100644 --- a/src/plugins/platforms/minimal/.prev_CMakeLists.txt +++ b/src/plugins/platforms/minimal/.prev_CMakeLists.txt @@ -17,7 +17,6 @@ qt_internal_add_plugin(QMinimalIntegrationPlugin Qt::Core Qt::CorePrivate Qt::EventDispatcherSupportPrivate - Qt::FontDatabaseSupportPrivate Qt::Gui Qt::GuiPrivate ) @@ -28,10 +27,15 @@ qt_internal_add_plugin(QMinimalIntegrationPlugin ## Scopes: ##################################################################### +qt_extend_target(QMinimalIntegrationPlugin CONDITION NOT APPLE + PUBLIC_LIBRARIES + Qt::FontDatabaseSupportPrivate +) + qt_extend_target(QMinimalIntegrationPlugin CONDITION QT_FEATURE_freetype LIBRARIES WrapFreetype::WrapFreetype ) -#### Keys ignored in scope 3:.:.:minimal.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN: +#### Keys ignored in scope 4:.:.:minimal.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN: # PLUGIN_EXTENDS = "-" diff --git a/src/plugins/platforms/minimal/CMakeLists.txt b/src/plugins/platforms/minimal/CMakeLists.txt index b2ce151b55..9fd20bd3c4 100644 --- a/src/plugins/platforms/minimal/CMakeLists.txt +++ b/src/plugins/platforms/minimal/CMakeLists.txt @@ -20,7 +20,6 @@ qt_internal_add_plugin(QMinimalIntegrationPlugin Qt::Core Qt::CorePrivate Qt::EventDispatcherSupportPrivate - Qt::FontDatabaseSupportPrivate Qt::Gui Qt::GuiPrivate ) @@ -31,10 +30,15 @@ qt_internal_add_plugin(QMinimalIntegrationPlugin ## Scopes: ##################################################################### +qt_extend_target(QMinimalIntegrationPlugin CONDITION NOT APPLE + PUBLIC_LIBRARIES + Qt::FontDatabaseSupportPrivate +) + qt_extend_target(QMinimalIntegrationPlugin CONDITION QT_FEATURE_freetype LIBRARIES WrapFreetype::WrapFreetype ) -#### Keys ignored in scope 3:.:.:minimal.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN: +#### Keys ignored in scope 4:.:.:minimal.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN: # PLUGIN_EXTENDS = "-" -- cgit v1.2.3