diff options
| author | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-09-14 15:35:32 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-09-17 03:24:15 +0200 |
| commit | eedcc340f1c1e8bb09759946a4b2c241e219cc58 (patch) | |
| tree | 82bccd0f8ec9b61027254795616efdaa31620e50 /tests | |
| parent | 4840be02398041315da8be67041a8cd9152ee8a1 (diff) | |
Compile with refactor
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>
Diffstat (limited to 'tests')
8 files changed, 9 insertions, 11 deletions
diff --git a/tests/auto/qdeclarativeaudio/tst_qdeclarativeaudio.cpp b/tests/auto/qdeclarativeaudio/tst_qdeclarativeaudio.cpp index b75ed8485..ddf3fce13 100644 --- a/tests/auto/qdeclarativeaudio/tst_qdeclarativeaudio.cpp +++ b/tests/auto/qdeclarativeaudio/tst_qdeclarativeaudio.cpp @@ -51,7 +51,7 @@ #include <qmediaserviceprovider.h> #include <qmetadatareadercontrol.h> -#include <QtGui/qapplication.h> +#include <QtWidgets/qapplication.h> class tst_QDeclarativeAudio : public QObject { diff --git a/tests/auto/qdeclarativevideo/tst_qdeclarativevideo.cpp b/tests/auto/qdeclarativevideo/tst_qdeclarativevideo.cpp index 01bc0e769..035310079 100644 --- a/tests/auto/qdeclarativevideo/tst_qdeclarativevideo.cpp +++ b/tests/auto/qdeclarativevideo/tst_qdeclarativevideo.cpp @@ -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 diff --git a/tests/auto/qgraphicsvideoitem/tst_qgraphicsvideoitem.cpp b/tests/auto/qgraphicsvideoitem/tst_qgraphicsvideoitem.cpp index f932bfd7d..79b3a0ab3 100644 --- a/tests/auto/qgraphicsvideoitem/tst_qgraphicsvideoitem.cpp +++ b/tests/auto/qgraphicsvideoitem/tst_qgraphicsvideoitem.cpp @@ -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 diff --git a/tests/auto/qmediaservice/qmediaservice.pro b/tests/auto/qmediaservice/qmediaservice.pro index 3f6cbb7d2..4d48c4887 100644 --- a/tests/auto/qmediaservice/qmediaservice.pro +++ b/tests/auto/qmediaservice/qmediaservice.pro @@ -4,4 +4,3 @@ QT += multimediakit-private CONFIG += no_private_qt_headers_warning SOURCES += tst_qmediaservice.cpp - diff --git a/tests/auto/qmediaservice/tst_qmediaservice.cpp b/tests/auto/qmediaservice/tst_qmediaservice.cpp index 8f1dc38d1..3a46c5626 100644 --- a/tests/auto/qmediaservice/tst_qmediaservice.cpp +++ b/tests/auto/qmediaservice/tst_qmediaservice.cpp @@ -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 diff --git a/tests/auto/qpaintervideosurface/tst_qpaintervideosurface.cpp b/tests/auto/qpaintervideosurface/tst_qpaintervideosurface.cpp index 66fa43945..53ed906e9 100644 --- a/tests/auto/qpaintervideosurface/tst_qpaintervideosurface.cpp +++ b/tests/auto/qpaintervideosurface/tst_qpaintervideosurface.cpp @@ -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) diff --git a/tests/auto/qvideoframe/tst_qvideoframe.cpp b/tests/auto/qvideoframe/tst_qvideoframe.cpp index 37f7dc440..f400bfecb 100644 --- a/tests/auto/qvideoframe/tst_qvideoframe.cpp +++ b/tests/auto/qvideoframe/tst_qvideoframe.cpp @@ -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); diff --git a/tests/auto/qvideowidget/tst_qvideowidget.cpp b/tests/auto/qvideowidget/tst_qvideowidget.cpp index cfcd79927..58ab43eed 100644 --- a/tests/auto/qvideowidget/tst_qvideowidget.cpp +++ b/tests/auto/qvideowidget/tst_qvideowidget.cpp @@ -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 |