qtwebkit-examples: add RDEPENDS for ca-certificates

If qtbase is configured with openssl support then the
qtwebkit browser example apps require CA certificates.

(From meta-qt5 rev: e6f2641311118bc2169a9a43f2ff2d21a18f4572)

Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>

diff --git a/meta-qt5/recipes-qt/qt5/qt5.inc b/meta-qt5/recipes-qt/qt5/qt5.inc
index 7e739c5..e2a1662 100644 (file)
--- a/meta-qt5/recipes-qt/qt5/qt5.inc
+++ b/meta-qt5/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/meta-qt5/recipes-qt/qt5/qtbase.inc b/meta-qt5/recipes-qt/qt5/qtbase.inc
index 5237906..d8ad4da 100644 (file)
--- a/meta-qt5/recipes-qt/qt5/qtbase.inc
+++ b/meta-qt5/recipes-qt/qt5/qtbase.inc
@@ -42,6 +42,8 @@ PACKAGECONFIG_MULTIMEDIA ?= "${@base_contains('DISTRO_FEATURES', 'pulseaudio', '
 PACKAGECONFIG_DISTRO ?= ""
 # Either release or debug, can be overridden in bbappends
 PACKAGECONFIG_RELEASE ?= "release"
+# This is in qt5.inc, because qtwebkit-examples are using it to enable ca-certificates dependency
+# PACKAGECONFIG_OPENSSL ?= "openssl"
 
 PACKAGECONFIG ??= " \
     ${PACKAGECONFIG_RELEASE} \
@@ -49,7 +51,7 @@ PACKAGECONFIG ??= " \
     udev \
     evdev \
     widgets \
-    openssl \
+    ${PACKAGECONFIG_OPENSSL} \
     ${PACKAGECONFIG_GL} \
     ${PACKAGECONFIG_FB} \
     ${PACKAGECONFIG_X11} \

diff --git a/meta-qt5/recipes-qt/qt5/qtwebkit-examples.inc b/meta-qt5/recipes-qt/qt5/qtwebkit-examples.inc
index 50c28cd..84f16a4 100644 (file)
--- a/meta-qt5/recipes-qt/qt5/qtwebkit-examples.inc
+++ b/meta-qt5/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)}"