Rename QtMultimediaKit to QtMultimedia.

There are a few legacy bits left in place so it passes CI, and
then qt5.git etc can be updated.

Change-Id: I6b082e50e6958c72fdabc2974992e16d90dafa3a
Reviewed-on: http://codereview.qt-project.org/5368
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>

73 files changed, 284 insertions, 284 deletions

diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro
index a8160c376..affd4e3d2 100644
--- a/tests/auto/auto.pro
+++ b/tests/auto/auto.pro
@@ -1,7 +1,7 @@
 TEMPLATE = subdirs
 
 SUBDIRS += multimedia.pro
-contains(QT_CONFIG,multimediakitwidgets): SUBDIRS += multimediawidgets.pro
+contains(QT_CONFIG,multimediawidgets): SUBDIRS += multimediawidgets.pro
 
 # These autotests consist of things such as static code checks
 # which require that the autotest is run on the same machine
diff --git a/tests/auto/qabstractvideobuffer/qabstractvideobuffer.pro b/tests/auto/qabstractvideobuffer/qabstractvideobuffer.pro
index 9bc5bbebc..d6c7a0766 100644
--- a/tests/auto/qabstractvideobuffer/qabstractvideobuffer.pro
+++ b/tests/auto/qabstractvideobuffer/qabstractvideobuffer.pro
@@ -1,6 +1,6 @@
 load(qttest_p4)
 
-QT += core multimediakit-private
+QT += core multimedia-private
 CONFIG += no_private_qt_headers_warning
 
 SOURCES += tst_qabstractvideobuffer.cpp
diff --git a/tests/auto/qabstractvideosurface/qabstractvideosurface.pro b/tests/auto/qabstractvideosurface/qabstractvideosurface.pro
index 49461d385..d580a0e8a 100644
--- a/tests/auto/qabstractvideosurface/qabstractvideosurface.pro
+++ b/tests/auto/qabstractvideosurface/qabstractvideosurface.pro
@@ -1,6 +1,6 @@
 load(qttest_p4)
 
-QT += core multimediakit-private
+QT += core multimedia-private
 CONFIG += no_private_qt_headers_warning
 
 SOURCES += tst_qabstractvideosurface.cpp
diff --git a/tests/auto/qaudiocapturesource/qaudiocapturesource.pro b/tests/auto/qaudiocapturesource/qaudiocapturesource.pro
index 9addb194c..9a53b54a1 100644
--- a/tests/auto/qaudiocapturesource/qaudiocapturesource.pro
+++ b/tests/auto/qaudiocapturesource/qaudiocapturesource.pro
@@ -1,6 +1,6 @@
 load(qttest_p4)
 
-QT += multimediakit-private
+QT += multimedia-private
 CONFIG += no_private_qt_headers_warning
 
 SOURCES += tst_qaudiocapturesource.cpp
diff --git a/tests/auto/qaudiocapturesource/tst_qaudiocapturesource.cpp b/tests/auto/qaudiocapturesource/tst_qaudiocapturesource.cpp
index f798d8f2c..d2620b8eb 100644
--- a/tests/auto/qaudiocapturesource/tst_qaudiocapturesource.cpp
+++ b/tests/auto/qaudiocapturesource/tst_qaudiocapturesource.cpp
@@ -167,14 +167,14 @@ void tst_QAudioCaptureSource::testAvailability()
     QAudioCaptureSource source(0, &provider);
 
     QVERIFY(source.isAvailable() == false);
-    QVERIFY(source.availabilityError() == QtMultimediaKit::ServiceMissingError);
+    QVERIFY(source.availabilityError() == QtMultimedia::ServiceMissingError);
 
     service.hasControls = true;
     MockMediaServiceProvider provider2(&service);
     QAudioCaptureSource source2(0, &provider2);
 
     QVERIFY(source2.isAvailable() == true);
-    QVERIFY(source2.availabilityError() == QtMultimediaKit::NoError);
+    QVERIFY(source2.availabilityError() == QtMultimedia::NoError);
 }
 
 void tst_QAudioCaptureSource::testAvailableAudioInputChangedSignal()
diff --git a/tests/auto/qaudiodeviceinfo/qaudiodeviceinfo.pro b/tests/auto/qaudiodeviceinfo/qaudiodeviceinfo.pro
index bca2f3edd..0d66771fe 100644
--- a/tests/auto/qaudiodeviceinfo/qaudiodeviceinfo.pro
+++ b/tests/auto/qaudiodeviceinfo/qaudiodeviceinfo.pro
@@ -1,6 +1,6 @@
 load(qttest_p4)
 
-QT += core multimediakit-private
+QT += core multimedia-private
 CONFIG += no_private_qt_headers_warning
 
 # This is more of a system test
diff --git a/tests/auto/qaudioformat/qaudioformat.pro b/tests/auto/qaudioformat/qaudioformat.pro
index 60fd74a4f..10b962ed2 100644
--- a/tests/auto/qaudioformat/qaudioformat.pro
+++ b/tests/auto/qaudioformat/qaudioformat.pro
@@ -1,6 +1,6 @@
 load(qttest_p4)
 
-QT += core multimediakit-private
+QT += core multimedia-private
 CONFIG += no_private_qt_headers_warning
 
 SOURCES += tst_qaudioformat.cpp
diff --git a/tests/auto/qaudioinput/qaudioinput.pro b/tests/auto/qaudioinput/qaudioinput.pro
index c5a952bf8..446315f07 100644
--- a/tests/auto/qaudioinput/qaudioinput.pro
+++ b/tests/auto/qaudioinput/qaudioinput.pro
@@ -1,6 +1,6 @@
 load(qttest_p4)
 
-QT += core multimediakit-private
+QT += core multimedia-private
 CONFIG += no_private_qt_headers_warning
 
 # This is more of a system test
diff --git a/tests/auto/qaudiooutput/qaudiooutput.pro b/tests/auto/qaudiooutput/qaudiooutput.pro
index 3693dbbef..4a0267286 100644
--- a/tests/auto/qaudiooutput/qaudiooutput.pro
+++ b/tests/auto/qaudiooutput/qaudiooutput.pro
@@ -1,6 +1,6 @@
 load(qttest_p4)
 
-QT += core multimediakit-private
+QT += core multimedia-private
 CONFIG += no_private_qt_headers_warning
 
 # This is more of a system test
diff --git a/tests/auto/qcamera/qcamera.pro b/tests/auto/qcamera/qcamera.pro
index 9e4a7e8ae..75a9200e9 100644
--- a/tests/auto/qcamera/qcamera.pro
+++ b/tests/auto/qcamera/qcamera.pro
@@ -1,6 +1,6 @@
 load(qttest_p4)
 
-QT += multimediakit-private
+QT += multimedia-private
 CONFIG += no_private_qt_headers_warning
 
 include (../qmultimedia_common/mock.pri)
diff --git a/tests/auto/qcamera/tst_qcamera.cpp b/tests/auto/qcamera/tst_qcamera.cpp
index f0962394a..c9093e239 100644
--- a/tests/auto/qcamera/tst_qcamera.cpp
+++ b/tests/auto/qcamera/tst_qcamera.cpp
@@ -69,7 +69,7 @@
 
 QT_USE_NAMESPACE
 
-Q_DECLARE_METATYPE(QtMultimediaKit::MetaData)
+Q_DECLARE_METATYPE(QtMultimedia::MetaData)
 
 class tst_QCamera: public QObject
 {
@@ -175,7 +175,7 @@ void tst_QCamera::initTestCase()
     provider = new MockMediaServiceProvider;
     mockSimpleCameraService = new MockSimpleCameraService;
     provider->service = mockSimpleCameraService;
-    qRegisterMetaType<QtMultimediaKit::MetaData>("QtMultimediaKit::MetaData");
+    qRegisterMetaType<QtMultimedia::MetaData>("QtMultimedia::MetaData");
 }
 
 void tst_QCamera::cleanupTestCase()
@@ -515,7 +515,7 @@ void tst_QCamera::testCameraCaptureMetadata()
     QCamera camera(0, provider);
     QCameraImageCapture imageCapture(&camera);
 
-    QSignalSpy metadataSignal(&imageCapture, SIGNAL(imageMetadataAvailable(int,QtMultimediaKit::MetaData,QVariant)));
+    QSignalSpy metadataSignal(&imageCapture, SIGNAL(imageMetadataAvailable(int,QtMultimedia::MetaData,QVariant)));
     QSignalSpy extendedMetadataSignal(&imageCapture, SIGNAL(imageMetadataAvailable(int,QString,QVariant)));
     QSignalSpy savedSignal(&imageCapture, SIGNAL(imageSaved(int,QString)));
 
@@ -531,12 +531,12 @@ void tst_QCamera::testCameraCaptureMetadata()
 
     QVariantList metadata = metadataSignal[0];
     QCOMPARE(metadata[0].toInt(), id);
-    QCOMPARE(metadata[1].value<QtMultimediaKit::MetaData>(), QtMultimediaKit::FocalLengthIn35mmFilm);
+    QCOMPARE(metadata[1].value<QtMultimedia::MetaData>(), QtMultimedia::FocalLengthIn35mmFilm);
     QCOMPARE(metadata[2].value<QVariant>().toInt(), 50);
 
     metadata = metadataSignal[1];
     QCOMPARE(metadata[0].toInt(), id);
-    QCOMPARE(metadata[1].value<QtMultimediaKit::MetaData>(), QtMultimediaKit::DateTimeOriginal);
+    QCOMPARE(metadata[1].value<QtMultimedia::MetaData>(), QtMultimedia::DateTimeOriginal);
     QDateTime captureTime = metadata[2].value<QVariant>().value<QDateTime>();
     QVERIFY(qAbs(captureTime.secsTo(QDateTime::currentDateTime()) < 5)); //it should not takes more than 5 seconds for signal to arrive here
 
@@ -785,9 +785,9 @@ void tst_QCamera::testImageSettings()
     QVERIFY(settings != QImageEncoderSettings());
 
     settings = QImageEncoderSettings();
-    QCOMPARE(settings.quality(), QtMultimediaKit::NormalQuality);
-    settings.setQuality(QtMultimediaKit::HighQuality);
-    QCOMPARE(settings.quality(), QtMultimediaKit::HighQuality);
+    QCOMPARE(settings.quality(), QtMultimedia::NormalQuality);
+    settings.setQuality(QtMultimedia::HighQuality);
+    QCOMPARE(settings.quality(), QtMultimedia::HighQuality);
     QVERIFY(!settings.isNull());
 
     settings = QImageEncoderSettings();
@@ -801,7 +801,7 @@ void tst_QCamera::testImageSettings()
     settings = QImageEncoderSettings();
     QVERIFY(settings.isNull());
     QCOMPARE(settings.codec(), QString());
-    QCOMPARE(settings.quality(), QtMultimediaKit::NormalQuality);
+    QCOMPARE(settings.quality(), QtMultimedia::NormalQuality);
     QCOMPARE(settings.resolution(), QSize());
 
     {
@@ -813,7 +813,7 @@ void tst_QCamera::testImageSettings()
         QCOMPARE(settings2, settings1);
         QVERIFY(settings2.isNull());
 
-        settings1.setQuality(QtMultimediaKit::HighQuality);
+        settings1.setQuality(QtMultimedia::HighQuality);
 
         QVERIFY(settings2.isNull());
         QVERIFY(!settings1.isNull());
@@ -829,7 +829,7 @@ void tst_QCamera::testImageSettings()
         QCOMPARE(settings2, settings1);
         QVERIFY(settings2.isNull());
 
-        settings1.setQuality(QtMultimediaKit::HighQuality);
+        settings1.setQuality(QtMultimedia::HighQuality);
 
         QVERIFY(settings2.isNull());
         QVERIFY(!settings1.isNull());
@@ -856,11 +856,11 @@ void tst_QCamera::testImageSettings()
     QVERIFY(settings1 != settings2);
 
     settings1 = QImageEncoderSettings();
-    settings1.setQuality(QtMultimediaKit::NormalQuality);
+    settings1.setQuality(QtMultimedia::NormalQuality);
     settings2 = QImageEncoderSettings();
-    settings2.setQuality(QtMultimediaKit::NormalQuality);
+    settings2.setQuality(QtMultimedia::NormalQuality);
     QVERIFY(settings1 == settings2);
-    settings2.setQuality(QtMultimediaKit::LowQuality);
+    settings2.setQuality(QtMultimedia::LowQuality);
     QVERIFY(settings1 != settings2);
 }
 
@@ -1246,10 +1246,10 @@ void tst_QCamera::testAvailabilityError()
     MockCameraService service;
     provider->service = &service;
     QCamera camera(0, provider);
-    QVERIFY(camera.availabilityError() == QtMultimediaKit::NoError);
+    QVERIFY(camera.availabilityError() == QtMultimedia::NoError);
 
     QCamera *camera1 = new QCamera("random");
-    QVERIFY(camera1->availabilityError() == QtMultimediaKit::ServiceMissingError);
+    QVERIFY(camera1->availabilityError() == QtMultimedia::ServiceMissingError);
     delete camera1;
 }
 
diff --git a/tests/auto/qcamerabackend/qcamerabackend.pro b/tests/auto/qcamerabackend/qcamerabackend.pro
index 638c2c368..70206b229 100644
--- a/tests/auto/qcamerabackend/qcamerabackend.pro
+++ b/tests/auto/qcamerabackend/qcamerabackend.pro
@@ -1,6 +1,6 @@
 load(qttest_p4)
 
-QT += multimediakit-private multimediakitwidgets-private
+QT += multimedia-private multimediawidgets-private
 CONFIG += no_private_qt_headers_warning
 
 # This is more of a system test
diff --git a/tests/auto/qcamerabackend/tst_qcamerabackend.cpp b/tests/auto/qcamerabackend/tst_qcamerabackend.cpp
index 523a8e290..a6399f5c6 100644
--- a/tests/auto/qcamerabackend/tst_qcamerabackend.cpp
+++ b/tests/auto/qcamerabackend/tst_qcamerabackend.cpp
@@ -121,7 +121,7 @@ QT_USE_NAMESPACE
 */
 
 
