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.

6 files changed, 12 insertions, 40 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
 
diff --git a/tests/auto/qmediaplayer/tst_qmediaplayer.cpp b/tests/auto/qmediaplayer/tst_qmediaplayer.cpp
index 1775ec6..a96e08d 100644
--- a/tests/auto/qmediaplayer/tst_qmediaplayer.cpp
+++ b/tests/auto/qmediaplayer/tst_qmediaplayer.cpp
@@ -304,10 +304,7 @@ void tst_QMediaPlayer::initTestCase_data()
 
 void tst_QMediaPlayer::initTestCase()
 {
-    qRegisterMetaType<QMediaPlayer::State>("QMediaPlayer::State");
-    qRegisterMetaType<QMediaPlayer::Error>("QMediaPlayer::Error");
-    qRegisterMetaType<QMediaPlayer::MediaStatus>("QMediaPlayer::MediaStatus");
-    qRegisterMetaType<QMediaContent>("QMediaContent");
+    qRegisterMetaType<QMediaContent>();
 
     mockService = new MockPlayerService;
     mockProvider = new MockProvider(mockService);
@@ -738,10 +735,6 @@ void tst_QMediaPlayer::testMediaStatus()
     QCOMPARE(player->mediaStatus(), QMediaPlayer::LoadingMedia);
     QCOMPARE(statusSpy.count(), 1);
 
-#ifdef QTM_NAMESPACE
-    //looks like the correct value is emited, but QSignalSpy doesn't work correctly with QtMobility namespace
-    QEXPECT_FAIL("", "QSignalSpy doesn't grab the correct value from signal because of QtMobility namespace", Continue);
-#endif
     QCOMPARE(qvariant_cast<QMediaPlayer::MediaStatus>(statusSpy.last().value(0)),
              QMediaPlayer::LoadingMedia);
 
@@ -749,10 +742,6 @@ void tst_QMediaPlayer::testMediaStatus()
     QCOMPARE(player->mediaStatus(), QMediaPlayer::LoadedMedia);
     QCOMPARE(statusSpy.count(), 2);
 
-#ifdef QTM_NAMESPACE
-    //looks like the correct value is emited, but QSignalSpy doesn't work correctly with QtMobility namespace
-    QEXPECT_FAIL("", "QSignalSpy doesn't grab the correct value from signal because of QtMobility namespace", Continue);
-#endif
     QCOMPARE(qvariant_cast<QMediaPlayer::MediaStatus>(statusSpy.last().value(0)),
              QMediaPlayer::LoadedMedia);
 
@@ -764,10 +753,6 @@ void tst_QMediaPlayer::testMediaStatus()
     QCOMPARE(player->mediaStatus(), QMediaPlayer::StalledMedia);
     QCOMPARE(statusSpy.count(), 3);
 
-#ifdef QTM_NAMESPACE
-    //looks like the correct value is emited, but QSignalSpy doesn't work correctly with QtMobility namespace
-    QEXPECT_FAIL("", "QSignalSpy doesn't grab the correct value from signal because of QtMobility namespace", Continue);
-#endif
     QCOMPARE(qvariant_cast<QMediaPlayer::MediaStatus>(statusSpy.last().value(0)),
              QMediaPlayer::StalledMedia);
 
@@ -781,10 +766,6 @@ void tst_QMediaPlayer::testMediaStatus()
     QCOMPARE(player->mediaStatus(), QMediaPlayer::BufferingMedia);
     QCOMPARE(statusSpy.count(), 4);
 
-#ifdef QTM_NAMESPACE
-    //looks like the correct value is emited, but QSignalSpy doesn't work correctly with QtMobility namespace
-    QEXPECT_FAIL("", "QSignalSpy doesn't grab the correct value from signal because of QtMobility namespace", Continue);
-#endif
     QCOMPARE(qvariant_cast<QMediaPlayer::MediaStatus>(statusSpy.last().value(0)),
              QMediaPlayer::BufferingMedia);
 
@@ -798,10 +779,6 @@ void tst_QMediaPlayer::testMediaStatus()
     QCOMPARE(player->mediaStatus(), QMediaPlayer::BufferedMedia);
     QCOMPARE(statusSpy.count(), 5);
 
-#ifdef QTM_NAMESPACE
-    //looks like the correct value is emited, but QSignalSpy doesn't work correctly with QtMobility namespace
-    QEXPECT_FAIL("", "QSignalSpy doesn't grab the correct value from signal because of QtMobility namespace", Continue);
-#endif
     QCOMPARE(qvariant_cast<QMediaPlayer::MediaStatus>(statusSpy.last().value(0)),
              QMediaPlayer::BufferedMedia);
 
@@ -813,10 +790,6 @@ void tst_QMediaPlayer::testMediaStatus()
     QCOMPARE(player->mediaStatus(), QMediaPlayer::EndOfMedia);
     QCOMPARE(statusSpy.count(), 6);
 
-#ifdef QTM_NAMESPACE
-    //looks like the correct value is emited, but QSignalSpy doesn't work correctly with QtMobility namespace
-    QEXPECT_FAIL("", "QSignalSpy doesn't grab the correct value from signal because of QtMobility namespace", Continue);
-#endif
     QCOMPARE(qvariant_cast<QMediaPlayer::MediaStatus>(statusSpy.last().value(0)),
              QMediaPlayer::EndOfMedia);
 }