From e1046125d212a016d96944ff907e17d51a5b41af Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Tue, 23 Jan 2018 14:47:22 +0000 Subject: qt5: upgrade to 5.9.4 * update LICENSE in qtsystems which was updated to match other qt modules 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 34aef48c..ae3f2e3d 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 6119c88abf41f36b790e86e07e7a73d39e5f936b Mon Sep 17 00:00:00 2001 +From aaa3d0e57ea0eea6dbd4179eecc3756fdddc0681 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