summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtmultimedia
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2016-04-20 11:38:06 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2016-04-21 21:36:18 +0200
commit754aaadc7f0a1c98a4895899617afbaef0f1cdfa (patch)
treea417716816e08846114d65394239c309bc129dbd /recipes-qt/qt5/qtmultimedia
parentf636eb7444a3454f2a25275a07e414d7409734d7 (diff)
downloadmeta-qt5-754aaadc7f0a1c98a4895899617afbaef0f1cdfa.tar.gz
qt5: upgrade to latest revision in 5.6 branch
* qtsvg/0001-textobject.pro-use-DEPLOYMENT-only-for-wince-like-ot.patch and qtwebkit/0004-Fix-linking-with-libpthread.patch were resolved upstream * all patches were refreshed with: git format-patch --no-numbered --no-signature -NUMBER to remove numbering from Subject (it's good enough in filename) and to remove git version from signature (so it doesn't look differently when generated on different hosts with different git version). Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtmultimedia')
-rw-r--r--recipes-qt/qt5/qtmultimedia/0001-Initial-porting-effort-to-GStreamer-1.0.patch5
1 files changed, 1 insertions, 4 deletions
diff --git a/recipes-qt/qt5/qtmultimedia/0001-Initial-porting-effort-to-GStreamer-1.0.patch b/recipes-qt/qt5/qtmultimedia/0001-Initial-porting-effort-to-GStreamer-1.0.patch
index a4ac12ab..05f54732 100644
--- a/recipes-qt/qt5/qtmultimedia/0001-Initial-porting-effort-to-GStreamer-1.0.patch
+++ b/recipes-qt/qt5/qtmultimedia/0001-Initial-porting-effort-to-GStreamer-1.0.patch
@@ -1,4 +1,4 @@
1From e8e2e289288acd3124536a41351e7bcd639bef07 Mon Sep 17 00:00:00 2001 1From 98455d75df7b040817e323417b6042118c093d56 Mon Sep 17 00:00:00 2001
2From: Yoann Lopes <yoann.lopes@digia.com> 2From: Yoann Lopes <yoann.lopes@digia.com>
3Date: Thu, 31 Oct 2013 15:06:30 +0100 3Date: Thu, 31 Oct 2013 15:06:30 +0100
4Subject: [PATCH] Initial porting effort to GStreamer 1.0. 4Subject: [PATCH] Initial porting effort to GStreamer 1.0.
@@ -54,6 +54,3 @@ index 98bb315..287887f 100644
54 } 54 }
55 55
56 qtCompileTest(resourcepolicy) 56 qtCompileTest(resourcepolicy)
57--
582.7.0
59