diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2015-04-16 13:15:26 +0200 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2015-08-18 12:07:34 +0200 |
| commit | 18741e483851e1a6aae79992b130aee34ad48879 (patch) | |
| tree | c6523af371af79a48d726578217d6b3b1570beb0 /recipes-qt/qt5/qtwebkit-examples_git.bb | |
| parent | d2c05c81e8230358dca80cf9df67e49f9f672a29 (diff) | |
| download | meta-qt5-18741e483851e1a6aae79992b130aee34ad48879.tar.gz | |
recipes-git: upgrade to 5.5
* based on my WIP patch + fixes from John Mullen
* I was trying to get rhid of 0003-Add-external-hostbindir-option.patch
and 0010-Add-external-hostbindir-option-for-native-sdk.patch by using
upstream configure parameter added in some previous version, but I've
failed, so now good-old -external-hostbindir parameter is back
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtwebkit-examples_git.bb')
| -rw-r--r-- | recipes-qt/qt5/qtwebkit-examples_git.bb | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/recipes-qt/qt5/qtwebkit-examples_git.bb b/recipes-qt/qt5/qtwebkit-examples_git.bb index 5fd64366..62e9612b 100644 --- a/recipes-qt/qt5/qtwebkit-examples_git.bb +++ b/recipes-qt/qt5/qtwebkit-examples_git.bb | |||
| @@ -5,11 +5,11 @@ require qt5-git.inc | |||
| 5 | # There are no GPLv2 licensed files in this component. | 5 | # There are no GPLv2 licensed files in this component. |
| 6 | LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & Digia-Qt-LGPL-Exception-1.1 | LGPL-3.0)" | 6 | LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & Digia-Qt-LGPL-Exception-1.1 | LGPL-3.0)" |
| 7 | LIC_FILES_CHKSUM = " \ | 7 | LIC_FILES_CHKSUM = " \ |
| 8 | file://LICENSE.GPLv2;md5=e782f55badfa137e5e59c330f12cc8ed \ | 8 | file://LICENSE.GPLv2;md5=05832301944453ec79e40ba3c3cfceec \ |
| 9 | file://LICENSE.LGPLv21;md5=cff17b12416c896e10ae2c17a64252e7 \ | 9 | file://LICENSE.LGPLv21;md5=58a180e1cf84c756c29f782b3a485c29 \ |
| 10 | file://LICENSE.LGPLv3;md5=c1939be5579666be947371bc8120425f \ | 10 | file://LICENSE.LGPLv3;md5=c4fe8c6de4eef597feec6e90ed62e962 \ |
| 11 | file://examples/webkitwidgets/scroller/wheel/main.cpp;endline=112;md5=6f92d041824c63426993c8ce3ae0eb77 \ | 11 | file://examples/webkitwidgets/scroller/wheel/main.cpp;endline=39;md5=b0739af76072fbe303dc04b6941e054f \ |
| 12 | file://examples/webkitwidgets/imageanalyzer/imageanalyzer.cpp;endline=223;md5=13ffb472fefe4bdf6464954a22251f35 \ | 12 | file://examples/webkitwidgets/imageanalyzer/imageanalyzer.cpp;endline=39;md5=b0739af76072fbe303dc04b6941e054f \ |
| 13 | " | 13 | " |
| 14 | 14 | ||
| 15 | SRC_URI += " \ | 15 | SRC_URI += " \ |
| @@ -20,4 +20,4 @@ DEPENDS += "qtwebkit qtxmlpatterns" | |||
| 20 | RDEPENDS_${PN}-examples += "qtwebkit-qmlplugins" | 20 | RDEPENDS_${PN}-examples += "qtwebkit-qmlplugins" |
| 21 | RDEPENDS_${PN}-examples += "${@base_contains('PACKAGECONFIG_OPENSSL', 'openssl', 'ca-certificates', '', d)}" | 21 | RDEPENDS_${PN}-examples += "${@base_contains('PACKAGECONFIG_OPENSSL', 'openssl', 'ca-certificates', '', d)}" |
| 22 | 22 | ||
| 23 | SRCREV = "9f20ed0b48f4e5adcc9558b2cc4171eb17f243dd" | 23 | SRCREV = "b7c95dc2ada1171f06183ce8608990732791aa3f" |
