slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Allow plugins to override the QML VideoOutput type.

Browse Source 
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>
This commit is contained in:
Andrew den Exter
2013-12-05 15:38:14 +10:00
committed by The Qt Project
parent a52f552d42
commit 60fb11d9a2
21 changed files with 76 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tests/auto/integration/qdeclarativevideooutput/qdeclarativevideooutput.pro
View File

@@ -3,9 +3,6 @@ TARGET = tst_qdeclarativevideooutput
QT += multimedia-private qml testlib quick
CONFIG += testcase
OTHER_FILES += \
../../../../src/imports/multimedia/qdeclarativevideooutput_p.h
SOURCES += \
tst_qdeclarativevideooutput.cpp

2
tests/auto/integration/qdeclarativevideooutput/tst_qdeclarativevideooutput.cpp
View File

@@ -46,7 +46,7 @@
#include <QtQml/qqmlengine.h>
#include <QtQml/qqmlcomponent.h>
#include "qdeclarativevideooutput_p.h"
#include "private/qdeclarativevideooutput_p.h"
#include <qabstractvideosurface.h>
#include <qvideorenderercontrol.h>

3
tests/auto/integration/qdeclarativevideooutput_window/qdeclarativevideooutput_window.pro
View File

@@ -3,9 +3,6 @@ TARGET = tst_qdeclarativevideooutput_window
QT += multimedia-private qml testlib quick
CONFIG += testcase
OTHER_FILES += \
../../../../src/imports/multimedia/qdeclarativevideooutput_p.h
SOURCES += \
tst_qdeclarativevideooutput_window.cpp

2
tests/auto/integration/qdeclarativevideooutput_window/tst_qdeclarativevideooutput_window.cpp
View File

@@ -42,7 +42,7 @@
//TESTED_COMPONENT=plugins/declarative/multimedia
#include "qdeclarativevideooutput_p.h"
#include "private/qdeclarativevideooutput_p.h"
#include <QtCore/qobject.h>
#include <QtTest/qtest.h>
#include <QtQml/qqmlengine.h>