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

Compile with refactor

Browse Source 
Change-Id: I248f811a13ca00ccbf5d342a556d389bca625856
Reviewed-on: http://codereview.qt-project.org/4940
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
This commit is contained in:
Gunnar Sletta
2011-09-14 15:35:32 +02:00
committed by Qt by Nokia
parent 4840be0239
commit eedcc340f1
84 changed files with 92 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/auto/qdeclarativeaudio/tst_qdeclarativeaudio.cpp
View File

@@ -51,7 +51,7 @@
#include <qmediaserviceprovider.h>
#include <qmetadatareadercontrol.h>
#include <QtGui/qapplication.h>
#include <QtWidgets/qapplication.h>
class tst_QDeclarativeAudio : public QObject
{

2
tests/auto/qdeclarativevideo/tst_qdeclarativevideo.cpp
View File

@@ -55,7 +55,7 @@
#include <qvideowindowcontrol.h>
#include <qvideosurfaceformat.h>
#include <QtGui/qapplication.h>
#include <QtWidgets/qapplication.h>
#include <QtGui/qpainter.h>
class tst_QDeclarativeVideo : public QObject

6
tests/auto/qgraphicsvideoitem/tst_qgraphicsvideoitem.cpp
View File

@@ -52,9 +52,9 @@
#include <qabstractvideosurface.h>
#include <qvideosurfaceformat.h>
#include <QtGui/qapplication.h>
#include <QtGui/qgraphicsscene.h>
#include <QtGui/qgraphicsview.h>
#include <QtWidgets/qapplication.h>
#include <QtWidgets/qgraphicsscene.h>
#include <QtWidgets/qgraphicsview.h>
QT_USE_NAMESPACE
class tst_QGraphicsVideoItem : public QObject

1
tests/auto/qmediaservice/qmediaservice.pro
View File

@@ -4,4 +4,3 @@ QT += multimediakit-private
CONFIG += no_private_qt_headers_warning
SOURCES += tst_qmediaservice.cpp

3
tests/auto/qmediaservice/tst_qmediaservice.cpp
View File

@@ -47,8 +47,7 @@
#include <qmediacontrol.h>
#include <qmediaservice.h>
#include <QtGui/qapplication.h>
#include <QtGui/qstyle.h>
#include <QtCore/qcoreapplication.h>
QT_BEGIN_NAMESPACE

2
tests/auto/qpaintervideosurface/tst_qpaintervideosurface.cpp
View File

@@ -44,7 +44,7 @@
#include <private/qpaintervideosurface_p.h>
#include <QtTest/QtTest>
#include <QtGui/qapplication.h>
#include <QtWidgets/qapplication.h>
#include <qvideosurfaceformat.h>
#if !defined(QT_NO_OPENGL) && !defined(QT_OPENGL_ES_1_CL) && !defined(QT_OPENGL_ES_1)

2
tests/auto/qvideoframe/tst_qvideoframe.cpp
View File

@@ -650,7 +650,7 @@ void tst_QVideoFrame::mapImage()
QVERIFY(frame.map(mode));
QVERIFY(frame.bits());
QCOMPARE(frame.mappedBytes(), image.numBytes());
QCOMPARE(frame.mappedBytes(), image.byteCount());
QCOMPARE(frame.bytesPerLine(), image.bytesPerLine());
QCOMPARE(frame.mapMode(), mode);

2
tests/auto/qvideowidget/tst_qvideowidget.cpp
View File

@@ -56,7 +56,7 @@
#include <qabstractvideosurface.h>
#include <qvideosurfaceformat.h>
#include <QtGui/qapplication.h>
#include <QtWidgets/qapplication.h>
QT_USE_NAMESPACE
class tst_QVideoWidget : public QObject