diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2017-08-19 15:44:17 +0200 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2017-08-20 19:30:06 +0200 |
| commit | 2d14d9956f21f3f096bdda7df1d1ba99cca4a6ed (patch) | |
| tree | bdf9c293b998f776a26d6ad2ec273f282333f929 /recipes-qt/qt5/qtmultimedia_git.bb | |
| parent | a0b2220b5e08a7914d55afec0ff6e2316cb47404 (diff) | |
qt: refresh remaining patches and add links to meta-qt5 repos
* remove
qtdeclarative/0001-Fix-QQmlExpression-leaking-QQmlError-objects.patch
qtwayland/0002-Fix-initial-window-property-values-being-propagated.patch
which is already applied and fuzzy patch just apply the same section
twice
* restore
qttools/0001-add-noqtwebkit-configuration.patch
which was removed from SRC_URI in 5.9 upgrade
* add comment with link to meta-qt5 repository where the meta-qt5 .patch
files are maintained, include branch and tag name so that it's more
clear from where these changes are exported (with:
git format-patch --no-numbered --no-signature)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtmultimedia_git.bb')
| -rw-r--r-- | recipes-qt/qt5/qtmultimedia_git.bb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb index 19966183..998f32f5 100644 --- a/recipes-qt/qt5/qtmultimedia_git.bb +++ b/recipes-qt/qt5/qtmultimedia_git.bb @@ -25,6 +25,8 @@ EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" # Disable GStreamer if completely disabled EXTRA_QMAKEVARS_CONFIGURE += "${@bb.utils.contains_any('PACKAGECONFIG', 'gstreamer gstreamer010', '', '-no-gstreamer', d)}" +# Patches from https://github.com/meta-qt5/qtmultimedia/commits/b5.9 +# 5.9.meta-qt5.1 SRC_URI += "\ file://0001-qtmultimedia-fix-a-conflicting-declaration.patch \ " |