From c587035d51881a7bd98935edb8e5217cb07b5b2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= <tor.arne.vestbo@qt.io>
Date: Tue, 26 May 2020 15:01:05 +0200
Subject: [PATCH] Adapt to QtPlatformCompositorSupport removal

Change-Id: Ic85f91d64c625a7196694cb49ff19df0661d5cbc
Reviewed-by: Liang Qi <liang.qi@qt.io>
---
 src/plugins/platforms/wayland/CMakeLists.txt          | 4 ++--
 src/plugins/platforms/wayland/client.pro              | 3 +--
 src/plugins/platforms/wayland/qwaylandintegration.cpp | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/plugins/platforms/wayland/CMakeLists.txt b/src/plugins/platforms/wayland/CMakeLists.txt
index fa5c34be480..883424aa036 100644
--- a/src/plugins/platforms/wayland/CMakeLists.txt
+++ b/src/plugins/platforms/wayland/CMakeLists.txt
@@ -99,9 +99,9 @@ qt_extend_target(WaylandClient CONDITION QT_FEATURE_xkbcommon
         Qt::XkbCommonSupportPrivate
 )
 
-qt_extend_target(WaylandClient CONDITION TARGET Qt::PlatformCompositorSupportPrivate
+qt_extend_target(WaylandClient CONDITION QT_FEATURE_opengl
     LIBRARIES
-        Qt::PlatformCompositorSupportPrivate
+        Qt::OpenGLPrivate
 )
 
 qt_extend_target(WaylandClient CONDITION TARGET Qt::LinuxAccessibilitySupportPrivate
diff --git a/src/plugins/platforms/wayland/client.pro b/src/plugins/platforms/wayland/client.pro
index 3355d663573..9ebdcf0e25b 100644
--- a/src/plugins/platforms/wayland/client.pro
+++ b/src/plugins/platforms/wayland/client.pro
@@ -19,8 +19,7 @@ qtConfig(xkbcommon) {
     QT_FOR_PRIVATE += xkbcommon_support-private
 }
 
-qtHaveModule(platformcompositor_support-private): \
-    QT_PRIVATE += platformcompositor_support-private
+qtConfig(opengl): QT += opengl-private
 
 qtHaveModule(linuxaccessibility_support-private): \
     QT_PRIVATE += linuxaccessibility_support-private
diff --git a/src/plugins/platforms/wayland/qwaylandintegration.cpp b/src/plugins/platforms/wayland/qwaylandintegration.cpp
index b5535cabfb0..4a5fce48a82 100644
--- a/src/plugins/platforms/wayland/qwaylandintegration.cpp
+++ b/src/plugins/platforms/wayland/qwaylandintegration.cpp
@@ -68,7 +68,7 @@
 #include <QtGui/QSurfaceFormat>
 #if QT_CONFIG(opengl)
 #include <QtGui/QOpenGLContext>
-#include <QtPlatformCompositorSupport/qpa/qplatformbackingstoreopenglsupport.h>
+#include <QtOpenGL/qpa/qplatformbackingstoreopenglsupport.h>
 #endif // QT_CONFIG(opengl)
 #include <QSocketNotifier>