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/directfb | |
| 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/directfb')
4 files changed, 2 insertions, 5 deletions
diff --git a/src/plugins/platforms/directfb/.prev_CMakeLists.txt b/src/plugins/platforms/directfb/.prev_CMakeLists.txt index a9bac7c988..15e43244f0 100644 --- a/src/plugins/platforms/directfb/.prev_CMakeLists.txt +++ b/src/plugins/platforms/directfb/.prev_CMakeLists.txt @@ -24,7 +24,6 @@ qt_internal_add_plugin(QDirectFbIntegrationPlugin Qt::CorePrivate Qt::Gui Qt::GuiPrivate - Qt::ServiceSupportPrivate ) #### Keys ignored in scope 1:.:.:directfb.pro:<TRUE>: diff --git a/src/plugins/platforms/directfb/CMakeLists.txt b/src/plugins/platforms/directfb/CMakeLists.txt index ce6e4af3a3..be6e08bd8e 100644 --- a/src/plugins/platforms/directfb/CMakeLists.txt +++ b/src/plugins/platforms/directfb/CMakeLists.txt @@ -28,7 +28,6 @@ qt_internal_add_plugin(QDirectFbIntegrationPlugin Qt::CorePrivate Qt::Gui Qt::GuiPrivate - Qt::ServiceSupportPrivate ) #### Keys ignored in scope 1:.:.:directfb.pro:<TRUE>: diff --git a/src/plugins/platforms/directfb/directfb.pro b/src/plugins/platforms/directfb/directfb.pro index 57195de551..d63d2469ff 100644 --- a/src/plugins/platforms/directfb/directfb.pro +++ b/src/plugins/platforms/directfb/directfb.pro @@ -1,8 +1,7 @@ TARGET = qdirectfb QT += \ - core-private gui-private \ - service_support-private + core-private gui-private QMAKE_USE += directfb diff --git a/src/plugins/platforms/directfb/qdirectfbintegration.cpp b/src/plugins/platforms/directfb/qdirectfbintegration.cpp index 393ce69c52..0212f52afa 100644 --- a/src/plugins/platforms/directfb/qdirectfbintegration.cpp +++ b/src/plugins/platforms/directfb/qdirectfbintegration.cpp @@ -46,7 +46,7 @@ #include <QtGui/private/qgenericunixfontdatabase_p.h> #include <QtGui/private/qgenericunixeventdispatcher_p.h> -#include <QtServiceSupport/private/qgenericunixservices_p.h> +#include <QtGui/private/qgenericunixservices_p.h> #include <QtGui/private/qpixmap_blitter_p.h> #include <QtGui/private/qpixmap_raster_p.h> |