From fb8a7a484f08c8950ae84463f6425243b1f560a0 Mon Sep 17 00:00:00 2001
From: Liang Qi <liang.qi@qt.io>
Date: Tue, 16 Jun 2020 08:50:58 +0200
Subject: [PATCH] Update dependencies on 'dev' in qt/qtwayland

Remove FontDatabaseSupportPrivate/fontdatabase_support-private
in the libraries dependency. The libraries were removed in qtbase in
6be9830d865be32f224e15d13ddefd9c7e176553 and the functionality is now
in QtGui.

Remove PlatformCompositorSupport mentions, it was removed in qtbase
in 7172b5112e5dbf0cb63dec68d2f916a323748aa1, and functionality moved
to QtGui.

Add explicit package dependency on OpenGL, in case if qtdeclarative
modules are missing, so that qtwayland can still be built without
qtdeclarative.

Change-Id: I5e8ec4cddd293e52c288ba629e6ba954c689a803
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
---
 src/plugins/platforms/wayland/.prev_CMakeLists.txt    | 1 -
 src/plugins/platforms/wayland/CMakeLists.txt          | 1 -
 src/plugins/platforms/wayland/client.pro              | 2 +-
 src/plugins/platforms/wayland/qwaylandintegration.cpp | 6 +++---
 4 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/plugins/platforms/wayland/.prev_CMakeLists.txt b/src/plugins/platforms/wayland/.prev_CMakeLists.txt
index e7e24dac212..84be2329153 100644
--- a/src/plugins/platforms/wayland/.prev_CMakeLists.txt
+++ b/src/plugins/platforms/wayland/.prev_CMakeLists.txt
@@ -55,7 +55,6 @@ qt_add_module(WaylandClient
         shellintegration
     LIBRARIES
         Qt::CorePrivate
-        Qt::FontDatabaseSupportPrivate
         Qt::GuiPrivate
         Qt::ServiceSupportPrivate
         Qt::ThemeSupportPrivate
diff --git a/src/plugins/platforms/wayland/CMakeLists.txt b/src/plugins/platforms/wayland/CMakeLists.txt
index 696cb1f66c6..b5fd478017b 100644
--- a/src/plugins/platforms/wayland/CMakeLists.txt
+++ b/src/plugins/platforms/wayland/CMakeLists.txt
@@ -55,7 +55,6 @@ qt_add_module(WaylandClient
         shellintegration
     LIBRARIES
         Qt::CorePrivate
-        Qt::FontDatabaseSupportPrivate
         Qt::GuiPrivate
         Qt::ServiceSupportPrivate
         Qt::ThemeSupportPrivate
diff --git a/src/plugins/platforms/wayland/client.pro b/src/plugins/platforms/wayland/client.pro
index d76bdbf7151..8c8d4936977 100644
--- a/src/plugins/platforms/wayland/client.pro
+++ b/src/plugins/platforms/wayland/client.pro
@@ -3,7 +3,7 @@ MODULE = waylandclient
 
 QT += core-private gui-private
 QT_FOR_PRIVATE += service_support-private
-QT_PRIVATE += fontdatabase_support-private theme_support-private
+QT_PRIVATE += theme_support-private
 
 # We have a bunch of C code with casts, so we can't have this option
 QMAKE_CXXFLAGS_WARN_ON -= -Wcast-qual
diff --git a/src/plugins/platforms/wayland/qwaylandintegration.cpp b/src/plugins/platforms/wayland/qwaylandintegration.cpp
index d310a189c50..97678f33180 100644
--- a/src/plugins/platforms/wayland/qwaylandintegration.cpp
+++ b/src/plugins/platforms/wayland/qwaylandintegration.cpp
@@ -53,10 +53,10 @@
 #include "qwaylandscreen_p.h"
 
 #if defined(Q_OS_MACOS)
-#  include <QtFontDatabaseSupport/private/qcoretextfontdatabase_p.h>
-#  include <QtFontDatabaseSupport/private/qfontengine_coretext_p.h>
+#  include <QtGui/private/qcoretextfontdatabase_p.h>
+#  include <QtGui/private/qfontengine_coretext_p.h>
 #else
-#  include <QtFontDatabaseSupport/private/qgenericunixfontdatabase_p.h>
+#  include <QtGui/private/qgenericunixfontdatabase_p.h>
 #endif
 #include <QtGui/private/qgenericunixeventdispatcher_p.h>
 #include <QtThemeSupport/private/qgenericunixthemes_p.h>