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/eglfs | |
| 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/eglfs')
4 files changed, 2 insertions, 4 deletions
diff --git a/src/plugins/platforms/eglfs/.prev_CMakeLists.txt b/src/plugins/platforms/eglfs/.prev_CMakeLists.txt index 106e94718a..900be49379 100644 --- a/src/plugins/platforms/eglfs/.prev_CMakeLists.txt +++ b/src/plugins/platforms/eglfs/.prev_CMakeLists.txt @@ -25,7 +25,6 @@ qt_add_module(EglFSDeviceIntegration Qt::EglSupportPrivate Qt::FbSupportPrivate Qt::GuiPrivate - Qt::ServiceSupportPrivate Qt::ThemeSupportPrivate ) diff --git a/src/plugins/platforms/eglfs/CMakeLists.txt b/src/plugins/platforms/eglfs/CMakeLists.txt index d1211f38b8..8e625fdc58 100644 --- a/src/plugins/platforms/eglfs/CMakeLists.txt +++ b/src/plugins/platforms/eglfs/CMakeLists.txt @@ -26,7 +26,6 @@ qt_add_module(EglFSDeviceIntegration Qt::EglSupportPrivate Qt::FbSupportPrivate Qt::GuiPrivate - Qt::ServiceSupportPrivate Qt::ThemeSupportPrivate EGL::EGL # special case ) diff --git a/src/plugins/platforms/eglfs/api/qeglfsintegration.cpp b/src/plugins/platforms/eglfs/api/qeglfsintegration.cpp index 651c28745b..ecabfee101 100644 --- a/src/plugins/platforms/eglfs/api/qeglfsintegration.cpp +++ b/src/plugins/platforms/eglfs/api/qeglfsintegration.cpp @@ -68,7 +68,7 @@ #endif #include <QtGui/private/qgenericunixfontdatabase_p.h> -#include <QtServiceSupport/private/qgenericunixservices_p.h> +#include <QtGui/private/qgenericunixservices_p.h> #include <QtThemeSupport/private/qgenericunixthemes_p.h> #include <QtGui/private/qgenericunixeventdispatcher_p.h> #include <QtFbSupport/private/qfbvthandler_p.h> diff --git a/src/plugins/platforms/eglfs/eglfsdeviceintegration.pro b/src/plugins/platforms/eglfs/eglfsdeviceintegration.pro index dce1a4b894..87eb8515eb 100644 --- a/src/plugins/platforms/eglfs/eglfsdeviceintegration.pro +++ b/src/plugins/platforms/eglfs/eglfsdeviceintegration.pro @@ -11,7 +11,7 @@ MODULE = eglfsdeviceintegration QT += \ core-private gui-private \ devicediscovery_support-private \ - service_support-private theme_support-private \ + theme_support-private \ fb_support-private egl_support-private qtHaveModule(input_support-private): \ |