diff options
Diffstat (limited to 'src/plugins/platforms/minimal')
-rw-r--r-- | src/plugins/platforms/minimal/.prev_CMakeLists.txt | 7 | ||||
-rw-r--r-- | src/plugins/platforms/minimal/CMakeLists.txt | 7 | ||||
-rw-r--r-- | src/plugins/platforms/minimal/minimal.pro | 1 | ||||
-rw-r--r-- | src/plugins/platforms/minimal/qminimalintegration.cpp | 2 |
4 files changed, 3 insertions, 14 deletions
diff --git a/src/plugins/platforms/minimal/.prev_CMakeLists.txt b/src/plugins/platforms/minimal/.prev_CMakeLists.txt index 82a1040bd0..cdcdffa8e1 100644 --- a/src/plugins/platforms/minimal/.prev_CMakeLists.txt +++ b/src/plugins/platforms/minimal/.prev_CMakeLists.txt @@ -26,11 +26,6 @@ qt_internal_add_plugin(QMinimalIntegrationPlugin ## Scopes: ##################################################################### -qt_extend_target(QMinimalIntegrationPlugin CONDITION UNIX - PUBLIC_LIBRARIES - Qt::EventDispatcherSupportPrivate -) - qt_extend_target(QMinimalIntegrationPlugin CONDITION NOT APPLE PUBLIC_LIBRARIES Qt::FontDatabaseSupportPrivate @@ -41,5 +36,5 @@ qt_extend_target(QMinimalIntegrationPlugin CONDITION QT_FEATURE_freetype WrapFreetype::WrapFreetype ) -#### Keys ignored in scope 5:.:.: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 1fd9437053..72c1090771 100644 --- a/src/plugins/platforms/minimal/CMakeLists.txt +++ b/src/plugins/platforms/minimal/CMakeLists.txt @@ -29,11 +29,6 @@ qt_internal_add_plugin(QMinimalIntegrationPlugin ## Scopes: ##################################################################### -qt_extend_target(QMinimalIntegrationPlugin CONDITION UNIX - PUBLIC_LIBRARIES - Qt::EventDispatcherSupportPrivate -) - qt_extend_target(QMinimalIntegrationPlugin CONDITION NOT APPLE PUBLIC_LIBRARIES Qt::FontDatabaseSupportPrivate @@ -44,5 +39,5 @@ qt_extend_target(QMinimalIntegrationPlugin CONDITION QT_FEATURE_freetype WrapFreetype::WrapFreetype ) -#### Keys ignored in scope 5:.:.: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/minimal.pro b/src/plugins/platforms/minimal/minimal.pro index 345244a820..a644e65026 100644 --- a/src/plugins/platforms/minimal/minimal.pro +++ b/src/plugins/platforms/minimal/minimal.pro @@ -3,7 +3,6 @@ TARGET = qminimal QT += \ core-private gui-private -!win32: QT += eventdispatcher_support-private !darwin: QT += fontdatabase_support-private DEFINES += QT_NO_FOREACH diff --git a/src/plugins/platforms/minimal/qminimalintegration.cpp b/src/plugins/platforms/minimal/qminimalintegration.cpp index a11012a81a..16045d5e59 100644 --- a/src/plugins/platforms/minimal/qminimalintegration.cpp +++ b/src/plugins/platforms/minimal/qminimalintegration.cpp @@ -65,7 +65,7 @@ #endif #if !defined(Q_OS_WIN) -#include <QtEventDispatcherSupport/private/qgenericunixeventdispatcher_p.h> +#include <QtGui/private/qgenericunixeventdispatcher_p.h> #else #include <QtCore/private/qeventdispatcher_win_p.h> #endif |