qt5: upgrade to latest revision in 5.5 branches

* qtbase/0008-Fix-build-with-clang-3.7.patch is now applied upstream

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>

1 files changed, 13 insertions, 12 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 59a5282e..ec96ddce 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 @@
-From fe90d2bb5dcfd1cb75ed5414a4acdb9dfc9d4367 Mon Sep 17 00:00:00 2001
+From c75cdeeb0ea705b9415c3cf777c611aee01f62c2 Mon Sep 17 00:00:00 2001
 From: Yoann Lopes <yoann.lopes@digia.com>
 Date: Thu, 31 Oct 2013 15:06:30 +0100
 Subject: [PATCH] Initial porting effort to GStreamer 1.0.
@@ -13,14 +13,14 @@ Subject: [PATCH] Initial porting effort to GStreamer 1.0.
 
 Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
 ---
- qtmultimedia.pro | 25 +++++++++++++------------
- 1 file changed, 13 insertions(+), 12 deletions(-)
+ qtmultimedia.pro | 26 ++++++++++++++------------
+ 1 file changed, 14 insertions(+), 12 deletions(-)
 
 diff --git a/qtmultimedia.pro b/qtmultimedia.pro
-index 1225ffb..a60b1fc 100644
+index 1225ffb..4f675fe 100644
 --- a/qtmultimedia.pro
 +++ b/qtmultimedia.pro
-@@ -18,19 +18,20 @@ win32 {
+@@ -18,19 +18,21 @@ win32 {
      contains(QT_CONFIG, alsa):qtCompileTest(alsa)
      contains(QT_CONFIG, pulseaudio):qtCompileTest(pulseaudio)
  
@@ -36,6 +36,13 @@ index 1225ffb..a60b1fc 100644
 +            } else: contains(QT_CONFIG, gstreamer-1.0) {
 +                GST_VERSION = 1.0
 +            }
++        }
++        cache(GST_VERSION, set)
++        !isEmpty(GST_VERSION):qtCompileTest(gstreamer) {
++            qtCompileTest(gstreamer_photography)
++            qtCompileTest(gstreamer_encodingprofiles)
++            qtCompileTest(gstreamer_appsrc)
++            qtCompileTest(linux_v4l)
          }
 -    }
 -    cache(GST_VERSION, set)
@@ -44,15 +51,9 @@ index 1225ffb..a60b1fc 100644
 -        qtCompileTest(gstreamer_encodingprofiles)
 -        qtCompileTest(gstreamer_appsrc)
 -        qtCompileTest(linux_v4l)
-+        cache(GST_VERSION, set)
-+        !isEmpty(GST_VERSION):qtCompileTest(gstreamer) {
-+            qtCompileTest(gstreamer_photography)
-+            qtCompileTest(gstreamer_encodingprofiles)
-+            qtCompileTest(gstreamer_appsrc)
-+            qtCompileTest(linux_v4l)
      }
  
      qtCompileTest(resourcepolicy)
 -- 
-2.4.2
+2.5.3