1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adapt to moving EventDispatchers to QtGui

Browse Source 
Task-number: QTBUG-83255
Change-Id: Iea32600c1d2443c86723653a4fb8b568363cd796
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
This commit is contained in:
Friedemann Kleint 2020-06-10 14:21:12 +02:00 committed by Tor Arne Vestbø
parent b4542740df
commit 9ef67d0769
4 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/platforms/wayland/.prev_CMakeLists.txt
View File

@ -55,7 +55,6 @@ qt_add_module(WaylandClient
shellintegration shellintegration
LIBRARIES LIBRARIES
Qt::CorePrivate Qt::CorePrivate
Qt::EventDispatcherSupportPrivate
Qt::FontDatabaseSupportPrivate Qt::FontDatabaseSupportPrivate
Qt::GuiPrivate Qt::GuiPrivate
Qt::ServiceSupportPrivate Qt::ServiceSupportPrivate
@ -99,11 +98,6 @@ qt_extend_target(WaylandClient CONDITION QT_FEATURE_xkbcommon
Qt::XkbCommonSupportPrivate Qt::XkbCommonSupportPrivate
) )
qt_extend_target(WaylandClient CONDITION TARGET Qt::PlatformCompositorSupportPrivate
LIBRARIES
Qt::PlatformCompositorSupportPrivate
)
qt_extend_target(WaylandClient CONDITION TARGET Qt::LinuxAccessibilitySupportPrivate qt_extend_target(WaylandClient CONDITION TARGET Qt::LinuxAccessibilitySupportPrivate
LIBRARIES LIBRARIES
Qt::LinuxAccessibilitySupportPrivate Qt::LinuxAccessibilitySupportPrivate

1
src/plugins/platforms/wayland/CMakeLists.txt
View File

@ -55,7 +55,6 @@ qt_add_module(WaylandClient
shellintegration shellintegration
LIBRARIES LIBRARIES
Qt::CorePrivate Qt::CorePrivate
Qt::EventDispatcherSupportPrivate
Qt::FontDatabaseSupportPrivate Qt::FontDatabaseSupportPrivate
Qt::GuiPrivate Qt::GuiPrivate
Qt::ServiceSupportPrivate Qt::ServiceSupportPrivate

2
src/plugins/platforms/wayland/client.pro
View File

@ -3,7 +3,7 @@ MODULE = waylandclient
QT += core-private gui-private QT += core-private gui-private
QT_FOR_PRIVATE += service_support-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 # We have a bunch of C code with casts, so we can't have this option
QMAKE_CXXFLAGS_WARN_ON -= -Wcast-qual QMAKE_CXXFLAGS_WARN_ON -= -Wcast-qual

2
src/plugins/platforms/wayland/qwaylandintegration.cpp
View File

@ -58,7 +58,7 @@
#else #else
# include <QtFontDatabaseSupport/private/qgenericunixfontdatabase_p.h> # include <QtFontDatabaseSupport/private/qgenericunixfontdatabase_p.h>
#endif #endif
#include <QtEventDispatcherSupport/private/qgenericunixeventdispatcher_p.h> #include <QtGui/private/qgenericunixeventdispatcher_p.h>
#include <QtThemeSupport/private/qgenericunixthemes_p.h> #include <QtThemeSupport/private/qgenericunixthemes_p.h>
#include <QtGui/private/qguiapplication_p.h> #include <QtGui/private/qguiapplication_p.h>