-Q_DECLARE_METATYPE(QtMultimediaKit::MetaData)
+Q_DECLARE_METATYPE(QtMultimedia::MetaData)
 Q_DECLARE_METATYPE(QVideoFrame)
 
 class tst_QCameraBackend: public QObject
@@ -149,7 +149,7 @@ private:
 
 void tst_QCameraBackend::initTestCase()
 {
-    qRegisterMetaType<QtMultimediaKit::MetaData>("QtMultimediaKit::MetaData");
+    qRegisterMetaType<QtMultimedia::MetaData>("QtMultimedia::MetaData");
 
     QCamera camera;
     if (!camera.isAvailable())
@@ -523,7 +523,7 @@ void tst_QCameraBackend::testCameraCaptureMetadata()
     QCameraImageCapture imageCapture(&camera);
     camera.exposure()->setFlashMode(QCameraExposure::FlashOff);
 
-    QSignalSpy metadataSignal(&imageCapture, SIGNAL(imageMetadataAvailable(int,QtMultimediaKit::MetaData,QVariant)));
+    QSignalSpy metadataSignal(&imageCapture, SIGNAL(imageMetadataAvailable(int,QtMultimedia::MetaData,QVariant)));
     QSignalSpy savedSignal(&imageCapture, SIGNAL(imageSaved(int,QString)));
 
     camera.start();
diff --git a/tests/auto/qcameraimagecapture/qcameraimagecapture.pro b/tests/auto/qcameraimagecapture/qcameraimagecapture.pro
index a69d2f342..7f37061fa 100644
--- a/tests/auto/qcameraimagecapture/qcameraimagecapture.pro
+++ b/tests/auto/qcameraimagecapture/qcameraimagecapture.pro
@@ -1,6 +1,6 @@
 load(qttest_p4)
 
-QT += multimediakit-private
+QT += multimedia-private
 CONFIG += no_private_qt_headers_warning
 
 SOURCES += \
diff --git a/tests/auto/qcameraimagecapture/tst_qcameraimagecapture.cpp b/tests/auto/qcameraimagecapture/tst_qcameraimagecapture.cpp
index 312def45e..e842cbb83 100644
--- a/tests/auto/qcameraimagecapture/tst_qcameraimagecapture.cpp
+++ b/tests/auto/qcameraimagecapture/tst_qcameraimagecapture.cpp
@@ -254,11 +254,11 @@ void tst_QCameraImageCapture::encodingSettings()
     QVERIFY(imageCapture.encodingSettings() == QImageEncoderSettings());
     QImageEncoderSettings settings;
     settings.setCodec("JPEG");
-    settings.setQuality(QtMultimediaKit::NormalQuality);
+    settings.setQuality(QtMultimedia::NormalQuality);
     imageCapture.setEncodingSettings(settings);
     QVERIFY(!imageCapture.encodingSettings().isNull());
     QVERIFY(imageCapture.encodingSettings().codec() == "JPEG");
-    QVERIFY(imageCapture.encodingSettings().quality() == QtMultimediaKit::NormalQuality);
+    QVERIFY(imageCapture.encodingSettings().quality() == QtMultimedia::NormalQuality);
 }
 
 //MaemoAPI-1838:test supportedImageCodecs
@@ -307,7 +307,7 @@ void tst_QCameraImageCapture::errors()
     imageCapture1.capture(QString::fromLatin1("/dev/null"));
     QVERIFY(imageCapture1.error() == QCameraImageCapture::NotSupportedFeatureError);
     QVERIFY2(!imageCapture1.errorString().isEmpty(), "Device does not support images capture");
-    QVERIFY(imageCapture1.availabilityError() == QtMultimediaKit::ServiceMissingError);
+    QVERIFY(imageCapture1.availabilityError() == QtMultimedia::ServiceMissingError);
 
 
     QCamera camera(0, provider);
@@ -315,12 +315,12 @@ void tst_QCameraImageCapture::errors()
     QVERIFY(imageCapture.isAvailable() == true);
     QVERIFY(imageCapture.error() == QCameraImageCapture::NoError);
     QVERIFY(imageCapture.errorString().isEmpty());
-    QVERIFY(imageCapture.availabilityError() == QtMultimediaKit::NoError);
+    QVERIFY(imageCapture.availabilityError() == QtMultimedia::NoError);
 
     imageCapture.capture();
     QVERIFY(imageCapture.error() == QCameraImageCapture::NotReadyError);
     QVERIFY2(!imageCapture.errorString().isEmpty(), "Could not capture in stopped state");
-    QVERIFY(imageCapture.availabilityError() == QtMultimediaKit::NoError);
+    QVERIFY(imageCapture.availabilityError() == QtMultimedia::NoError);
 }
 
 //MaemoAPI-1831:test error
diff --git a/tests/auto/qcameraviewfinder/qcameraviewfinder.pro b/tests/auto/qcameraviewfinder/qcameraviewfinder.pro
index 3f751ac95..2543b3ffd 100644
--- a/tests/auto/qcameraviewfinder/qcameraviewfinder.pro
+++ b/tests/auto/qcameraviewfinder/qcameraviewfinder.pro
@@ -1,6 +1,6 @@
 load(qttest_p4)
 
-QT += multimediakit-private multimediakitwidgets-private
+QT += multimedia-private multimediawidgets-private
 CONFIG += no_private_qt_headers_warning
 
 include (../qmultimedia_common/mock.pri)
diff --git a/tests/auto/qcamerawidgets/qcamerawidgets.pro b/tests/auto/qcamerawidgets/qcamerawidgets.pro
index 220e16d6b..b97232ab3 100644
--- a/tests/auto/qcamerawidgets/qcamerawidgets.pro
+++ b/tests/auto/qcamerawidgets/qcamerawidgets.pro
@@ -1,6 +1,6 @@
 load(qttest_p4)
 
-QT += multimediakit-private multimediakitwidgets-private
+QT += multimedia-private multimediawidgets-private
 CONFIG += no_private_qt_headers_warning
 
 include (../qmultimedia_common/mock.pri)
diff --git a/tests/auto/qcamerawidgets/tst_qcamerawidgets.cpp b/tests/auto/qcamerawidgets/tst_qcamerawidgets.cpp
index c6b448225..dc29b949d 100644
--- a/tests/auto/qcamerawidgets/tst_qcamerawidgets.cpp
+++ b/tests/auto/qcamerawidgets/tst_qcamerawidgets.cpp
@@ -72,7 +72,7 @@
 
 QT_USE_NAMESPACE
 
-Q_DECLARE_METATYPE(QtMultimediaKit::MetaData)
+Q_DECLARE_METATYPE(QtMultimedia::MetaData)
 
 class tst_QCameraWidgets: public QObject
 {
@@ -98,7 +98,7 @@ void tst_QCameraWidgets::initTestCase()
     provider = new MockMediaServiceProvider;
     mockSimpleCameraService = new MockSimpleCameraService;
     provider->service = mockSimpleCameraService;
-    qRegisterMetaType<QtMultimediaKit::MetaData>("QtMultimediaKit::MetaData");
+    qRegisterMetaType<QtMultimedia::MetaData>("QtMultimedia::MetaData");
 }
 
 void tst_QCameraWidgets::cleanupTestCase()
diff --git a/tests/auto/qdeclarativeaudio/qdeclarativeaudio.pro b/tests/auto/qdeclarativeaudio/qdeclarativeaudio.pro
index 0b9b5e295..923e3bad3 100644
--- a/tests/auto/qdeclarativeaudio/qdeclarativeaudio.pro
+++ b/tests/auto/qdeclarativeaudio/qdeclarativeaudio.pro
@@ -1,16 +1,16 @@
 load(qttest_p4)
 
-QT += multimediakit-private declarative
+QT += multimedia-private declarative
 CONFIG += no_private_qt_headers_warning
 
 HEADERS += \
-        $$QT.multimediakit.sources/../imports/multimedia/qdeclarativeaudio_p.h \
-        $$QT.multimediakit.sources/../imports/multimedia/qdeclarativemediabase_p.h \
-        $$QT.multimediakit.sources/../imports/multimedia/qdeclarativemediametadata_p.h
+        $$QT.multimedia.sources/../imports/multimedia/qdeclarativeaudio_p.h \
+        $$QT.multimedia.sources/../imports/multimedia/qdeclarativemediabase_p.h \
+        $$QT.multimedia.sources/../imports/multimedia/qdeclarativemediametadata_p.h
 
 SOURCES += \
         tst_qdeclarativeaudio.cpp \
-        $$QT.multimediakit.sources/../imports/multimedia/qdeclarativeaudio.cpp \
-        $$QT.multimediakit.sources/../imports/multimedia/qdeclarativemediabase.cpp
+        $$QT.multimedia.sources/../imports/multimedia/qdeclarativeaudio.cpp \
+        $$QT.multimedia.sources/../imports/multimedia/qdeclarativemediabase.cpp
 
-INCLUDEPATH += $$QT.multimediakit.sources/../imports/multimedia
+INCLUDEPATH += $$QT.multimedia.sources/../imports/multimedia
diff --git a/tests/auto/qdeclarativeaudio/tst_qdeclarativeaudio.cpp b/tests/auto/qdeclarativeaudio/tst_qdeclarativeaudio.cpp
index ddf3fce13..01d14f3c9 100644
--- a/tests/auto/qdeclarativeaudio/tst_qdeclarativeaudio.cpp
+++ b/tests/auto/qdeclarativeaudio/tst_qdeclarativeaudio.cpp
@@ -82,7 +82,7 @@ private slots:
     void loops();
 };
 
-Q_DECLARE_METATYPE(QtMultimediaKit::MetaData);
+Q_DECLARE_METATYPE(QtMultimedia::MetaData);
 Q_DECLARE_METATYPE(QDeclarativeAudio::Error);
 
 class QtTestMediaPlayerControl : public QMediaPlayerControl
@@ -203,17 +203,17 @@ public:
 
     bool isMetaDataAvailable() const { return true; }
 
-    QVariant metaData(QtMultimediaKit::MetaData key) const { return m_metaData.value(key); }
-    void setMetaData(QtMultimediaKit::MetaData key, const QVariant &value) {
+    QVariant metaData(QtMultimedia::MetaData key) const { return m_metaData.value(key); }
+    void setMetaData(QtMultimedia::MetaData key, const QVariant &value) {
         m_metaData.insert(key, value); emit metaDataChanged(); }
 
-    QList<QtMultimediaKit::MetaData> availableMetaData() const { return m_metaData.keys(); }
+    QList<QtMultimedia::MetaData> availableMetaData() const { return m_metaData.keys(); }
 
     QVariant extendedMetaData(const QString &) const { return QVariant(); }
     QStringList availableExtendedMetaData() const { return QStringList(); }
 
 private:
-    QMap<QtMultimediaKit::MetaData, QVariant> m_metaData;
+    QMap<QtMultimedia::MetaData, QVariant> m_metaData;
 };
 
 class QtTestMediaService : public QMediaService
@@ -1123,29 +1123,29 @@ void tst_QDeclarativeAudio::status()
 void tst_QDeclarativeAudio::metaData_data()
 {
     QTest::addColumn<QByteArray>("propertyName");
-    QTest::addColumn<QtMultimediaKit::MetaData>("propertyKey");
+    QTest::addColumn<QtMultimedia::MetaData>("propertyKey");
     QTest::addColumn<QVariant>("value");
 
     QTest::newRow("title")
             << QByteArray("title")
-            << QtMultimediaKit::Title
+            << QtMultimedia::Title
             << QVariant(QString::fromLatin1("This is a title"));
 
     QTest::newRow("genre")
             << QByteArray("genre")
-            << QtMultimediaKit::Genre
+            << QtMultimedia::Genre
             << QVariant(QString::fromLatin1("rock"));
 
     QTest::newRow("trackNumber")
             << QByteArray("trackNumber")
-            << QtMultimediaKit::TrackNumber
+            << QtMultimedia::TrackNumber
             << QVariant(8);
 }
 
 void tst_QDeclarativeAudio::metaData()
 {
     QFETCH(QByteArray, propertyName);
-    QFETCH(QtMultimediaKit::MetaData, propertyKey);
+    QFETCH(QtMultimedia::MetaData, propertyKey);
     QFETCH(QVariant, value);
 
     QtTestMediaServiceProvider provider;
diff --git a/tests/auto/qdeclarativevideo/qdeclarativevideo.pro b/tests/auto/qdeclarativevideo/qdeclarativevideo.pro
index 35d7b14cf..02afacee9 100644
--- a/tests/auto/qdeclarativevideo/qdeclarativevideo.pro
+++ b/tests/auto/qdeclarativevideo/qdeclarativevideo.pro
@@ -1,17 +1,17 @@
 load(qttest_p4)
 
-QT += multimediakit-private declarative
+QT += multimedia-private declarative
 CONFIG += no_private_qt_headers_warning
 
 HEADERS += \
-        $$QT.multimediakit.sources/../imports/multimedia/qdeclarativevideo_p.h \
-        $$QT.multimediakit.sources/../imports/multimedia/qdeclarativemediabase_p.h \
-        $$QT.multimediakit.sources/../imports/multimedia/qdeclarativemediametadata_p.h
+        $$QT.multimedia.sources/../imports/multimedia/qdeclarativevideo_p.h \
+        $$QT.multimedia.sources/../imports/multimedia/qdeclarativemediabase_p.h \
+        $$QT.multimedia.sources/../imports/multimedia/qdeclarativemediametadata_p.h
 
 SOURCES += \
         tst_qdeclarativevideo.cpp \
-        $$QT.multimediakit.sources/../imports/multimedia/qdeclarativevideo.cpp \
-        $$QT.multimediakit.sources/../imports/multimedia/qdeclarativemediabase.cpp
+        $$QT.multimedia.sources/../imports/multimedia/qdeclarativevideo.cpp \
+        $$QT.multimedia.sources/../imports/multimedia/qdeclarativemediabase.cpp
 
-INCLUDEPATH += $$QT.multimediakit.sources/../imports/multimedia
+INCLUDEPATH += $$QT.multimedia.sources/../imports/multimedia
 QT+=widgets
diff --git a/tests/auto/qdeclarativevideo/tst_qdeclarativevideo.cpp b/tests/auto/qdeclarativevideo/tst_qdeclarativevideo.cpp
index 035310079..750cd9320 100644
--- a/tests/auto/qdeclarativevideo/tst_qdeclarativevideo.cpp
+++ b/tests/auto/qdeclarativevideo/tst_qdeclarativevideo.cpp
@@ -78,7 +78,7 @@ private slots:
     void geometry();
 };
 
