diff -r 6fbed849b4f4 -r 1f895d8a5b2b qtmobility/tests/auto/qmediaobject/tst_qmediaobject.cpp
--- a/qtmobility/tests/auto/qmediaobject/tst_qmediaobject.cpp	Wed Jun 23 19:08:38 2010 +0300
+++ b/qtmobility/tests/auto/qmediaobject/tst_qmediaobject.cpp	Tue Jul 06 15:12:50 2010 +0300
@@ -87,10 +87,10 @@
         if (m_available != available)
             emit metaDataAvailableChanged(m_available = available);
     }
-    QList<QtMultimedia::MetaData> availableMetaData() const { return m_data.keys(); }
+    QList<QtMultimediaKit::MetaData> availableMetaData() const { return m_data.keys(); }
 
 
-    QVariant metaData(QtMultimedia::MetaData key) const { return m_data.value(key); }
+    QVariant metaData(QtMultimediaKit::MetaData key) const { return m_data.value(key); }
 
     QVariant extendedMetaData(const QString &key) const { return m_extendedData.value(key); }
 
@@ -104,7 +104,7 @@
     }
 
     bool m_available;
-    QMap<QtMultimedia::MetaData, QVariant> m_data;
+    QMap<QtMultimediaKit::MetaData, QVariant> m_data;
     QMap<QString, QVariant> m_extendedData;
 };
 
@@ -366,9 +366,9 @@
 
     QCOMPARE(object.isMetaDataAvailable(), false);
 
-    QCOMPARE(object.metaData(QtMultimedia::Title).toString(), QString());
+    QCOMPARE(object.metaData(QtMultimediaKit::Title).toString(), QString());
     QCOMPARE(object.extendedMetaData(titleKey).toString(), QString());
-    QCOMPARE(object.availableMetaData(), QList<QtMultimedia::MetaData>());
+    QCOMPARE(object.availableMetaData(), QList<QtMultimediaKit::MetaData>());
     QCOMPARE(object.availableExtendedMetaData(), QStringList());
     QCOMPARE(spy.count(), 0);
 }
@@ -433,18 +433,18 @@
     QtTestMediaObject object(&service);
     QVERIFY(object.availableMetaData().isEmpty());
 
-    service.metaData.m_data.insert(QtMultimedia::AlbumArtist, artist);
-    service.metaData.m_data.insert(QtMultimedia::Title, title);
-    service.metaData.m_data.insert(QtMultimedia::Genre, genre);
+    service.metaData.m_data.insert(QtMultimediaKit::AlbumArtist, artist);
+    service.metaData.m_data.insert(QtMultimediaKit::Title, title);
+    service.metaData.m_data.insert(QtMultimediaKit::Genre, genre);
 
-    QCOMPARE(object.metaData(QtMultimedia::AlbumArtist).toString(), artist);
-    QCOMPARE(object.metaData(QtMultimedia::Title).toString(), title);
+    QCOMPARE(object.metaData(QtMultimediaKit::AlbumArtist).toString(), artist);
+    QCOMPARE(object.metaData(QtMultimediaKit::Title).toString(), title);
 
-    QList<QtMultimedia::MetaData> metaDataKeys = object.availableMetaData();
+    QList<QtMultimediaKit::MetaData> metaDataKeys = object.availableMetaData();
     QCOMPARE(metaDataKeys.size(), 3);
-    QVERIFY(metaDataKeys.contains(QtMultimedia::AlbumArtist));
-    QVERIFY(metaDataKeys.contains(QtMultimedia::Title));
-    QVERIFY(metaDataKeys.contains(QtMultimedia::Genre));
+    QVERIFY(metaDataKeys.contains(QtMultimediaKit::AlbumArtist));
+    QVERIFY(metaDataKeys.contains(QtMultimediaKit::Title));
+    QVERIFY(metaDataKeys.contains(QtMultimediaKit::Genre));
 }
 
 void tst_QMediaObject::extendedMetaData()