From 7ec12b2902cc84a85ac6fe05ea98f76efa214344 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@qt.io>
Date: Wed, 10 Jun 2020 13:03:35 +0200
Subject: Move the UNIX event dispatchers into QtGui
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Task-number: QTBUG-83255
Change-Id: I7d32eb1ec01784c9ed6bf5fc4913ffc5b3a34a49
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
---
 src/plugins/platforms/offscreen/.prev_CMakeLists.txt      | 7 +------
 src/plugins/platforms/offscreen/CMakeLists.txt            | 7 +------
 src/plugins/platforms/offscreen/offscreen.pro             | 1 -
 src/plugins/platforms/offscreen/qoffscreenintegration.cpp | 2 +-
 4 files changed, 3 insertions(+), 14 deletions(-)

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

diff --git a/src/plugins/platforms/offscreen/.prev_CMakeLists.txt b/src/plugins/platforms/offscreen/.prev_CMakeLists.txt
index e36b70588a..a8643961d3 100644
--- a/src/plugins/platforms/offscreen/.prev_CMakeLists.txt
+++ b/src/plugins/platforms/offscreen/.prev_CMakeLists.txt
@@ -27,11 +27,6 @@ qt_internal_add_plugin(QOffscreenIntegrationPlugin
 ## Scopes:
 #####################################################################
 
-qt_extend_target(QOffscreenIntegrationPlugin CONDITION UNIX
-    PUBLIC_LIBRARIES
-        Qt::EventDispatcherSupportPrivate
-)
-
 qt_extend_target(QOffscreenIntegrationPlugin CONDITION NOT APPLE
     PUBLIC_LIBRARIES
         Qt::FontDatabaseSupportPrivate
@@ -44,5 +39,5 @@ qt_extend_target(QOffscreenIntegrationPlugin CONDITION QT_FEATURE_opengl AND QT_
         Qt::GlxSupportPrivate
 )
 
-#### Keys ignored in scope 5:.:.:offscreen.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN:
+#### Keys ignored in scope 4:.:.:offscreen.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN:
 # PLUGIN_EXTENDS = "-"
diff --git a/src/plugins/platforms/offscreen/CMakeLists.txt b/src/plugins/platforms/offscreen/CMakeLists.txt
index 446d8ff94b..59bfb19fc9 100644
--- a/src/plugins/platforms/offscreen/CMakeLists.txt
+++ b/src/plugins/platforms/offscreen/CMakeLists.txt
@@ -28,11 +28,6 @@ qt_internal_add_plugin(QOffscreenIntegrationPlugin
 ## Scopes:
 #####################################################################
 
-qt_extend_target(QOffscreenIntegrationPlugin CONDITION UNIX
-    PUBLIC_LIBRARIES
-        Qt::EventDispatcherSupportPrivate
-)
-
 qt_extend_target(QOffscreenIntegrationPlugin CONDITION NOT APPLE
     PUBLIC_LIBRARIES
         Qt::FontDatabaseSupportPrivate
@@ -45,5 +40,5 @@ qt_extend_target(QOffscreenIntegrationPlugin CONDITION QT_FEATURE_opengl AND QT_
         Qt::GlxSupportPrivate
 )
 
-#### Keys ignored in scope 5:.:.:offscreen.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN:
+#### Keys ignored in scope 4:.:.:offscreen.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN:
 # PLUGIN_EXTENDS = "-"
diff --git a/src/plugins/platforms/offscreen/offscreen.pro b/src/plugins/platforms/offscreen/offscreen.pro
index c68d88bc59..0d6faf08a4 100644
--- a/src/plugins/platforms/offscreen/offscreen.pro
+++ b/src/plugins/platforms/offscreen/offscreen.pro
@@ -3,7 +3,6 @@ TARGET = qoffscreen
 QT += \
     core-private gui-private
 
-!win32: QT += eventdispatcher_support-private
 !darwin: QT += fontdatabase_support-private
 
 DEFINES += QT_NO_FOREACH
diff --git a/src/plugins/platforms/offscreen/qoffscreenintegration.cpp b/src/plugins/platforms/offscreen/qoffscreenintegration.cpp
index 849faeccb1..7d2d585194 100644
--- a/src/plugins/platforms/offscreen/qoffscreenintegration.cpp
+++ b/src/plugins/platforms/offscreen/qoffscreenintegration.cpp
@@ -42,7 +42,7 @@
 #include "qoffscreencommon.h"
 
 #if defined(Q_OS_UNIX)
-#include <QtEventDispatcherSupport/private/qgenericunixeventdispatcher_p.h>
+#include <QtGui/private/qgenericunixeventdispatcher_p.h>
 #if defined(Q_OS_MAC)
 #include <qpa/qplatformfontdatabase.h>
 #include <QtGui/private/qcoretextfontdatabase_p.h>
-- 
cgit v1.2.3