diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-06-15 10:54:00 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-06-18 12:02:26 +0200 |
| commit | 7e83f09eadc54fb3a9ae89598a42b7dc0aa2828c (patch) | |
| tree | ba2413b432a83a0ad1151026840e746bf332df37 /src/plugins/platforms/xcb | |
| parent | ab01885e48873fb2ad71841a3f1627fe4d9cd835 (diff) | |
Move UNIX services into QtGui
Task-number: QTBUG-83255
Change-Id: I95cd25c6e18ffb46955acc76d6cab551d1c8f5ae
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Diffstat (limited to 'src/plugins/platforms/xcb')
| -rw-r--r-- | src/plugins/platforms/xcb/.prev_CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/plugins/platforms/xcb/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/plugins/platforms/xcb/qxcbintegration.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/platforms/xcb/xcb_qpa_lib.pro | 2 |
4 files changed, 2 insertions, 4 deletions
diff --git a/src/plugins/platforms/xcb/.prev_CMakeLists.txt b/src/plugins/platforms/xcb/.prev_CMakeLists.txt index c5012582ea..83df27ddd0 100644 --- a/src/plugins/platforms/xcb/.prev_CMakeLists.txt +++ b/src/plugins/platforms/xcb/.prev_CMakeLists.txt @@ -43,7 +43,6 @@ qt_add_module(XcbQpa Qt::CorePrivate Qt::EdidSupportPrivate Qt::GuiPrivate - Qt::ServiceSupportPrivate Qt::ThemeSupportPrivate Qt::XkbCommonSupportPrivate XCB::ICCCM diff --git a/src/plugins/platforms/xcb/CMakeLists.txt b/src/plugins/platforms/xcb/CMakeLists.txt index 1288cc6a5f..28861862d8 100644 --- a/src/plugins/platforms/xcb/CMakeLists.txt +++ b/src/plugins/platforms/xcb/CMakeLists.txt @@ -43,7 +43,6 @@ qt_add_module(XcbQpa Qt::CorePrivate Qt::EdidSupportPrivate Qt::GuiPrivate - Qt::ServiceSupportPrivate Qt::ThemeSupportPrivate Qt::XkbCommonSupportPrivate XCB::ICCCM diff --git a/src/plugins/platforms/xcb/qxcbintegration.cpp b/src/plugins/platforms/xcb/qxcbintegration.cpp index 7956da2c91..cec25ef47b 100644 --- a/src/plugins/platforms/xcb/qxcbintegration.cpp +++ b/src/plugins/platforms/xcb/qxcbintegration.cpp @@ -60,7 +60,7 @@ #include <xcb/xcb.h> #include <QtGui/private/qgenericunixfontdatabase_p.h> -#include <QtServiceSupport/private/qgenericunixservices_p.h> +#include <QtGui/private/qgenericunixservices_p.h> #if QT_CONFIG(opengl) #include <QtOpenGL/qpa/qplatformbackingstoreopenglsupport.h> #endif diff --git a/src/plugins/platforms/xcb/xcb_qpa_lib.pro b/src/plugins/platforms/xcb/xcb_qpa_lib.pro index 3cca31aa2f..0e168b9e1c 100644 --- a/src/plugins/platforms/xcb/xcb_qpa_lib.pro +++ b/src/plugins/platforms/xcb/xcb_qpa_lib.pro @@ -4,7 +4,7 @@ DEFINES += QT_NO_FOREACH QT += \ core-private gui-private \ - service_support-private theme_support-private \ + theme_support-private \ edid_support-private \ xkbcommon_support-private |