Allow plugins to override the QML VideoOutput type.
authorAndrew den Exter <andrew.den.exter@jollamobile.com>
Thu, 5 Dec 2013 05:38:14 +0000 (15:38 +1000)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Mon, 20 Jan 2014 13:26:03 +0000 (14:26 +0100)
commit60fb11d9a2f5ff659a6ccffe01b4de16c1fb5929
tree9b715c70d25f1b46b3a4caf46e58cb1caa0ad34f
parenta52f552d4274eeaeb3a7362c509e77df501b1349
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>
34 files changed:
src/imports/multimedia/multimedia.cpp
src/imports/multimedia/multimedia.pro
src/imports/multimedia/qdeclarativevideooutput.cpp [deleted file]
src/imports/multimedia/qdeclarativevideooutput_backend_p.h [deleted file]
src/imports/multimedia/qdeclarativevideooutput_p.h [deleted file]
src/imports/multimedia/qdeclarativevideooutput_render.cpp [deleted file]
src/imports/multimedia/qdeclarativevideooutput_render_p.h [deleted file]
src/imports/multimedia/qdeclarativevideooutput_window.cpp [deleted file]
src/imports/multimedia/qdeclarativevideooutput_window_p.h [deleted file]
src/imports/multimedia/qsgvideonode_i420.cpp [deleted file]
src/imports/multimedia/qsgvideonode_i420.h [deleted file]
src/imports/multimedia/qsgvideonode_rgb.cpp [deleted file]
src/imports/multimedia/qsgvideonode_rgb.h [deleted file]
src/imports/multimedia/qsgvideonode_texture.cpp [deleted file]
src/imports/multimedia/qsgvideonode_texture.h [deleted file]
src/multimedia/qtmultimediaquicktools_headers/qdeclarativevideooutput_backend_p.h [new file with mode: 0644]
src/multimedia/qtmultimediaquicktools_headers/qdeclarativevideooutput_p.h [new file with mode: 0644]
src/multimedia/qtmultimediaquicktools_headers/qsgvideonode_p.h
src/qtmultimediaquicktools/qdeclarativevideooutput.cpp [new file with mode: 0644]
src/qtmultimediaquicktools/qdeclarativevideooutput_render.cpp [new file with mode: 0644]
src/qtmultimediaquicktools/qdeclarativevideooutput_render_p.h [new file with mode: 0644]
src/qtmultimediaquicktools/qdeclarativevideooutput_window.cpp [new file with mode: 0644]
src/qtmultimediaquicktools/qdeclarativevideooutput_window_p.h [new file with mode: 0644]
src/qtmultimediaquicktools/qsgvideonode_i420.cpp [new file with mode: 0644]
src/qtmultimediaquicktools/qsgvideonode_i420.h [new file with mode: 0644]
src/qtmultimediaquicktools/qsgvideonode_rgb.cpp [new file with mode: 0644]
src/qtmultimediaquicktools/qsgvideonode_rgb.h [new file with mode: 0644]
src/qtmultimediaquicktools/qsgvideonode_texture.cpp [new file with mode: 0644]
src/qtmultimediaquicktools/qsgvideonode_texture.h [new file with mode: 0644]
src/qtmultimediaquicktools/qtmultimediaquicktools.pro
tests/auto/integration/qdeclarativevideooutput/qdeclarativevideooutput.pro
tests/auto/integration/qdeclarativevideooutput/tst_qdeclarativevideooutput.cpp
tests/auto/integration/qdeclarativevideooutput_window/qdeclarativevideooutput_window.pro
tests/auto/integration/qdeclarativevideooutput_window/tst_qdeclarativevideooutput_window.cpp