diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-01-21 03:01:46 +0100 |
|---|---|---|
| committer | VaL Doroshchuk <valentyn.doroshchuk@qt.io> | 2020-01-21 08:52:14 +0000 |
| commit | 3a27739539638c5dd7c11262f2238eb02b14616e (patch) | |
| tree | 2f10d3bbd4cef4e0572321e75cc925829d6ccc6c /src/imports | |
| parent | 91679ad2b392db83dd723463b7d1f715ad5f2d8e (diff) | |
| parent | 8517f09af1536502011618d2b0c37537d1eb12ee (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Conflicts:
src/imports/multimedia/multimedia.cpp
Change-Id: I5b395bce97f2d2edc45294db046929cb9d9cd7b9
Diffstat (limited to 'src/imports')
| -rw-r--r-- | src/imports/multimedia/multimedia.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/imports/multimedia/multimedia.cpp b/src/imports/multimedia/multimedia.cpp index 5e3071f2b..7dadaea32 100644 --- a/src/imports/multimedia/multimedia.cpp +++ b/src/imports/multimedia/multimedia.cpp @@ -60,6 +60,7 @@ #include "qdeclarativecameraimageprocessing_p.h" #include "qdeclarativecameraviewfinder_p.h" #include "qdeclarativetorch_p.h" +#include <QAbstractVideoSurface> QML_DECLARE_TYPE(QSoundEffect) @@ -160,6 +161,10 @@ public: // 5.13 types qmlRegisterType<QDeclarativeVideoOutput, 13>(uri, 5, 13, "VideoOutput"); + // 5.15 types + qmlRegisterType<QDeclarativeVideoOutput, 15>(uri, 5, 15, "VideoOutput"); + qmlRegisterType<QAbstractVideoSurface>(); + // The minor version used to be the current Qt 5 minor. For compatibility it is the last // Qt 5 release. qmlRegisterModule(uri, 5, 15); |