Merge remote-tracking branch 'origin/5.5' into 5.6

Change-Id: Ie1e478eca1cdfd99ccd3a3c8a07aefbfa27ccbdb

src/multimedia/gsttools_headers/qgstutils_p.h

@@ -150,6 +150,8 @@ gboolean qt_gst_element_query_position(GstElement *element, GstFormat format, gi
 gboolean qt_gst_element_query_duration(GstElement *element, GstFormat format, gint64 *cur);
 GstCaps *qt_gst_caps_normalize(GstCaps *caps);
 const gchar *qt_gst_element_get_factory_name(GstElement *element);
+gboolean qt_gst_caps_can_intersect(const GstCaps * caps1, const GstCaps * caps2);
+GList *qt_gst_video_sinks();
 
 QDebug operator <<(QDebug debug, GstCaps *caps);
 

src/multimedia/gsttools_headers/qvideosurfacegstsink_p.h

@@ -157,7 +157,12 @@ private:
 
     static gboolean unlock(GstBaseSink *sink);
 
+#if GST_CHECK_VERSION(0, 10, 25)
     static GstFlowReturn show_frame(GstVideoSink *sink, GstBuffer *buffer);
+#else
+    static GstFlowReturn preroll(GstBaseSink *sink, GstBuffer *buffer);
+    static GstFlowReturn render(GstBaseSink *sink, GstBuffer *buffer);
+#endif
 
 private:
     QVideoSurfaceGstDelegate *delegate;

src/multimedia/video/qvideooutputorientationhandler_p.h

@@ -59,10 +59,10 @@ public:
 
     int currentOrientation() const;
 
-signals:
+Q_SIGNALS:
     void orientationChanged(int angle);
 
-private slots:
+private Q_SLOTS:
     void screenOrientationChanged(Qt::ScreenOrientation orientation);
 
 private: