summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtmultimedia/0001-qtmultimedia-fix-a-conflicting-declaration.patch
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2019-04-04 11:47:26 +0000
committerMartin Jansa <Martin.Jansa@gmail.com>2019-04-04 14:05:30 +0000
commit95974f44f18c9e0c1e52391d0a7da255b3bb1332 (patch)
tree298ba5a0dd84df15bb1116d6dde6175e1ffc0290 /recipes-qt/qt5/qtmultimedia/0001-qtmultimedia-fix-a-conflicting-declaration.patch
parenta4bf2402c19742b866cf4b5e5e4665ae070500ff (diff)
downloadmeta-qt5-95974f44f18c9e0c1e52391d0a7da255b3bb1332.tar.gz
qtbase, qtmultimedia: refresh patches to apply cleanly and update them on github.com/meta-qt5 forks
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtmultimedia/0001-qtmultimedia-fix-a-conflicting-declaration.patch')
-rw-r--r--recipes-qt/qt5/qtmultimedia/0001-qtmultimedia-fix-a-conflicting-declaration.patch2
1 files changed, 1 insertions, 1 deletions
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 74e12360..5a8ef9f3 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 @@
1From d581392ff8c849a8773fc4ae784f78a885a658e1 Mon Sep 17 00:00:00 2001 1From 207ce5790b1f4fd1755dff0cf5d45a1e8fc29a70 Mon Sep 17 00:00:00 2001
2From: Wenlin Kang <wenlin.kang@windriver.com> 2From: Wenlin Kang <wenlin.kang@windriver.com>
3Date: Thu, 8 Sep 2016 12:18:13 +0800 3Date: Thu, 8 Sep 2016 12:18:13 +0800
4Subject: [PATCH] qtmultimedia: fix a conflicting declaration 4Subject: [PATCH] qtmultimedia: fix a conflicting declaration