diff options
| author | Justin McPherson <justin.mcpherson@nokia.com> | 2010-04-19 00:08:35 (GMT) |
|---|---|---|
| committer | Justin McPherson <justin.mcpherson@nokia.com> | 2010-04-19 00:49:29 (GMT) |
| commit | 5c09309811c13fa360ba5e7b3173039da9c038f6 (patch) | |
| tree | ef032cc4eb2b54e3ea0e7dec3c2085fd1fa08134 /tests/auto/qdeclarativevideo | |
| parent | fdb5a0fe7a465c0d193260eea94f7caf36263265 (diff) | |
| download | Qt-5c09309811c13fa360ba5e7b3173039da9c038f6.zip Qt-5c09309811c13fa360ba5e7b3173039da9c038f6.tar.gz Qt-5c09309811c13fa360ba5e7b3173039da9c038f6.tar.bz2 | |
Tests; Fix media tests, make sure they are using mediaservies.
Reviewed-by: Dmytro Poplavskiy
Diffstat (limited to 'tests/auto/qdeclarativevideo')
| -rw-r--r-- | tests/auto/qdeclarativevideo/tst_qdeclarativevideo.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/auto/qdeclarativevideo/tst_qdeclarativevideo.cpp b/tests/auto/qdeclarativevideo/tst_qdeclarativevideo.cpp index 0fbd78c..99b447a 100644 --- a/tests/auto/qdeclarativevideo/tst_qdeclarativevideo.cpp +++ b/tests/auto/qdeclarativevideo/tst_qdeclarativevideo.cpp @@ -45,11 +45,11 @@ #include <QtGui/qapplication.h> #include <QtMultimedia/qabstractvideosurface.h> -#include <QtMultimedia/qgraphicsvideoitem.h> -#include <QtMultimedia/qmediaplayercontrol.h> -#include <QtMultimedia/qmediaservice.h> -#include <QtMultimedia/qvideooutputcontrol.h> -#include <QtMultimedia/qvideorenderercontrol.h> +#include <QtMediaServices/qgraphicsvideoitem.h> +#include <QtMediaServices/qmediaplayercontrol.h> +#include <QtMediaServices/qmediaservice.h> +#include <QtMediaServices/qvideooutputcontrol.h> +#include <QtMediaServices/qvideorenderercontrol.h> #include <QtMultimedia/qvideosurfaceformat.h> @@ -73,7 +73,7 @@ private slots: void geometry(); }; -Q_DECLARE_METATYPE(QtMultimedia::MetaData); +Q_DECLARE_METATYPE(QtMediaServices::MetaData); Q_DECLARE_METATYPE(QDeclarativeVideo::Error); class QtTestMediaPlayerControl : public QMediaPlayerControl |