diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-06-18 16:57:00 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2020-06-26 10:46:22 +0200 |
| commit | 6073a896d685ad443843125b04e856d788609818 (patch) | |
| tree | bb7e5d36d9cdd8770632a12ed6cd09d58ac97591 | |
| parent | bad18e2db95a399e350b890a0cd084d53c1e2ae8 (diff) | |
Adapt to moving of UNIX services/themes into QtGui
Task-number: QTBUG-83255
Change-Id: I4770b796eb90c1ff76db940cd0cda44ea47648fa
Reviewed-by: Liang Qi <liang.qi@qt.io>
| -rw-r--r-- | src/client/.prev_CMakeLists.txt | 3 | ||||
| -rw-r--r-- | src/client/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | src/client/client.pro | 2 | ||||
| -rw-r--r-- | src/client/qwaylandintegration.cpp | 2 | ||||
| -rw-r--r-- | src/client/qwaylandwindowmanagerintegration_p.h | 2 |
5 files changed, 2 insertions, 10 deletions
diff --git a/src/client/.prev_CMakeLists.txt b/src/client/.prev_CMakeLists.txt index 84be23291..5b1a73e5a 100644 --- a/src/client/.prev_CMakeLists.txt +++ b/src/client/.prev_CMakeLists.txt @@ -56,8 +56,6 @@ qt_add_module(WaylandClient LIBRARIES Qt::CorePrivate Qt::GuiPrivate - Qt::ServiceSupportPrivate - Qt::ThemeSupportPrivate PUBLIC_LIBRARIES Qt::Core Qt::Gui @@ -65,7 +63,6 @@ qt_add_module(WaylandClient PRIVATE_MODULE_INTERFACE Qt::CorePrivate Qt::GuiPrivate - Qt::ServiceSupportPrivate ) qt6_generate_wayland_protocol_client_sources(WaylandClient diff --git a/src/client/CMakeLists.txt b/src/client/CMakeLists.txt index b5fd47801..362b721be 100644 --- a/src/client/CMakeLists.txt +++ b/src/client/CMakeLists.txt @@ -56,8 +56,6 @@ qt_add_module(WaylandClient LIBRARIES Qt::CorePrivate Qt::GuiPrivate - Qt::ServiceSupportPrivate - Qt::ThemeSupportPrivate PUBLIC_LIBRARIES Qt::Core Qt::Gui @@ -65,7 +63,6 @@ qt_add_module(WaylandClient PRIVATE_MODULE_INTERFACE Qt::CorePrivate Qt::GuiPrivate - Qt::ServiceSupportPrivate ) qt6_generate_wayland_protocol_client_sources(WaylandClient diff --git a/src/client/client.pro b/src/client/client.pro index 8c8d49369..bdcf42561 100644 --- a/src/client/client.pro +++ b/src/client/client.pro @@ -2,8 +2,6 @@ TARGET = QtWaylandClient MODULE = waylandclient 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 QMAKE_CXXFLAGS_WARN_ON -= -Wcast-qual diff --git a/src/client/qwaylandintegration.cpp b/src/client/qwaylandintegration.cpp index 97678f331..3d0631c37 100644 --- a/src/client/qwaylandintegration.cpp +++ b/src/client/qwaylandintegration.cpp @@ -59,7 +59,7 @@ # include <QtGui/private/qgenericunixfontdatabase_p.h> #endif #include <QtGui/private/qgenericunixeventdispatcher_p.h> -#include <QtThemeSupport/private/qgenericunixthemes_p.h> +#include <QtGui/private/qgenericunixthemes_p.h> #include <QtGui/private/qguiapplication_p.h> diff --git a/src/client/qwaylandwindowmanagerintegration_p.h b/src/client/qwaylandwindowmanagerintegration_p.h index 31de6ddd3..1c36f67bb 100644 --- a/src/client/qwaylandwindowmanagerintegration_p.h +++ b/src/client/qwaylandwindowmanagerintegration_p.h @@ -54,7 +54,7 @@ #include <QtCore/QObject> #include <QtCore/QScopedPointer> -#include <QtServiceSupport/private/qgenericunixservices_p.h> +#include <QtGui/private/qgenericunixservices_p.h> #include <QtWaylandClient/private/qwayland-qt-windowmanager.h> #include <QtWaylandClient/qtwaylandclientglobal.h> |