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

4 files changed, 15 insertions, 15 deletions

diff --git a/examples/multimediawidgets/customvideosurface/customvideoitem/videoitem.h b/examples/multimediawidgets/customvideosurface/customvideoitem/videoitem.h
index 062dd1db8..6b971512e 100644
--- a/examples/multimediawidgets/customvideosurface/customvideoitem/videoitem.h
+++ b/examples/multimediawidgets/customvideosurface/customvideoitem/videoitem.h
@@ -55,16 +55,16 @@ public:
     explicit VideoItem(QGraphicsItem *parentItem = 0);
     ~VideoItem();
 
-    QRectF boundingRect() const;
-    void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0);
+    QRectF boundingRect() const override;
+    void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0) override;
 
     //video surface
     QList<QVideoFrame::PixelFormat> supportedPixelFormats(
-            QAbstractVideoBuffer::HandleType handleType = QAbstractVideoBuffer::NoHandle) const;
+            QAbstractVideoBuffer::HandleType handleType = QAbstractVideoBuffer::NoHandle) const override;
 
-    bool start(const QVideoSurfaceFormat &format);
-    void stop();
-    bool present(const QVideoFrame &frame);
+    bool start(const QVideoSurfaceFormat &format) override;
+    void stop() override;
+    bool present(const QVideoFrame &frame) override;
 
 private:
     QImage::Format imageFormat;
diff --git a/examples/multimediawidgets/customvideosurface/customvideoitem/videoplayer.h b/examples/multimediawidgets/customvideosurface/customvideoitem/videoplayer.h
index 5edea4ce3..1b4b07dd2 100644
--- a/examples/multimediawidgets/customvideosurface/customvideoitem/videoplayer.h
+++ b/examples/multimediawidgets/customvideosurface/customvideoitem/videoplayer.h
@@ -60,7 +60,7 @@ public:
     VideoPlayer(QWidget *parent = 0);
     ~VideoPlayer();
 
-    QSize sizeHint() const { return QSize(800, 600); }
+    QSize sizeHint() const override { return QSize(800, 600); }
 
 public slots:
     void openFile();
diff --git a/examples/multimediawidgets/customvideosurface/customvideowidget/videowidget.h b/examples/multimediawidgets/customvideosurface/customvideowidget/videowidget.h
index f769f15b8..b57754643 100644
--- a/examples/multimediawidgets/customvideosurface/customvideowidget/videowidget.h
+++ b/examples/multimediawidgets/customvideosurface/customvideowidget/videowidget.h
@@ -56,11 +56,11 @@ public:
 
     QAbstractVideoSurface *videoSurface() const { return surface; }
 
-    QSize sizeHint() const;
+    QSize sizeHint() const override;
 
 protected:
-    void paintEvent(QPaintEvent *event);
-    void resizeEvent(QResizeEvent *event);
+    void paintEvent(QPaintEvent *event) override;
+    void resizeEvent(QResizeEvent *event) override;
 
 private:
     VideoWidgetSurface *surface;
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();