-Q_DECLARE_METATYPE(QtMultimediaKit::MetaData);
+Q_DECLARE_METATYPE(QtMultimedia::MetaData);
 Q_DECLARE_METATYPE(QDeclarativeVideo::Error);
 
 class QtTestMediaPlayerControl : public QMediaPlayerControl
diff --git a/tests/auto/qgraphicsvideoitem/qgraphicsvideoitem.pro b/tests/auto/qgraphicsvideoitem/qgraphicsvideoitem.pro
index 25ebe0ff2..cd88f4ba0 100644
--- a/tests/auto/qgraphicsvideoitem/qgraphicsvideoitem.pro
+++ b/tests/auto/qgraphicsvideoitem/qgraphicsvideoitem.pro
@@ -1,6 +1,6 @@
 load(qttest_p4)
 
-QT += multimediakit-private multimediakitwidgets-private
+QT += multimedia-private multimediawidgets-private
 CONFIG += no_private_qt_headers_warning
 
 SOURCES += tst_qgraphicsvideoitem.cpp
diff --git a/tests/auto/qgraphicsvideoitem/tst_qgraphicsvideoitem.cpp b/tests/auto/qgraphicsvideoitem/tst_qgraphicsvideoitem.cpp
index 79b3a0ab3..393ac7a49 100644
--- a/tests/auto/qgraphicsvideoitem/tst_qgraphicsvideoitem.cpp
+++ b/tests/auto/qgraphicsvideoitem/tst_qgraphicsvideoitem.cpp
@@ -41,7 +41,7 @@
 
 //TESTED_COMPONENT=src/multimedia
 
-#include <qtmultimediakitdefs.h>
+#include <qtmultimediadefs.h>
 #include "qgraphicsvideoitem.h"
 #include <QtTest/QtTest>
 #include "qmediaobject.h"
diff --git a/tests/auto/qmediabindableinterface/qmediabindableinterface.pro b/tests/auto/qmediabindableinterface/qmediabindableinterface.pro
index 95e9f24a7..530d55039 100644
--- a/tests/auto/qmediabindableinterface/qmediabindableinterface.pro
+++ b/tests/auto/qmediabindableinterface/qmediabindableinterface.pro
@@ -1,6 +1,6 @@
 load(qttest_p4)
 
-QT += multimediakit-private
+QT += multimedia-private
 CONFIG += no_private_qt_headers_warning
 
 SOURCES += \
diff --git a/tests/auto/qmediacontainercontrol/qmediacontainercontrol.pro b/tests/auto/qmediacontainercontrol/qmediacontainercontrol.pro
index c9e94711e..54088400f 100644
--- a/tests/auto/qmediacontainercontrol/qmediacontainercontrol.pro
+++ b/tests/auto/qmediacontainercontrol/qmediacontainercontrol.pro
@@ -1,6 +1,6 @@
 load(qttest_p4)
 
-QT += multimediakit-private
+QT += multimedia-private
 CONFIG += no_private_qt_headers_warning
 
 SOURCES += tst_qmediacontainercontrol.cpp
diff --git a/tests/auto/qmediacontent/qmediacontent.pro b/tests/auto/qmediacontent/qmediacontent.pro
index a843c30e4..493a1d977 100644
--- a/tests/auto/qmediacontent/qmediacontent.pro
+++ b/tests/auto/qmediacontent/qmediacontent.pro
@@ -1,6 +1,6 @@
 load(qttest_p4)
 
-QT += multimediakit-private network
+QT += multimedia-private network
 CONFIG += no_private_qt_headers_warning
 
 SOURCES += tst_qmediacontent.cpp
diff --git a/tests/auto/qmediaimageviewer/qmediaimageviewer.pro b/tests/auto/qmediaimageviewer/qmediaimageviewer.pro
index 5372a19d6..50b01f1b6 100644
--- a/tests/auto/qmediaimageviewer/qmediaimageviewer.pro
+++ b/tests/auto/qmediaimageviewer/qmediaimageviewer.pro
@@ -1,6 +1,6 @@
 load(qttest_p4)
 
-QT += multimediakit-private network
+QT += multimedia-private network
 CONFIG += no_private_qt_headers_warning
 
 SOURCES += tst_qmediaimageviewer.cpp
diff --git a/tests/auto/qmediaimageviewer/tst_qmediaimageviewer.cpp b/tests/auto/qmediaimageviewer/tst_qmediaimageviewer.cpp
index e1de92a05..00cfe8549 100644
--- a/tests/auto/qmediaimageviewer/tst_qmediaimageviewer.cpp
+++ b/tests/auto/qmediaimageviewer/tst_qmediaimageviewer.cpp
@@ -41,7 +41,7 @@
 
 //TESTED_COMPONENT=src/multimedia
 
-#include <qtmultimediakitdefs.h>
+#include <qtmultimediadefs.h>
 #include <QtTest/QtTest>
 
 #include <QtCore/qdir.h>
diff --git a/tests/auto/qmediaimageviewerwidgets/qmediaimageviewerwidgets.pro b/tests/auto/qmediaimageviewerwidgets/qmediaimageviewerwidgets.pro
index f3493685c..95cb87568 100644
--- a/tests/auto/qmediaimageviewerwidgets/qmediaimageviewerwidgets.pro
+++ b/tests/auto/qmediaimageviewerwidgets/qmediaimageviewerwidgets.pro
@@ -1,6 +1,6 @@
 load(qttest_p4)
 
-QT += multimediakit-private multimediakitwidgets-private network
+QT += multimedia-private multimediawidgets-private network
 CONFIG += no_private_qt_headers_warning
 
 SOURCES += tst_qmediaimageviewerwidgets.cpp
diff --git a/tests/auto/qmediaimageviewerwidgets/tst_qmediaimageviewerwidgets.cpp b/tests/auto/qmediaimageviewerwidgets/tst_qmediaimageviewerwidgets.cpp
index fd51b0063..80c745fe0 100644
--- a/tests/auto/qmediaimageviewerwidgets/tst_qmediaimageviewerwidgets.cpp
+++ b/tests/auto/qmediaimageviewerwidgets/tst_qmediaimageviewerwidgets.cpp
@@ -41,7 +41,7 @@
 
 //TESTED_COMPONENT=src/multimedia
 
-#include <qtmultimediakitdefs.h>
+#include <qtmultimediadefs.h>
 #include <QtTest/QtTest>
 
 #include <QtCore/qdir.h>
diff --git a/tests/auto/qmediaobject/qmediaobject.pro b/tests/auto/qmediaobject/qmediaobject.pro
index 66f60e1d5..b164adbb6 100644
--- a/tests/auto/qmediaobject/qmediaobject.pro
+++ b/tests/auto/qmediaobject/qmediaobject.pro
@@ -1,6 +1,6 @@
 load(qttest_p4)
 
-QT += multimediakit-private
+QT += multimedia-private
 CONFIG += no_private_qt_headers_warning
 
 include (../qmultimedia_common/mockrecorder.pri)
diff --git a/tests/auto/qmediaobject/tst_qmediaobject.cpp b/tests/auto/qmediaobject/tst_qmediaobject.cpp
index 6a337ac50..dde293634 100644
--- a/tests/auto/qmediaobject/tst_qmediaobject.cpp
+++ b/tests/auto/qmediaobject/tst_qmediaobject.cpp
@@ -244,9 +244,9 @@ void tst_QMediaObject::nullMetaDataControl()
 
     QCOMPARE(object.isMetaDataAvailable(), false);
 
-    QCOMPARE(object.metaData(QtMultimediaKit::Title).toString(), QString());
+    QCOMPARE(object.metaData(QtMultimedia::Title).toString(), QString());
     QCOMPARE(object.extendedMetaData(titleKey).toString(), QString());
-    QCOMPARE(object.availableMetaData(), QList<QtMultimediaKit::MetaData>());
+    QCOMPARE(object.availableMetaData(), QList<QtMultimedia::MetaData>());
     QCOMPARE(object.availableExtendedMetaData(), QStringList());
     QCOMPARE(spy.count(), 0);
 }
@@ -311,18 +311,18 @@ void tst_QMediaObject::metaData()
     QtTestMediaObject object(&service);
     QVERIFY(object.availableMetaData().isEmpty());
 
-    service.metaData.m_data.insert(QtMultimediaKit::AlbumArtist, artist);
-    service.metaData.m_data.insert(QtMultimediaKit::Title, title);
-    service.metaData.m_data.insert(QtMultimediaKit::Genre, genre);
+    service.metaData.m_data.insert(QtMultimedia::AlbumArtist, artist);
+    service.metaData.m_data.insert(QtMultimedia::Title, title);
+    service.metaData.m_data.insert(QtMultimedia::Genre, genre);
 
-    QCOMPARE(object.metaData(QtMultimediaKit::AlbumArtist).toString(), artist);
-    QCOMPARE(object.metaData(QtMultimediaKit::Title).toString(), title);
+    QCOMPARE(object.metaData(QtMultimedia::AlbumArtist).toString(), artist);
+    QCOMPARE(object.metaData(QtMultimedia::Title).toString(), title);
 
-    QList<QtMultimediaKit::MetaData> metaDataKeys = object.availableMetaData();
+    QList<QtMultimedia::MetaData> metaDataKeys = object.availableMetaData();
     QCOMPARE(metaDataKeys.size(), 3);
-    QVERIFY(metaDataKeys.contains(QtMultimediaKit::AlbumArtist));
-    QVERIFY(metaDataKeys.contains(QtMultimediaKit::Title));
-    QVERIFY(metaDataKeys.contains(QtMultimediaKit::Genre));
+    QVERIFY(metaDataKeys.contains(QtMultimedia::AlbumArtist));
+    QVERIFY(metaDataKeys.contains(QtMultimedia::Title));
+    QVERIFY(metaDataKeys.contains(QtMultimedia::Genre));
 }
 
 void tst_QMediaObject::extendedMetaData()
@@ -353,12 +353,12 @@ void tst_QMediaObject::availability()
 {
     QtTestMediaObject nullObject(0);
     QCOMPARE(nullObject.isAvailable(), false);
-    QCOMPARE(nullObject.availabilityError(), QtMultimediaKit::ServiceMissingError);
+    QCOMPARE(nullObject.availabilityError(), QtMultimedia::ServiceMissingError);
 
     QtTestMetaDataService service;
     QtTestMediaObject object(&service);
     QCOMPARE(object.isAvailable(), true);
-    QCOMPARE(object.availabilityError(), QtMultimediaKit::NoError);
+    QCOMPARE(object.availabilityError(), QtMultimedia::NoError);
 }
 
  void tst_QMediaObject::service()
diff --git a/tests/auto/qmediaplayer/qmediaplayer.pro b/tests/auto/qmediaplayer/qmediaplayer.pro
index bdb616a27..dae3ddebd 100644
--- a/tests/auto/qmediaplayer/qmediaplayer.pro
+++ b/tests/auto/qmediaplayer/qmediaplayer.pro
@@ -1,6 +1,6 @@
 load(qttest_p4)
 
-QT += network multimediakit-private
+QT += network multimedia-private
 CONFIG += no_private_qt_headers_warning
 
 HEADERS += tst_qmediaplayer.h
diff --git a/tests/auto/qmediaplayer/tst_qmediaplayer.cpp b/tests/auto/qmediaplayer/tst_qmediaplayer.cpp
index 8117ae1aa..383a4c4f3 100644
--- a/tests/auto/qmediaplayer/tst_qmediaplayer.cpp
+++ b/tests/auto/qmediaplayer/tst_qmediaplayer.cpp
@@ -167,7 +167,7 @@ void tst_QMediaPlayer::testNullService()
     QCOMPARE(player.playbackRate(), qreal(0));
     QCOMPARE(player.error(), QMediaPlayer::ServiceMissingError);
     QCOMPARE(player.isAvailable(), false);
