From 7e83f09eadc54fb3a9ae89598a42b7dc0aa2828c Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@qt.io>
Date: Mon, 15 Jun 2020 10:54:00 +0200
Subject: Move UNIX services into QtGui
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Task-number: QTBUG-83255
Change-Id: I95cd25c6e18ffb46955acc76d6cab551d1c8f5ae
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
---
 src/plugins/platforms/linuxfb/.prev_CMakeLists.txt    | 1 -
 src/plugins/platforms/linuxfb/CMakeLists.txt          | 1 -
 src/plugins/platforms/linuxfb/linuxfb.pro             | 1 -
 src/plugins/platforms/linuxfb/qlinuxfbintegration.cpp | 2 +-
 4 files changed, 1 insertion(+), 4 deletions(-)

(limited to 'src/plugins/platforms/linuxfb')

diff --git a/src/plugins/platforms/linuxfb/.prev_CMakeLists.txt b/src/plugins/platforms/linuxfb/.prev_CMakeLists.txt
index caa3f03f5d..258b70603e 100644
--- a/src/plugins/platforms/linuxfb/.prev_CMakeLists.txt
+++ b/src/plugins/platforms/linuxfb/.prev_CMakeLists.txt
@@ -19,7 +19,6 @@ qt_internal_add_plugin(QLinuxFbIntegrationPlugin
         Qt::FbSupportPrivate
         Qt::Gui
         Qt::GuiPrivate
-        Qt::ServiceSupportPrivate
 )
 
 #### Keys ignored in scope 1:.:.:linuxfb.pro:<TRUE>:
diff --git a/src/plugins/platforms/linuxfb/CMakeLists.txt b/src/plugins/platforms/linuxfb/CMakeLists.txt
index fdfe076902..ea5642f1c0 100644
--- a/src/plugins/platforms/linuxfb/CMakeLists.txt
+++ b/src/plugins/platforms/linuxfb/CMakeLists.txt
@@ -20,7 +20,6 @@ qt_internal_add_plugin(QLinuxFbIntegrationPlugin
         Qt::FbSupportPrivate
         Qt::Gui
         Qt::GuiPrivate
-        Qt::ServiceSupportPrivate
 )
 
 #### Keys ignored in scope 1:.:.:linuxfb.pro:<TRUE>:
diff --git a/src/plugins/platforms/linuxfb/linuxfb.pro b/src/plugins/platforms/linuxfb/linuxfb.pro
index 9af0956cf7..08a4d6dd0c 100644
--- a/src/plugins/platforms/linuxfb/linuxfb.pro
+++ b/src/plugins/platforms/linuxfb/linuxfb.pro
@@ -4,7 +4,6 @@ DEFINES += QT_NO_FOREACH
 
 QT += \
     core-private gui-private \
-    service_support-private \
     fb_support-private
 
 qtHaveModule(input_support-private): \
diff --git a/src/plugins/platforms/linuxfb/qlinuxfbintegration.cpp b/src/plugins/platforms/linuxfb/qlinuxfbintegration.cpp
index 4940302d36..68c68ab8f6 100644
--- a/src/plugins/platforms/linuxfb/qlinuxfbintegration.cpp
+++ b/src/plugins/platforms/linuxfb/qlinuxfbintegration.cpp
@@ -44,7 +44,7 @@
 #endif
 
 #include <QtGui/private/qgenericunixfontdatabase_p.h>
-#include <QtServiceSupport/private/qgenericunixservices_p.h>
+#include <QtGui/private/qgenericunixservices_p.h>
 #include <QtGui/private/qgenericunixeventdispatcher_p.h>
 
 #include <QtFbSupport/private/qfbvthandler_p.h>
-- 
cgit v1.2.3