diff options
| author | Andrew den Exter <andrew.den-exter@nokia.com> | 2010-02-17 02:41:11 (GMT) |
|---|---|---|
| committer | Andrew den Exter <andrew.den-exter@nokia.com> | 2010-02-17 02:49:42 (GMT) |
| commit | a2aaed149cffdde161fc1fc7d718b3fd7f6c96c5 (patch) | |
| tree | 34f2c866f13ff902971537c8bc477ca50d827d45 /src/multimedia | |
| parent | 4cbeafe5be5f7d20525518fa9c9686fd68869171 (diff) | |
| download | Qt-a2aaed149cffdde161fc1fc7d718b3fd7f6c96c5.zip Qt-a2aaed149cffdde161fc1fc7d718b3fd7f6c96c5.tar.gz Qt-a2aaed149cffdde161fc1fc7d718b3fd7f6c96c5.tar.bz2 | |
Fix QMediaPlayer test failure.
Prepending the Qt namespace with QT_PREPEND_NAMESPACE in a
Q_DECLARE_METATYPE statement is unecessary and appears not to work with
signal declarations in QSignalSpy.
Diffstat (limited to 'src/multimedia')
| -rw-r--r-- | src/multimedia/base/qmediacontent.h | 2 | ||||
| -rw-r--r-- | src/multimedia/base/qmediaplaylist.h | 4 | ||||
| -rw-r--r-- | src/multimedia/base/qmediaresource.h | 4 | ||||
| -rw-r--r-- | src/multimedia/playback/qmediaplayer.cpp | 7 | ||||
| -rw-r--r-- | src/multimedia/playback/qmediaplayer.h | 6 |
5 files changed, 11 insertions, 12 deletions
diff --git a/src/multimedia/base/qmediacontent.h b/src/multimedia/base/qmediacontent.h index 49d1155..1ea4898 100644 --- a/src/multimedia/base/qmediacontent.h +++ b/src/multimedia/base/qmediacontent.h @@ -83,7 +83,7 @@ private: QT_END_NAMESPACE -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE(QMediaContent)) +Q_DECLARE_METATYPE(QMediaContent) QT_END_HEADER diff --git a/src/multimedia/base/qmediaplaylist.h b/src/multimedia/base/qmediaplaylist.h index c16541a..494cf11 100644 --- a/src/multimedia/base/qmediaplaylist.h +++ b/src/multimedia/base/qmediaplaylist.h @@ -139,8 +139,8 @@ private: QT_END_NAMESPACE -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE(QMediaPlaylist::PlaybackMode)) -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE(QMediaPlaylist::Error)) +Q_DECLARE_METATYPE(QMediaPlaylist::PlaybackMode) +Q_DECLARE_METATYPE(QMediaPlaylist::Error) QT_END_HEADER diff --git a/src/multimedia/base/qmediaresource.h b/src/multimedia/base/qmediaresource.h index 516120a..a535bbd 100644 --- a/src/multimedia/base/qmediaresource.h +++ b/src/multimedia/base/qmediaresource.h @@ -125,8 +125,8 @@ typedef QList<QMediaResource> QMediaResourceList; QT_END_NAMESPACE -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE(QMediaResource)) -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE(QMediaResourceList)) +Q_DECLARE_METATYPE(QMediaResource) +Q_DECLARE_METATYPE(QMediaResourceList) QT_END_HEADER diff --git a/src/multimedia/playback/qmediaplayer.cpp b/src/multimedia/playback/qmediaplayer.cpp index 0853597..6ce34ab 100644 --- a/src/multimedia/playback/qmediaplayer.cpp +++ b/src/multimedia/playback/qmediaplayer.cpp @@ -42,7 +42,6 @@ #include <QtCore/qcoreevent.h> #include <QtCore/qmetaobject.h> #include <QtCore/qtimer.h> -#include <QtCore/qdebug.h> #include <QtCore/qpointer.h> #include <QtMultimedia/qmediaplayer.h> @@ -112,9 +111,9 @@ class MediaPlayerRegisterMetaTypes public: MediaPlayerRegisterMetaTypes() { - qRegisterMetaType<QMediaPlayer::State>("QMediaPlayer::State"); - qRegisterMetaType<QMediaPlayer::MediaStatus>("QMediaPlayer::MediaStatus"); - qRegisterMetaType<QMediaPlayer::Error>("QMediaPlayer::Error"); + qRegisterMetaType<QMediaPlayer::State>(); + qRegisterMetaType<QMediaPlayer::MediaStatus>(); + qRegisterMetaType<QMediaPlayer::Error>(); } } _registerPlayerMetaTypes; } diff --git a/src/multimedia/playback/qmediaplayer.h b/src/multimedia/playback/qmediaplayer.h index dc9d4f0..91d6790 100644 --- a/src/multimedia/playback/qmediaplayer.h +++ b/src/multimedia/playback/qmediaplayer.h @@ -193,9 +193,9 @@ private: QT_END_NAMESPACE -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE(QMediaPlayer::State)) -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE(QMediaPlayer::MediaStatus)) -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE(QMediaPlayer::Error)) +Q_DECLARE_METATYPE(QMediaPlayer::State) +Q_DECLARE_METATYPE(QMediaPlayer::MediaStatus) +Q_DECLARE_METATYPE(QMediaPlayer::Error) QT_END_HEADER |