-    QCOMPARE(player.availabilityError(), QtMultimediaKit::ServiceMissingError);
+    QCOMPARE(player.availabilityError(), QtMultimedia::ServiceMissingError);
 
     {
         QFETCH_GLOBAL(QMediaContent, mediaContent);
@@ -448,7 +448,7 @@ void tst_QMediaPlayer::testErrorString()
 void tst_QMediaPlayer::testIsAvailable()
 {
     QCOMPARE(player->isAvailable(), true);
-    QCOMPARE(player->availabilityError(), QtMultimediaKit::NoError);
+    QCOMPARE(player->availabilityError(), QtMultimedia::NoError);
 }
 
 void tst_QMediaPlayer::testService()
diff --git a/tests/auto/qmediaplayerbackend/qmediaplayerbackend.pro b/tests/auto/qmediaplayerbackend/qmediaplayerbackend.pro
index c89a30f31..c86afc44b 100644
--- a/tests/auto/qmediaplayerbackend/qmediaplayerbackend.pro
+++ b/tests/auto/qmediaplayerbackend/qmediaplayerbackend.pro
@@ -1,6 +1,6 @@
 load(qttest_p4)
 
-QT += multimediakit-private
+QT += multimedia-private
 CONFIG += no_private_qt_headers_warning
 
 # This is more of a system test
diff --git a/tests/auto/qmediaplayerwidgets/qmediaplayerwidgets.pro b/tests/auto/qmediaplayerwidgets/qmediaplayerwidgets.pro
index a750ca9fa..61c9c2bcc 100644
--- a/tests/auto/qmediaplayerwidgets/qmediaplayerwidgets.pro
+++ b/tests/auto/qmediaplayerwidgets/qmediaplayerwidgets.pro
@@ -1,6 +1,6 @@
 load(qttest_p4)
 
-QT += network multimediakit-private multimediakitwidgets-private
+QT += network multimedia-private multimediawidgets-private
 CONFIG += no_private_qt_headers_warning
 
 HEADERS += tst_qmediaplayerwidgets.h
diff --git a/tests/auto/qmediaplaylist/qmediaplaylist.pro b/tests/auto/qmediaplaylist/qmediaplaylist.pro
index 38bac95ae..346251a31 100644
--- a/tests/auto/qmediaplaylist/qmediaplaylist.pro
+++ b/tests/auto/qmediaplaylist/qmediaplaylist.pro
@@ -5,18 +5,18 @@ CONFIG += insignificant_test
 
 include (../qmultimedia_common/mockplaylist.pri)
 
-QT += multimediakit-private
+QT += multimedia-private
 CONFIG += no_private_qt_headers_warning
 
 DEFINES += TESTDATA_DIR=\\\"$$PWD/\\\"
 
 HEADERS += \
-    $$QT.multimediakit.sources/../plugins/m3u/qm3uhandler.h
+    $$QT.multimedia.sources/../plugins/m3u/qm3uhandler.h
 
 SOURCES += \
     tst_qmediaplaylist.cpp \
-    $$QT.multimediakit.sources/../plugins/m3u/qm3uhandler.cpp
+    $$QT.multimedia.sources/../plugins/m3u/qm3uhandler.cpp
 
-INCLUDEPATH += $$QT.multimediakit.sources/../plugins/m3u
+INCLUDEPATH += $$QT.multimedia.sources/../plugins/m3u
 
 maemo*:CONFIG += insignificant_test
diff --git a/tests/auto/qmediaplaylistnavigator/qmediaplaylistnavigator.pro b/tests/auto/qmediaplaylistnavigator/qmediaplaylistnavigator.pro
index 488249177..33c4336e5 100644
--- a/tests/auto/qmediaplaylistnavigator/qmediaplaylistnavigator.pro
+++ b/tests/auto/qmediaplaylistnavigator/qmediaplaylistnavigator.pro
@@ -1,6 +1,6 @@
 load(qttest_p4)
 
-QT += multimediakit-private
+QT += multimedia-private
 CONFIG += no_private_qt_headers_warning
 
 SOURCES += tst_qmediaplaylistnavigator.cpp
diff --git a/tests/auto/qmediapluginloader/qmediapluginloader.pro b/tests/auto/qmediapluginloader/qmediapluginloader.pro
index 3299d50e5..eb1fd96e9 100644
--- a/tests/auto/qmediapluginloader/qmediapluginloader.pro
+++ b/tests/auto/qmediapluginloader/qmediapluginloader.pro
@@ -1,6 +1,6 @@
 load(qttest_p4)
 
-QT += multimediakit-private
+QT += multimedia-private
 CONFIG += no_private_qt_headers_warning
 
 SOURCES += tst_qmediapluginloader.cpp
diff --git a/tests/auto/qmediarecorder/qmediarecorder.pro b/tests/auto/qmediarecorder/qmediarecorder.pro
index 5243a8206..b7ca93df1 100644
--- a/tests/auto/qmediarecorder/qmediarecorder.pro
+++ b/tests/auto/qmediarecorder/qmediarecorder.pro
@@ -1,6 +1,6 @@
 load(qttest_p4)
 
-QT += multimediakit-private
+QT += multimedia-private
 CONFIG += no_private_qt_headers_warning
 
 include (../qmultimedia_common/mock.pri)
diff --git a/tests/auto/qmediarecorder/tst_qmediarecorder.cpp b/tests/auto/qmediarecorder/tst_qmediarecorder.cpp
index 4f46f54f5..d99d73cfb 100644
--- a/tests/auto/qmediarecorder/tst_qmediarecorder.cpp
+++ b/tests/auto/qmediarecorder/tst_qmediarecorder.cpp
@@ -135,7 +135,7 @@ void tst_QMediaRecorder::testNullControls()
 
     QAudioEncoderSettings audio;
     audio.setCodec(id);
-    audio.setQuality(QtMultimediaKit::LowQuality);
+    audio.setQuality(QtMultimedia::LowQuality);
 
     QVideoEncoderSettings video;
     video.setCodec(id);
@@ -320,18 +320,18 @@ void tst_QMediaRecorder::testEncodingSettings()
     QCOMPARE(audioSettings.codec(), QString("audio/pcm"));
     QCOMPARE(audioSettings.bitRate(), 128*1024);
     QCOMPARE(audioSettings.sampleRate(), 8000);
-    QCOMPARE(audioSettings.quality(), QtMultimediaKit::NormalQuality);
+    QCOMPARE(audioSettings.quality(), QtMultimedia::NormalQuality);
     QCOMPARE(audioSettings.channelCount(), -1);
 
-    QCOMPARE(audioSettings.encodingMode(), QtMultimediaKit::ConstantQualityEncoding);
+    QCOMPARE(audioSettings.encodingMode(), QtMultimedia::ConstantQualityEncoding);
 
     QVideoEncoderSettings videoSettings = capture->videoSettings();
     QCOMPARE(videoSettings.codec(), QString());
     QCOMPARE(videoSettings.bitRate(), -1);
     QCOMPARE(videoSettings.resolution(), QSize());
     QCOMPARE(videoSettings.frameRate(), 0.0);
-    QCOMPARE(videoSettings.quality(), QtMultimediaKit::NormalQuality);
-    QCOMPARE(videoSettings.encodingMode(), QtMultimediaKit::ConstantQualityEncoding);
+    QCOMPARE(videoSettings.quality(), QtMultimedia::NormalQuality);
+    QCOMPARE(videoSettings.encodingMode(), QtMultimedia::ConstantQualityEncoding);
 
     QString format = capture->containerMimeType();
     QCOMPARE(format, QString());
@@ -339,15 +339,15 @@ void tst_QMediaRecorder::testEncodingSettings()
     audioSettings.setCodec("audio/mpeg");
     audioSettings.setSampleRate(44100);
     audioSettings.setBitRate(256*1024);
-    audioSettings.setQuality(QtMultimediaKit::HighQuality);
-    audioSettings.setEncodingMode(QtMultimediaKit::AverageBitRateEncoding);
+    audioSettings.setQuality(QtMultimedia::HighQuality);
+    audioSettings.setEncodingMode(QtMultimedia::AverageBitRateEncoding);
 
     videoSettings.setCodec("video/3gpp");
     videoSettings.setBitRate(800);
     videoSettings.setFrameRate(24*1024);
     videoSettings.setResolution(QSize(800,600));
-    videoSettings.setQuality(QtMultimediaKit::HighQuality);
-    audioSettings.setEncodingMode(QtMultimediaKit::TwoPassEncoding);
+    videoSettings.setQuality(QtMultimedia::HighQuality);
+    audioSettings.setEncodingMode(QtMultimedia::TwoPassEncoding);
 
     format = QString("mov");
 
@@ -377,9 +377,9 @@ void tst_QMediaRecorder::testAudioSettings()
     QVERIFY(!settings.isNull());
 
     settings = QAudioEncoderSettings();
-    QCOMPARE(settings.quality(), QtMultimediaKit::NormalQuality);
-    settings.setQuality(QtMultimediaKit::HighQuality);
-    QCOMPARE(settings.quality(), QtMultimediaKit::HighQuality);
+    QCOMPARE(settings.quality(), QtMultimedia::NormalQuality);
+    settings.setQuality(QtMultimedia::HighQuality);
+    QCOMPARE(settings.quality(), QtMultimedia::HighQuality);
     QVERIFY(!settings.isNull());
 
     settings = QAudioEncoderSettings();
@@ -398,7 +398,7 @@ void tst_QMediaRecorder::testAudioSettings()
     QVERIFY(settings.isNull());
     QCOMPARE(settings.codec(), QString());
     QCOMPARE(settings.bitRate(), -1);
-    QCOMPARE(settings.quality(), QtMultimediaKit::NormalQuality);
+    QCOMPARE(settings.quality(), QtMultimedia::NormalQuality);
     QCOMPARE(settings.sampleRate(), -1);
 
     {
@@ -410,7 +410,7 @@ void tst_QMediaRecorder::testAudioSettings()
         QCOMPARE(settings2, settings1);
         QVERIFY(settings2.isNull());
 
-        settings1.setQuality(QtMultimediaKit::HighQuality);
+        settings1.setQuality(QtMultimedia::HighQuality);
 
         QVERIFY(settings2.isNull());
         QVERIFY(!settings1.isNull());
@@ -426,7 +426,7 @@ void tst_QMediaRecorder::testAudioSettings()
         QCOMPARE(settings2, settings1);
         QVERIFY(settings2.isNull());
 
-        settings1.setQuality(QtMultimediaKit::HighQuality);
+        settings1.setQuality(QtMultimedia::HighQuality);
 
         QVERIFY(settings2.isNull());
         QVERIFY(!settings1.isNull());
@@ -458,19 +458,19 @@ void tst_QMediaRecorder::testAudioSettings()
     QVERIFY(settings1 != settings2);
 
     settings1 = QAudioEncoderSettings();
-    settings1.setEncodingMode(QtMultimediaKit::ConstantBitRateEncoding);
+    settings1.setEncodingMode(QtMultimedia::ConstantBitRateEncoding);
     settings2 = QAudioEncoderSettings();
-    settings2.setEncodingMode(QtMultimediaKit::ConstantBitRateEncoding);
+    settings2.setEncodingMode(QtMultimedia::ConstantBitRateEncoding);
     QVERIFY(settings1 == settings2);
-    settings2.setEncodingMode(QtMultimediaKit::TwoPassEncoding);
+    settings2.setEncodingMode(QtMultimedia::TwoPassEncoding);
     QVERIFY(settings1 != settings2);
 
     settings1 = QAudioEncoderSettings();
-    settings1.setQuality(QtMultimediaKit::NormalQuality);
+    settings1.setQuality(QtMultimedia::NormalQuality);
     settings2 = QAudioEncoderSettings();
-    settings2.setQuality(QtMultimediaKit::NormalQuality);
+    settings2.setQuality(QtMultimedia::NormalQuality);
     QVERIFY(settings1 == settings2);
-    settings2.setQuality(QtMultimediaKit::LowQuality);
+    settings2.setQuality(QtMultimedia::LowQuality);
     QVERIFY(settings1 != settings2);
 
     settings1 = QAudioEncoderSettings();
@@ -501,9 +501,9 @@ void tst_QMediaRecorder::testVideoSettings()
     QVERIFY(!settings.isNull());
 
     settings = QVideoEncoderSettings();
-    QCOMPARE(settings.quality(), QtMultimediaKit::NormalQuality);
-    settings.setQuality(QtMultimediaKit::HighQuality);
-    QCOMPARE(settings.quality(), QtMultimediaKit::HighQuality);
+    QCOMPARE(settings.quality(), QtMultimedia::NormalQuality);
+    settings.setQuality(QtMultimedia::HighQuality);
+    QCOMPARE(settings.quality(), QtMultimedia::HighQuality);
     QVERIFY(!settings.isNull());
 
     settings = QVideoEncoderSettings();
@@ -526,7 +526,7 @@ void tst_QMediaRecorder::testVideoSettings()
     QVERIFY(settings.isNull());
     QCOMPARE(settings.codec(), QString());
     QCOMPARE(settings.bitRate(), -1);
-    QCOMPARE(settings.quality(), QtMultimediaKit::NormalQuality);
+    QCOMPARE(settings.quality(), QtMultimedia::NormalQuality);
     QCOMPARE(settings.frameRate(), qreal());
     QCOMPARE(settings.resolution(), QSize());
 
@@ -539,7 +539,7 @@ void tst_QMediaRecorder::testVideoSettings()
         QCOMPARE(settings2, settings1);
         QVERIFY(settings2.isNull());
 
-        settings1.setQuality(QtMultimediaKit::HighQuality);
+        settings1.setQuality(QtMultimedia::HighQuality);
 
         QVERIFY(settings2.isNull());
         QVERIFY(!settings1.isNull());
@@ -555,7 +555,7 @@ void tst_QMediaRecorder::testVideoSettings()
         QCOMPARE(settings2, settings1);
         QVERIFY(settings2.isNull());
 
-        settings1.setQuality(QtMultimediaKit::HighQuality);
+        settings1.setQuality(QtMultimedia::HighQuality);
 
         QVERIFY(settings2.isNull());
         QVERIFY(!settings1.isNull());
@@ -587,19 +587,19 @@ void tst_QMediaRecorder::testVideoSettings()
     QVERIFY(settings1 != settings2);
 
     settings1 = QVideoEncoderSettings();
-    settings1.setEncodingMode(QtMultimediaKit::ConstantBitRateEncoding);
+    settings1.setEncodingMode(QtMultimedia::ConstantBitRateEncoding);
     settings2 = QVideoEncoderSettings();
-    settings2.setEncodingMode(QtMultimediaKit::ConstantBitRateEncoding);
+    settings2.setEncodingMode(QtMultimedia::ConstantBitRateEncoding);
     QVERIFY(settings1 == settings2);
-    settings2.setEncodingMode(QtMultimediaKit::TwoPassEncoding);
+    settings2.setEncodingMode(QtMultimedia::TwoPassEncoding);
     QVERIFY(settings1 != settings2);
 
     settings1 = QVideoEncoderSettings();
-    settings1.setQuality(QtMultimediaKit::NormalQuality);
+    settings1.setQuality(QtMultimedia::NormalQuality);
     settings2 = QVideoEncoderSettings();
-    settings2.setQuality(QtMultimediaKit::NormalQuality);
+    settings2.setQuality(QtMultimedia::NormalQuality);
     QVERIFY(settings1 == settings2);
-    settings2.setQuality(QtMultimediaKit::LowQuality);
+    settings2.setQuality(QtMultimedia::LowQuality);
     QVERIFY(settings1 != settings2);
 
     settings1 = QVideoEncoderSettings();
@@ -629,12 +629,12 @@ void tst_QMediaRecorder::nullMetaDataControl()
     QCOMPARE(recorder.isMetaDataAvailable(), false);
     QCOMPARE(recorder.isMetaDataWritable(), false);
 
-    recorder.setMetaData(QtMultimediaKit::Title, title);
+    recorder.setMetaData(QtMultimedia::Title, title);
     recorder.setExtendedMetaData(titleKey, title);
 
-    QCOMPARE(recorder.metaData(QtMultimediaKit::Title).toString(), QString());
+    QCOMPARE(recorder.metaData(QtMultimedia::Title).toString(), QString());
     QCOMPARE(recorder.extendedMetaData(titleKey).toString(), QString());
-    QCOMPARE(recorder.availableMetaData(), QList<QtMultimediaKit::MetaData>());
+    QCOMPARE(recorder.availableMetaData(), QList<QtMultimedia::MetaData>());
     QCOMPARE(recorder.availableExtendedMetaData(), QStringList());
     QCOMPARE(spy.count(), 0);
 }
@@ -734,18 +734,18 @@ void tst_QMediaRecorder::metaData()
     QMediaRecorder recorder(&object);
     QVERIFY(object.availableMetaData().isEmpty());
 
-    service.mockMetaDataControl->m_data.insert(QtMultimediaKit::AlbumArtist, artist);
-    service.mockMetaDataControl->m_data.insert(QtMultimediaKit::Title, title);
-    service.mockMetaDataControl->m_data.insert(QtMultimediaKit::Genre, genre);
+    service.mockMetaDataControl->m_data.insert(QtMultimedia::AlbumArtist, artist);
+    service.mockMetaDataControl->m_data.insert(QtMultimedia::Title, title);
+    service.mockMetaDataControl->m_data.insert(QtMultimedia::Genre, genre);
 
-    QCOMPARE(recorder.metaData(QtMultimediaKit::AlbumArtist).toString(), artist);
-    QCOMPARE(recorder.metaData(QtMultimediaKit::Title).toString(), title);
+    QCOMPARE(recorder.metaData(QtMultimedia::AlbumArtist).toString(), artist);
+    QCOMPARE(recorder.metaData(QtMultimedia::Title).toString(), title);
 
-    QList<QtMultimediaKit::MetaData> metaDataKeys = recorder.availableMetaData();
+    QList<QtMultimedia::MetaData> metaDataKeys = recorder.availableMetaData();
     QCOMPARE(metaDataKeys.size(), 3);
-    QVERIFY(metaDataKeys.contains(QtMultimediaKit::AlbumArtist));
-    QVERIFY(metaDataKeys.contains(QtMultimediaKit::Title));
-    QVERIFY(metaDataKeys.contains(QtMultimediaKit::Genre));
+    QVERIFY(metaDataKeys.contains(QtMultimedia::AlbumArtist));
+    QVERIFY(metaDataKeys.contains(QtMultimedia::Title));
+    QVERIFY(metaDataKeys.contains(QtMultimedia::Genre));
 }
 
 void tst_QMediaRecorder::setMetaData_data()
