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: use opengl DISTRO_FEATURE for dependencies

Browse Source 
QtPdf requires opengl DISTRO_FEATURE, but it can be built independently
from the webengine.

Pick-to: 6.9 6.8
Task-number: QTBUG-129718
Change-Id: I6707a34494babf298d964fa1092c7aa126031db3
Reviewed-by: Ari Parkkila <ari.parkkila@qt.io>
This commit is contained in:
Samuli Piippo 2025-01-27 14:56:31 +00:00
parent b344e6cdd7
commit 8abb0e74a2
2 changed files with 15 additions and 10 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,20 +50,25 @@ RDEPENDS:${PN} += " \
RDEPENDS:${PN}:append:aarch64 = "\
qtquick3dphysics \
${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtwebengine qtwebview qtpdf', '', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qtpdf', '', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtwebengine qtwebview', '', d)} \
"
RDEPENDS:${PN}:append:arm = " qtquick3dphysics"
RDEPENDS:${PN}:append:armv6 = "\
${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtwebengine qtwebview qtpdf', '', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qtpdf', '', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtwebengine qtwebview', '', d)} \
"
RDEPENDS:${PN}:append:armv7a = "\
${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtwebengine qtwebview qtpdf', '', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qtpdf', '', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtwebengine qtwebview', '', d)} \
"
RDEPENDS:${PN}:append:armv7ve = "\
${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtwebengine qtwebview qtpdf', '', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qtpdf', '', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtwebengine qtwebview', '', d)} \
"
RDEPENDS:${PN}:append:x86 = " qtquick3dphysics"
RDEPENDS:${PN}:append:x86-64 = "\
qtquick3dphysics \
${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtwebengine qtwebview qtpdf', '', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qtpdf', '', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtwebengine qtwebview', '', d)} \
"

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

@ -29,13 +29,13 @@ DEPENDS += "\
qtsvg \
qtwebsockets \
"
DEPENDS:append:aarch64 = " ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtpdf', '', d)} qtquick3dphysics"
DEPENDS:append:aarch64 = " ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qtpdf', '', d)} qtquick3dphysics"
DEPENDS:append:arm = " qtquick3dphysics"
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:armv6 = " ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qtpdf', '', d)}"
DEPENDS:append:armv7a = " ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qtpdf', '', d)}"
DEPENDS:append:armv7ve = " ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qtpdf', '', d)}"
DEPENDS:append:x86 = " qtquick3dphysics"
DEPENDS:append:x86-64 = " ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtpdf', '', d)} qtquick3dphysics"
DEPENDS:append:x86-64 = " ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qtpdf', '', d)} qtquick3dphysics"
PACKAGECONFIG ?= "examples"