From d2241c2842beb5766cef31a078f80aeaabf72c60 Mon Sep 17 00:00:00 2001
From: Ari Parkkila <ari.parkkila@qt.io>
Date: Fri, 20 Sep 2024 13:40:56 +0300
Subject: [PATCH] qtpdf: Add dependency to webengine

QtWebengine depends on mesa-dev packages so opengl or vulkan
must be enabled on DISTRO_FEATURES to pass its config check.
Qtpdf is implemented within webengine so instead of forcing
support for opengl or vulkan make qtpdf depend on webengine.
This omits config where qtpdf is wanted without webengine.

Change-Id: I4e94201d3c2c3a1ef97549ec330f7c4c4408b3a9
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
---
 .../packagegroups/packagegroup-qt6-addons.bb      | 15 +++++----------
 recipes-qt/qt6/qtdoc_git.bb                       | 10 +++++-----
 2 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/recipes-qt/packagegroups/packagegroup-qt6-addons.bb b/recipes-qt/packagegroups/packagegroup-qt6-addons.bb
index 4b191b3..dbb407c 100644
--- a/recipes-qt/packagegroups/packagegroup-qt6-addons.bb
+++ b/recipes-qt/packagegroups/packagegroup-qt6-addons.bb
@@ -50,25 +50,20 @@ RDEPENDS:${PN} += " \
 
 RDEPENDS:${PN}:append:aarch64 = "\
     qtquick3dphysics \
-    qtpdf \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtwebengine qtwebview', '', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtwebengine qtwebview qtpdf', '', d)} \
 "
 RDEPENDS:${PN}:append:arm = " qtquick3dphysics"
 RDEPENDS:${PN}:append:armv6 = "\
-    qtpdf \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtwebengine qtwebview', '', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtwebengine qtwebview qtpdf', '', d)} \
 "
 RDEPENDS:${PN}:append:armv7a = "\
-    qtpdf \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtwebengine qtwebview', '', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtwebengine qtwebview qtpdf', '', d)} \
 "
 RDEPENDS:${PN}:append:armv7ve = "\
-    qtpdf \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtwebengine qtwebview', '', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtwebengine qtwebview qtpdf', '', d)} \
 "
 RDEPENDS:${PN}:append:x86 = " qtquick3dphysics"
 RDEPENDS:${PN}:append:x86-64 = "\
     qtquick3dphysics \
-    qtpdf \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtwebengine qtwebview', '', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtwebengine qtwebview qtpdf', '', d)} \
 "
diff --git a/recipes-qt/qt6/qtdoc_git.bb b/recipes-qt/qt6/qtdoc_git.bb
index fc4652a..031abcf 100644
--- a/recipes-qt/qt6/qtdoc_git.bb
+++ b/recipes-qt/qt6/qtdoc_git.bb
@@ -29,12 +29,12 @@ DEPENDS += "\
     qtsvg \
     qtwebsockets \
 "
-DEPENDS:append:aarch64 = " qtpdf qtquick3dphysics"
+DEPENDS:append:aarch64 = " ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtpdf', '', d)} qtquick3dphysics"
 DEPENDS:append:arm = " qtquick3dphysics"
-DEPENDS:append:armv6 = " qtpdf"
-DEPENDS:append:armv7a = " qtpdf"
-DEPENDS:append:armv7ve = " qtpdf"
+DEPENDS:append:armv6 = " ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtpdf', '', d)}"
+DEPENDS:append:armv7a = " ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtpdf', '', d)}"
+DEPENDS:append:armv7ve = " ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtpdf', '', d)}"
 DEPENDS:append:x86 = " qtquick3dphysics"
-DEPENDS:append:x86-64 = " qtpdf qtquick3dphysics"
+DEPENDS:append:x86-64 = " ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtpdf', '', d)} qtquick3dphysics"
 
 PACKAGECONFIG ?= "examples"