[oe] [meta-qt5][PATCH v2 2/2] qtwebkit-examples: add RDEPENDS for ca-certificates
Andre McCurdy
armccurdy at gmail.com
Sat Feb 22 05:30:07 UTC 2014
If qtbase is configured with openssl support then the
qtwebkit browser example apps require CA certificates.
Signed-off-by: Andre McCurdy <armccurdy at gmail.com>
---
recipes-qt/qt5/qt5.inc | 2 ++
recipes-qt/qt5/qtbase.inc | 2 +-
recipes-qt/qt5/qtwebkit-examples.inc | 1 +
3 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/recipes-qt/qt5/qt5.inc b/recipes-qt/qt5/qt5.inc
index 7e739c5..e2a1662 100644
--- a/recipes-qt/qt5/qt5.inc
+++ b/recipes-qt/qt5/qt5.inc
@@ -7,6 +7,8 @@ inherit qmake5
ICU = "icu "
ICU_powerpc = "pango"
+PACKAGECONFIG_OPENSSL ?= "openssl"
+
QT_MODULE ?= "${BPN}"
# we don't want conflicts with qt4
diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc
index 6a0149a..d805c47 100644
--- a/recipes-qt/qt5/qtbase.inc
+++ b/recipes-qt/qt5/qtbase.inc
@@ -47,7 +47,7 @@ PACKAGECONFIG ??= " \
udev \
evdev \
widgets \
- openssl \
+ ${PACKAGECONFIG_OPENSSL} \
${PACKAGECONFIG_GL} \
${PACKAGECONFIG_FB} \
${PACKAGECONFIG_X11} \
diff --git a/recipes-qt/qt5/qtwebkit-examples.inc b/recipes-qt/qt5/qtwebkit-examples.inc
index 50c28cd..84f16a4 100644
--- a/recipes-qt/qt5/qtwebkit-examples.inc
+++ b/recipes-qt/qt5/qtwebkit-examples.inc
@@ -10,3 +10,4 @@ SRC_URI += " \
DEPENDS += "qtwebkit"
RDEPENDS_${PN}-examples += "qtwebkit-qmlplugins"
+RDEPENDS_${PN}-examples += "${@base_contains('PACKAGECONFIG_OPENSSL', 'openssl', 'ca-certificates', '', d)}"
--
1.8.1.2
More information about the Openembedded-devel
mailing list