@@ -768,9 +768,9 @@ void tst_QMediaRecorder::setMetaData()
 
     QMediaRecorder recorder(&object);
 
-    recorder.setMetaData(QtMultimediaKit::Title, title);
-    QCOMPARE(recorder.metaData(QtMultimediaKit::Title).toString(), title);
-    QCOMPARE(service.mockMetaDataControl->m_data.value(QtMultimediaKit::Title).toString(), title);
+    recorder.setMetaData(QtMultimedia::Title, title);
+    QCOMPARE(recorder.metaData(QtMultimedia::Title).toString(), title);
+    QCOMPARE(service.mockMetaDataControl->m_data.value(QtMultimedia::Title).toString(), title);
 }
 
 void tst_QMediaRecorder::extendedMetaData()
@@ -828,8 +828,8 @@ void tst_QMediaRecorder::testAudioSettingsCopyConstructor()
     audiosettings.setBitRate(128*1000);
     audiosettings.setChannelCount(4);
     audiosettings.setCodec("audio/pcm");
-    audiosettings.setEncodingMode(QtMultimediaKit::ConstantBitRateEncoding);
-    audiosettings.setQuality(QtMultimediaKit::LowQuality);
+    audiosettings.setEncodingMode(QtMultimedia::ConstantBitRateEncoding);
+    audiosettings.setQuality(QtMultimedia::LowQuality);
     audiosettings.setSampleRate(44100);
 
     /* Copy constructor */
@@ -858,16 +858,16 @@ void tst_QMediaRecorder::testAudioSettingsOperatorNotEqual()
     audiosettings1.setBitRate(128*1000);
     audiosettings1.setChannelCount(4);
     audiosettings1.setCodec("audio/pcm");
-    audiosettings1.setEncodingMode(QtMultimediaKit::ConstantBitRateEncoding);
-    audiosettings1.setQuality(QtMultimediaKit::LowQuality);
+    audiosettings1.setEncodingMode(QtMultimedia::ConstantBitRateEncoding);
+    audiosettings1.setQuality(QtMultimedia::LowQuality);
     audiosettings1.setSampleRate(44100);
 
     /* setting the desired properties for the AudioEncoder */
     audiosettings2.setBitRate(128*1000);
     audiosettings2.setChannelCount(4);
     audiosettings2.setCodec("audio/pcm");
-    audiosettings2.setEncodingMode(QtMultimediaKit::ConstantBitRateEncoding);
-    audiosettings2.setQuality(QtMultimediaKit::LowQuality);
+    audiosettings2.setEncodingMode(QtMultimedia::ConstantBitRateEncoding);
+    audiosettings2.setQuality(QtMultimedia::LowQuality);
     audiosettings2.setSampleRate(44100);
 
     /* verify the both are equal or not */
@@ -875,7 +875,7 @@ void tst_QMediaRecorder::testAudioSettingsOperatorNotEqual()
 
     /* Modify the settings value for one object */
     audiosettings2.setBitRate(64*1000);
-    audiosettings2.setEncodingMode(QtMultimediaKit::ConstantQualityEncoding);
+    audiosettings2.setEncodingMode(QtMultimedia::ConstantQualityEncoding);
 
     /* verify the not equal opertor */
     QVERIFY(audiosettings1 != audiosettings2);
@@ -894,8 +894,8 @@ void tst_QMediaRecorder::testAudioSettingsOperatorEqual()
     audiosettings1.setBitRate(128*1000);
     audiosettings1.setChannelCount(4);
     audiosettings1.setCodec("audio/pcm");
-    audiosettings1.setEncodingMode(QtMultimediaKit::ConstantBitRateEncoding);
-    audiosettings1.setQuality(QtMultimediaKit::LowQuality);
+    audiosettings1.setEncodingMode(QtMultimedia::ConstantBitRateEncoding);
+    audiosettings1.setQuality(QtMultimedia::LowQuality);
     audiosettings1.setSampleRate(44100);
 
     QAudioEncoderSettings audiosettings2;
@@ -905,8 +905,8 @@ void tst_QMediaRecorder::testAudioSettingsOperatorEqual()
     audiosettings2.setBitRate(128*1000);
     audiosettings2.setChannelCount(4);
     audiosettings2.setCodec("audio/pcm");
-    audiosettings2.setEncodingMode(QtMultimediaKit::ConstantBitRateEncoding);
-    audiosettings2.setQuality(QtMultimediaKit::LowQuality);
+    audiosettings2.setEncodingMode(QtMultimedia::ConstantBitRateEncoding);
+    audiosettings2.setQuality(QtMultimedia::LowQuality);
     audiosettings2.setSampleRate(44100);
 
     /* verify both the values are same or not */
@@ -926,8 +926,8 @@ void tst_QMediaRecorder::testAudioSettingsOperatorAssign()
     audiosettings1.setBitRate(128*1000);
     audiosettings1.setChannelCount(4);
     audiosettings1.setCodec("audio/pcm");
-    audiosettings1.setEncodingMode(QtMultimediaKit::ConstantBitRateEncoding);
-    audiosettings1.setQuality(QtMultimediaKit::LowQuality);
+    audiosettings1.setEncodingMode(QtMultimedia::ConstantBitRateEncoding);
+    audiosettings1.setQuality(QtMultimedia::LowQuality);
     audiosettings1.setSampleRate(44100);
 
     QAudioEncoderSettings audiosettings2;
@@ -958,14 +958,14 @@ void tst_QMediaRecorder::testAvailabilityError()
     MockMediaRecorderService service(0, 0);
     MockMediaObject object(0, &service);
     QMediaRecorder recorder(&object);
-    QCOMPARE(recorder.availabilityError(), QtMultimediaKit::ServiceMissingError);
+    QCOMPARE(recorder.availabilityError(), QtMultimedia::ServiceMissingError);
 
     MockMediaRecorderControl recorderControl(0);
     MockMediaRecorderService service1(0, &recorderControl);
     service1.mockMetaDataControl->populateMetaData();
     MockMediaObject object1(0, &service1);
     QMediaRecorder recorder1(&object1);
-    QCOMPARE(recorder1.availabilityError(), QtMultimediaKit::NoError);
+    QCOMPARE(recorder1.availabilityError(), QtMultimedia::NoError);
 }
 
 /* isAvailable() API test. */
@@ -1026,21 +1026,21 @@ void tst_QMediaRecorder::testVideoSettingsQuality()
     QVERIFY(settings == QVideoEncoderSettings());
 
     /* Verify the default value is intialised correctly*/
-    QCOMPARE(settings.quality(), QtMultimediaKit::NormalQuality);
+    QCOMPARE(settings.quality(), QtMultimedia::NormalQuality);
 
     /* Set all types of Quality parameter and Verify if it is set correctly*/
-    settings.setQuality(QtMultimediaKit::HighQuality);
-    QCOMPARE(settings.quality(), QtMultimediaKit::HighQuality);
+    settings.setQuality(QtMultimedia::HighQuality);
+    QCOMPARE(settings.quality(), QtMultimedia::HighQuality);
     QVERIFY(!settings.isNull());
 
-    settings.setQuality(QtMultimediaKit::VeryLowQuality);
-    QCOMPARE(settings.quality(), QtMultimediaKit::VeryLowQuality);
+    settings.setQuality(QtMultimedia::VeryLowQuality);
+    QCOMPARE(settings.quality(), QtMultimedia::VeryLowQuality);
 
-    settings.setQuality(QtMultimediaKit::LowQuality);
-    QCOMPARE(settings.quality(), QtMultimediaKit::LowQuality);
+    settings.setQuality(QtMultimedia::LowQuality);
+    QCOMPARE(settings.quality(), QtMultimedia::LowQuality);
 
-    settings.setQuality(QtMultimediaKit::VeryHighQuality);
-    QCOMPARE(settings.quality(), QtMultimediaKit::VeryHighQuality);
+    settings.setQuality(QtMultimedia::VeryHighQuality);
+    QCOMPARE(settings.quality(), QtMultimedia::VeryHighQuality);
 }
 
 /* Test  QVideoEncoderSettings encodingMode */
@@ -1052,19 +1052,19 @@ void tst_QMediaRecorder::testVideoSettingsEncodingMode()
     QVERIFY(settings == QVideoEncoderSettings());
 
     /* Verify the default values are initialised correctly*/
-    QCOMPARE(settings.encodingMode(), QtMultimediaKit::ConstantQualityEncoding);
+    QCOMPARE(settings.encodingMode(), QtMultimedia::ConstantQualityEncoding);
     QVERIFY(settings.isNull());
 
     /* Set each type of encoding mode and Verify if it is set correctly*/
-    settings.setEncodingMode(QtMultimediaKit::ConstantBitRateEncoding);
-    QCOMPARE(settings.encodingMode(),QtMultimediaKit::ConstantBitRateEncoding);
+    settings.setEncodingMode(QtMultimedia::ConstantBitRateEncoding);
+    QCOMPARE(settings.encodingMode(),QtMultimedia::ConstantBitRateEncoding);
     QVERIFY(!settings.isNull());
 
-    settings.setEncodingMode(QtMultimediaKit::AverageBitRateEncoding);
-    QCOMPARE(settings.encodingMode(), QtMultimediaKit::AverageBitRateEncoding);
+    settings.setEncodingMode(QtMultimedia::AverageBitRateEncoding);
+    QCOMPARE(settings.encodingMode(), QtMultimedia::AverageBitRateEncoding);
 
-    settings.setEncodingMode(QtMultimediaKit::TwoPassEncoding);
-    QCOMPARE(settings.encodingMode(), QtMultimediaKit::TwoPassEncoding);
+    settings.setEncodingMode(QtMultimedia::TwoPassEncoding);
+    QCOMPARE(settings.encodingMode(), QtMultimedia::TwoPassEncoding);
 }
 
 /* Test QVideoEncoderSettings copy constructor */
@@ -1074,8 +1074,8 @@ void tst_QMediaRecorder::testVideoSettingsCopyConstructor()
     QVideoEncoderSettings settings1;
     settings1.setCodec(QLatin1String("codecName"));
     settings1.setBitRate(128000);
-    settings1.setQuality(QtMultimediaKit::HighQuality);
-    settings1.setEncodingMode(QtMultimediaKit::ConstantBitRateEncoding);
+    settings1.setQuality(QtMultimedia::HighQuality);
+    settings1.setEncodingMode(QtMultimedia::ConstantBitRateEncoding);
     settings1.setFrameRate(30000.0/10001);
     settings1.setResolution(QSize(320,240));
 
@@ -1086,10 +1086,10 @@ void tst_QMediaRecorder::testVideoSettingsCopyConstructor()
     QCOMPARE(settings2 != settings1, false);
     QCOMPARE(settings2.codec(), QLatin1String("codecName"));
     QCOMPARE(settings2.bitRate(), 128000);
-    QCOMPARE(settings2.encodingMode(), QtMultimediaKit::ConstantBitRateEncoding);
+    QCOMPARE(settings2.encodingMode(), QtMultimedia::ConstantBitRateEncoding);
     QVERIFY(qFuzzyCompare(settings2.frameRate(), qreal(30000.0/10001)));
     QCOMPARE(settings2.resolution(), QSize(320,240));
