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, 6 insertions, 6 deletions

diff --git a/examples/multimediawidgets/player/playlistmodel.h b/examples/multimediawidgets/player/playlistmodel.h
index 85a1fbef0..960943f1c 100644
--- a/examples/multimediawidgets/player/playlistmodel.h
+++ b/examples/multimediawidgets/player/playlistmodel.h
@@ -60,18 +60,18 @@ public:
 
     PlaylistModel(QObject *parent = 0);
 
-    int rowCount(const QModelIndex &parent = QModelIndex()) const;
-    int columnCount(const QModelIndex &parent = QModelIndex()) const;
+    int rowCount(const QModelIndex &parent = QModelIndex()) const override;
+    int columnCount(const QModelIndex &parent = QModelIndex()) const override;
 
-    QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const;
-    QModelIndex parent(const QModelIndex &child) const;
+    QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const override;
+    QModelIndex parent(const QModelIndex &child) const override;
 
-    QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
+    QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
 
     QMediaPlaylist *playlist() const;
     void setPlaylist(QMediaPlaylist *playlist);
 
-    bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::DisplayRole);
+    bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::DisplayRole) override;
 
 private slots:
     void beginInsertItems(int start, int end);