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

Adapt to moving of UNIX services/themes into QtGui

Browse Source 
Task-number: QTBUG-83255
Change-Id: I4770b796eb90c1ff76db940cd0cda44ea47648fa
Reviewed-by: Liang Qi <liang.qi@qt.io>
This commit is contained in:
Friedemann Kleint 2020-06-18 16:57:00 +02:00 committed by Liang Qi
parent f4807a0e1d
commit 8deb43d138
5 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -56,8 +56,6 @@ qt_add_module(WaylandClient
LIBRARIES LIBRARIES
Qt::CorePrivate Qt::CorePrivate
Qt::GuiPrivate Qt::GuiPrivate
Qt::ServiceSupportPrivate
Qt::ThemeSupportPrivate
PUBLIC_LIBRARIES PUBLIC_LIBRARIES
Qt::Core Qt::Core
Qt::Gui Qt::Gui
@ -65,7 +63,6 @@ qt_add_module(WaylandClient
PRIVATE_MODULE_INTERFACE PRIVATE_MODULE_INTERFACE
Qt::CorePrivate Qt::CorePrivate
Qt::GuiPrivate Qt::GuiPrivate
Qt::ServiceSupportPrivate
) )
qt6_generate_wayland_protocol_client_sources(WaylandClient qt6_generate_wayland_protocol_client_sources(WaylandClient

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

@ -56,8 +56,6 @@ qt_add_module(WaylandClient
LIBRARIES LIBRARIES
Qt::CorePrivate Qt::CorePrivate
Qt::GuiPrivate Qt::GuiPrivate
Qt::ServiceSupportPrivate
Qt::ThemeSupportPrivate
PUBLIC_LIBRARIES PUBLIC_LIBRARIES
Qt::Core Qt::Core
Qt::Gui Qt::Gui
@ -65,7 +63,6 @@ qt_add_module(WaylandClient
PRIVATE_MODULE_INTERFACE PRIVATE_MODULE_INTERFACE
Qt::CorePrivate Qt::CorePrivate
Qt::GuiPrivate Qt::GuiPrivate
Qt::ServiceSupportPrivate
) )
qt6_generate_wayland_protocol_client_sources(WaylandClient qt6_generate_wayland_protocol_client_sources(WaylandClient

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

@ -2,8 +2,6 @@ TARGET = QtWaylandClient
MODULE = waylandclient MODULE = waylandclient
QT += core-private gui-private QT += core-private gui-private
QT_FOR_PRIVATE += service_support-private
QT_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

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

2
src/plugins/platforms/wayland/qwaylandwindowmanagerintegration_p.h
View File

@ -54,7 +54,7 @@
#include <QtCore/QObject> #include <QtCore/QObject>
#include <QtCore/QScopedPointer> #include <QtCore/QScopedPointer>
#include <QtServiceSupport/private/qgenericunixservices_p.h> #include <QtGui/private/qgenericunixservices_p.h>
#include <QtWaylandClient/private/qwayland-qt-windowmanager.h> #include <QtWaylandClient/private/qwayland-qt-windowmanager.h>
#include <QtWaylandClient/qtwaylandclientglobal.h> #include <QtWaylandClient/qtwaylandclientglobal.h>