-    QCOMPARE(settings2.quality(), QtMultimediaKit::HighQuality);
+    QCOMPARE(settings2.quality(), QtMultimedia::HighQuality);
 
     /* Verify both the instances are equal*/
     QCOMPARE(settings2, settings1);
@@ -1108,10 +1108,10 @@ void tst_QMediaRecorder::testVideoSettingsOperatorAssignment()
     /* Initialize all the parameters */
     settings1.setCodec(QLatin1String("codecName"));
     settings1.setBitRate(128000);
-    settings1.setEncodingMode(QtMultimediaKit::ConstantBitRateEncoding);
+    settings1.setEncodingMode(QtMultimedia::ConstantBitRateEncoding);
     settings1.setFrameRate(30000.0/10001);
     settings1.setResolution(QSize(320,240));
-    settings1.setQuality(QtMultimediaKit::HighQuality);
+    settings1.setQuality(QtMultimedia::HighQuality);
     /* Assign one object to other*/
     settings2 = settings1;
 
@@ -1119,10 +1119,10 @@ void tst_QMediaRecorder::testVideoSettingsOperatorAssignment()
     QCOMPARE(settings2, settings1);
     QCOMPARE(settings2.codec(), QLatin1String("codecName"));
     QCOMPARE(settings2.bitRate(), 128000);
-    QCOMPARE(settings2.encodingMode(), QtMultimediaKit::ConstantBitRateEncoding);
+    QCOMPARE(settings2.encodingMode(), QtMultimedia::ConstantBitRateEncoding);
     QVERIFY(qFuzzyCompare(settings2.frameRate(), qreal(30000.0/10001)));
     QCOMPARE(settings2.resolution(), QSize(320,240));
-    QCOMPARE(settings2.quality(), QtMultimediaKit::HighQuality);
+    QCOMPARE(settings2.quality(), QtMultimedia::HighQuality);
     QCOMPARE(settings2, settings1);
     QVERIFY(!settings2.isNull());
 }
@@ -1165,23 +1165,23 @@ void tst_QMediaRecorder::testVideoSettingsOperatorNotEqual()
 
     /* Verify EncodingMode with not equal operator*/
     settings1 = QVideoEncoderSettings();
-    settings1.setEncodingMode(QtMultimediaKit::ConstantBitRateEncoding);
+    settings1.setEncodingMode(QtMultimedia::ConstantBitRateEncoding);
     settings2 = QVideoEncoderSettings();
-    settings2.setEncodingMode(QtMultimediaKit::ConstantBitRateEncoding);
+    settings2.setEncodingMode(QtMultimedia::ConstantBitRateEncoding);
     /* OperatorNotEqual returns false when both objects are equal*/
     QCOMPARE(settings1 != settings2, false);
-    settings2.setEncodingMode(QtMultimediaKit::TwoPassEncoding);
+    settings2.setEncodingMode(QtMultimedia::TwoPassEncoding);
     /* OperatorNotEqual returns true when both objects are not equal*/
     QVERIFY(settings1 != settings2);
 
     /* Verify Quality with not equal operator*/
     settings1 = QVideoEncoderSettings();
-    settings1.setQuality(QtMultimediaKit::NormalQuality);
+    settings1.setQuality(QtMultimedia::NormalQuality);
     settings2 = QVideoEncoderSettings();
-    settings2.setQuality(QtMultimediaKit::NormalQuality);
+    settings2.setQuality(QtMultimedia::NormalQuality);
     /* OperatorNotEqual returns false when both objects are equal*/
     QCOMPARE(settings1 != settings2, false);
-    settings2.setQuality(QtMultimediaKit::LowQuality);
+    settings2.setQuality(QtMultimedia::LowQuality);
     /* OperatorNotEqual returns true when both objects are not equal*/
     QVERIFY(settings1 != settings2);
 
@@ -1236,23 +1236,23 @@ void tst_QMediaRecorder::testVideoSettingsOperatorComparison()
 
     /* Verify EncodingMode with comparison operator*/
     settings1 = QVideoEncoderSettings();
-    settings1.setEncodingMode(QtMultimediaKit::ConstantBitRateEncoding);
+    settings1.setEncodingMode(QtMultimedia::ConstantBitRateEncoding);
     settings2 = QVideoEncoderSettings();
-    settings2.setEncodingMode(QtMultimediaKit::ConstantBitRateEncoding);
+    settings2.setEncodingMode(QtMultimedia::ConstantBitRateEncoding);
     /* Comparison operator returns true when both objects are equal*/
     QVERIFY(settings1 == settings2);
-    settings2.setEncodingMode(QtMultimediaKit::TwoPassEncoding);
+    settings2.setEncodingMode(QtMultimedia::TwoPassEncoding);
     /* Comparison operator returns false when both objects are not equal*/
     QCOMPARE(settings1 == settings2, false);
 
     /* Verify Quality with comparison operator*/
     settings1 = QVideoEncoderSettings();
-    settings1.setQuality(QtMultimediaKit::NormalQuality);
+    settings1.setQuality(QtMultimedia::NormalQuality);
     settings2 = QVideoEncoderSettings();
-    settings2.setQuality(QtMultimediaKit::NormalQuality);
+    settings2.setQuality(QtMultimedia::NormalQuality);
     /* Comparison operator returns true when both objects are equal*/
     QVERIFY(settings1 == settings2);
-    settings2.setQuality(QtMultimediaKit::LowQuality);
+    settings2.setQuality(QtMultimedia::LowQuality);
     /* Comparison operator returns false when both objects are not equal*/
     QCOMPARE(settings1 == settings2, false);
 
diff --git a/tests/auto/qmediaresource/qmediaresource.pro b/tests/auto/qmediaresource/qmediaresource.pro
index e003c7a1e..4d8cf5e1b 100644
--- a/tests/auto/qmediaresource/qmediaresource.pro
+++ b/tests/auto/qmediaresource/qmediaresource.pro
@@ -1,6 +1,6 @@
 load(qttest_p4)
 
-QT += network multimediakit-private
+QT += network multimedia-private
 CONFIG += no_private_qt_headers_warning
 
 SOURCES += tst_qmediaresource.cpp
diff --git a/tests/auto/qmediaservice/qmediaservice.pro b/tests/auto/qmediaservice/qmediaservice.pro
index 4d48c4887..7fc2305d5 100644
--- a/tests/auto/qmediaservice/qmediaservice.pro
+++ b/tests/auto/qmediaservice/qmediaservice.pro
@@ -1,6 +1,6 @@
 load(qttest_p4)
 
-QT += multimediakit-private
+QT += multimedia-private
 CONFIG += no_private_qt_headers_warning
 
 SOURCES += tst_qmediaservice.cpp
diff --git a/tests/auto/qmediaserviceprovider/qmediaserviceprovider.pro b/tests/auto/qmediaserviceprovider/qmediaserviceprovider.pro
index f51f84958..f0b00a1dd 100644
--- a/tests/auto/qmediaserviceprovider/qmediaserviceprovider.pro
+++ b/tests/auto/qmediaserviceprovider/qmediaserviceprovider.pro
@@ -1,6 +1,6 @@
 load(qttest_p4)
 
-QT += multimediakit-private
+QT += multimedia-private
 CONFIG += no_private_qt_headers_warning
 
 SOURCES += tst_qmediaserviceprovider.cpp
diff --git a/tests/auto/qmediaserviceprovider/tst_qmediaserviceprovider.cpp b/tests/auto/qmediaserviceprovider/tst_qmediaserviceprovider.cpp
index f6b3ad1cd..c70401f7d 100644
--- a/tests/auto/qmediaserviceprovider/tst_qmediaserviceprovider.cpp
+++ b/tests/auto/qmediaserviceprovider/tst_qmediaserviceprovider.cpp
@@ -93,16 +93,16 @@ public:
         delete service;
     }
 
-    QtMultimediaKit::SupportEstimate hasSupport(const QString &mimeType, const QStringList& codecs) const
+    QtMultimedia::SupportEstimate hasSupport(const QString &mimeType, const QStringList& codecs) const
     {
         if (codecs.contains(QLatin1String("mpeg4")))
-            return QtMultimediaKit::NotSupported;
+            return QtMultimedia::NotSupported;
 
         if (mimeType == "audio/ogg") {
-            return QtMultimediaKit::ProbablySupported;
+            return QtMultimedia::ProbablySupported;
         }
 
-        return QtMultimediaKit::MaybeSupported;
+        return QtMultimedia::MaybeSupported;
     }
 
     QStringList supportedMimeTypes() const
@@ -152,14 +152,14 @@ public:
         delete service;
     }
 
-    QtMultimediaKit::SupportEstimate hasSupport(const QString &mimeType, const QStringList& codecs) const
+    QtMultimedia::SupportEstimate hasSupport(const QString &mimeType, const QStringList& codecs) const
     {
         Q_UNUSED(codecs);
 
         if (mimeType == "audio/wav")
-            return QtMultimediaKit::PreferredService;
+            return QtMultimedia::PreferredService;
 
-        return QtMultimediaKit::NotSupported;
+        return QtMultimedia::NotSupported;
     }
 
     QStringList supportedMimeTypes() const
@@ -247,15 +247,15 @@ public:
         delete service;
     }
 
-    QtMultimediaKit::SupportEstimate hasSupport(const QString &mimeType, const QStringList& codecs) const
+    QtMultimedia::SupportEstimate hasSupport(const QString &mimeType, const QStringList& codecs) const
     {
         if (codecs.contains(QLatin1String("jpeg2000")))
-            return QtMultimediaKit::NotSupported;
+            return QtMultimedia::NotSupported;
 
         if (supportedMimeTypes().contains(mimeType))
-            return QtMultimediaKit::ProbablySupported;
+            return QtMultimedia::ProbablySupported;
 
-        return QtMultimediaKit::MaybeSupported;
+        return QtMultimedia::MaybeSupported;
     }
 
     QStringList supportedMimeTypes() const
@@ -342,7 +342,7 @@ void tst_QMediaServiceProvider::testHasSupport()
 {
     MockMediaServiceProvider mockProvider;
     QCOMPARE(mockProvider.hasSupport(QByteArray(Q_MEDIASERVICE_MEDIAPLAYER), "video/ogv", QStringList()),
-             QtMultimediaKit::MaybeSupported);
+             QtMultimedia::MaybeSupported);
 
     QMediaServiceProvider *provider = QMediaServiceProvider::defaultServiceProvider();
 
@@ -350,44 +350,44 @@ void tst_QMediaServiceProvider::testHasSupport()
         QSKIP("No default provider", SkipSingle);
 
     QCOMPARE(provider->hasSupport(QByteArray(Q_MEDIASERVICE_MEDIAPLAYER), "video/ogv", QStringList()),
-             QtMultimediaKit::MaybeSupported);
+             QtMultimedia::MaybeSupported);
 
     QCOMPARE(provider->hasSupport(QByteArray(Q_MEDIASERVICE_MEDIAPLAYER), "audio/ogg", QStringList()),
-             QtMultimediaKit::ProbablySupported);
+             QtMultimedia::ProbablySupported);
 
     //while the service returns PreferredService, provider should return ProbablySupported
     QCOMPARE(provider->hasSupport(QByteArray(Q_MEDIASERVICE_MEDIAPLAYER), "audio/wav", QStringList()),
-             QtMultimediaKit::ProbablySupported);
+             QtMultimedia::ProbablySupported);
 
     //even while all the plugins with "hasSupport" returned NotSupported,
     //MockServicePlugin3 has no "hasSupport" interface, so MaybeSupported
     QCOMPARE(provider->hasSupport(QByteArray(Q_MEDIASERVICE_MEDIAPLAYER), "video/avi",
                                   QStringList() << "mpeg4"),
-             QtMultimediaKit::MaybeSupported);
+             QtMultimedia::MaybeSupported);
 
     QCOMPARE(provider->hasSupport(QByteArray("non existing service"), "video/ogv", QStringList()),
-             QtMultimediaKit::NotSupported);
+             QtMultimedia::NotSupported);
 
-    QCOMPARE(QMediaPlayer::hasSupport("video/ogv"), QtMultimediaKit::MaybeSupported);
-    QCOMPARE(QMediaPlayer::hasSupport("audio/ogg"), QtMultimediaKit::ProbablySupported);
-    QCOMPARE(QMediaPlayer::hasSupport("audio/wav"), QtMultimediaKit::ProbablySupported);
+    QCOMPARE(QMediaPlayer::hasSupport("video/ogv"), QtMultimedia::MaybeSupported);
+    QCOMPARE(QMediaPlayer::hasSupport("audio/ogg"), QtMultimedia::ProbablySupported);
+    QCOMPARE(QMediaPlayer::hasSupport("audio/wav"), QtMultimedia::ProbablySupported);
 
     //test low latency flag support
     QCOMPARE(QMediaPlayer::hasSupport("audio/wav", QStringList(), QMediaPlayer::LowLatency),
-             QtMultimediaKit::ProbablySupported);
+             QtMultimedia::ProbablySupported);
     //plugin1 probably supports audio/ogg, it checked because it doesn't provide features iface
     QCOMPARE(QMediaPlayer::hasSupport("audio/ogg", QStringList(), QMediaPlayer::LowLatency),
-             QtMultimediaKit::ProbablySupported);
+             QtMultimedia::ProbablySupported);
     //Plugin4 is not checked here, sine it's known not support low latency
     QCOMPARE(QMediaPlayer::hasSupport("video/quicktime", QStringList(), QMediaPlayer::LowLatency),
-             QtMultimediaKit::MaybeSupported);
+             QtMultimedia::MaybeSupported);
 
     //test streaming flag support
     QCOMPARE(QMediaPlayer::hasSupport("video/quicktime", QStringList(), QMediaPlayer::StreamPlayback),
-             QtMultimediaKit::ProbablySupported);
+             QtMultimedia::ProbablySupported);
     //Plugin2 is not checked here, sine it's known not support streaming
     QCOMPARE(QMediaPlayer::hasSupport("audio/wav", QStringList(), QMediaPlayer::StreamPlayback),
-             QtMultimediaKit::MaybeSupported);
+             QtMultimedia::MaybeSupported);
 
     //ensure the correct media player plugin is chosen for mime type
     QMediaPlayer simplePlayer(0, QMediaPlayer::LowLatency);
