diff options
| author | Andrew den Exter <andrew.den.exter@jollamobile.com> | 2013-12-05 15:38:14 +1000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-01-20 14:26:03 +0100 |
| commit | 60fb11d9a2f5ff659a6ccffe01b4de16c1fb5929 (patch) | |
| tree | 9b715c70d25f1b46b3a4caf46e58cb1caa0ad34f /src/imports/multimedia/multimedia.cpp | |
| parent | a52f552d4274eeaeb3a7362c509e77df501b1349 (diff) | |
| download | qtmultimedia-60fb11d9a2f5ff659a6ccffe01b4de16c1fb5929.tar.gz | |
Allow plugins to override the QML VideoOutput type.
Move QDeclarativeVideoOutput to the private QtMultimediaQuickTools
library to make the QDeclarativeVideoOutputBackend interface
implementable by a plugin.
Change-Id: I763c483a1fc9ec56dc7b8be0bc71523f029a36ee
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
Diffstat (limited to 'src/imports/multimedia/multimedia.cpp')
| -rw-r--r-- | src/imports/multimedia/multimedia.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/imports/multimedia/multimedia.cpp b/src/imports/multimedia/multimedia.cpp index f05252f5c..94b697e85 100644 --- a/src/imports/multimedia/multimedia.cpp +++ b/src/imports/multimedia/multimedia.cpp @@ -45,9 +45,10 @@ #include <QtQml/qqmlcomponent.h> #include "qsoundeffect.h" +#include <private/qdeclarativevideooutput_p.h> + #include "qdeclarativemediametadata_p.h" #include "qdeclarativeaudio_p.h" -#include "qdeclarativevideooutput_p.h" #include "qdeclarativeradio_p.h" #include "qdeclarativeradiodata_p.h" #include "qdeclarativecamera_p.h" |