diff options
| author | Alexander Volkov <a.volkov@rusbitech.ru> | 2016-12-11 15:10:11 +0300 |
|---|---|---|
| committer | Yoann Lopes <yoann.lopes@qt.io> | 2016-12-12 15:29:53 +0000 |
| commit | 32e35a8839085d88ddbf289ba2669c6745e9a04a (patch) | |
| tree | 8a009ea34d44114ee4cfabf275cdf95fb9bf159a /src/multimedia/qtmultimediaquicktools_headers | |
| parent | c89e2ea249015142f59c8ea440b6e36bac6f96c9 (diff) | |
Add missing override and remove redundant virtual
Change-Id: Ifd439abf21877adff57080489324bea729ee5279
Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
Diffstat (limited to 'src/multimedia/qtmultimediaquicktools_headers')
| -rw-r--r-- | src/multimedia/qtmultimediaquicktools_headers/qdeclarativevideooutput_p.h | 8 | ||||
| -rw-r--r-- | src/multimedia/qtmultimediaquicktools_headers/qsgvideonode_p.h | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/multimedia/qtmultimediaquicktools_headers/qdeclarativevideooutput_p.h b/src/multimedia/qtmultimediaquicktools_headers/qdeclarativevideooutput_p.h index 54282cad4..465821cb1 100644 --- a/src/multimedia/qtmultimediaquicktools_headers/qdeclarativevideooutput_p.h +++ b/src/multimedia/qtmultimediaquicktools_headers/qdeclarativevideooutput_p.h @@ -134,10 +134,10 @@ Q_SIGNALS: void contentRectChanged(); protected: - QSGNode *updatePaintNode(QSGNode *, UpdatePaintNodeData *); - void itemChange(ItemChange change, const ItemChangeData &changeData); - void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry); - void releaseResources(); + QSGNode *updatePaintNode(QSGNode *, UpdatePaintNodeData *) override; + void itemChange(ItemChange change, const ItemChangeData &changeData) override; + void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) override; + void releaseResources() override; private Q_SLOTS: void _q_updateMediaObject(); diff --git a/src/multimedia/qtmultimediaquicktools_headers/qsgvideonode_p.h b/src/multimedia/qtmultimediaquicktools_headers/qsgvideonode_p.h index ab7c5aa23..c094bed1f 100644 --- a/src/multimedia/qtmultimediaquicktools_headers/qsgvideonode_p.h +++ b/src/multimedia/qtmultimediaquicktools_headers/qsgvideonode_p.h @@ -101,8 +101,8 @@ class Q_MULTIMEDIAQUICK_EXPORT QSGVideoNodeFactoryPlugin : public QObject, publi Q_OBJECT Q_INTERFACES(QSGVideoNodeFactoryInterface) public: - virtual QList<QVideoFrame::PixelFormat> supportedPixelFormats(QAbstractVideoBuffer::HandleType handleType) const = 0; - virtual QSGVideoNode *createNode(const QVideoSurfaceFormat &format) = 0; + QList<QVideoFrame::PixelFormat> supportedPixelFormats(QAbstractVideoBuffer::HandleType handleType) const override = 0; + QSGVideoNode *createNode(const QVideoSurfaceFormat &format) override = 0; }; QT_END_NAMESPACE |