diff --git a/tests/auto/qmediastreamscontrol/qmediastreamscontrol.pro b/tests/auto/qmediastreamscontrol/qmediastreamscontrol.pro
index 3ee331104..ddbd37fed 100644
--- a/tests/auto/qmediastreamscontrol/qmediastreamscontrol.pro
+++ b/tests/auto/qmediastreamscontrol/qmediastreamscontrol.pro
@@ -1,6 +1,6 @@
 load(qttest_p4)
 
-QT += multimediakit-private
+QT += multimedia-private
 CONFIG += no_private_qt_headers_warning
 
 SOURCES += \
diff --git a/tests/auto/qmediastreamscontrol/tst_qmediastreamscontrol.cpp b/tests/auto/qmediastreamscontrol/tst_qmediastreamscontrol.cpp
index 433ee1238..d72869185 100644
--- a/tests/auto/qmediastreamscontrol/tst_qmediastreamscontrol.cpp
+++ b/tests/auto/qmediastreamscontrol/tst_qmediastreamscontrol.cpp
@@ -126,13 +126,13 @@ public:
         streams[index].type = type;
     }
 
-    QVariant metaData(int index, QtMultimediaKit::MetaData key)
+    QVariant metaData(int index, QtMultimedia::MetaData key)
     {
-        QtMultimediaKit::MetaData keys = key;
+        QtMultimedia::MetaData keys = key;
         return keys;
     }
 
-    void setMetaData(int index, QtMultimediaKit::MetaData key, const QVariant &value)
+    void setMetaData(int index, QtMultimedia::MetaData key, const QVariant &value)
     {
         streams[index].metaData.insert(key, value);
     }
@@ -191,7 +191,7 @@ public:
     {
         Stream() : type(UnknownStream), active(false) {}
         StreamType type;
-        QMap<QtMultimediaKit::MetaData, QVariant> metaData;
+        QMap<QtMultimedia::MetaData, QVariant> metaData;
         bool active;
     };
 
@@ -400,8 +400,8 @@ void tst_qmediastreamscontrol::streamsChanged()
 void tst_qmediastreamscontrol::metadata()
 {
     QtTestMediaStreamsControl m_metadata;
-    m_metadata.metaData(1,QtMultimediaKit::AlbumArtist);
-    qDebug() << m_metadata.metaData(1,QtMultimediaKit::AlbumArtist);
+    m_metadata.metaData(1,QtMultimedia::AlbumArtist);
+    qDebug() << m_metadata.metaData(1,QtMultimedia::AlbumArtist);
 }
 QTEST_MAIN(tst_qmediastreamscontrol);
 
diff --git a/tests/auto/qmediatimerange/qmediatimerange.pro b/tests/auto/qmediatimerange/qmediatimerange.pro
index 25f709fae..a8a36d7ec 100644
--- a/tests/auto/qmediatimerange/qmediatimerange.pro
+++ b/tests/auto/qmediatimerange/qmediatimerange.pro
@@ -1,6 +1,6 @@
 load(qttest_p4)
 
-QT += multimediakit-private
+QT += multimedia-private
 CONFIG += no_private_qt_headers_warning
 
 SOURCES += tst_qmediatimerange.cpp
diff --git a/tests/auto/qmetadatareadercontrol/qmetadatareadercontrol.pro b/tests/auto/qmetadatareadercontrol/qmetadatareadercontrol.pro
index 675f5b0b2..7cf024771 100644
--- a/tests/auto/qmetadatareadercontrol/qmetadatareadercontrol.pro
+++ b/tests/auto/qmetadatareadercontrol/qmetadatareadercontrol.pro
@@ -1,6 +1,6 @@
 load(qttest_p4)
 
-QT += multimediakit-private
+QT += multimedia-private
 CONFIG += no_private_qt_headers_warning
 
 SOURCES += tst_qmetadatareadercontrol.cpp
diff --git a/tests/auto/qmetadatareadercontrol/tst_qmetadatareadercontrol.cpp b/tests/auto/qmetadatareadercontrol/tst_qmetadatareadercontrol.cpp
index d9de33e16..30df40418 100644
--- a/tests/auto/qmetadatareadercontrol/tst_qmetadatareadercontrol.cpp
+++ b/tests/auto/qmetadatareadercontrol/tst_qmetadatareadercontrol.cpp
@@ -103,7 +103,7 @@ void tst_QMetaDataReaderControl::metaDataReaderControlMetaData ()
 {
     MockMetaDataReaderControl *metaData = new MockMetaDataReaderControl();
     QVERIFY(metaData !=NULL);
-    metaData->metaData(QtMultimediaKit::Title);
+    metaData->metaData(QtMultimedia::Title);
     delete metaData;
 }
 
diff --git a/tests/auto/qmetadatawritercontrol/qmetadatawritercontrol.pro b/tests/auto/qmetadatawritercontrol/qmetadatawritercontrol.pro
index b6da11344..e172d7660 100644
--- a/tests/auto/qmetadatawritercontrol/qmetadatawritercontrol.pro
+++ b/tests/auto/qmetadatawritercontrol/qmetadatawritercontrol.pro
@@ -1,6 +1,6 @@
 load(qttest_p4)
 
-QT += multimediakit-private
+QT += multimedia-private
 CONFIG += no_private_qt_headers_warning
 
 SOURCES += tst_qmetadatawritercontrol.cpp
diff --git a/tests/auto/qmetadatawritercontrol/tst_qmetadatawritercontrol.cpp b/tests/auto/qmetadatawritercontrol/tst_qmetadatawritercontrol.cpp
index 8ce1f27b1..68d428151 100644
--- a/tests/auto/qmetadatawritercontrol/tst_qmetadatawritercontrol.cpp
+++ b/tests/auto/qmetadatawritercontrol/tst_qmetadatawritercontrol.cpp
@@ -75,10 +75,10 @@ void tst_QMetaDataWriterControl::constructor()
     mock->availableMetaData();
     mock->isMetaDataAvailable();
     mock->isWritable();
-    mock->metaData((QtMultimediaKit::MetaData) 1 );
+    mock->metaData((QtMultimedia::MetaData) 1 );
     mock->extendedMetaData(QString("XYZ"));
     mock->setExtendedMetaData(QString("XYZ"),QVariant());
-    mock->setMetaData((QtMultimediaKit::MetaData) 1,QVariant());
+    mock->setMetaData((QtMultimedia::MetaData) 1,QVariant());
     ((MockMetaDataWriterControl*)mock)->setWritable();
     ((MockMetaDataWriterControl*)mock)->setMetaDataAvailable();
     delete mock;
diff --git a/tests/auto/qmultimedia_common/mockcameraimagecapturecontrol.h b/tests/auto/qmultimedia_common/mockcameraimagecapturecontrol.h
index 78681be80..5fb3cb19d 100644
--- a/tests/auto/qmultimedia_common/mockcameraimagecapturecontrol.h
+++ b/tests/auto/qmultimedia_common/mockcameraimagecapturecontrol.h
@@ -95,11 +95,11 @@ private Q_SLOTS:
             emit imageCaptured(m_captureRequest, QImage());
 
             emit imageMetadataAvailable(m_captureRequest,
-                                        QtMultimediaKit::FocalLengthIn35mmFilm,
+                                        QtMultimedia::FocalLengthIn35mmFilm,
                                         QVariant(50));
 
             emit imageMetadataAvailable(m_captureRequest,
-                                        QtMultimediaKit::DateTimeOriginal,
+                                        QtMultimedia::DateTimeOriginal,
                                         QVariant(QDateTime::currentDateTime()));
 
             emit imageMetadataAvailable(m_captureRequest,
diff --git a/tests/auto/qmultimedia_common/mockcameraservice.h b/tests/auto/qmultimedia_common/mockcameraservice.h
index c51f75f5e..ea0620a13 100644
--- a/tests/auto/qmultimedia_common/mockcameraservice.h
+++ b/tests/auto/qmultimedia_common/mockcameraservice.h
@@ -56,7 +56,7 @@
 #include "../qmultimedia_common/mockvideosurface.h"
 #include "../qmultimedia_common/mockvideorenderercontrol.h"
 
-#if defined(QT_MULTIMEDIAKIT_MOCK_WIDGETS)
+#if defined(QT_MULTIMEDIA_MOCK_WIDGETS)
 #include "../qmultimedia_common/mockvideowindowcontrol.h"
 #endif
 
@@ -105,7 +105,7 @@ public:
         mockImageProcessingControl = new MockImageProcessingControl(this);
         mockImageEncoderControl = new MockImageEncoderControl(this);
         rendererControl = new MockVideoRendererControl(this);
-#if defined(QT_MULTIMEDIAKIT_MOCK_WIDGETS)
+#if defined(QT_MULTIMEDIA_MOCK_WIDGETS)
         windowControl = new MockVideoWindowControl(this);
 #endif
         rendererRef = 0;
@@ -154,7 +154,7 @@ public:
                 return rendererControl;
             }
         }
-#if defined(QT_MULTIMEDIAKIT_MOCK_WIDGETS)
+#if defined(QT_MULTIMEDIA_MOCK_WIDGETS)
         if (qstrcmp(iid, QVideoWindowControl_iid) == 0) {
             if (windowRef == 0) {
                 windowRef += 1;
@@ -169,7 +169,7 @@ public:
     {
         if (control == rendererControl)
             rendererRef -= 1;
-#if defined(QT_MULTIMEDIAKIT_MOCK_WIDGETS)
+#if defined(QT_MULTIMEDIA_MOCK_WIDGETS)
         if (control == windowControl)
             windowRef -= 1;
 #endif
@@ -186,7 +186,7 @@ public:
     MockImageProcessingControl *mockImageProcessingControl;
     MockImageEncoderControl *mockImageEncoderControl;
     MockVideoRendererControl *rendererControl;
-#if defined(QT_MULTIMEDIAKIT_MOCK_WIDGETS)
+#if defined(QT_MULTIMEDIA_MOCK_WIDGETS)
     MockVideoWindowControl *windowControl;
 #endif
     int rendererRef;
diff --git a/tests/auto/qmultimedia_common/mockimageencodercontrol.h b/tests/auto/qmultimedia_common/mockimageencodercontrol.h
index 0e9d7f38f..c63ecd617 100644
--- a/tests/auto/qmultimedia_common/mockimageencodercontrol.h
+++ b/tests/auto/qmultimedia_common/mockimageencodercontrol.h
@@ -65,12 +65,12 @@ public:
                 settings.resolution() == QSize(320,240))
                 resolutions << settings.resolution();
 
-            if (settings.quality() == QtMultimediaKit::HighQuality && settings.resolution() == QSize(640,480))
+            if (settings.quality() == QtMultimedia::HighQuality && settings.resolution() == QSize(640,480))
                 resolutions << settings.resolution();
         } else {
             resolutions << QSize(160, 120);
             resolutions << QSize(320, 240);
-            if (settings.quality() == QtMultimediaKit::HighQuality)
+            if (settings.quality() == QtMultimedia::HighQuality)
                 resolutions << QSize(640, 480);
         }
 
diff --git a/tests/auto/qmultimedia_common/mockmediaplayerservice.h b/tests/auto/qmultimedia_common/mockmediaplayerservice.h
index 57697225c..fb0f1b28d 100644
--- a/tests/auto/qmultimedia_common/mockmediaplayerservice.h
+++ b/tests/auto/qmultimedia_common/mockmediaplayerservice.h
@@ -48,7 +48,7 @@
 #include "mockmediastreamscontrol.h"
 #include "mockmedianetworkaccesscontrol.h"
 #include "mockvideorenderercontrol.h"
-#if defined(QT_MULTIMEDIAKIT_MOCK_WIDGETS)
+#if defined(QT_MULTIMEDIA_MOCK_WIDGETS)
 #include "mockvideowindowcontrol.h"
 #endif
 
@@ -64,7 +64,7 @@ public:
         mockNetworkControl = new MockNetworkAccessControl;
         rendererControl = new MockVideoRendererControl;
         rendererRef = 0;
-#if defined(QT_MULTIMEDIAKIT_MOCK_WIDGETS)
+#if defined(QT_MULTIMEDIA_MOCK_WIDGETS)
         windowControl = new MockVideoWindowControl;
         windowRef = 0;
 #endif
@@ -76,7 +76,7 @@ public:
         delete mockStreamsControl;
         delete mockNetworkControl;
         delete rendererControl;
-#if defined(QT_MULTIMEDIAKIT_MOCK_WIDGETS)
+#if defined(QT_MULTIMEDIA_MOCK_WIDGETS)
         delete windowControl;
 #endif
     }
@@ -91,7 +91,7 @@ public:
                 return rendererControl;
             }
         }
