diff options
| author | VaL Doroshchuk <valentyn.doroshchuk@qt.io> | 2019-02-25 15:50:21 +0100 |
|---|---|---|
| committer | VaL Doroshchuk <valentyn.doroshchuk@qt.io> | 2019-02-25 15:33:01 +0000 |
| commit | eecd98d19211383ef197ecedc28ba57dee316944 (patch) | |
| tree | cc552dd8b8955a01589921f4ba3e34850a5f9f11 | |
| parent | 14b0f477159b5d0d28b38a67c6f329042ad322fa (diff) | |
Add a revision of QML VideoOutput flushMode property to 5.13
Change-Id: Ie7982232af45fd09a46854c96d7c7d6672857a97
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
| -rw-r--r-- | src/imports/multimedia/multimedia.cpp | 3 | ||||
| -rw-r--r-- | src/multimedia/qtmultimediaquicktools_headers/qdeclarativevideooutput_p.h | 2 | ||||
| -rw-r--r-- | src/qtmultimediaquicktools/qdeclarativevideooutput.cpp | 1 |
3 files changed, 5 insertions, 1 deletions
diff --git a/src/imports/multimedia/multimedia.cpp b/src/imports/multimedia/multimedia.cpp index f9170f790..8aed83d33 100644 --- a/src/imports/multimedia/multimedia.cpp +++ b/src/imports/multimedia/multimedia.cpp @@ -157,6 +157,9 @@ public: qmlRegisterType<QDeclarativeMediaMetaData>(); qmlRegisterType<QAbstractVideoFilter>(); + // 5.13 types + qmlRegisterType<QDeclarativeVideoOutput, 13>(uri, 5, 13, "VideoOutput"); + // Auto-increment the import to stay in sync with ALL future QtQuick minor versions from 5.11 onward qmlRegisterModule(uri, 5, QT_VERSION_MINOR); } diff --git a/src/multimedia/qtmultimediaquicktools_headers/qdeclarativevideooutput_p.h b/src/multimedia/qtmultimediaquicktools_headers/qdeclarativevideooutput_p.h index 894796dfb..8ea0dc338 100644 --- a/src/multimedia/qtmultimediaquicktools_headers/qdeclarativevideooutput_p.h +++ b/src/multimedia/qtmultimediaquicktools_headers/qdeclarativevideooutput_p.h @@ -79,7 +79,7 @@ class Q_MULTIMEDIAQUICK_EXPORT QDeclarativeVideoOutput : public QQuickItem Q_PROPERTY(QRectF sourceRect READ sourceRect NOTIFY sourceRectChanged) Q_PROPERTY(QRectF contentRect READ contentRect NOTIFY contentRectChanged) Q_PROPERTY(QQmlListProperty<QAbstractVideoFilter> filters READ filters); - Q_PROPERTY(FlushMode flushMode READ flushMode WRITE setFlushMode NOTIFY flushModeChanged) + Q_PROPERTY(FlushMode flushMode READ flushMode WRITE setFlushMode NOTIFY flushModeChanged REVISION 13) Q_ENUMS(FlushMode) Q_ENUMS(FillMode) diff --git a/src/qtmultimediaquicktools/qdeclarativevideooutput.cpp b/src/qtmultimediaquicktools/qdeclarativevideooutput.cpp index fccab54ab..b6d3afaa4 100644 --- a/src/qtmultimediaquicktools/qdeclarativevideooutput.cpp +++ b/src/qtmultimediaquicktools/qdeclarativevideooutput.cpp @@ -880,6 +880,7 @@ void QDeclarativeVideoOutput::_q_invalidateSceneGraph() /*! \qmlproperty enumeration QtMultimedia::VideoOutput::flushMode + \since QtMultimedia 5.13 Set this property to define what \c VideoOutput should show when playback is finished or stopped. |