From f6373503a015b3a5b4f797c286dfc07e660cc20b Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Fri, 19 Apr 2019 11:27:38 +0000 Subject: qt5: upgrade to 5.9.8 * unfortunatelly most of the modules don't have the v5.9.8 tags merged to 5.9 branch yet, the only exception are: qtnetworkauth, qtremoteobjects, qttranslations * in most cases it means that we're missing just changes files, but in some cases there are also some functional commits which are missing in 5.9 SRCREV: qtdeclarative: 9d6d2ee21 Use Los Angeles to represent PST8PDT, not Vancouver qtimageformats: 11a7040 Update bundled libtiff to version 4.0.10 Signed-off-by: Martin Jansa --- .../qtmultimedia/0001-qtmultimedia-fix-a-conflicting-declaration.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'recipes-qt/qt5/qtmultimedia') diff --git a/recipes-qt/qt5/qtmultimedia/0001-qtmultimedia-fix-a-conflicting-declaration.patch b/recipes-qt/qt5/qtmultimedia/0001-qtmultimedia-fix-a-conflicting-declaration.patch index 07f127ca..15365923 100644 --- a/recipes-qt/qt5/qtmultimedia/0001-qtmultimedia-fix-a-conflicting-declaration.patch +++ b/recipes-qt/qt5/qtmultimedia/0001-qtmultimedia-fix-a-conflicting-declaration.patch @@ -1,4 +1,4 @@ -From b1622c53d65c11212f9c9b61303b70cf3e65c729 Mon Sep 17 00:00:00 2001 +From ed4b7ebd4c4a367691d4c958e69e350d3a28ad1d Mon Sep 17 00:00:00 2001 From: Wenlin Kang Date: Thu, 8 Sep 2016 12:18:13 +0800 Subject: [PATCH] qtmultimedia: fix a conflicting declaration -- cgit v1.2.3-54-g00ecf