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

Change-Id: I87da2a6655784bcaf76dd73992c8b874853b1fc7

1 files changed, 4 insertions, 4 deletions

diff --git a/src/plugins/directshow/player/directshowplayerservice.h b/src/plugins/directshow/player/directshowplayerservice.h
index de71a6fdf..d48b0575a 100644
--- a/src/plugins/directshow/player/directshowplayerservice.h
+++ b/src/plugins/directshow/player/directshowplayerservice.h
@@ -79,10 +79,10 @@ public:
     };
 
     DirectShowPlayerService(QObject *parent = 0);
-    ~DirectShowPlayerService();
+    ~DirectShowPlayerService() override;
 
-    QMediaControl* requestControl(const char *name);
-    void releaseControl(QMediaControl *control);
+    QMediaControl *requestControl(const char *name) override;
+    void releaseControl(QMediaControl *control) override;
 
     void load(const QMediaContent &media, QIODevice *stream);
     void play();
@@ -101,7 +101,7 @@ public:
     void setVideoOutput(IBaseFilter *filter);
 
 protected:
-    void customEvent(QEvent *event);
+    void customEvent(QEvent *event) override;
 
 private Q_SLOTS:
     void videoOutputChanged();