diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-06-10 14:21:12 +0200 |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2020-06-11 16:55:34 +0200 |
| commit | 634269c4c0f3f0772506ae1bb15be5e814e43454 (patch) | |
| tree | f0ed59a62fa49d7ce796eaf6506f4263c4e24fc0 | |
| parent | ad21c33475ce9e033fc79140908c641d1424fa3f (diff) | |
Adapt to moving EventDispatchers to QtGui
Task-number: QTBUG-83255
Change-Id: Iea32600c1d2443c86723653a4fb8b568363cd796
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
| -rw-r--r-- | CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/client/.prev_CMakeLists.txt | 6 | ||||
| -rw-r--r-- | src/client/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/client/client.pro | 2 | ||||
| -rw-r--r-- | src/client/qwaylandintegration.cpp | 2 |
5 files changed, 2 insertions, 10 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index a3bb9e4ba..73997c03c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -34,7 +34,6 @@ endif() find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS Core Gui - EventDispatcherSupport ) find_package(Qt6 ${PROJECT_VERSION} CONFIG OPTIONAL_COMPONENTS diff --git a/src/client/.prev_CMakeLists.txt b/src/client/.prev_CMakeLists.txt index c19adbed8..e7e24dac2 100644 --- a/src/client/.prev_CMakeLists.txt +++ b/src/client/.prev_CMakeLists.txt @@ -55,7 +55,6 @@ qt_add_module(WaylandClient shellintegration LIBRARIES Qt::CorePrivate - Qt::EventDispatcherSupportPrivate Qt::FontDatabaseSupportPrivate Qt::GuiPrivate Qt::ServiceSupportPrivate @@ -99,11 +98,6 @@ qt_extend_target(WaylandClient CONDITION QT_FEATURE_xkbcommon Qt::XkbCommonSupportPrivate ) -qt_extend_target(WaylandClient CONDITION TARGET Qt::PlatformCompositorSupportPrivate - LIBRARIES - Qt::PlatformCompositorSupportPrivate -) - qt_extend_target(WaylandClient CONDITION TARGET Qt::LinuxAccessibilitySupportPrivate LIBRARIES Qt::LinuxAccessibilitySupportPrivate diff --git a/src/client/CMakeLists.txt b/src/client/CMakeLists.txt index fba3c37e5..696cb1f66 100644 --- a/src/client/CMakeLists.txt +++ b/src/client/CMakeLists.txt @@ -55,7 +55,6 @@ qt_add_module(WaylandClient shellintegration LIBRARIES Qt::CorePrivate - Qt::EventDispatcherSupportPrivate Qt::FontDatabaseSupportPrivate Qt::GuiPrivate Qt::ServiceSupportPrivate diff --git a/src/client/client.pro b/src/client/client.pro index 1d496b78d..d76bdbf71 100644 --- a/src/client/client.pro +++ b/src/client/client.pro @@ -3,7 +3,7 @@ MODULE = waylandclient QT += core-private gui-private QT_FOR_PRIVATE += service_support-private -QT_PRIVATE += fontdatabase_support-private eventdispatcher_support-private theme_support-private +QT_PRIVATE += fontdatabase_support-private theme_support-private # We have a bunch of C code with casts, so we can't have this option QMAKE_CXXFLAGS_WARN_ON -= -Wcast-qual diff --git a/src/client/qwaylandintegration.cpp b/src/client/qwaylandintegration.cpp index b7e32c87c..d310a189c 100644 --- a/src/client/qwaylandintegration.cpp +++ b/src/client/qwaylandintegration.cpp @@ -58,7 +58,7 @@ #else # include <QtFontDatabaseSupport/private/qgenericunixfontdatabase_p.h> #endif -#include <QtEventDispatcherSupport/private/qgenericunixeventdispatcher_p.h> +#include <QtGui/private/qgenericunixeventdispatcher_p.h> #include <QtThemeSupport/private/qgenericunixthemes_p.h> #include <QtGui/private/qguiapplication_p.h> |