summaryrefslogtreecommitdiffstats
path: root/examples/multimediawidgets/videographicsitem/videoplayer.h
diff options
context:
space:
mode:
authorYoann Lopes <yoann.lopes@qt.io>2017-01-26 15:40:30 +0100
committerYoann Lopes <yoann.lopes@qt.io>2017-01-26 15:53:44 +0100
commitc5ff5b853b9bca231c54ee07e5238714c0407595 (patch)
tree0a4d842e7fcb6079d7c7b4935843eb1ba46a4422 /examples/multimediawidgets/videographicsitem/videoplayer.h
parent7e48870c182e66a8408bbcb4c9469d751a777daa (diff)
parentc1164f874a21959d03893f62db8f8e2def44122d (diff)
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
Diffstat (limited to 'examples/multimediawidgets/videographicsitem/videoplayer.h')
-rw-r--r--examples/multimediawidgets/videographicsitem/videoplayer.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/examples/multimediawidgets/videographicsitem/videoplayer.h b/examples/multimediawidgets/videographicsitem/videoplayer.h
index 914c5949..ffccc9a9 100644
--- a/examples/multimediawidgets/videographicsitem/videoplayer.h
+++ b/examples/multimediawidgets/videographicsitem/videoplayer.h
@@ -62,7 +62,7 @@ public:
void load(const QUrl &url);
bool isPlayerAvailable() const;
- QSize sizeHint() const Q_DECL_OVERRIDE;
+ QSize sizeHint() const override;
public slots:
void openFile();