-#if defined(QT_MULTIMEDIAKIT_MOCK_WIDGETS)
+#if defined(QT_MULTIMEDIA_MOCK_WIDGETS)
         if (qstrcmp(iid, QVideoWindowControl_iid) == 0) {
             if (windowRef == 0) {
                 windowRef += 1;
@@ -109,7 +109,7 @@ public:
     {
         if (control == rendererControl)
             rendererRef -= 1;
-#if defined(QT_MULTIMEDIAKIT_MOCK_WIDGETS)
+#if defined(QT_MULTIMEDIA_MOCK_WIDGETS)
         if (control == windowControl)
             windowRef -= 1;
 #endif
@@ -164,7 +164,7 @@ public:
     MockStreamsControl *mockStreamsControl;
     MockNetworkAccessControl *mockNetworkControl;
     MockVideoRendererControl *rendererControl;
-#if defined(QT_MULTIMEDIAKIT_MOCK_WIDGETS)
+#if defined(QT_MULTIMEDIA_MOCK_WIDGETS)
     MockVideoWindowControl *windowControl;
     int windowRef;
 #endif
diff --git a/tests/auto/qmultimedia_common/mockmediastreamscontrol.h b/tests/auto/qmultimedia_common/mockmediastreamscontrol.h
index 902f4fc12..d1d967df6 100644
--- a/tests/auto/qmultimedia_common/mockmediastreamscontrol.h
+++ b/tests/auto/qmultimedia_common/mockmediastreamscontrol.h
@@ -55,9 +55,9 @@ public:
     StreamType streamType(int index) { return _streams.at(index).type; }
     void setStreamType(int index, StreamType type) { _streams[index].type = type; }
 
-    QVariant metaData(int index, QtMultimediaKit::MetaData key) {
+    QVariant metaData(int index, QtMultimedia::MetaData key) {
         return _streams.at(index).metaData.value(key); }
-    void setMetaData(int index, QtMultimediaKit::MetaData key, const QVariant &value) {
+    void setMetaData(int index, QtMultimedia::MetaData key, const QVariant &value) {
         _streams[index].metaData.insert(key, value); }
 
     bool isActive(int index) { return _streams.at(index).active; }
@@ -68,7 +68,7 @@ private:
     {
         Stream() : type(UnknownStream), active(false) {}
         StreamType type;
-        QMap<QtMultimediaKit::MetaData, QVariant> metaData;
+        QMap<QtMultimedia::MetaData, QVariant> metaData;
         bool active;
     };
 
diff --git a/tests/auto/qmultimedia_common/mockmetadatareadercontrol.h b/tests/auto/qmultimedia_common/mockmetadatareadercontrol.h
index 6aa08778b..f0847622f 100644
--- a/tests/auto/qmultimedia_common/mockmetadatareadercontrol.h
+++ b/tests/auto/qmultimedia_common/mockmetadatareadercontrol.h
@@ -63,12 +63,12 @@ public:
         if (m_available != available)
             emit metaDataAvailableChanged(m_available = available);
     }
-    QList<QtMultimediaKit::MetaData> availableMetaData() const
+    QList<QtMultimedia::MetaData> availableMetaData() const
     {
         return m_data.keys();
     }
 
-    QVariant metaData(QtMultimediaKit::MetaData key) const
+    QVariant metaData(QtMultimedia::MetaData key) const
     {
         return m_data.value(key);
     }
@@ -91,7 +91,7 @@ public:
     }
 
     bool m_available;
-    QMap<QtMultimediaKit::MetaData, QVariant> m_data;
+    QMap<QtMultimedia::MetaData, QVariant> m_data;
     QMap<QString, QVariant> m_extendedData;
 };
 
diff --git a/tests/auto/qmultimedia_common/mockmetadatawritercontrol.h b/tests/auto/qmultimedia_common/mockmetadatawritercontrol.h
index dcd9a8e55..e9f7c7573 100644
--- a/tests/auto/qmultimedia_common/mockmetadatawritercontrol.h
+++ b/tests/auto/qmultimedia_common/mockmetadatawritercontrol.h
@@ -64,13 +64,13 @@ public:
         if (m_available != available)
             emit metaDataAvailableChanged(m_available = available);
     }
-    QList<QtMultimediaKit::MetaData> availableMetaData() const { return m_data.keys(); }
+    QList<QtMultimedia::MetaData> availableMetaData() const { return m_data.keys(); }
 
     bool isWritable() const { return m_writable; }
     void setWritable(bool writable) { emit writableChanged(m_writable = writable); }
 
-    QVariant metaData(QtMultimediaKit::MetaData key) const { return m_data.value(key); }//Getting the metadata from Multimediakit
-    void setMetaData(QtMultimediaKit::MetaData key, const QVariant &value)
+    QVariant metaData(QtMultimedia::MetaData key) const { return m_data.value(key); }//Getting the metadata from Multimediakit
+    void setMetaData(QtMultimedia::MetaData key, const QVariant &value)
     {
         m_data.insert(key, value);
     }
@@ -100,7 +100,7 @@ public:
 
     bool m_available;
     bool m_writable;
-    QMap<QtMultimediaKit::MetaData, QVariant> m_data;
+    QMap<QtMultimedia::MetaData, QVariant> m_data;
     QMap<QString, QVariant> m_extendedData;
 };
 
diff --git a/tests/auto/qmultimedia_common/mockradiotunercontrol.h b/tests/auto/qmultimedia_common/mockradiotunercontrol.h
index aa446074f..5e2d015f9 100644
--- a/tests/auto/qmultimedia_common/mockradiotunercontrol.h
+++ b/tests/auto/qmultimedia_common/mockradiotunercontrol.h
@@ -70,9 +70,9 @@ public:
     {
         return true;
     }
-    QtMultimediaKit::AvailabilityError availabilityError() const
+    QtMultimedia::AvailabilityError availabilityError() const
     {
-        return QtMultimediaKit::NoError;
+        return QtMultimedia::NoError;
     }
 
     QRadioTuner::Band band() const
diff --git a/tests/auto/qmultimedia_common/mockvideo.pri b/tests/auto/qmultimedia_common/mockvideo.pri
index 6ffa0366a..ea991661f 100644
--- a/tests/auto/qmultimedia_common/mockvideo.pri
+++ b/tests/auto/qmultimedia_common/mockvideo.pri
@@ -3,9 +3,9 @@ INCLUDEPATH += $$PWD \
     ../../../src/multimedia \
     ../../../src/multimedia/video
 
-contains(QT,multimediakitwidgets)|contains(QT,multimediakitwidgets-private) {
+contains(QT,multimediawidgets)|contains(QT,multimediawidgets-private) {
     HEADERS *= ../qmultimedia_common/mockvideowindowcontrol.h
-    DEFINES *= QT_MULTIMEDIAKIT_MOCK_WIDGETS
+    DEFINES *= QT_MULTIMEDIA_MOCK_WIDGETS
 }
 
 HEADERS *= \
diff --git a/tests/auto/qmultimedia_common/mockvideowindowcontrol.h b/tests/auto/qmultimedia_common/mockvideowindowcontrol.h
index 981e266c8..83255e24c 100644
--- a/tests/auto/qmultimedia_common/mockvideowindowcontrol.h
+++ b/tests/auto/qmultimedia_common/mockvideowindowcontrol.h
@@ -42,7 +42,7 @@
 #ifndef MOCKVIDEOWINDOWCONTROL_H
 #define MOCKVIDEOWINDOWCONTROL_H
 
-#if defined(QT_MULTIMEDIAKIT_MOCK_WIDGETS)
+#if defined(QT_MULTIMEDIA_MOCK_WIDGETS)
 
 #include "qvideowindowcontrol.h"
 
@@ -70,5 +70,5 @@ public:
     void setSaturation(int) {}
 };
 
-#endif // QT_MULTIMEDIAKIT_MOCK_WIDGETS
+#endif // QT_MULTIMEDIA_MOCK_WIDGETS
 #endif // MOCKVIDEOWINDOWCONTROL_H
diff --git a/tests/auto/qpaintervideosurface/qpaintervideosurface.pro b/tests/auto/qpaintervideosurface/qpaintervideosurface.pro
index 8c109b20a..7ced1d3d1 100644
--- a/tests/auto/qpaintervideosurface/qpaintervideosurface.pro
+++ b/tests/auto/qpaintervideosurface/qpaintervideosurface.pro
@@ -1,6 +1,6 @@
 load(qttest_p4)
 
-QT += multimediakit-private multimediakitwidgets-private
+QT += multimedia-private multimediawidgets-private
 CONFIG += no_private_qt_headers_warning
 contains(QT_CONFIG, opengl) | contains(QT_CONFIG, opengles2) {
    QT += opengl
diff --git a/tests/auto/qradiotuner/qradiotuner.pro b/tests/auto/qradiotuner/qradiotuner.pro
index b04057ba4..f5c45e63c 100644
--- a/tests/auto/qradiotuner/qradiotuner.pro
+++ b/tests/auto/qradiotuner/qradiotuner.pro
@@ -1,6 +1,6 @@
 load(qttest_p4)
 
-QT += multimediakit-private
+QT += multimedia-private
 CONFIG += no_private_qt_headers_warning
 
 HEADERS += tst_qradiotuner.h
diff --git a/tests/auto/qradiotuner/tst_qradiotuner.cpp b/tests/auto/qradiotuner/tst_qradiotuner.cpp
index 80bac62db..62db50ce1 100644
--- a/tests/auto/qradiotuner/tst_qradiotuner.cpp
+++ b/tests/auto/qradiotuner/tst_qradiotuner.cpp
@@ -56,13 +56,13 @@ void tst_QRadioTuner::initTestCase()
     radio = new QRadioTuner(0,provider);
     QVERIFY(radio->service() != 0);
     QVERIFY(radio->isAvailable());
-    QVERIFY(radio->availabilityError() == QtMultimediaKit::NoError);
+    QVERIFY(radio->availabilityError() == QtMultimedia::NoError);
 
     QSignalSpy stateSpy(radio, SIGNAL(stateChanged(QRadioTuner::State)));
 
     QCOMPARE(radio->state(), QRadioTuner::StoppedState);    
     radio->start();
-    QVERIFY(radio->availabilityError() == QtMultimediaKit::NoError);
+    QVERIFY(radio->availabilityError() == QtMultimedia::NoError);
     QCOMPARE(radio->state(), QRadioTuner::ActiveState);
 
     QCOMPARE(stateSpy.count(), 1);
@@ -77,7 +77,7 @@ void tst_QRadioTuner::cleanupTestCase()
     QSignalSpy stateSpy(radio, SIGNAL(stateChanged(QRadioTuner::State)));
 
     radio->stop();
-    QVERIFY(radio->availabilityError() == QtMultimediaKit::NoError);
+    QVERIFY(radio->availabilityError() == QtMultimedia::NoError);
     QCOMPARE(radio->state(), QRadioTuner::StoppedState);
     QCOMPARE(stateSpy.count(), 1);
 
diff --git a/tests/auto/qsoundeffect/qsoundeffect.pro b/tests/auto/qsoundeffect/qsoundeffect.pro
index c1e317893..8c5ef7011 100644
--- a/tests/auto/qsoundeffect/qsoundeffect.pro
+++ b/tests/auto/qsoundeffect/qsoundeffect.pro
@@ -1,6 +1,6 @@
 load(qttest_p4)
 
-QT += core declarative multimediakit-private
+QT += core declarative multimedia-private
 CONFIG += no_private_qt_headers_warning
 
 # This is more of a system test
diff --git a/tests/auto/qvideodevicecontrol/qvideodevicecontrol.pro b/tests/auto/qvideodevicecontrol/qvideodevicecontrol.pro
index e336c6eb9..c0f5b3759 100644
--- a/tests/auto/qvideodevicecontrol/qvideodevicecontrol.pro
+++ b/tests/auto/qvideodevicecontrol/qvideodevicecontrol.pro
@@ -1,6 +1,6 @@
 load(qttest_p4)
 
-QT += multimediakit-private
+QT += multimedia-private
 CONFIG += no_private_qt_headers_warning
 
 SOURCES += tst_qvideodevicecontrol.cpp
diff --git a/tests/auto/qvideoencodercontrol/qvideoencodercontrol.pro b/tests/auto/qvideoencodercontrol/qvideoencodercontrol.pro
index 98b64c17d..e41404c7e 100644
--- a/tests/auto/qvideoencodercontrol/qvideoencodercontrol.pro
+++ b/tests/auto/qvideoencodercontrol/qvideoencodercontrol.pro
@@ -1,6 +1,6 @@
 load(qttest_p4)
 
-QT += multimediakit-private
+QT += multimedia-private
 CONFIG += no_private_qt_headers_warning
 
 SOURCES += \
diff --git a/tests/auto/qvideoframe/qvideoframe.pro b/tests/auto/qvideoframe/qvideoframe.pro
index 13bcf1ee1..c129025d2 100644
--- a/tests/auto/qvideoframe/qvideoframe.pro
+++ b/tests/auto/qvideoframe/qvideoframe.pro
@@ -1,6 +1,6 @@
 load(qttest_p4)
 
-QT += core multimediakit-private
+QT += core multimedia-private
 CONFIG += no_private_qt_headers_warning
 
 SOURCES += tst_qvideoframe.cpp
diff --git a/tests/auto/qvideosurfaceformat/qvideosurfaceformat.pro b/tests/auto/qvideosurfaceformat/qvideosurfaceformat.pro
index 26ea850fb..97d576f8a 100644
--- a/tests/auto/qvideosurfaceformat/qvideosurfaceformat.pro
+++ b/tests/auto/qvideosurfaceformat/qvideosurfaceformat.pro
@@ -1,6 +1,6 @@
 load(qttest_p4)
 
-QT += core multimediakit-private
+QT += core multimedia-private
 CONFIG += no_private_qt_headers_warning
 
 SOURCES += tst_qvideosurfaceformat.cpp
diff --git a/tests/auto/qvideowidget/qvideowidget.pro b/tests/auto/qvideowidget/qvideowidget.pro
index 4a034c17a..a6f8a660b 100644
--- a/tests/auto/qvideowidget/qvideowidget.pro
+++ b/tests/auto/qvideowidget/qvideowidget.pro
@@ -1,6 +1,6 @@
 load(qttest_p4)
 
-QT += multimediakit-private multimediakitwidgets-private
+QT += multimedia-private multimediawidgets-private
 CONFIG += no_private_qt_headers_warning
 
 SOURCES += tst_qvideowidget.cpp
diff --git a/tests/auto/qvideowidget/tst_qvideowidget.cpp b/tests/auto/qvideowidget/tst_qvideowidget.cpp
index 58ab43eed..9f9bafc50 100644
--- a/tests/auto/qvideowidget/tst_qvideowidget.cpp
+++ b/tests/auto/qvideowidget/tst_qvideowidget.cpp
@@ -41,7 +41,7 @@
 
 //TESTED_COMPONENT=src/multimedia
 
-#include <qtmultimediakitdefs.h>
+#include <qtmultimediadefs.h>
 #include <QtTest/QtTest>
 
 #include "qvideowidget.h"