diff options
| author | Andre McCurdy <armccurdy@gmail.com> | 2014-02-21 21:30:07 -0800 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2014-02-22 09:12:13 +0100 |
| commit | e6f2641311118bc2169a9a43f2ff2d21a18f4572 (patch) | |
| tree | e4726ffc6107de2dbd3a6d27b82623e849ed85ff | |
| parent | b7b624386cb736b0f9ff5529e92059fb97d9787d (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: 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 7e739c54..e2a16621 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 5237906a..d8ad4da5 100644 --- a/recipes-qt/qt5/qtbase.inc +++ b/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/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)}" |