summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndre McCurdy <armccurdy@gmail.com>2014-02-21 21:30:07 -0800
committerMartin Jansa <Martin.Jansa@gmail.com>2014-02-22 09:12:13 +0100
commite6f2641311118bc2169a9a43f2ff2d21a18f4572 (patch)
treee4726ffc6107de2dbd3a6d27b82623e849ed85ff
parentb7b624386cb736b0f9ff5529e92059fb97d9787d (diff)
downloadmeta-qt5-e6f2641311118bc2169a9a43f2ff2d21a18f4572.tar.gz
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.inc2
-rw-r--r--recipes-qt/qt5/qtbase.inc4
-rw-r--r--recipes-qt/qt5/qtwebkit-examples.inc1
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
7ICU = "icu " 7ICU = "icu "
8ICU_powerpc = "pango" 8ICU_powerpc = "pango"
9 9
10PACKAGECONFIG_OPENSSL ?= "openssl"
11
10QT_MODULE ?= "${BPN}" 12QT_MODULE ?= "${BPN}"
11 13
12# we don't want conflicts with qt4 14# 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', '
42PACKAGECONFIG_DISTRO ?= "" 42PACKAGECONFIG_DISTRO ?= ""
43# Either release or debug, can be overridden in bbappends 43# Either release or debug, can be overridden in bbappends
44PACKAGECONFIG_RELEASE ?= "release" 44PACKAGECONFIG_RELEASE ?= "release"
45# This is in qt5.inc, because qtwebkit-examples are using it to enable ca-certificates dependency
46# PACKAGECONFIG_OPENSSL ?= "openssl"
45 47
46PACKAGECONFIG ??= " \ 48PACKAGECONFIG ??= " \
47 ${PACKAGECONFIG_RELEASE} \ 49 ${PACKAGECONFIG_RELEASE} \
@@ -49,7 +51,7 @@ PACKAGECONFIG ??= " \
49 udev \ 51 udev \
50 evdev \ 52 evdev \
51 widgets \ 53 widgets \
52 openssl \ 54 ${PACKAGECONFIG_OPENSSL} \
53 ${PACKAGECONFIG_GL} \ 55 ${PACKAGECONFIG_GL} \
54 ${PACKAGECONFIG_FB} \ 56 ${PACKAGECONFIG_FB} \
55 ${PACKAGECONFIG_X11} \ 57 ${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 += " \
10 10
11DEPENDS += "qtwebkit" 11DEPENDS += "qtwebkit"
12RDEPENDS_${PN}-examples += "qtwebkit-qmlplugins" 12RDEPENDS_${PN}-examples += "qtwebkit-qmlplugins"
13RDEPENDS_${PN}-examples += "${@base_contains('PACKAGECONFIG_OPENSSL', 'openssl', 'ca-certificates', '', d)}"