CaROS/meta-qt6
3
0
Fork 0
mirror of http://code.qt.io/yocto/meta-qt6.git synced 2026-01-01 13:58:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

qtpdf: Add dependency to webengine

Browse Source 
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>
This commit is contained in:
Ari Parkkila 2024-09-20 13:40:56 +03:00
parent 01692b5a8a
commit d2241c2842
2 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
recipes-qt/packagegroups/packagegroup-qt6-addons.bb
View File

@ -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)} \
"

10
recipes-qt/qt6/qtdoc_git.bb
View File

@ -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"