diff options
| author | Andre McCurdy <armccurdy@gmail.com> | 2014-02-27 23:20:38 +0100 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2014-03-05 19:17:27 +0100 |
| commit | 0713745617924844fa04d865f0e502c2765e7a41 (patch) | |
| tree | d9e384174de218fc69fb9e1a54dc6526a64a9a2d | |
| parent | 4545815d2e1788742dd70fc4a7f2a332d1cbfd08 (diff) | |
qtwebkit-examples: add RDEPENDS for ca-certificates
If qtbase is configured with openssl support then the
qtwebkit browser example apps require CA certificates.
Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
Signed-off-by: Nicolas Dechesne <nicolas.dechesne@linaro.org>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| -rw-r--r-- | recipes-qt/qt5/qt5.inc | 2 | ||||
| -rw-r--r-- | recipes-qt/qt5/qtbase.inc | 4 | ||||
| -rw-r--r-- | recipes-qt/qt5/qtwebkit-examples.inc | 1 |
3 files changed, 6 insertions, 1 deletions
diff --git a/recipes-qt/qt5/qt5.inc b/recipes-qt/qt5/qt5.inc index 7669efc3..d9ebbff7 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 4f81f8ea..eb22e400 100644 --- a/recipes-qt/qt5/qtbase.inc +++ b/recipes-qt/qt5/qtbase.inc @@ -43,6 +43,8 @@ PACKAGECONFIG_FONTS ?= "" PACKAGECONFIG_SYSTEM ?= "jpeg libpng zlib" PACKAGECONFIG_MULTIMEDIA ?= "${@base_contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)}" PACKAGECONFIG_DISTRO ?= "" +# This is in qt5.inc, because qtwebkit-examples are using it to enable ca-certificates dependency +# PACKAGECONFIG_OPENSSL ?= "openssl" PACKAGECONFIG ??= " \ release \ @@ -50,7 +52,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 50c28cdb..84f16a4e 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)}" |