Merge remote-tracking branch 'origin/5.8' into dev

Conflicts:
	.qmake.conf
	examples/multimediawidgets/videographicsitem/videoplayer.h
	src/plugins/gstreamer/mediaplayer/qgstreamerplayersession.cpp

Change-Id: Id5ce05ffe2cd25657232157b162680b2e24a35ba

1 files changed, 5 insertions, 5 deletions

diff --git a/examples/multimediawidgets/customvideosurface/customvideowidget/videowidgetsurface.h b/examples/multimediawidgets/customvideosurface/customvideowidget/videowidgetsurface.h
index c869dbeb6..41d05b709 100644
--- a/examples/multimediawidgets/customvideosurface/customvideowidget/videowidgetsurface.h
+++ b/examples/multimediawidgets/customvideosurface/customvideowidget/videowidgetsurface.h
@@ -55,13 +55,13 @@ public:
     VideoWidgetSurface(QWidget *widget, QObject *parent = 0);
 
     QList<QVideoFrame::PixelFormat> supportedPixelFormats(
-            QAbstractVideoBuffer::HandleType handleType = QAbstractVideoBuffer::NoHandle) const;
-    bool isFormatSupported(const QVideoSurfaceFormat &format) const;
+            QAbstractVideoBuffer::HandleType handleType = QAbstractVideoBuffer::NoHandle) const override;
+    bool isFormatSupported(const QVideoSurfaceFormat &format) const override;
 
-    bool start(const QVideoSurfaceFormat &format);
-    void stop();
+    bool start(const QVideoSurfaceFormat &format) override;
+    void stop() override;
 
-    bool present(const QVideoFrame &frame);
+    bool present(const QVideoFrame &frame) override;
 
     QRect videoRect() const { return targetRect; }
     void updateVideoRect();