--- a/qtmobility/tests/auto/qmediaplayer/tst_qmediaplayer.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/tests/auto/qmediaplayer/tst_qmediaplayer.cpp	Fri May 14 16:41:33 2010 +0300
@@ -50,7 +50,7 @@
 #include <qmediastreamscontrol.h>
 
 
-QTM_USE_NAMESPACE
+QT_USE_NAMESPACE
 class AutoConnection
 {
 public:
@@ -155,9 +155,9 @@
     StreamType streamType(int index) { return _streams.at(index).type; }
     void setStreamType(int index, StreamType type) { _streams[index].type = type; }
 
-    QVariant metaData(int index, QtMedia::MetaData key) {
+    QVariant metaData(int index, QtMediaServices::MetaData key) {
         return _streams.at(index).metaData.value(key); }
-    void setMetaData(int index, QtMedia::MetaData key, const QVariant &value) {
+    void setMetaData(int index, QtMediaServices::MetaData key, const QVariant &value) {
         _streams[index].metaData.insert(key, value); }
 
     bool isActive(int index) { return _streams.at(index).active; }
@@ -168,7 +168,7 @@
     {
         Stream() : type(UnknownStream), active(false) {}
         StreamType type;
-        QMap<QtMedia::MetaData, QVariant> metaData;
+        QMap<QtMediaServices::MetaData, QVariant> metaData;
         bool active;
     };
 
@@ -772,10 +772,6 @@
     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);
 
@@ -783,10 +779,6 @@
     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);
 
@@ -798,10 +790,6 @@
     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);
 
@@ -815,10 +803,6 @@
     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);
 
@@ -832,10 +816,6 @@
     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);
 
@@ -847,10 +827,6 @@
     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);
 }