summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtmultimedia
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2018-01-23 14:47:22 +0000
committerMartin Jansa <Martin.Jansa@gmail.com>2018-01-23 23:53:58 +0000
commite1046125d212a016d96944ff907e17d51a5b41af (patch)
treee7a94a083fe46b6cdcaf98c89e2fa7f2aa3026c1 /recipes-qt/qt5/qtmultimedia
parente0a55c24f6637b58f0a517e3d7fc092249d5d987 (diff)
downloadmeta-qt5-e1046125d212a016d96944ff907e17d51a5b41af.tar.gz
qt5: upgrade to 5.9.4
* update LICENSE in qtsystems which was updated to match other qt modules Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtmultimedia')
-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 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 @@
1From 6119c88abf41f36b790e86e07e7a73d39e5f936b Mon Sep 17 00:00:00 2001 1From aaa3d0e57ea0eea6dbd4179eecc3756fdddc0681 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