From 1f37019fd5156ed139108c83b34e12d34d140ac8 Mon Sep 17 00:00:00 2001
From: Liang Qi <liang.qi@qt.io>
Date: Tue, 16 Jun 2020 08:50:58 +0200
Subject: 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>
---
 CMakeLists.txt                     | 3 +--
 dependencies.yaml                  | 4 ++--
 src/client/.prev_CMakeLists.txt    | 1 -
 src/client/CMakeLists.txt          | 1 -
 src/client/client.pro              | 2 +-
 src/client/qwaylandintegration.cpp | 6 +++---
 6 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 73997c03c..e1a32a252 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -34,14 +34,13 @@ endif()
 find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS
     Core
     Gui
+    OpenGL
 )
 
 find_package(Qt6 ${PROJECT_VERSION} CONFIG OPTIONAL_COMPONENTS
     EglSupport
     GlxSupport
     LinuxAccessibilitySupport
-    FontDatabaseSupport
-    PlatformCompositorSupport
     Quick
     ServiceSupport
     XkbCommonSupport
diff --git a/dependencies.yaml b/dependencies.yaml
index ee7e3a5b8..e2f5a6caa 100644
--- a/dependencies.yaml
+++ b/dependencies.yaml
@@ -1,7 +1,7 @@
 dependencies:
   ../qtbase:
-    ref: bd793d3c46ec08ff84dd67db467def8578922697
+    ref: b89d8c406b5809f868f1a06d9ab05096ecb226f3
     required: true
   ../qtdeclarative:
-    ref: a8d357761dbf74cbdc72348be6c655cafb745ff2
+    ref: dd8e9f3fae84da3dd40b94122ad54d74d329163f
     required: false
diff --git a/src/client/.prev_CMakeLists.txt b/src/client/.prev_CMakeLists.txt
index e7e24dac2..84be23291 100644
--- a/src/client/.prev_CMakeLists.txt
+++ b/src/client/.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/client/CMakeLists.txt b/src/client/CMakeLists.txt
index 696cb1f66..b5fd47801 100644
--- a/src/client/CMakeLists.txt
+++ b/src/client/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/client/client.pro b/src/client/client.pro
index d76bdbf71..8c8d49369 100644
--- a/src/client/client.pro
+++ b/src/client/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/client/qwaylandintegration.cpp b/src/client/qwaylandintegration.cpp
index d310a189c..97678f331 100644
--- a/src/client/qwaylandintegration.cpp
+++ b/src/client/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>
-- 
cgit v1.2.3