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

Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev

Browse Source
This commit is contained in:
Yoann Lopes
2014-01-30 14:32:29 +01:00
committed by The Qt Project
parent 5980bc41cf 9459acf48e
commit 67b86a9fbd
43 changed files with 1358 additions and 288 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>