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>

395 files changed, 1400 insertions, 3095 deletions

diff --git a/doc/src/examples/camera.qdoc b/doc/src/examples/camera.qdoc
index a87869e13..455e45fd3 100644
--- a/doc/src/examples/camera.qdoc
+++ b/doc/src/examples/camera.qdoc
@@ -36,7 +36,7 @@ or video.
 
 
 
-The Camera Example demonstrates how you can use the QtMultimediaKit to implement
+The Camera Example demonstrates how you can use QtMultimedia to implement
 some basic Camera functionality to take still images and record video clips
 with audio.
 
diff --git a/doc/src/multimedia.qdoc b/doc/src/multimedia.qdoc
index 04f6b5691..8cdf1386c 100644
--- a/doc/src/multimedia.qdoc
+++ b/doc/src/multimedia.qdoc
@@ -42,7 +42,7 @@ collection of media content.
 
 Multimedia provides a set of APIs that allow the developer to play, record
 and manage a collection of media content. It is dependent on the
-QtMultimediaKit module. QtMultimediaKit is the recommended API to build multimedia
+QtMultimedia module. QtMultimedia is the recommended API to build multimedia
 applications using Qt. The Phonon API is no longer recommended.
 
 \tableofcontents
@@ -67,7 +67,7 @@ from a remote location and identified by a URL. Finally, many different
 codecs are supported 'out
 of the box'.
 
-The supplied \l {qtmultimediakit examples}{examples} give a good idea at the ease of use of the API. When
+The supplied \l {qtmultimedia examples}{examples} give a good idea at the ease of use of the API. When
 the supporting user interface code is ignored we can see that functionality
 is immediately available with minimal effort.
 
@@ -304,7 +304,7 @@ the operation can be cancelled by calling
 cancellation can be done by calling \l {QCamera::unlock()}{unlock}(QCamera::LockFocus).
 
 
-\target qtmultimediakit examples
+\target qtmultimedia examples
 \section1 Examples
 
 \section2 Record a Sound Source
@@ -326,7 +326,7 @@ QVideoWidget classes.
 
 \section2 Camera Example
 
-The \l{Camera Example} shows how use the QtMultimediaKit API to quickly
+The \l{Camera Example} shows how use the QtMultimedia API to quickly
 write a camera application in C++.
 
 \section2 QML Camera Example
diff --git a/doc/src/plugins/qml-multimedia.qdoc b/doc/src/plugins/qml-multimedia.qdoc
index 2d5d010ba..b539cf499 100644
--- a/doc/src/plugins/qml-multimedia.qdoc
+++ b/doc/src/plugins/qml-multimedia.qdoc
@@ -55,7 +55,7 @@
     \qml
 
     import Qt 4.7
-    import QtMultimediaKit 1.1
+    import QtMultimedia 4.0
     // ...
 
     Audio {
@@ -238,7 +238,7 @@
     \qml
 
     import Qt 4.7
-    import QtMultimediaKit 1.1
+    import QtMultimedia 4.0
 
 
         SoundEffect {
@@ -265,7 +265,7 @@
 
     \qml
     import Qt 4.7
-    import QtMultimediaKit 1.1
+    import QtMultimedia 4.0
 
     Camera {
         focus : visible // to receive focus and capture key events when visible
diff --git a/doc/src/snippets/multimedia-snippets/audiorecorder.cpp b/doc/src/snippets/multimedia-snippets/audiorecorder.cpp
index 9d292c48f..6ff496510 100644
--- a/doc/src/snippets/multimedia-snippets/audiorecorder.cpp
+++ b/doc/src/snippets/multimedia-snippets/audiorecorder.cpp
@@ -45,7 +45,7 @@
 #include <qmediarecorder.h>
 #include <qmediaservice.h>
 
-#include <QtMultimediaKit/qaudioformat.h>
+#include <QtMultimedia/qaudioformat.h>
 
 #include "audiorecorder.h"
 
diff --git a/doc/src/snippets/multimedia-snippets/media.cpp b/doc/src/snippets/multimedia-snippets/media.cpp
index 44f2327bf..baff4d3b1 100644
--- a/doc/src/snippets/multimedia-snippets/media.cpp
+++ b/doc/src/snippets/multimedia-snippets/media.cpp
@@ -210,7 +210,7 @@ void MediaExample::MediaRecorder()
 
     QAudioEncoderSettings audioSettings;
     audioSettings.setCodec("audio/vorbis");
-    audioSettings.setQuality(QtMultimediaKit::HighQuality);
+    audioSettings.setQuality(QtMultimedia::HighQuality);
 
     recorder->setEncodingSettings(audioSettings);
 
diff --git a/doc/src/snippets/multimedia-snippets/multimedia-snippets.pro b/doc/src/snippets/multimedia-snippets/multimedia-snippets.pro
index b04d16979..bf5c0945d 100644
--- a/doc/src/snippets/multimedia-snippets/multimedia-snippets.pro
+++ b/doc/src/snippets/multimedia-snippets/multimedia-snippets.pro
@@ -4,14 +4,14 @@ TEMPLATE = lib
 TARGET = qtmmksnippets
 
 INCLUDEPATH += ../../../../src/global \
-               ../../../../src/multimediakit \
-               ../../../../src/multimediakit/audio \
-               ../../../../src/multimediakit/video \
-               ../../../../src/multimediakit/effects
+               ../../../../src/multimedia \
+               ../../../../src/multimedia/audio \
+               ../../../../src/multimedia/video \
+               ../../../../src/multimedia/effects
 
 CONFIG += console
 
-qtAddLibrary(QtMultimediaKit)
+QT += multimedia
 
 SOURCES += \
     audio.cpp \
diff --git a/doc/src/snippets/multimedia-snippets/player.cpp b/doc/src/snippets/multimedia-snippets/player.cpp
index 0db3c1447..1280baba3 100644
--- a/doc/src/snippets/multimedia-snippets/player.cpp
+++ b/doc/src/snippets/multimedia-snippets/player.cpp
@@ -177,14 +177,14 @@ void Player::positionChanged(qint64 progress)
 
 void Player::metaDataChanged()
 {
-    //qDebug() << "update metadata" << player->metaData(QtMultimediaKit::Title).toString();
+    //qDebug() << "update metadata" << player->metaData(QtMultimedia::Title).toString();
     if (player->isMetaDataAvailable()) {
         setTrackInfo(QString("%1 - %2")
-                .arg(player->metaData(QtMultimediaKit::AlbumArtist).toString())
-                .arg(player->metaData(QtMultimediaKit::Title).toString()));
+                .arg(player->metaData(QtMultimedia::AlbumArtist).toString())
+                .arg(player->metaData(QtMultimedia::Title).toString()));
 
         if (coverLabel) {
-            QUrl url = player->metaData(QtMultimediaKit::CoverArtUrlLarge).value<QUrl>();
+            QUrl url = player->metaData(QtMultimedia::CoverArtUrlLarge).value<QUrl>();
 
             coverLabel->setPixmap(!url.isEmpty()
                     ? QPixmap(url.toString())
diff --git a/doc/src/snippets/multimedia-snippets/soundeffect.qml b/doc/src/snippets/multimedia-snippets/soundeffect.qml
index 629c11cb1..21e75f116 100644
--- a/doc/src/snippets/multimedia-snippets/soundeffect.qml
+++ b/doc/src/snippets/multimedia-snippets/soundeffect.qml
@@ -41,7 +41,7 @@
 
 //! [complete snippet]
 import Qt 4.7
-import QtMultimediaKit 1.1
+import QtMultimedia 4.0
 
 Text {
     text: "Click Me!";
diff --git a/examples/audiodevices/audiodevices.pro b/examples/audiodevices/audiodevices.pro
index 87391db1f..7bd598762 100644
--- a/examples/audiodevices/audiodevices.pro
+++ b/examples/audiodevices/audiodevices.pro
@@ -1,7 +1,7 @@
 TEMPLATE = app
 TARGET = audiodevices
 
-QT += multimediakit
+QT += multimedia
 
 HEADERS       = audiodevices.h
 
@@ -10,9 +10,9 @@ SOURCES       = audiodevices.cpp \
 
 FORMS        += audiodevicesbase.ui
 
-target.path = $$[QT_INSTALL_EXAMPLES]/qtmultimediakit/audiodevices
+target.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/audiodevices
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimediakit/audiodevices
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/audiodevices
 
 INSTALLS += target sources
 
diff --git a/examples/audioinput/audioinput.pro b/examples/audioinput/audioinput.pro
index cd6306673..f4cdc3141 100644
--- a/examples/audioinput/audioinput.pro
+++ b/examples/audioinput/audioinput.pro
@@ -1,16 +1,16 @@
 TEMPLATE = app
 TARGET = audioinput
 
-QT += multimediakit
+QT += multimedia
 
 HEADERS       = audioinput.h
 
 SOURCES       = audioinput.cpp \
                 main.cpp
 
-target.path = $$[QT_INSTALL_EXAMPLES]/qtmultimediakit/audioinput
+target.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/audioinput
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimediakit/audioinput
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/audioinput
 
 INSTALLS += target sources
 
diff --git a/examples/audiooutput/audiooutput.pro b/examples/audiooutput/audiooutput.pro
index b289cdbfc..f2a2244d2 100644
--- a/examples/audiooutput/audiooutput.pro
+++ b/examples/audiooutput/audiooutput.pro
@@ -1,16 +1,16 @@
 TEMPLATE = app
 TARGET += audiooutput
 
-QT += multimediakit
+QT += multimedia
 
 HEADERS       = audiooutput.h
 
 SOURCES       = audiooutput.cpp \
                 main.cpp
 
-target.path = $$[QT_INSTALL_EXAMPLES]/qtmultimediakit/audiooutput
+target.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/audiooutput
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimediakit/audiooutput
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/audiooutput
 
 INSTALLS += target sources
 
diff --git a/examples/audiorecorder/audiorecorder.cpp b/examples/audiorecorder/audiorecorder.cpp
index 38f08ac4b..ad4dc3540 100644
--- a/examples/audiorecorder/audiorecorder.cpp
+++ b/examples/audiorecorder/audiorecorder.cpp
@@ -88,8 +88,8 @@ AudioRecorder::AudioRecorder(QWidget *parent)
                 sampleRate));
     }
 
-    ui->qualitySlider->setRange(0, int(QtMultimediaKit::VeryHighQuality));
-    ui->qualitySlider->setValue(int(QtMultimediaKit::NormalQuality));
+    ui->qualitySlider->setRange(0, int(QtMultimedia::VeryHighQuality));
+    ui->qualitySlider->setValue(int(QtMultimedia::NormalQuality));
 
     //bitrates:
     ui->bitrateBox->addItem(QString("Default"), QVariant(0));
@@ -172,10 +172,10 @@ void AudioRecorder::toggleRecord()
         settings.setCodec(boxValue(ui->audioCodecBox).toString());
         settings.setSampleRate(boxValue(ui->sampleRateBox).toInt());
         settings.setBitRate(boxValue(ui->bitrateBox).toInt());
-        settings.setQuality(QtMultimediaKit::EncodingQuality(ui->qualitySlider->value()));
+        settings.setQuality(QtMultimedia::EncodingQuality(ui->qualitySlider->value()));
         settings.setEncodingMode(ui->constantQualityRadioButton->isChecked() ?
-                                 QtMultimediaKit::ConstantQualityEncoding :
-                                 QtMultimediaKit::ConstantBitRateEncoding);
+                                 QtMultimedia::ConstantQualityEncoding :
+                                 QtMultimedia::ConstantBitRateEncoding);
 
         QString container = boxValue(ui->containerBox).toString();
 
diff --git a/examples/audiorecorder/audiorecorder.pro b/examples/audiorecorder/audiorecorder.pro
index b5b5d1055..f2af6387e 100644
--- a/examples/audiorecorder/audiorecorder.pro
+++ b/examples/audiorecorder/audiorecorder.pro
@@ -1,7 +1,7 @@
 TEMPLATE = app
 TARGET = audiorecorder
 
-QT += multimediakit
+QT += multimedia
 
 HEADERS = \
     audiorecorder.h
@@ -16,9 +16,9 @@ maemo*: {
     FORMS += audiorecorder.ui
 }
 
-target.path = $$[QT_INSTALL_EXAMPLES]/qtmultimediakit/audiorecorder
+target.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/audiorecorder
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimediakit/audiorecorder
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/audiorecorder
 
 INSTALLS += target sources
 
diff --git a/examples/camera/camera.cpp b/examples/camera/camera.cpp
index b8bb675be..d30d6c19d 100644
--- a/examples/camera/camera.cpp
+++ b/examples/camera/camera.cpp
@@ -124,7 +124,7 @@ void Camera::setCamera(const QByteArray &cameraDevice)
     connect(mediaRecorder, SIGNAL(durationChanged(qint64)), this, SLOT(updateRecordTime()));
     connect(mediaRecorder, SIGNAL(error(QMediaRecorder::Error)), this, SLOT(displayRecorderError()));
 
-    mediaRecorder->setMetaData(QtMultimediaKit::Title, QVariant(QLatin1String("Test Title")));
+    mediaRecorder->setMetaData(QtMultimedia::Title, QVariant(QLatin1String("Test Title")));
 
     connect(ui->exposureCompensation, SIGNAL(valueChanged(int)), SLOT(setExposureCompensation(int)));
 
diff --git a/examples/camera/camera.pro b/examples/camera/camera.pro
index a519354ed..f7dd8b787 100644
--- a/examples/camera/camera.pro
+++ b/examples/camera/camera.pro
@@ -1,7 +1,7 @@
 TEMPLATE = app
 TARGET = camera
 
-QT += multimediakit multimediakitwidgets
+QT += multimedia multimediawidgets
 
 HEADERS = \
     camera.h \
@@ -19,9 +19,9 @@ FORMS += \
     videosettings.ui \
     imagesettings.ui
 
-target.path = $$[QT_INSTALL_EXAMPLES]/qtmultimediakit/camera
+target.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/camera
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimediakit/camera
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/camera
 
 INSTALLS += target sources
 
diff --git a/examples/camera/imagesettings.cpp b/examples/camera/imagesettings.cpp
index c3b9b22c2..bb73f3a02 100644
--- a/examples/camera/imagesettings.cpp
+++ b/examples/camera/imagesettings.cpp
@@ -62,7 +62,7 @@ ImageSettings::ImageSettings(QCameraImageCapture *imageCapture, QWidget *parent)
         ui->imageCodecBox->addItem(codecName+": "+description, QVariant(codecName));
     }
 
-    ui->imageQualitySlider->setRange(0, int(QtMultimediaKit::VeryHighQuality));
+    ui->imageQualitySlider->setRange(0, int(QtMultimedia::VeryHighQuality));
 
     ui->imageResolutionBox->addItem(tr("Default Resolution"));
     QList<QSize> supportedResolutions = imagecapture->supportedResolutions();
@@ -93,7 +93,7 @@ QImageEncoderSettings ImageSettings::imageSettings() const
 {
     QImageEncoderSettings settings = imagecapture->encodingSettings();
     settings.setCodec(boxValue(ui->imageCodecBox).toString());
-    settings.setQuality(QtMultimediaKit::EncodingQuality(ui->imageQualitySlider->value()));
+    settings.setQuality(QtMultimedia::EncodingQuality(ui->imageQualitySlider->value()));
     settings.setResolution(boxValue(ui->imageResolutionBox).toSize());
 
     return settings;
diff --git a/examples/camera/videosettings.cpp b/examples/camera/videosettings.cpp
index c1d816012..f97f4adf2 100644
--- a/examples/camera/videosettings.cpp
+++ b/examples/camera/videosettings.cpp
@@ -66,7 +66,7 @@ VideoSettings::VideoSettings(QMediaRecorder *mediaRecorder, QWidget *parent) :
         ui->audioSampleRateBox->addItem(QString::number(sampleRate), QVariant(sampleRate));
     }
 
-    ui->audioQualitySlider->setRange(0, int(QtMultimediaKit::VeryHighQuality));
+    ui->audioQualitySlider->setRange(0, int(QtMultimedia::VeryHighQuality));
 
     //video codecs
     ui->videoCodecBox->addItem(tr("Default video codec"), QVariant(QString()));
@@ -75,7 +75,7 @@ VideoSettings::VideoSettings(QMediaRecorder *mediaRecorder, QWidget *parent) :
         ui->videoCodecBox->addItem(codecName+": "+description, QVariant(codecName));
     }
 
-    ui->videoQualitySlider->setRange(0, int(QtMultimediaKit::VeryHighQuality));
+    ui->videoQualitySlider->setRange(0, int(QtMultimedia::VeryHighQuality));
 
 
     ui->videoResolutionBox->addItem(tr("Default"));
@@ -122,7 +122,7 @@ QAudioEncoderSettings VideoSettings::audioSettings() const
 {
     QAudioEncoderSettings settings = mediaRecorder->audioSettings();
     settings.setCodec(boxValue(ui->audioCodecBox).toString());
-    settings.setQuality(QtMultimediaKit::EncodingQuality(ui->audioQualitySlider->value()));
+    settings.setQuality(QtMultimedia::EncodingQuality(ui->audioQualitySlider->value()));
     settings.setSampleRate(boxValue(ui->audioSampleRateBox).toInt());
     return settings;
 }
@@ -138,7 +138,7 @@ QVideoEncoderSettings VideoSettings::videoSettings() const
 {
     QVideoEncoderSettings settings = mediaRecorder->videoSettings();
     settings.setCodec(boxValue(ui->videoCodecBox).toString());
-    settings.setQuality(QtMultimediaKit::EncodingQuality(ui->videoQualitySlider->value()));
+    settings.setQuality(QtMultimedia::EncodingQuality(ui->videoQualitySlider->value()));
     settings.setResolution(boxValue(ui->videoResolutionBox).toSize());
     settings.setFrameRate(boxValue(ui->videoFramerateBox).value<qreal>());
 
diff --git a/examples/declarative-camera/CameraPropertyButton.qml b/examples/declarative-camera/CameraPropertyButton.qml
index 91ddeffa0..152bb9375 100644
--- a/examples/declarative-camera/CameraPropertyButton.qml
+++ b/examples/declarative-camera/CameraPropertyButton.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 import Qt 4.7
-import QtMultimediaKit 1.1
+import QtMultimedia 4.0
 
 Item {
     id: propertyButton
diff --git a/examples/declarative-camera/CaptureControls.qml b/examples/declarative-camera/CaptureControls.qml
index 3332fe1d2..6120dad01 100644
--- a/examples/declarative-camera/CaptureControls.qml
+++ b/examples/declarative-camera/CaptureControls.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 import Qt 4.7
-import QtMultimediaKit 1.1
+import QtMultimedia 4.0
 
 FocusScope {
     property Camera camera
diff --git a/examples/declarative-camera/FocusButton.qml b/examples/declarative-camera/FocusButton.qml
index 3522b0e68..6a54c8d22 100644
--- a/examples/declarative-camera/FocusButton.qml
+++ b/examples/declarative-camera/FocusButton.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 import Qt 4.7
-import QtMultimediaKit 1.1
+import QtMultimedia 4.0
 
 CameraButton {
     property Camera camera
diff --git a/examples/declarative-camera/PhotoPreview.qml b/examples/declarative-camera/PhotoPreview.qml
index 97deec8fb..6cd7f35b0 100644
--- a/examples/declarative-camera/PhotoPreview.qml
+++ b/examples/declarative-camera/PhotoPreview.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 import Qt 4.7
-import QtMultimediaKit 1.1
+import QtMultimedia 4.0
 
 Item {
     property alias source : preview.source
diff --git a/examples/declarative-camera/ZoomControl.qml b/examples/declarative-camera/ZoomControl.qml
index 0d804d3d9..b141523c1 100644
--- a/examples/declarative-camera/ZoomControl.qml
+++ b/examples/declarative-camera/ZoomControl.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 import Qt 4.7
-import QtMultimediaKit 1.1
+import QtMultimedia 4.0
 
 Item {
     id : zoomControl
diff --git a/examples/declarative-camera/declarative-camera.pro b/examples/declarative-camera/declarative-camera.pro
index ad544e9f4..f1599741d 100644
--- a/examples/declarative-camera/declarative-camera.pro
+++ b/examples/declarative-camera/declarative-camera.pro
@@ -1,7 +1,7 @@
 
 TEMPLATE=app
 
-QT += declarative qtquick1 network multimediakit
+QT += declarative qtquick1 network multimedia
 
 contains(QT_CONFIG, opengl) {
     QT += opengl
@@ -13,9 +13,9 @@ else:TARGET = QmlCamera
 
 RESOURCES += declarative-camera.qrc
 
-target.path = $$[QT_INSTALL_EXAMPLES]/qtmultimediakit/qml_camera
+target.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/qml_camera
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimediakit/qml_camera
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/qml_camera
 
 INSTALLS += target sources
 
diff --git a/examples/declarative-camera/declarative-camera.qml b/examples/declarative-camera/declarative-camera.qml
index 000185459..fdc210de6 100644
--- a/examples/declarative-camera/declarative-camera.qml
+++ b/examples/declarative-camera/declarative-camera.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 import Qt 4.7
-import QtMultimediaKit 1.1
+import QtMultimedia 4.0
 
 Rectangle {
     id : cameraUI
diff --git a/examples/declarative-radio/declarative-radio.pro b/examples/declarative-radio/declarative-radio.pro
index f3dab6411..4ade74285 100644
--- a/examples/declarative-radio/declarative-radio.pro
+++ b/examples/declarative-radio/declarative-radio.pro
@@ -2,7 +2,7 @@ TEMPLATE = app
 TARGET = declarative-radio
 DEPENDPATH += .
 INCLUDEPATH += .
-QT += declarative multimediakit
+QT += declarative multimedia
 
 # Input
 SOURCES += main.cpp
diff --git a/examples/declarative-radio/view.qml b/examples/declarative-radio/view.qml
index 4e2882d45..71cca9d11 100644
--- a/examples/declarative-radio/view.qml
+++ b/examples/declarative-radio/view.qml
@@ -39,7 +39,7 @@
  ****************************************************************************/
 
 import QtQuick 2.0
-import Qt.multimediakit 4.0
+import Qt.multimedia 4.0
 
 Rectangle {
     width: 400; height: 300;
diff --git a/examples/player/player.cpp b/examples/player/player.cpp
index 18c9885aa..8b822e18c 100644
--- a/examples/player/player.cpp
+++ b/examples/player/player.cpp
@@ -221,14 +221,14 @@ void Player::positionChanged(qint64 progress)
 
 void Player::metaDataChanged()
 {
-    //qDebug() << "update metadata" << player->metaData(QtMultimediaKit::Title).toString();
+    //qDebug() << "update metadata" << player->metaData(QtMultimedia::Title).toString();
     if (player->isMetaDataAvailable()) {
         setTrackInfo(QString("%1 - %2")
-                .arg(player->metaData(QtMultimediaKit::AlbumArtist).toString())
-                .arg(player->metaData(QtMultimediaKit::Title).toString()));
+                .arg(player->metaData(QtMultimedia::AlbumArtist).toString())
+                .arg(player->metaData(QtMultimedia::Title).toString()));
 
         if (coverLabel) {
-            QUrl url = player->metaData(QtMultimediaKit::CoverArtUrlLarge).value<QUrl>();
+            QUrl url = player->metaData(QtMultimedia::CoverArtUrlLarge).value<QUrl>();
 
             coverLabel->setPixmap(!url.isEmpty()
                     ? QPixmap(url.toString())
diff --git a/examples/player/player.pro b/examples/player/player.pro
index 58b6f8ed7..3bc6c654d 100644
--- a/examples/player/player.pro
+++ b/examples/player/player.pro
@@ -5,8 +5,8 @@ CONFIG += qt warn_on
 
 QT += network \
       xml \
-      multimediakit \
-      multimediakitwidgets
+      multimedia \
+      multimediawidgets
 
 HEADERS = \
     player.h \
@@ -24,9 +24,9 @@ maemo* {
 }
 
 #install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtmultimediakit/player
+target.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/player
 sources.files = $$SOURCES $HEADERS $$RESOURCES $$FORMS *.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimediakit/player
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/player
 INSTALLS += target sources
 
 QT+=widgets
diff --git a/examples/player/playlistmodel.h b/examples/player/playlistmodel.h
index 45461260c..247f4ceb8 100644
--- a/examples/player/playlistmodel.h
+++ b/examples/player/playlistmodel.h
@@ -41,7 +41,7 @@
 #ifndef PLAYLISTMODEL_H
 #define PLAYLISTMODEL_H
 
-#include <qtmultimediakitdefs.h>
+#include <qtmultimediadefs.h>
 #include <QtCore/qabstractitemmodel.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/examples/radio/radio.pro b/examples/radio/radio.pro
index de55c591b..6931879dd 100644
--- a/examples/radio/radio.pro
+++ b/examples/radio/radio.pro
@@ -1,7 +1,7 @@
 TEMPLATE = app
 TARGET = radio
 
-QT += multimediakit
+QT += multimedia
 
 HEADERS = \
     radio.h
@@ -10,9 +10,9 @@ SOURCES = \
     main.cpp \
     radio.cpp
 
-target.path = $$[QT_INSTALL_EXAMPLES]/qtmultimediakit/radio
+target.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/radio
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimediakit/radio
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/radio
 
 INSTALLS += target sources
 
diff --git a/examples/slideshow/slideshow.pro b/examples/slideshow/slideshow.pro
index c4cb38080..133735d6f 100644
--- a/examples/slideshow/slideshow.pro
+++ b/examples/slideshow/slideshow.pro
@@ -1,7 +1,7 @@
 TEMPLATE = app
 TARGET = slideshow
 
-QT += multimediakit multimediakitwidgets
+QT += multimedia multimediawidgets
 
 HEADERS = \
     slideshow.h
@@ -10,9 +10,9 @@ SOURCES = \
     main.cpp \
     slideshow.cpp
 
-target.path = $$[QT_INSTALL_EXAMPLES]/qtmultimediakit/slideshow
+target.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/slideshow
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimediakit/slideshow
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/slideshow
 
 INSTALLS += target sources
 
diff --git a/examples/spectrum/3rdparty/fftreal/fftreal.pro b/examples/spectrum/3rdparty/fftreal/fftreal.pro
index 2c667ef76..19019b1d4 100644
--- a/examples/spectrum/3rdparty/fftreal/fftreal.pro
+++ b/examples/spectrum/3rdparty/fftreal/fftreal.pro
@@ -41,6 +41,6 @@ macx {
 
 sources.files = $$SOURCES $$HEADERS fftreal.pro readme.txt license.txt
 sources.files += bwins/fftreal.def eabi/fftreal.def
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimediakit/spectrum/3rdparty/fftreal
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/spectrum/3rdparty/fftreal
 INSTALLS += sources
 
diff --git a/examples/spectrum/README.txt b/examples/spectrum/README.txt
index 8d9a81f3b..c39d4a709 100644
--- a/examples/spectrum/README.txt
+++ b/examples/spectrum/README.txt
@@ -4,7 +4,7 @@ Spectrum analyser demo app
 Introduction
 ------------
 
-This application is a demo which uses the QtMultimediaKit APIs to capture and play back PCM audio.  While either recording or playback is ongoing, the application performs real-time level and frequency spectrum analysis, displaying the results in its main window.
+This application is a demo which uses the QtMultimedia APIs to capture and play back PCM audio.  While either recording or playback is ongoing, the application performs real-time level and frequency spectrum analysis, displaying the results in its main window.
 
 
 Acknowledgments
@@ -96,7 +96,7 @@ If you don't like the combination of the waveform and progress bar in a single w
 
 The spectrum.h file defines a number of parameters which can be played with.  These control things such as the number of audio samples analysed per FFT calculation, the range and number of bands displayed by the spectrograph, and so on.
 
-The part of the application which interacts with QtMultimediaKit is in the Engine class.
+The part of the application which interacts with QtMultimedia is in the Engine class.
 
 Some ideas for enhancements to the app are listed in TODO.txt.  Feel free to start work on any of them :)
 
diff --git a/examples/spectrum/app/app.pro b/examples/spectrum/app/app.pro
index 28cc16ab0..aec69d239 100644
--- a/examples/spectrum/app/app.pro
+++ b/examples/spectrum/app/app.pro
@@ -6,7 +6,7 @@ TEMPLATE = app
 
 TARGET = spectrum
 
-QT       += multimediakit
+QT       += multimedia
 
 SOURCES  += main.cpp \
             engine.cpp \
@@ -59,9 +59,9 @@ RESOURCES = spectrum.qrc
 # Install
 
 sources.files = $$SOURCES $$HEADERS $$RESOURCES app.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimediakit/spectrum/app
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/spectrum/app
 images.files += images/record.png images/settings.png
-images.path = $$[QT_INSTALL_EXAMPLES]/qtmultimediakit/spectrum/app/images
+images.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/spectrum/app/images
 INSTALLS += sources images
 
 # Deployment
diff --git a/examples/spectrum/app/engine.cpp b/examples/spectrum/app/engine.cpp
index 6373b439d..bea24523e 100644
--- a/examples/spectrum/app/engine.cpp
+++ b/examples/spectrum/app/engine.cpp
@@ -47,8 +47,8 @@
 #include <QCoreApplication>
 #include <QMetaObject>
 #include <QSet>
-#include <QtMultimediaKit/QAudioInput>
-#include <QtMultimediaKit/QAudioOutput>
+#include <QtMultimedia/QAudioInput>
+#include <QtMultimedia/QAudioOutput>
 #include <QDebug>
 #include <QThread>
 #include <QFile>
diff --git a/examples/spectrum/app/engine.h b/examples/spectrum/app/engine.h
index bd263ac1b..51c63b370 100644
--- a/examples/spectrum/app/engine.h
+++ b/examples/spectrum/app/engine.h
@@ -49,8 +49,8 @@
 #include <QByteArray>
 #include <QBuffer>
 #include <QVector>
-#include <QtMultimediaKit/QAudioDeviceInfo>
-#include <QtMultimediaKit/QAudioFormat>
+#include <QtMultimedia/QAudioDeviceInfo>
+#include <QtMultimedia/QAudioFormat>
 
 #ifdef DUMP_CAPTURED_AUDIO
 #define DUMP_DATA
@@ -70,7 +70,7 @@ QT_FORWARD_DECLARE_CLASS(QAudioOutput)
 QT_FORWARD_DECLARE_CLASS(QFile)
 
 /**
- * This class interfaces with the QtMultimediaKit audio classes, and also with
+ * This class interfaces with the QtMultimedia audio classes, and also with
  * the SpectrumAnalyser class.  Its role is to manage the capture and playback
  * of audio data, meanwhile performing real-time analysis of the audio level
  * and frequency spectrum.
diff --git a/examples/spectrum/app/main.cpp b/examples/spectrum/app/main.cpp
index af567a000..c776499dc 100644
--- a/examples/spectrum/app/main.cpp
+++ b/examples/spectrum/app/main.cpp
@@ -44,7 +44,7 @@
 int main(int argc, char **argv)
 {
     QApplication app(argc, argv);
-    app.setApplicationName("QtMultimediaKit spectrum analyzer");
+    app.setApplicationName("QtMultimedia spectrum analyzer");
     MainWidget w;
 
     w.show();
diff --git a/examples/spectrum/app/mainwidget.h b/examples/spectrum/app/mainwidget.h
index 5a9574832..14c62a2d3 100644
--- a/examples/spectrum/app/mainwidget.h
+++ b/examples/spectrum/app/mainwidget.h
@@ -43,7 +43,7 @@
 
 #include <QWidget>
 #include <QIcon>
-#include <QtMultimediaKit/qaudio.h>
+#include <QtMultimedia/qaudio.h>
 
 class Engine;
 class FrequencySpectrum;
diff --git a/examples/spectrum/app/settingsdialog.h b/examples/spectrum/app/settingsdialog.h
index ab043f3b1..71d1796b1 100644
--- a/examples/spectrum/app/settingsdialog.h
+++ b/examples/spectrum/app/settingsdialog.h
@@ -43,7 +43,7 @@
 
 #include "spectrum.h"
 #include <QDialog>
-#include <QtMultimediaKit/QAudioDeviceInfo>
+#include <QtMultimedia/QAudioDeviceInfo>
 
 QT_FORWARD_DECLARE_CLASS(QComboBox)
 QT_FORWARD_DECLARE_CLASS(QCheckBox)
diff --git a/examples/spectrum/app/spectrumanalyser.cpp b/examples/spectrum/app/spectrumanalyser.cpp
index 6198c6b1d..8c3212d34 100644
--- a/examples/spectrum/app/spectrumanalyser.cpp
+++ b/examples/spectrum/app/spectrumanalyser.cpp
@@ -43,7 +43,7 @@
 
 #include <QtCore/qmath.h>
 #include <QtCore/qmetatype.h>
-#include <QtMultimediaKit/QAudioFormat>
+#include <QtMultimedia/QAudioFormat>
 #include <QThread>
 
 #include "fftreal_wrapper.h"
diff --git a/examples/spectrum/app/tonegenerator.cpp b/examples/spectrum/app/tonegenerator.cpp
index d1d606684..f3cad99d9 100644
--- a/examples/spectrum/app/tonegenerator.cpp
+++ b/examples/spectrum/app/tonegenerator.cpp
@@ -41,7 +41,7 @@
 #include "spectrum.h"
 #include "utils.h"
 #include <QByteArray>
-#include <QtMultimediaKit/QAudioFormat>
+#include <QtMultimedia/QAudioFormat>
 #include <QtCore/qmath.h>
 #include <QtCore/qendian.h>
 
diff --git a/examples/spectrum/app/tonegeneratordialog.h b/examples/spectrum/app/tonegeneratordialog.h
index 7d9ccc459..788a0ea74 100644
--- a/examples/spectrum/app/tonegeneratordialog.h
+++ b/examples/spectrum/app/tonegeneratordialog.h
@@ -43,7 +43,7 @@
 
 #include "spectrum.h"
 #include <QDialog>
-#include <QtMultimediaKit/QAudioDeviceInfo>
+#include <QtMultimedia/QAudioDeviceInfo>
 
 QT_FORWARD_DECLARE_CLASS(QCheckBox)
 QT_FORWARD_DECLARE_CLASS(QSlider)
diff --git a/examples/spectrum/app/utils.cpp b/examples/spectrum/app/utils.cpp
index d13aa0be5..31cc25b26 100644
--- a/examples/spectrum/app/utils.cpp
+++ b/examples/spectrum/app/utils.cpp
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-#include <QtMultimediaKit/QAudioFormat>
+#include <QtMultimedia/QAudioFormat>
 #include "utils.h"
 
 qint64 audioDuration(const QAudioFormat &format, qint64 bytes)
diff --git a/examples/spectrum/app/waveform.h b/examples/spectrum/app/waveform.h
index 2d3a4883f..a3b706d7c 100644
--- a/examples/spectrum/app/waveform.h
+++ b/examples/spectrum/app/waveform.h
@@ -42,7 +42,7 @@
 #define WAVEFORM_H
 
 #include <QWidget>
-#include <QtMultimediaKit/QAudioFormat>
+#include <QtMultimedia/QAudioFormat>
 #include <QPixmap>
 #include <QScopedPointer>
 
diff --git a/examples/spectrum/app/wavfile.h b/examples/spectrum/app/wavfile.h
index 37bc8505b..b974c475d 100644
--- a/examples/spectrum/app/wavfile.h
+++ b/examples/spectrum/app/wavfile.h
@@ -44,7 +44,7 @@
 
 #include <QtCore/qobject.h>
 #include <QtCore/qfile.h>
-#include <QtMultimediaKit/qaudioformat.h>
+#include <QtMultimedia/qaudioformat.h>
 
 class WavFile : public QFile
 {
diff --git a/examples/spectrum/spectrum.pro b/examples/spectrum/spectrum.pro
index 989ad11d9..662d6522a 100644
--- a/examples/spectrum/spectrum.pro
+++ b/examples/spectrum/spectrum.pro
@@ -14,7 +14,7 @@ SUBDIRS += app
 TARGET = spectrum
 
 sources.files = README.txt spectrum.pri spectrum.pro TODO.txt
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimediakit/spectrum
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/spectrum
 INSTALLS += sources
 
 QT+=widgets
diff --git a/examples/videographicsitem/videographicsitem.pro b/examples/videographicsitem/videographicsitem.pro
index 54002cf50..66ed4f683 100644
--- a/examples/videographicsitem/videographicsitem.pro
+++ b/examples/videographicsitem/videographicsitem.pro
@@ -1,7 +1,7 @@
 TEMPLATE = app
 TARGET = videographicsitem
 
-QT += multimediakit multimediakitwidgets
+QT += multimedia multimediawidgets
 
 contains(QT_CONFIG, opengl): QT += opengl
 
@@ -12,9 +12,9 @@ SOURCES   += main.cpp \
              videoplayer.cpp \
              videoitem.cpp
 
-target.path = $$[QT_INSTALL_EXAMPLES]/qtmultimediakit/videographicsitem
+target.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/videographicsitem
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimediakit/videographicsitem
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/videographicsitem
 
 INSTALLS += target sources
 
diff --git a/examples/videowidget/videowidget.pro b/examples/videowidget/videowidget.pro
index 4e442563b..76e5f36da 100644
--- a/examples/videowidget/videowidget.pro
+++ b/examples/videowidget/videowidget.pro
@@ -1,7 +1,7 @@
 TEMPLATE = app
 TARGET = videowidget
 
-QT += multimediakit multimediakitwidgets
+QT += multimedia multimediawidgets
 
 HEADERS = \
     videoplayer.h \
@@ -14,9 +14,9 @@ SOURCES = \
     videowidget.cpp \
     videowidgetsurface.cpp
 
-target.path = $$[QT_INSTALL_EXAMPLES]/qtmultimediakit/videowidget
+target.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/videowidget
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimediakit/videowidget
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/videowidget
 
 INSTALLS += target sources
 
diff --git a/modules/qt_multimedia.pri b/modules/qt_multimedia.pri
new file mode 100644
index 000000000..cb87b0ae7
--- /dev/null
+++ b/modules/qt_multimedia.pri
@@ -0,0 +1,17 @@
+QT.multimedia.VERSION = 5.0.0
+QT.multimedia.MAJOR_VERSION = 5
+QT.multimedia.MINOR_VERSION = 0
+QT.multimedia.PATCH_VERSION = 0
+
+QT.multimedia.name = QtMultimedia
+QT.multimedia.bins = $$QT_MODULE_BIN_BASE
+QT.multimedia.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/QtMultimedia
+QT.multimedia.private_includes = $$QT_MODULE_INCLUDE_BASE/QtMultimedia/$$QT.multimedia.VERSION
+QT.multimedia.sources = $$QT_MODULE_BASE/src/multimedia
+QT.multimedia.libs = $$QT_MODULE_LIB_BASE
+QT.multimedia.plugins = $$QT_MODULE_PLUGIN_BASE
+QT.multimedia.imports = $$QT_MODULE_IMPORT_BASE
+QT.multimedia.depends = gui network
+QT.multimedia.DEFINES = QT_MULTIMEDIA_LIB
+
+QT_CONFIG += multimedia
diff --git a/modules/qt_multimediakit.pri b/modules/qt_multimediakit.pri
deleted file mode 100644
index 3400e1480..000000000
--- a/modules/qt_multimediakit.pri
+++ /dev/null
@@ -1,17 +0,0 @@
-QT.multimediakit.VERSION = 5.0.0
-QT.multimediakit.MAJOR_VERSION = 5
-QT.multimediakit.MINOR_VERSION = 0
-QT.multimediakit.PATCH_VERSION = 0
-
-QT.multimediakit.name = QtMultimediaKit
-QT.multimediakit.bins = $$QT_MODULE_BIN_BASE
-QT.multimediakit.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/QtMultimediaKit
-QT.multimediakit.private_includes = $$QT_MODULE_INCLUDE_BASE/QtMultimediaKit/$$QT.multimediakit.VERSION
-QT.multimediakit.sources = $$QT_MODULE_BASE/src/multimediakit
-QT.multimediakit.libs = $$QT_MODULE_LIB_BASE
-QT.multimediakit.plugins = $$QT_MODULE_PLUGIN_BASE
-QT.multimediakit.imports = $$QT_MODULE_IMPORT_BASE
-QT.multimediakit.depends = gui network
-QT.multimediakit.DEFINES = QT_MULTIMEDIAKIT_LIB
-
-QT_CONFIG += multimediakit
diff --git a/modules/qt_multimediakitwidgets.pri b/modules/qt_multimediakitwidgets.pri
deleted file mode 100644
index 55faee924..000000000
--- a/modules/qt_multimediakitwidgets.pri
+++ /dev/null
@@ -1,17 +0,0 @@
-QT.multimediakitwidgets.VERSION = 5.0.0
-QT.multimediakitwidgets.MAJOR_VERSION = 5
-QT.multimediakitwidgets.MINOR_VERSION = 0
-QT.multimediakitwidgets.PATCH_VERSION = 0
-
-QT.multimediakitwidgets.name = QtMultimediaKitWidgets
-QT.multimediakitwidgets.bins = $$QT_MODULE_BIN_BASE
-QT.multimediakitwidgets.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/QtMultimediaKitWidgets
-QT.multimediakitwidgets.private_includes = $$QT_MODULE_INCLUDE_BASE/QtMultimediaKitWidgets/$$QT.multimediakitwidgets.VERSION
-QT.multimediakitwidgets.sources = $$QT_MODULE_BASE/src/multimediakitwidgets
-QT.multimediakitwidgets.libs = $$QT_MODULE_LIB_BASE
-QT.multimediakitwidgets.plugins = $$QT_MODULE_PLUGIN_BASE
-QT.multimediakitwidgets.imports = $$QT_MODULE_IMPORT_BASE
-QT.multimediakitwidgets.depends = gui network
-QT.multimediakitwidgets.DEFINES = QT_MULTIMEDIAKITWIDGETS_LIB
-
-QT_CONFIG += multimediakitwidgets
diff --git a/modules/qt_multimediawidgets.pri b/modules/qt_multimediawidgets.pri
new file mode 100644
index 000000000..4dcbf4143
--- /dev/null
+++ b/modules/qt_multimediawidgets.pri
@@ -0,0 +1,17 @@
+QT.multimediawidgets.VERSION = 5.0.0
+QT.multimediawidgets.MAJOR_VERSION = 5
+QT.multimediawidgets.MINOR_VERSION = 0
+QT.multimediawidgets.PATCH_VERSION = 0
+
+QT.multimediawidgets.name = QtMultimediaWidgets
+QT.multimediawidgets.bins = $$QT_MODULE_BIN_BASE
+QT.multimediawidgets.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/QtMultimediaWidgets
+QT.multimediawidgets.private_includes = $$QT_MODULE_INCLUDE_BASE/QtMultimediaWidgets/$$QT.multimediawidgets.VERSION
+QT.multimediawidgets.sources = $$QT_MODULE_BASE/src/multimediawidgets
+QT.multimediawidgets.libs = $$QT_MODULE_LIB_BASE
+QT.multimediawidgets.plugins = $$QT_MODULE_PLUGIN_BASE
+QT.multimediawidgets.imports = $$QT_MODULE_IMPORT_BASE
+QT.multimediawidgets.depends = gui network
+QT.multimediawidgets.DEFINES = QT_MULTIMEDIAWIDGETS_LIB
+
+QT_CONFIG += multimediawidgets
diff --git a/qtmultimedia.pro b/qtmultimedia.pro
new file mode 100644
index 000000000..4ebfd8402
--- /dev/null
+++ b/qtmultimedia.pro
@@ -0,0 +1,21 @@
+TEMPLATE = subdirs
+
+module_qtmultimedia_src.subdir = src
+module_qtmultimedia_src.target = module-qtmultimedia-src
+
+module_qtmultimedia_examples.subdir = examples
+module_qtmultimedia_examples.target = module-qtmultimedia-examples
+module_qtmultimedia_examples.depends = module_qtmultimedia_src
+!contains(QT_BUILD_PARTS,examples) {
+    module_qtmultimedia_examples.CONFIG = no_default_target no_default_install
+}
+
+module_qtmultimedia_tests.subdir = tests
+module_qtmultimedia_tests.target = module-qtmultimedia-tests
+module_qtmultimedia_tests.depends = module_qtmultimedia_src
+module_qtmultimedia_tests.CONFIG = no_default_target no_default_install
+
+SUBDIRS += module_qtmultimedia_src \
+           module_qtmultimedia_examples \
+           module_qtmultimedia_tests \
+
diff --git a/qtmultimediakit.pro b/qtmultimediakit.pro
index 54eb4058a..55aa22007 100644
--- a/qtmultimediakit.pro
+++ b/qtmultimediakit.pro
@@ -1,21 +1,4 @@
-TEMPLATE = subdirs
-
-module_qtmultimediakit_src.subdir = src
-module_qtmultimediakit_src.target = module-qtmultimediakit-src
-
-module_qtmultimediakit_examples.subdir = examples
-module_qtmultimediakit_examples.target = module-qtmultimediakit-examples
-module_qtmultimediakit_examples.depends = module_qtmultimediakit_src
-!contains(QT_BUILD_PARTS,examples) {
-    module_qtmultimediakit_examples.CONFIG = no_default_target no_default_install
-}
-
-module_qtmultimediakit_tests.subdir = tests
-module_qtmultimediakit_tests.target = module-qtmultimediakit-tests
-module_qtmultimediakit_tests.depends = module_qtmultimediakit_src
-module_qtmultimediakit_tests.CONFIG = no_default_target no_default_install
-
-SUBDIRS += module_qtmultimediakit_src \
-           module_qtmultimediakit_examples \
-           module_qtmultimediakit_tests \
+# This is only so that Qt5.git still builds, since it's expecting
+# the .pro file to match the directory name
+include(qtmultimedia.pro)
 
diff --git a/src/imports/multimedia/multimedia.cpp b/src/imports/multimedia/multimedia.cpp
index 2de7401c9..20333f218 100644
--- a/src/imports/multimedia/multimedia.cpp
+++ b/src/imports/multimedia/multimedia.cpp
@@ -68,7 +68,8 @@ class QMultimediaDeclarativeModule : public QDeclarativeExtensionPlugin
 public:
     virtual void registerTypes(const char *uri)
     {
-        Q_ASSERT(QLatin1String(uri) == QLatin1String("Qt.multimediakit"));
+        Q_ASSERT(QLatin1String(uri) == QLatin1String("QtMultimedia")
+                || QLatin1String(uri) == QLatin1String("Qt.multimediakit"));
 
         qmlRegisterType<QSoundEffect>(uri, 4, 0, "SoundEffect");
         qmlRegisterType<QDeclarativeAudio>(uri, 4, 0, "Audio");
diff --git a/src/imports/multimedia/multimedia.pro b/src/imports/multimedia/multimedia.pro
index 4574d0247..f6aa36486 100644
--- a/src/imports/multimedia/multimedia.pro
+++ b/src/imports/multimedia/multimedia.pro
@@ -1,11 +1,11 @@
 TARGET = declarative_multimedia
-TARGETPATH = Qt/multimediakit
+TARGETPATH = QtMultimedia
 
 include(../qimportbase.pri)
 
-QT += declarative network multimediakit-private
+QT += declarative network multimedia-private
 
-DESTDIR = $$QT.multimediakit.imports/$$TARGETPATH
+DESTDIR = $$QT.multimedia.imports/$$TARGETPATH
 target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH
 
 HEADERS += \
@@ -59,4 +59,16 @@ disabled {
 qmldir.files += $$PWD/qmldir
 qmldir.path +=  $$[QT_INSTALL_IMPORTS]/$$TARGETPATH
 
+# another copy of the qmldir file so the old import works
+OLDQMLDIRFILE = $${_PRO_FILE_PWD_}/qmldir.qtmultimediakit
+oldcopy2build.input = OLDQMLDIRFILE
+oldcopy2build.output = $$QT.multimedia.imports/Qt/multimediakit/qmldir
+!contains(TEMPLATE_PREFIX, vc):oldcopy2build.variable_out = PRE_TARGETDEPS
+oldcopy2build.commands = $$QMAKE_COPY ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT}
+oldcopy2build.name = COPY ${QMAKE_FILE_IN}
+oldcopy2build.CONFIG += no_link
+# `clean' should leave the build in a runnable state, which means it shouldn't delete qmldir
+oldcopy2build.CONFIG += no_clean
+QMAKE_EXTRA_COMPILERS += oldcopy2build
+
 INSTALLS += target qmldir
diff --git a/src/imports/multimedia/qdeclarativeaudio.cpp b/src/imports/multimedia/qdeclarativeaudio.cpp
index c15d31235..c12ef22d1 100644
--- a/src/imports/multimedia/qdeclarativeaudio.cpp
+++ b/src/imports/multimedia/qdeclarativeaudio.cpp
@@ -52,11 +52,11 @@ QT_BEGIN_NAMESPACE
 
     \ingroup qml-multimedia
 
-    This element is part of the \bold{QtMultimediaKit 1.1} module.
+    This element is part of the \bold{QtMultimedia 4.0} module.
 
     \qml
     import Qt 4.7
-    import QtMultimediaKit 1.1
+    import QtMultimedia 4.0
 
     Text {
         text: "Click Me!";
@@ -333,7 +333,7 @@ void QDeclarativeAudio::componentComplete()
 
     This property holds the tile of the media.
 
-    \sa {QtMultimediaKit::Title}
+    \sa {QtMultimedia::Title}
 */
 
 /*!
@@ -341,7 +341,7 @@ void QDeclarativeAudio::componentComplete()
 
     This property holds the sub-title of the media.
 
-    \sa {QtMultimediaKit::SubTitle}
+    \sa {QtMultimedia::SubTitle}
 */
 
 /*!
@@ -349,7 +349,7 @@ void QDeclarativeAudio::componentComplete()
 
     This property holds the author of the media.
 
-    \sa {QtMultimediaKit::Author}
+    \sa {QtMultimedia::Author}
 */
 
 /*!
@@ -357,7 +357,7 @@ void QDeclarativeAudio::componentComplete()
 
     This property holds a user comment about the media.
 
-    \sa {QtMultimediaKit::Comment}
+    \sa {QtMultimedia::Comment}
 */
 
 /*!
@@ -365,7 +365,7 @@ void QDeclarativeAudio::componentComplete()
 
     This property holds a description of the media.
 
-    \sa {QtMultimediaKit::Description}
+    \sa {QtMultimedia::Description}
 */
 
 /*!
@@ -373,7 +373,7 @@ void QDeclarativeAudio::componentComplete()
 
     This property holds the category of the media
 
-    \sa {QtMultimediaKit::Category}
+    \sa {QtMultimedia::Category}
 */
 
 /*!
@@ -381,7 +381,7 @@ void QDeclarativeAudio::componentComplete()
 
     This property holds the genre of the media.
 
-    \sa {QtMultimediaKit::Genre}
+    \sa {QtMultimedia::Genre}
 */
 
 /*!
@@ -389,7 +389,7 @@ void QDeclarativeAudio::componentComplete()
 
     This property holds the year of release of the media.
 
-    \sa {QtMultimediaKit::Year}
+    \sa {QtMultimedia::Year}
 */
 
 /*!
@@ -397,7 +397,7 @@ void QDeclarativeAudio::componentComplete()
 
     This property holds the date of the media.
 
-    \sa {QtMultimediaKit::Date}
+    \sa {QtMultimedia::Date}
 */
 
 /*!
@@ -405,7 +405,7 @@ void QDeclarativeAudio::componentComplete()
 
     This property holds a user rating of the media in the range of 0 to 100.
 
-    \sa {QtMultimediaKit::UserRating}
+    \sa {QtMultimedia::UserRating}
 */
 
 /*!
@@ -413,7 +413,7 @@ void QDeclarativeAudio::componentComplete()
 
     This property holds a list of keywords describing the media.
 
-    \sa {QtMultimediaKit::Keywords}
+    \sa {QtMultimedia::Keywords}
 */
 
 /*!
@@ -421,7 +421,7 @@ void QDeclarativeAudio::componentComplete()
 
     This property holds the language of the media, as an ISO 639-2 code.
 
-    \sa {QtMultimediaKit::Language}
+    \sa {QtMultimedia::Language}
 */
 
 /*!
@@ -429,7 +429,7 @@ void QDeclarativeAudio::componentComplete()
 
     This property holds the publisher of the media.
 
-    \sa {QtMultimediaKit::Publisher}
+    \sa {QtMultimedia::Publisher}
 */
 
 /*!
@@ -437,7 +437,7 @@ void QDeclarativeAudio::componentComplete()
 
     This property holds the media's copyright notice.
 
-    \sa {QtMultimediaKit::Copyright}
+    \sa {QtMultimedia::Copyright}
 */
 
 /*!
@@ -445,7 +445,7 @@ void QDeclarativeAudio::componentComplete()
 
     This property holds the parental rating of the media.
 
-    \sa {QtMultimediaKit::ParentalRating}
+    \sa {QtMultimedia::ParentalRating}
 */
 
 /*!
@@ -454,7 +454,7 @@ void QDeclarativeAudio::componentComplete()
     This property holds the name of the rating organisation responsible for the
     parental rating of the media.
 
-    \sa {QtMultimediaKit::RatingOrganisation}
+    \sa {QtMultimedia::RatingOrganisation}
 */
 
 /*!
@@ -462,7 +462,7 @@ void QDeclarativeAudio::componentComplete()
 
     This property property holds the size of the media in bytes.
 
-    \sa {QtMultimediaKit::Size}
+    \sa {QtMultimedia::Size}
 */
 
 /*!
@@ -470,7 +470,7 @@ void QDeclarativeAudio::componentComplete()
 
     This property holds the type of the media.
 
-    \sa {QtMultimediaKit::MediaType}
+    \sa {QtMultimedia::MediaType}
 */
 
 /*!
@@ -479,7 +479,7 @@ void QDeclarativeAudio::componentComplete()
     This property holds the bit rate of the media's audio stream ni bits per
     second.
 
-    \sa {QtMultimediaKit::AudioBitRate}
+    \sa {QtMultimedia::AudioBitRate}
 */
 
 /*!
@@ -487,7 +487,7 @@ void QDeclarativeAudio::componentComplete()
 
     This property holds the encoding of the media audio stream.
 
-    \sa {QtMultimediaKit::AudioCodec}
+    \sa {QtMultimedia::AudioCodec}
 */
 
 /*!
@@ -495,7 +495,7 @@ void QDeclarativeAudio::componentComplete()
 
     This property holds the average volume level of the media.
 
-    \sa {QtMultimediaKit::AverageLevel}
+    \sa {QtMultimedia::AverageLevel}
 */
 
 /*!
@@ -503,7 +503,7 @@ void QDeclarativeAudio::componentComplete()
 
     This property holds the number of channels in the media's audio stream.
 
-    \sa {QtMultimediaKit::ChannelCount}
+    \sa {QtMultimedia::ChannelCount}
 */
 
 /*!
@@ -511,7 +511,7 @@ void QDeclarativeAudio::componentComplete()
 
     This property holds the peak volume of media's audio stream.
 
-    \sa {QtMultimediaKit::PeakValue}
+    \sa {QtMultimedia::PeakValue}
 */
 
 /*!
@@ -519,7 +519,7 @@ void QDeclarativeAudio::componentComplete()
 
     This property holds the sample rate of the media's audio stream in hertz.
 
-    \sa {QtMultimediaKit::SampleRate}
+    \sa {QtMultimedia::SampleRate}
 */
 
 /*!
@@ -527,7 +527,7 @@ void QDeclarativeAudio::componentComplete()
 
     This property holds the title of the album the media belongs to.
 
-    \sa {QtMultimediaKit::AlbumTitle}
+    \sa {QtMultimedia::AlbumTitle}
 */
 
 /*!
@@ -536,7 +536,7 @@ void QDeclarativeAudio::componentComplete()
     This property holds the name of the principal artist of the album the media
     belongs to.
 
-    \sa {QtMultimediaKit::AlbumArtist}
+    \sa {QtMultimedia::AlbumArtist}
 */
 
 /*!
@@ -544,7 +544,7 @@ void QDeclarativeAudio::componentComplete()
 
     This property holds the names of artists contributing to the media.
 
-    \sa {QtMultimediaKit::ContributingArtist}
+    \sa {QtMultimedia::ContributingArtist}
 */
 
 /*!
@@ -552,7 +552,7 @@ void QDeclarativeAudio::componentComplete()
 
     This property holds the composer of the media.
 
-    \sa {QtMultimediaKit::Composer}
+    \sa {QtMultimedia::Composer}
 */
 
 /*!
@@ -560,7 +560,7 @@ void QDeclarativeAudio::componentComplete()
 
     This property holds the conductor of the media.
 
-    \sa {QtMultimediaKit::Conductor}
+    \sa {QtMultimedia::Conductor}
 */
 
 /*!
@@ -568,7 +568,7 @@ void QDeclarativeAudio::componentComplete()
 
     This property holds the lyrics to the media.
 
-    \sa {QtMultimediaKit::Lyrics}
+    \sa {QtMultimedia::Lyrics}
 */
 
 /*!
@@ -576,7 +576,7 @@ void QDeclarativeAudio::componentComplete()
 
     This property holds the mood of the media.
 
-    \sa {QtMultimediaKit::Mood}
+    \sa {QtMultimedia::Mood}
 */
 
 /*!
@@ -584,7 +584,7 @@ void QDeclarativeAudio::componentComplete()
 
     This property holds the track number of the media.
 
-    \sa {QtMultimediaKit::TrackNumber}
+    \sa {QtMultimedia::TrackNumber}
 */
 
 /*!
@@ -592,7 +592,7 @@ void QDeclarativeAudio::componentComplete()
 
     This property holds the number of track on the album containing the media.
 
-    \sa {QtMultimediaKit::TrackNumber}
+    \sa {QtMultimedia::TrackNumber}
 */
 
 /*!
@@ -600,7 +600,7 @@ void QDeclarativeAudio::componentComplete()
 
     This property holds the URL of a small cover art image.
 
-    \sa {QtMultimediaKit::CoverArtUrlSmall}
+    \sa {QtMultimedia::CoverArtUrlSmall}
 */
 
 /*!
@@ -608,7 +608,7 @@ void QDeclarativeAudio::componentComplete()
 
     This property holds the URL of a large cover art image.
 
-    \sa {QtMultimediaKit::CoverArtUrlLarge}
+    \sa {QtMultimedia::CoverArtUrlLarge}
 */
 
 /*!
@@ -616,7 +616,7 @@ void QDeclarativeAudio::componentComplete()
 
     This property holds the dimension of an image or video.
 
-    \sa {QtMultimediaKit::Resolution}
+    \sa {QtMultimedia::Resolution}
 */
 
 /*!
@@ -624,7 +624,7 @@ void QDeclarativeAudio::componentComplete()
 
     This property holds the pixel aspect ratio of an image or video.
 
-    \sa {QtMultimediaKit::PixelAspectRatio}
+    \sa {QtMultimedia::PixelAspectRatio}
 */
 
 /*!
@@ -632,7 +632,7 @@ void QDeclarativeAudio::componentComplete()
 
     This property holds the frame rate of the media's video stream.
 
-    \sa {QtMultimediaKit::VideoFrameRate}
+    \sa {QtMultimedia::VideoFrameRate}
 */
 
 /*!
@@ -641,7 +641,7 @@ void QDeclarativeAudio::componentComplete()
     This property holds the bit rate of the media's video stream in bits per
     second.
 
-    \sa {QtMultimediaKit::VideoBitRate}
+    \sa {QtMultimedia::VideoBitRate}
 */
 
 /*!
@@ -649,7 +649,7 @@ void QDeclarativeAudio::componentComplete()
 
     This property holds the encoding of the media's video stream.
 
-    \sa {QtMultimediaKit::VideoCodec}
+    \sa {QtMultimedia::VideoCodec}
 */
 
 /*!
@@ -657,7 +657,7 @@ void QDeclarativeAudio::componentComplete()
 
     This property holds the URL of a poster image.
 
-    \sa {QtMultimediaKit::PosterUrl}
+    \sa {QtMultimedia::PosterUrl}
 */
 
 /*!
@@ -665,7 +665,7 @@ void QDeclarativeAudio::componentComplete()
 
     This property holds the chapter number of the media.
 
-    \sa {QtMultimediaKit::ChapterNumber}
+    \sa {QtMultimedia::ChapterNumber}
 */
 
 /*!
@@ -673,7 +673,7 @@ void QDeclarativeAudio::componentComplete()
 
     This property holds the director of the media.
 
-    \sa {QtMultimediaKit::Director}
+    \sa {QtMultimedia::Director}
 */
 
 /*!
@@ -681,7 +681,7 @@ void QDeclarativeAudio::componentComplete()
 
     This property holds the lead performer in the media.
 
-    \sa {QtMultimediaKit::LeadPerformer}
+    \sa {QtMultimedia::LeadPerformer}
 */
 
 /*!
@@ -689,7 +689,7 @@ void QDeclarativeAudio::componentComplete()
 
     This property holds the writer of the media.
 
-    \sa {QtMultimediaKit::Writer}
+    \sa {QtMultimedia::Writer}
 */
 
 QT_END_NAMESPACE
diff --git a/src/imports/multimedia/qdeclarativecamera.cpp b/src/imports/multimedia/qdeclarativecamera.cpp
index b8fab3661..71b3b0697 100644
--- a/src/imports/multimedia/qdeclarativecamera.cpp
+++ b/src/imports/multimedia/qdeclarativecamera.cpp
@@ -75,11 +75,11 @@ void QDeclarativeCamera::_q_updateState(QCamera::State state)
     \ingroup qml-multimedia
     \inherits Item
 
-    This element is part of the \bold{QtMultimediaKit 1.1} module.
+    This element is part of the \bold{QtMultimedia 4.0} module.
 
     \qml
     import Qt 4.7
-    import QtMultimediaKit 1.1
+    import QtMultimedia 4.0
 
     Camera {
         id: camera
diff --git a/src/imports/multimedia/qdeclarativecameraexposure.cpp b/src/imports/multimedia/qdeclarativecameraexposure.cpp
index c7a8335b0..2dc92243a 100644
--- a/src/imports/multimedia/qdeclarativecameraexposure.cpp
+++ b/src/imports/multimedia/qdeclarativecameraexposure.cpp
@@ -50,13 +50,13 @@ QT_BEGIN_NAMESPACE
     \brief The CameraExposure element provides interface for exposure related camera settings.
     \ingroup qml-multimedia
 
-    This element is part of the \bold{Qt.multimediakit 4.0} module.
+    This element is part of the \bold{QtMultimedia 4.0} module.
 
     It should not be constructed separately but provided by Camera.exposure.
 
     \qml
     import QtQuick 2.0
-    import Qt.multimediakit 4.0
+    import QtMultimedia 4.0
 
     Camera {
         id: camera
diff --git a/src/imports/multimedia/qdeclarativecameraflash.cpp b/src/imports/multimedia/qdeclarativecameraflash.cpp
index 6150c6f5b..13f21d6b9 100644
--- a/src/imports/multimedia/qdeclarativecameraflash.cpp
+++ b/src/imports/multimedia/qdeclarativecameraflash.cpp
@@ -50,13 +50,13 @@ QT_BEGIN_NAMESPACE
     \brief The CameraFlash element provides interface for flash related camera settings.
     \ingroup qml-multimedia
 
-    This element is part of the \bold{Qt.multimediakit 4.0} module.
+    This element is part of the \bold{QtMultimedia 4.0} module.
 
     It should not be constructed separately but provided by Camera.flash.
 
     \qml
     import QtQuick 2.0
-    import Qt.multimediakit 4.0
+    import QtMultimedia 4.0
 
     Camera {
         id: camera
diff --git a/src/imports/multimedia/qdeclarativecamerafocus.cpp b/src/imports/multimedia/qdeclarativecamerafocus.cpp
index c356d4fd6..03460bfd7 100644
--- a/src/imports/multimedia/qdeclarativecamerafocus.cpp
+++ b/src/imports/multimedia/qdeclarativecamerafocus.cpp
@@ -50,13 +50,13 @@ QT_BEGIN_NAMESPACE
     \brief The CameraFocus element provides interface for focus related camera settings.
     \ingroup qml-multimedia
 
-    This element is part of the \bold{Qt.multimediakit 4.0} module.
+    This element is part of the \bold{QtMultimedia 4.0} module.
 
     It should not be constructed separately but provided by Camera.focus.
 
     \qml
     import QtQuick 2.0
-    import Qt.multimediakit 4.0
+    import QtMultimedia 4.0
 
     Camera {
         id: camera
diff --git a/src/imports/multimedia/qdeclarativemediabase.cpp b/src/imports/multimedia/qdeclarativemediabase.cpp
index 5d562d074..b2068627b 100644
--- a/src/imports/multimedia/qdeclarativemediabase.cpp
+++ b/src/imports/multimedia/qdeclarativemediabase.cpp
@@ -109,9 +109,9 @@ public:
 
     bool isMetaDataAvailable() const { return false; }
 
-    QVariant metaData(QtMultimediaKit::MetaData) const { return QVariant(); }
-    QList<QtMultimediaKit::MetaData> availableMetaData() const {
-        return QList<QtMultimediaKit::MetaData>(); }
+    QVariant metaData(QtMultimedia::MetaData) const { return QVariant(); }
+    QList<QtMultimedia::MetaData> availableMetaData() const {
+        return QList<QtMultimedia::MetaData>(); }
 
     QVariant extendedMetaData(const QString &) const { return QVariant(); }
     QStringList availableExtendedMetaData() const { return QStringList(); }
diff --git a/src/imports/multimedia/qdeclarativemediametadata_p.h b/src/imports/multimedia/qdeclarativemediametadata_p.h
index 72e9cbf3d..4a737052c 100644
--- a/src/imports/multimedia/qdeclarativemediametadata_p.h
+++ b/src/imports/multimedia/qdeclarativemediametadata_p.h
@@ -117,57 +117,57 @@ public:
     {
     }
 
-    QVariant title() const { return m_control->metaData(QtMultimediaKit::Title); }
-    QVariant subTitle() const { return m_control->metaData(QtMultimediaKit::SubTitle); }
-    QVariant author() const { return m_control->metaData(QtMultimediaKit::Author); }
-    QVariant comment() const { return m_control->metaData(QtMultimediaKit::Comment); }
-    QVariant description() const { return m_control->metaData(QtMultimediaKit::Description); }
-    QVariant category() const { return m_control->metaData(QtMultimediaKit::Category); }
-    QVariant genre() const { return m_control->metaData(QtMultimediaKit::Genre); }
-    QVariant year() const { return m_control->metaData(QtMultimediaKit::Year); }
-    QVariant date() const { return m_control->metaData(QtMultimediaKit::Date); }
-    QVariant userRating() const { return m_control->metaData(QtMultimediaKit::UserRating); }
-    QVariant keywords() const { return m_control->metaData(QtMultimediaKit::Keywords); }
-    QVariant language() const { return m_control->metaData(QtMultimediaKit::Language); }
-    QVariant publisher() const { return m_control->metaData(QtMultimediaKit::Publisher); }
-    QVariant copyright() const { return m_control->metaData(QtMultimediaKit::Copyright); }
-    QVariant parentalRating() const { return m_control->metaData(QtMultimediaKit::ParentalRating); }
+    QVariant title() const { return m_control->metaData(QtMultimedia::Title); }
+    QVariant subTitle() const { return m_control->metaData(QtMultimedia::SubTitle); }
+    QVariant author() const { return m_control->metaData(QtMultimedia::Author); }
+    QVariant comment() const { return m_control->metaData(QtMultimedia::Comment); }
+    QVariant description() const { return m_control->metaData(QtMultimedia::Description); }
+    QVariant category() const { return m_control->metaData(QtMultimedia::Category); }
+    QVariant genre() const { return m_control->metaData(QtMultimedia::Genre); }
+    QVariant year() const { return m_control->metaData(QtMultimedia::Year); }
+    QVariant date() const { return m_control->metaData(QtMultimedia::Date); }
+    QVariant userRating() const { return m_control->metaData(QtMultimedia::UserRating); }
+    QVariant keywords() const { return m_control->metaData(QtMultimedia::Keywords); }
+    QVariant language() const { return m_control->metaData(QtMultimedia::Language); }
+    QVariant publisher() const { return m_control->metaData(QtMultimedia::Publisher); }
+    QVariant copyright() const { return m_control->metaData(QtMultimedia::Copyright); }
+    QVariant parentalRating() const { return m_control->metaData(QtMultimedia::ParentalRating); }
     QVariant ratingOrganisation() const {
-        return m_control->metaData(QtMultimediaKit::RatingOrganisation); }
-    QVariant size() const { return m_control->metaData(QtMultimediaKit::Size); }
-    QVariant mediaType() const { return m_control->metaData(QtMultimediaKit::MediaType); }
-    QVariant duration() const { return m_control->metaData(QtMultimediaKit::Duration); }
-    QVariant audioBitRate() const { return m_control->metaData(QtMultimediaKit::AudioBitRate); }
-    QVariant audioCodec() const { return m_control->metaData(QtMultimediaKit::AudioCodec); }
-    QVariant averageLevel() const { return m_control->metaData(QtMultimediaKit::AverageLevel); }
-    QVariant channelCount() const { return m_control->metaData(QtMultimediaKit::ChannelCount); }
-    QVariant peakValue() const { return m_control->metaData(QtMultimediaKit::PeakValue); }
-    QVariant sampleRate() const { return m_control->metaData(QtMultimediaKit::SampleRate); }
-    QVariant albumTitle() const { return m_control->metaData(QtMultimediaKit::AlbumTitle); }
-    QVariant albumArtist() const { return m_control->metaData(QtMultimediaKit::AlbumArtist); }
+        return m_control->metaData(QtMultimedia::RatingOrganisation); }
+    QVariant size() const { return m_control->metaData(QtMultimedia::Size); }
+    QVariant mediaType() const { return m_control->metaData(QtMultimedia::MediaType); }
+    QVariant duration() const { return m_control->metaData(QtMultimedia::Duration); }
+    QVariant audioBitRate() const { return m_control->metaData(QtMultimedia::AudioBitRate); }
+    QVariant audioCodec() const { return m_control->metaData(QtMultimedia::AudioCodec); }
+    QVariant averageLevel() const { return m_control->metaData(QtMultimedia::AverageLevel); }
+    QVariant channelCount() const { return m_control->metaData(QtMultimedia::ChannelCount); }
+    QVariant peakValue() const { return m_control->metaData(QtMultimedia::PeakValue); }
+    QVariant sampleRate() const { return m_control->metaData(QtMultimedia::SampleRate); }
+    QVariant albumTitle() const { return m_control->metaData(QtMultimedia::AlbumTitle); }
+    QVariant albumArtist() const { return m_control->metaData(QtMultimedia::AlbumArtist); }
     QVariant contributingArtist() const {
-        return m_control->metaData(QtMultimediaKit::ContributingArtist); }
-    QVariant composer() const { return m_control->metaData(QtMultimediaKit::Composer); }
-    QVariant conductor() const { return m_control->metaData(QtMultimediaKit::Conductor); }
-    QVariant lyrics() const { return m_control->metaData(QtMultimediaKit::Lyrics); }
-    QVariant mood() const { return m_control->metaData(QtMultimediaKit::Mood); }
-    QVariant trackNumber() const { return m_control->metaData(QtMultimediaKit::TrackNumber); }
-    QVariant trackCount() const { return m_control->metaData(QtMultimediaKit::TrackCount); }
+        return m_control->metaData(QtMultimedia::ContributingArtist); }
+    QVariant composer() const { return m_control->metaData(QtMultimedia::Composer); }
+    QVariant conductor() const { return m_control->metaData(QtMultimedia::Conductor); }
+    QVariant lyrics() const { return m_control->metaData(QtMultimedia::Lyrics); }
+    QVariant mood() const { return m_control->metaData(QtMultimedia::Mood); }
+    QVariant trackNumber() const { return m_control->metaData(QtMultimedia::TrackNumber); }
+    QVariant trackCount() const { return m_control->metaData(QtMultimedia::TrackCount); }
     QVariant coverArtUrlSmall() const {
-        return m_control->metaData(QtMultimediaKit::CoverArtUrlSmall); }
+        return m_control->metaData(QtMultimedia::CoverArtUrlSmall); }
     QVariant coverArtUrlLarge() const {
-        return m_control->metaData(QtMultimediaKit::CoverArtUrlLarge); }
-    QVariant resolution() const { return m_control->metaData(QtMultimediaKit::Resolution); }
+        return m_control->metaData(QtMultimedia::CoverArtUrlLarge); }
+    QVariant resolution() const { return m_control->metaData(QtMultimedia::Resolution); }
     QVariant pixelAspectRatio() const {
-        return m_control->metaData(QtMultimediaKit::PixelAspectRatio); }
-    QVariant videoFrameRate() const { return m_control->metaData(QtMultimediaKit::VideoFrameRate); }
-    QVariant videoBitRate() const { return m_control->metaData(QtMultimediaKit::VideoBitRate); }
-    QVariant videoCodec() const { return m_control->metaData(QtMultimediaKit::VideoCodec); }
-    QVariant posterUrl() const { return m_control->metaData(QtMultimediaKit::PosterUrl); }
-    QVariant chapterNumber() const { return m_control->metaData(QtMultimediaKit::ChapterNumber); }
-    QVariant director() const { return m_control->metaData(QtMultimediaKit::Director); }
-    QVariant leadPerformer() const { return m_control->metaData(QtMultimediaKit::LeadPerformer); }
-    QVariant writer() const { return m_control->metaData(QtMultimediaKit::Writer); }
+        return m_control->metaData(QtMultimedia::PixelAspectRatio); }
+    QVariant videoFrameRate() const { return m_control->metaData(QtMultimedia::VideoFrameRate); }
+    QVariant videoBitRate() const { return m_control->metaData(QtMultimedia::VideoBitRate); }
+    QVariant videoCodec() const { return m_control->metaData(QtMultimedia::VideoCodec); }
+    QVariant posterUrl() const { return m_control->metaData(QtMultimedia::PosterUrl); }
+    QVariant chapterNumber() const { return m_control->metaData(QtMultimedia::ChapterNumber); }
+    QVariant director() const { return m_control->metaData(QtMultimedia::Director); }
+    QVariant leadPerformer() const { return m_control->metaData(QtMultimedia::LeadPerformer); }
+    QVariant writer() const { return m_control->metaData(QtMultimedia::Writer); }
 
 Q_SIGNALS:
     void metaDataChanged();
diff --git a/src/imports/multimedia/qdeclarativevideo.cpp b/src/imports/multimedia/qdeclarativevideo.cpp
index b2b4f33d0..956d1d796 100644
--- a/src/imports/multimedia/qdeclarativevideo.cpp
+++ b/src/imports/multimedia/qdeclarativevideo.cpp
@@ -72,11 +72,11 @@ void QDeclarativeVideo::_q_error(int errorCode, const QString &errorString)
     \inherits Item
     \ingroup qml-multimedia
 
-    This element is part of the \bold{QtMultimediaKit 1.1} module.
+    This element is part of the \bold{QtMultimedia 4.0} module.
 
     \qml
     import Qt 4.7
-    import QtMultimediaKit 1.1
+    import QtMultimedia 4.0
 
     Video {
         id: video
@@ -427,7 +427,7 @@ QT_END_NAMESPACE
 
     This property holds the tile of the media.
 
-    \sa {QtMultimediaKit::Title}
+    \sa {QtMultimedia::Title}
 */
 
 /*!
@@ -435,7 +435,7 @@ QT_END_NAMESPACE
 
     This property holds the sub-title of the media.
 
-    \sa {QtMultimediaKit::SubTitle}
+    \sa {QtMultimedia::SubTitle}
 */
 
 /*!
@@ -443,7 +443,7 @@ QT_END_NAMESPACE
 
     This property holds the author of the media.
 
-    \sa {QtMultimediaKit::Author}
+    \sa {QtMultimedia::Author}
 */
 
 /*!
@@ -451,7 +451,7 @@ QT_END_NAMESPACE
 
     This property holds a user comment about the media.
 
-    \sa {QtMultimediaKit::Comment}
+    \sa {QtMultimedia::Comment}
 */
 
 /*!
@@ -459,7 +459,7 @@ QT_END_NAMESPACE
 
     This property holds a description of the media.
 
-    \sa {QtMultimediaKit::Description}
+    \sa {QtMultimedia::Description}
 */
 
 /*!
@@ -467,7 +467,7 @@ QT_END_NAMESPACE
 
     This property holds the category of the media
 
-    \sa {QtMultimediaKit::Category}
+    \sa {QtMultimedia::Category}
 */
 
 /*!
@@ -475,7 +475,7 @@ QT_END_NAMESPACE
 
     This property holds the genre of the media.
 
-    \sa {QtMultimediaKit::Genre}
+    \sa {QtMultimedia::Genre}
 */
 
 /*!
@@ -483,7 +483,7 @@ QT_END_NAMESPACE
 
     This property holds the year of release of the media.
 
-    \sa {QtMultimediaKit::Year}
+    \sa {QtMultimedia::Year}
 */
 
 /*!
@@ -491,7 +491,7 @@ QT_END_NAMESPACE
 
     This property holds the date of the media.
 
-    \sa {QtMultimediaKit::Date}
+    \sa {QtMultimedia::Date}
 */
 
 /*!
@@ -499,7 +499,7 @@ QT_END_NAMESPACE
 
     This property holds a user rating of the media in the range of 0 to 100.
 
-    \sa {QtMultimediaKit::UserRating}
+    \sa {QtMultimedia::UserRating}
 */
 
 /*!
@@ -507,7 +507,7 @@ QT_END_NAMESPACE
 
     This property holds a list of keywords describing the media.
 
-    \sa {QtMultimediaKit::Keywords}
+    \sa {QtMultimedia::Keywords}
 */
 
 /*!
@@ -515,7 +515,7 @@ QT_END_NAMESPACE
 
     This property holds the language of the media, as an ISO 639-2 code.
 
-    \sa {QtMultimediaKit::Language}
+    \sa {QtMultimedia::Language}
 */
 
 /*!
@@ -523,7 +523,7 @@ QT_END_NAMESPACE
 
     This property holds the publisher of the media.
 
-    \sa {QtMultimediaKit::Publisher}
+    \sa {QtMultimedia::Publisher}
 */
 
 /*!
@@ -531,7 +531,7 @@ QT_END_NAMESPACE
 
     This property holds the media's copyright notice.
 
-    \sa {QtMultimediaKit::Copyright}
+    \sa {QtMultimedia::Copyright}
 */
 
 /*!
@@ -539,7 +539,7 @@ QT_END_NAMESPACE
 
     This property holds the parental rating of the media.
 
-    \sa {QtMultimediaKit::ParentalRating}
+    \sa {QtMultimedia::ParentalRating}
 */
 
 /*!
@@ -548,7 +548,7 @@ QT_END_NAMESPACE
     This property holds the name of the rating organisation responsible for the
     parental rating of the media.
 
-    \sa {QtMultimediaKit::RatingOrganisation}
+    \sa {QtMultimedia::RatingOrganisation}
 */
 
 /*!
@@ -556,7 +556,7 @@ QT_END_NAMESPACE
 
     This property property holds the size of the media in bytes.
 
-    \sa {QtMultimediaKit::Size}
+    \sa {QtMultimedia::Size}
 */
 
 /*!
@@ -564,7 +564,7 @@ QT_END_NAMESPACE
 
     This property holds the type of the media.
 
-    \sa {QtMultimediaKit::MediaType}
+    \sa {QtMultimedia::MediaType}
 */
 
 /*!
@@ -573,7 +573,7 @@ QT_END_NAMESPACE
     This property holds the bit rate of the media's audio stream ni bits per
     second.
 
-    \sa {QtMultimediaKit::AudioBitRate}
+    \sa {QtMultimedia::AudioBitRate}
 */
 
 /*!
@@ -581,7 +581,7 @@ QT_END_NAMESPACE
 
     This property holds the encoding of the media audio stream.
 
-    \sa {QtMultimediaKit::AudioCodec}
+    \sa {QtMultimedia::AudioCodec}
 */
 
 /*!
@@ -589,7 +589,7 @@ QT_END_NAMESPACE
 
     This property holds the average volume level of the media.
 
-    \sa {QtMultimediaKit::AverageLevel}
+    \sa {QtMultimedia::AverageLevel}
 */
 
 /*!
@@ -597,7 +597,7 @@ QT_END_NAMESPACE
 
     This property holds the number of channels in the media's audio stream.
 
-    \sa {QtMultimediaKit::ChannelCount}
+    \sa {QtMultimedia::ChannelCount}
 */
 
 /*!
@@ -605,7 +605,7 @@ QT_END_NAMESPACE
 
     This property holds the peak volume of media's audio stream.
 
-    \sa {QtMultimediaKit::PeakValue}
+    \sa {QtMultimedia::PeakValue}
 */
 
 /*!
@@ -613,7 +613,7 @@ QT_END_NAMESPACE
 
     This property holds the sample rate of the media's audio stream in hertz.
 
-    \sa {QtMultimediaKit::SampleRate}
+    \sa {QtMultimedia::SampleRate}
 */
 
 /*!
@@ -621,7 +621,7 @@ QT_END_NAMESPACE
 
     This property holds the title of the album the media belongs to.
 
-    \sa {QtMultimediaKit::AlbumTitle}
+    \sa {QtMultimedia::AlbumTitle}
 */
 
 /*!
@@ -630,7 +630,7 @@ QT_END_NAMESPACE
     This property holds the name of the principal artist of the album the media
     belongs to.
 
-    \sa {QtMultimediaKit::AlbumArtist}
+    \sa {QtMultimedia::AlbumArtist}
 */
 
 /*!
@@ -638,7 +638,7 @@ QT_END_NAMESPACE
 
     This property holds the names of artists contributing to the media.
 
-    \sa {QtMultimediaKit::ContributingArtist}
+    \sa {QtMultimedia::ContributingArtist}
 */
 
 /*!
@@ -646,7 +646,7 @@ QT_END_NAMESPACE
 
     This property holds the composer of the media.
 
-    \sa {QtMultimediaKit::Composer}
+    \sa {QtMultimedia::Composer}
 */
 
 /*!
@@ -654,7 +654,7 @@ QT_END_NAMESPACE
 
     This property holds the conductor of the media.
 
-    \sa {QtMultimediaKit::Conductor}
+    \sa {QtMultimedia::Conductor}
 */
 
 /*!
@@ -662,7 +662,7 @@ QT_END_NAMESPACE
 
     This property holds the lyrics to the media.
 
-    \sa {QtMultimediaKit::Lyrics}
+    \sa {QtMultimedia::Lyrics}
 */
 
 /*!
@@ -670,7 +670,7 @@ QT_END_NAMESPACE
 
     This property holds the mood of the media.
 
-    \sa {QtMultimediaKit::Mood}
+    \sa {QtMultimedia::Mood}
 */
 
 /*!
@@ -678,7 +678,7 @@ QT_END_NAMESPACE
 
     This property holds the track number of the media.
 
-    \sa {QtMultimediaKit::TrackNumber}
+    \sa {QtMultimedia::TrackNumber}
 */
 
 /*!
@@ -686,7 +686,7 @@ QT_END_NAMESPACE
 
     This property holds the number of track on the album containing the media.
 
-    \sa {QtMultimediaKit::TrackNumber}
+    \sa {QtMultimedia::TrackNumber}
 */
 
 /*!
@@ -694,7 +694,7 @@ QT_END_NAMESPACE
 
     This property holds the URL of a small cover art image.
 
-    \sa {QtMultimediaKit::CoverArtUrlSmall}
+    \sa {QtMultimedia::CoverArtUrlSmall}
 */
 
 /*!
@@ -702,7 +702,7 @@ QT_END_NAMESPACE
 
     This property holds the URL of a large cover art image.
 
-    \sa {QtMultimediaKit::CoverArtUrlLarge}
+    \sa {QtMultimedia::CoverArtUrlLarge}
 */
 
 /*!
@@ -710,7 +710,7 @@ QT_END_NAMESPACE
 
     This property holds the dimension of an image or video.
 
-    \sa {QtMultimediaKit::Resolution}
+    \sa {QtMultimedia::Resolution}
 */
 
 /*!
@@ -718,7 +718,7 @@ QT_END_NAMESPACE
 
     This property holds the pixel aspect ratio of an image or video.
 
-    \sa {QtMultimediaKit::PixelAspectRatio}
+    \sa {QtMultimedia::PixelAspectRatio}
 */
 
 /*!
@@ -726,7 +726,7 @@ QT_END_NAMESPACE
 
     This property holds the frame rate of the media's video stream.
 
-    \sa {QtMultimediaKit::VideoFrameRate}
+    \sa {QtMultimedia::VideoFrameRate}
 */
 
 /*!
@@ -735,7 +735,7 @@ QT_END_NAMESPACE
     This property holds the bit rate of the media's video stream in bits per
     second.
 
-    \sa {QtMultimediaKit::VideoBitRate}
+    \sa {QtMultimedia::VideoBitRate}
 */
 
 /*!
@@ -743,7 +743,7 @@ QT_END_NAMESPACE
 
     This property holds the encoding of the media's video stream.
 
-    \sa {QtMultimediaKit::VideoCodec}
+    \sa {QtMultimedia::VideoCodec}
 */
 
 /*!
@@ -751,7 +751,7 @@ QT_END_NAMESPACE
 
     This property holds the URL of a poster image.
 
-    \sa {QtMultimediaKit::PosterUrl}
+    \sa {QtMultimedia::PosterUrl}
 */
 
 /*!
@@ -759,7 +759,7 @@ QT_END_NAMESPACE
 
     This property holds the chapter number of the media.
 
-    \sa {QtMultimediaKit::ChapterNumber}
+    \sa {QtMultimedia::ChapterNumber}
 */
 
 /*!
@@ -767,7 +767,7 @@ QT_END_NAMESPACE
 
     This property holds the director of the media.
 
-    \sa {QtMultimediaKit::Director}
+    \sa {QtMultimedia::Director}
 */
 
 /*!
@@ -775,7 +775,7 @@ QT_END_NAMESPACE
 
     This property holds the lead performer in the media.
 
-    \sa {QtMultimediaKit::LeadPerformer}
+    \sa {QtMultimedia::LeadPerformer}
 */
 
 /*!
@@ -783,7 +783,7 @@ QT_END_NAMESPACE
 
     This property holds the writer of the media.
 
-    \sa {QtMultimediaKit::Writer}
+    \sa {QtMultimedia::Writer}
 */
 
 // The remaining properties are related to photos, and are technically
@@ -793,157 +793,157 @@ QT_END_NAMESPACE
 /*!
     \qmlproperty variant Video::metaData.cameraManufacturer
 
-    \sa {QtMultimediaKit::CameraManufacturer}
+    \sa {QtMultimedia::CameraManufacturer}
 */
 
 /*!
     \qmlproperty variant Video::metaData.cameraModel
 
-    \sa {QtMultimediaKit::CameraModel}
+    \sa {QtMultimedia::CameraModel}
 */
 
 /*!
     \qmlproperty variant Video::metaData.event
 
-    \sa {QtMultimediaKit::Event}
+    \sa {QtMultimedia::Event}
 */
 
 /*!
     \qmlproperty variant Video::metaData.subject
 
-    \sa {QtMultimediaKit::Subject}
+    \sa {QtMultimedia::Subject}
 */
 
 /*!
     \qmlproperty variant Video::metaData.orientation
 
-    \sa {QtMultimediaKit::Orientation}
+    \sa {QtMultimedia::Orientation}
 */
 
 /*!
     \qmlproperty variant Video::metaData.exposureTime
 
-    \sa {QtMultimediaKit::ExposureTime}
+    \sa {QtMultimedia::ExposureTime}
 */
 
 /*!
     \qmlproperty variant Video::metaData.fNumber
 
-    \sa {QtMultimediaKit::FNumber}
+    \sa {QtMultimedia::FNumber}
 */
 
 /*!
     \qmlproperty variant Video::metaData.exposureProgram
 
-    \sa {QtMultimediaKit::ExposureProgram}
+    \sa {QtMultimedia::ExposureProgram}
 */
 
 /*!
     \qmlproperty variant Video::metaData.isoSpeedRatings
 
-    \sa {QtMultimediaKit::ISOSpeedRatings}
+    \sa {QtMultimedia::ISOSpeedRatings}
 */
 
 /*!
     \qmlproperty variant Video::metaData.exposureBiasValue
 
-    \sa {QtMultimediaKit::ExposureBiasValue}
+    \sa {QtMultimedia::ExposureBiasValue}
 */
 
 /*!
     \qmlproperty variant Video::metaData.dateTimeDigitized
 
-    \sa {QtMultimediaKit::DateTimeDigitized}
+    \sa {QtMultimedia::DateTimeDigitized}
 */
 
 /*!
     \qmlproperty variant Video::metaData.subjectDistance
 
-    \sa {QtMultimediaKit::SubjectDistance}
+    \sa {QtMultimedia::SubjectDistance}
 */
 
 /*!
     \qmlproperty variant Video::metaData.meteringMode
 
-    \sa {QtMultimediaKit::MeteringMode}
+    \sa {QtMultimedia::MeteringMode}
 */
 
 /*!
     \qmlproperty variant Video::metaData.lightSource
 
-    \sa {QtMultimediaKit::LightSource}
+    \sa {QtMultimedia::LightSource}
 */
 
 /*!
     \qmlproperty variant Video::metaData.flash
 
-    \sa {QtMultimediaKit::Flash}
+    \sa {QtMultimedia::Flash}
 */
 
 /*!
     \qmlproperty variant Video::metaData.focalLength
 
-    \sa {QtMultimediaKit::FocalLength}
+    \sa {QtMultimedia::FocalLength}
 */
 
 /*!
     \qmlproperty variant Video::metaData.exposureMode
 
-    \sa {QtMultimediaKit::ExposureMode}
+    \sa {QtMultimedia::ExposureMode}
 */
 
 /*!
     \qmlproperty variant Video::metaData.whiteBalance
 
-    \sa {QtMultimediaKit::WhiteBalance}
+    \sa {QtMultimedia::WhiteBalance}
 */
 
 /*!
     \qmlproperty variant Video::metaData.DigitalZoomRatio
 
-    \sa {QtMultimediaKit::DigitalZoomRatio}
+    \sa {QtMultimedia::DigitalZoomRatio}
 */
 
 /*!
     \qmlproperty variant Video::metaData.focalLengthIn35mmFilm
 
-    \sa {QtMultimediaKit::FocalLengthIn35mmFile}
+    \sa {QtMultimedia::FocalLengthIn35mmFile}
 */
 
 /*!
     \qmlproperty variant Video::metaData.sceneCaptureType
 
-    \sa {QtMultimediaKit::SceneCaptureType}
+    \sa {QtMultimedia::SceneCaptureType}
 */
 
 /*!
     \qmlproperty variant Video::metaData.gainControl
 
-    \sa {QtMultimediaKit::GainControl}
+    \sa {QtMultimedia::GainControl}
 */
 
 /*!
     \qmlproperty variant Video::metaData.contrast
 
-    \sa {QtMultimediaKit::contrast}
+    \sa {QtMultimedia::contrast}
 */
 
 /*!
     \qmlproperty variant Video::metaData.saturation
 
-    \sa {QtMultimediaKit::Saturation}
+    \sa {QtMultimedia::Saturation}
 */
 
 /*!
     \qmlproperty variant Video::metaData.sharpness
 
-    \sa {QtMultimediaKit::Sharpness}
+    \sa {QtMultimedia::Sharpness}
 */
 
 /*!
     \qmlproperty variant Video::metaData.deviceSettingDescription
 
-    \sa {QtMultimediaKit::DeviceSettingDescription}
+    \sa {QtMultimedia::DeviceSettingDescription}
 */
 
 #endif
diff --git a/src/imports/multimedia/qdeclarativevideooutput.cpp b/src/imports/multimedia/qdeclarativevideooutput.cpp
index e715c55fa..ceefc7eb0 100644
--- a/src/imports/multimedia/qdeclarativevideooutput.cpp
+++ b/src/imports/multimedia/qdeclarativevideooutput.cpp
@@ -46,10 +46,10 @@
 
 #include <QtDeclarative/qsgitem.h>
 
-#include <QtMultimediaKit/QAbstractVideoSurface>
-#include <QtMultimediaKit/qmediaservice.h>
-#include <QtMultimediaKit/qvideorenderercontrol.h>
-#include <QtMultimediaKit/qvideosurfaceformat.h>
+#include <QtMultimedia/QAbstractVideoSurface>
+#include <QtMultimedia/qmediaservice.h>
+#include <QtMultimedia/qvideorenderercontrol.h>
+#include <QtMultimedia/qvideosurfaceformat.h>
 
 
 #include <QtCore/qmetaobject.h>
@@ -112,11 +112,11 @@ private:
 
     \ingroup qml-multimedia
 
-    This element is part of the \bold{QtMultimediaKit 4.0} module.
+    This element is part of the \bold{QtMultimedia 4.0} module.
 
     \qml
     import QtQuick 2.0
-    import Qt.multimediakit 4.0
+    import QtMultimedia 4.0
 
     Rectangle {
         width: 800
diff --git a/src/imports/multimedia/qdeclarativevideooutput_p.h b/src/imports/multimedia/qdeclarativevideooutput_p.h
index 3fbeb0fb7..9286fec8b 100644
--- a/src/imports/multimedia/qdeclarativevideooutput_p.h
+++ b/src/imports/multimedia/qdeclarativevideooutput_p.h
@@ -44,8 +44,8 @@
 
 #include <qsgitem.h>
 
-#include <QtMultimediaKit/qvideoframe.h>
-#include <QtMultimediaKit/qmediaobject.h>
+#include <QtMultimedia/qvideoframe.h>
+#include <QtMultimedia/qmediaobject.h>
 
 #include <QtCore/qsharedpointer.h>
 
diff --git a/src/imports/multimedia/qmldir.qtmultimediakit b/src/imports/multimedia/qmldir.qtmultimediakit
new file mode 100644
index 000000000..494204875
--- /dev/null
+++ b/src/imports/multimedia/qmldir.qtmultimediakit
@@ -0,0 +1 @@
+plugin declarative_multimedia ../../QtMultimedia
diff --git a/src/imports/multimedia/qsgvideonode_i420.h b/src/imports/multimedia/qsgvideonode_i420.h
index 516f70cc5..b02864a7c 100644
--- a/src/imports/multimedia/qsgvideonode_i420.h
+++ b/src/imports/multimedia/qsgvideonode_i420.h
@@ -43,7 +43,7 @@
 #define QSGVIDEONODE_I420_H
 
 #include "qsgvideonode_p.h"
-#include <QtMultimediaKit/qvideosurfaceformat.h>
+#include <QtMultimedia/qvideosurfaceformat.h>
 
 class QSGVideoMaterial_YUV420;
 class QSGVideoNode_I420 : public QSGVideoNode
diff --git a/src/imports/multimedia/qsgvideonode_p.h b/src/imports/multimedia/qsgvideonode_p.h
index 49d5a5c76..466b4566c 100644
--- a/src/imports/multimedia/qsgvideonode_p.h
+++ b/src/imports/multimedia/qsgvideonode_p.h
@@ -44,8 +44,8 @@
 
 #include <QtDeclarative/qsgnode.h>
 
-#include <QtMultimediaKit/qvideoframe.h>
-#include <QtMultimediaKit/qvideosurfaceformat.h>
+#include <QtMultimedia/qvideoframe.h>
+#include <QtMultimedia/qvideosurfaceformat.h>
 #include <QtOpenGL/qglfunctions.h>
 
 class QSGVideoNode : public QSGGeometryNode
diff --git a/src/imports/qimportbase.pri b/src/imports/qimportbase.pri
index 86e9c3df5..999bc5c87 100644
--- a/src/imports/qimportbase.pri
+++ b/src/imports/qimportbase.pri
@@ -14,7 +14,7 @@ isEmpty(TARGET) {
 
 QMLDIRFILE = $${_PRO_FILE_PWD_}/qmldir
 copy2build.input = QMLDIRFILE
-copy2build.output = $$QT.multimediakit.imports/$$TARGETPATH/qmldir
+copy2build.output = $$QT.multimedia.imports/$$TARGETPATH/qmldir
 !contains(TEMPLATE_PREFIX, vc):copy2build.variable_out = PRE_TARGETDEPS
 copy2build.commands = $$QMAKE_COPY ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT}
 copy2build.name = COPY ${QMAKE_FILE_IN}
diff --git a/src/meegoinstalls/Makefile b/src/meegoinstalls/Makefile
deleted file mode 100644
index de0b65142..000000000
--- a/src/meegoinstalls/Makefile
+++ /dev/null
@@ -1,40 +0,0 @@
-PKG_NAME := qt-mobility
-SPECFILE = $(addsuffix .spec, $(PKG_NAME))
-YAMLFILE = $(addsuffix .yaml, $(PKG_NAME))
-
-first: custom-help
-
-include /usr/share/meego-packaging-tools/Makefile.common
-
-custom-help: help
-	@echo "The above are common MeeGo packaging targets."
-	@echo "$(PKG_NAME) also has these additional targets:"
-	@echo " spec-git                        Create spec file, with options appropriate for git"
-	@echo " build-trunk-i686                Do a local i686 build against Trunk, without using OBS"
-	@echo " build-trunk-testing-i686        Do a local i686 build against Trunk:Testing, without using OBS"
-
-spec-git:
-	specify --skip-scm --not-download --non-interactive
-
-git-archive: spec-git
-	@VER=$$(sed -n -r -e 's|^Version: +||p' $(SPECFILE));     \
-	TARGZ=$$(sed -n -r                                        \
-	    -e 's|^Source0:.*/([^/]+)$$|\1|'                      \
-	    -e 's|%\{name\}|$(PKG_NAME)|'                         \
-	    -e "s|%\{version\}|$$VER|"                            \
-	    -e 's|.tar.gz||p'                                     \
-	$(SPECFILE) );                                            \
-	DIR="$$PWD";                                              \
-	cd $$(git rev-parse --git-dir) &&                         \
-	echo "Creating $$DIR/$$TARGZ.tar.gz ..." &&               \
-	git archive HEAD --prefix=$$TARGZ/ --format=tar | gzip > "$$DIR/$$TARGZ.tar.gz"
-
-build-no-obs = sudo build $(SPECFILE) --repository $1 --arch $2
-
-build-no-obs-deps: /usr/bin/build git-archive
-
-build-trunk-i686: build-no-obs-deps
-	$(call build-no-obs,http://download.meego.com/live/Trunk/standard/,i686)
-
-build-trunk-testing-i686: build-no-obs-deps
-	$(call build-no-obs,http://download.meego.com/live/Trunk:/Testing/standard/,i686)
diff --git a/src/meegoinstalls/README b/src/meegoinstalls/README
deleted file mode 100644
index fa3fc3049..000000000
--- a/src/meegoinstalls/README
+++ /dev/null
@@ -1,95 +0,0 @@
-This directory contains the MeeGo.com packaging metadata for Qt Mobility,
-for use with the MeeGo.com OpenSuSE Build Service (OBS).
-
-Please see http://build.meego.com/ for more information about OBS.
-
-Quick Start: run `make' in this directory to see some useful things you
-can do.
-
-
-
-PATCHES
-=======
-
-At the time of writing, there are some MeeGo-specific patches hosted
-on the MeeGo OBS.  These patches are unable to be hosted in the Mobility
-git repository at this time.
-
-In order to successfully build Mobility for MeeGo, you must also obtain
-these patches, or you must modify qt-mobility.yaml and qt-mobility.spec
-to remove the usage of the patches.
-
-Please do not add any more patches.
-
-
-
-HOW TO MAKE CHANGES
-===================
-
-Within this directory, there is a yaml file and a spec file.  The yaml
-file is maintained by hand; the spec file is partially generated from the
-yaml file, but partially maintained by hand also, in specially marked
-sections.
-
-The command used to generate the spec file from the yaml file is `specify'.
-This is part of a tool named Spectacle.  This can be installed from the
-MeeGo tools repositories.  It does not require a full MeeGo SDK install.
-For example, on Ubuntu:
-
-  $ sudo /bin/sh -c 'echo deb http://repo.meego.com/MeeGo/tools/repos/ubuntu/10.04/ / > /etc/apt/sources.list.d/meego-tools.list'
-  $ gpg --keyserver pgpkeys.mit.edu --recv 0BC7BEC479FC1F8A && gpg --export --armor 0BC7BEC479FC1F8A | sudo apt-key add -
-  $ sudo apt-get update
-  $ sudo apt-get install meego-packaging-tools
-
-Once you have installed meego-packaging-tools, you can run `make spec-git'
-in this directory to regenerate the spec file from the yaml file.
-The spec file and yaml file should be maintained together, so if you
-modify the yaml file, you should do `make spec-git' and put the
-modifications to the spec file in the same commit.
-
-Please see http://wiki.meego.com/Spectacle for more information about
-spectacle.
-
-
-
-HOW TO BUILD
-============
-
-Note: these instructions are not canonical or supported in any way.
-They are here as a quick start for people who want to contribute to
-Qt Mobility and do not know how to compile for MeeGo.
-
-The most accurate way to build is to use the OpenSuSE build service
-on build.meego.com.  Unfortunately, at time of writing, anonymous
-access to this service is not available.  Therefore, using build.meego.com
-is not an option for most people.
-
-However, a fairly accurate build can still be done using the `build' command
-and referring to the live MeeGo repos.
-
-
-Abbreviated example of how to install `build' for Ubuntu:
-
-  $ sudo /bin/sh -c 'echo deb http://repo.meego.com/MeeGo/tools/repos/ubuntu/10.04/ / > /etc/apt/sources.list.d/meego-tools.list'
-  $ gpg --keyserver pgpkeys.mit.edu --recv 0BC7BEC479FC1F8A && gpg --export --armor 0BC7BEC479FC1F8A | sudo apt-key add -
-  $ sudo apt-get update
-  $ sudo apt-get install build
-  $ gpg --keyserver pgpkeys.mit.edu --recv 79FC1F8A && gpg --export --armor 79FC1F8A | sudo rpm --import -
-
-
-Then, to do the build (for i686):
-
-  $ make build-trunk-i686
-
-
-Or, to use the Trunk:Testing repository (which may contain newer versions of some packages):
-
-  $ make build-trunk-testing-i686
-
-
-These builds will take place in a chroot, and hence will require root access.
-They will attempt to use `sudo' for this.
-
-If you hit an error, `rpm: error while loading shared libraries: liblua-5.1.so',
-edit /usr/lib/build/configs/default.conf and add liblua to one of the `Preinstall:' lines
-(see http://comments.gmane.org/gmane.comp.handhelds.meego.devel/7139 )
diff --git a/src/meegoinstalls/qt-mobility.spec b/src/meegoinstalls/qt-mobility.spec
deleted file mode 100644
index fab3effff..000000000
--- a/src/meegoinstalls/qt-mobility.spec
+++ /dev/null
@@ -1,1360 +0,0 @@
-# 
-# Do NOT Edit the Auto-generated Part!
-# Generated by: spectacle version 0.21
-# 
-# >> macros
-# << macros
-
-Name:       qt-mobility
-Summary:    APIs for mobile device functionality
-Version:    1.1.0+git2438
-Release:    1
-Group:      System/Libraries
-License:    LGPLv2.1 with exception or GPLv3
-URL:        http://qt.gitorious.org/qt-mobility
-Source0:    http://get.qt.nokia.com/qt/add-ons/%{name}-opensource-src-%{version}.tar.gz
-Source100:  qt-mobility.yaml
-Requires:   libqtconnectivity1 = %{version}
-Requires:   libqtcontacts1 = %{version}
-Requires:   libqtfeedback1 = %{version}
-Requires:   libqtgallery1 = %{version}
-Requires:   libqtlocation1 = %{version}
-Requires:   libqtmessaging1 = %{version}
-Requires:   libqtmultimediakit1 = %{version}
-Requires:   libqtorganizer1 = %{version}
-Requires:   libqtpublishsubscribe1 = %{version}
-Requires:   libqtsensors1 = %{version}
-Requires:   libqtserviceframework1 = %{version}
-Requires:   libqtsysteminfo1 = %{version}
-Requires:   libqtversit1 = %{version}
-Requires:   libqtversitorganizer1 = %{version}
-BuildRequires:  pkgconfig(QtGui)
-BuildRequires:  pkgconfig(QtOpenGL)
-BuildRequires:  pkgconfig(alsa)
-BuildRequires:  pkgconfig(blkid)
-BuildRequires:  pkgconfig(bluez)
-BuildRequires:  pkgconfig(connman)
-BuildRequires:  pkgconfig(contextsubscriber-1.0)
-BuildRequires:  pkgconfig(gconf-2.0)
-BuildRequires:  pkgconfig(geoclue)
-BuildRequires:  pkgconfig(gstreamer-plugins-bad-free-0.10)
-BuildRequires:  pkgconfig(gstreamer-plugins-base-0.10)
-BuildRequires:  pkgconfig(gypsy)
-BuildRequires:  pkgconfig(libiphb)
-BuildRequires:  pkgconfig(libpulse)
-BuildRequires:  pkgconfig(libmkcal)
-BuildRequires:  pkgconfig(meegotouch)
-BuildRequires:  pkgconfig(qttracker)
-BuildRequires:  pkgconfig(qmfclient)
-BuildRequires:  pkgconfig(sensord)
-BuildRequires:  pkgconfig(udev)
-BuildRequires:  pkgconfig(x11)
-BuildRequires:  pkgconfig(xext)
-BuildRequires:  pkgconfig(xrandr)
-BuildRequires:  pkgconfig(xrender)
-BuildRequires:  pkgconfig(xv)
-BuildRequires:  pkgconfig(QtSparql)
-BuildRequires:  pkgconfig(QtSparqlTrackerExtensions)
-BuildRequires:  qt-devel-tools
-BuildRequires:  fdupes
-
-
-%description
-Qt Mobility delivers a set of new APIs for mobile device functionality. These
-APIs allow the developer to use these features with ease from one framework and
-apply them to phones, netbooks and non-mobile personal computers.
-
-
-
-%package devel
-Summary:    APIs for mobile device functionality - development files
-Group:      Development/Libraries
-Requires:   %{name} = %{version}-%{release}
-Requires:   servicefw
-
-%description devel
-Qt Mobility delivers a set of new APIs for mobile device functionality.
-
-This package contains the development files needed to build Qt applications
-using Qt Mobility libraries.
-
-
-%package -n libqtconnectivity1
-Summary:    Qt Mobility Connectivity module
-Group:      System/Libraries
-Requires:   %{name} = %{version}-%{release}
-Requires(post): /sbin/ldconfig
-Requires(postun): /sbin/ldconfig
-
-%description -n libqtconnectivity1
-Qt Mobility delivers a set of new APIs for mobile device functionality.
-
-This package contains the Connectivity API. It provides APIs for working with
-local devices.
-
-
-%package -n libqtcontacts1
-Summary:    Qt Mobility Contacts module
-Group:      System/Libraries
-Requires:   %{name} = %{version}-%{release}
-Requires(post): /sbin/ldconfig
-Requires(postun): /sbin/ldconfig
-
-%description -n libqtcontacts1
-Qt Mobility delivers a set of new APIs for mobile device functionality.
-
-This package contains an API enabling clients to request contact data from
-local or remote backends.
-
-
-%package -n libqtfeedback1
-Summary:    Qt Mobility Feedback module
-Group:      System/Libraries
-Requires:   %{name} = %{version}-%{release}
-Requires(post): /sbin/ldconfig
-Requires(postun): /sbin/ldconfig
-
-%description -n libqtfeedback1
-Qt Mobility delivers a set of new APIs for mobile device functionality.
-
-This package contains the Feedback API. It enables a client to control
-the vibration of the device or the piezo feedback from the screen.
-
-
-%package -n libqtgallery1
-Summary:    Qt Mobility Document Gallery module
-Group:      System/Libraries
-Requires:   %{name} = %{version}-%{release}
-Requires(post): /sbin/ldconfig
-Requires(postun): /sbin/ldconfig
-
-%description -n libqtgallery1
-Qt Mobility delivers a set of new APIs for mobile device functionality.
-
-This package contains an API for accessing collections of documents and media
-and their meta-data.
-
-
-%package -n libqtlocation1
-Summary:    Qt Mobility Location module
-Group:      System/Libraries
-Requires:   %{name} = %{version}-%{release}
-Requires(post): /sbin/ldconfig
-Requires(postun): /sbin/ldconfig
-
-%description -n libqtlocation1
-Qt Mobility delivers a set of new APIs for mobile device functionality.
-
-This package contains the Location API. It provides a library for distributing
-and receiving location data using arbitrary data sources.
-
-
-%package -n libqtmessaging1
-Summary:    Qt Mobility Messaging module
-Group:      System/Libraries
-Requires:   %{name} = %{version}-%{release}
-Requires(post): /sbin/ldconfig
-Requires(postun): /sbin/ldconfig
-
-%description -n libqtmessaging1
-Qt Mobility delivers a set of new APIs for mobile device functionality.
-
-This package contains the Messaging API. It is a common interface for handling
-SMS, MMS, MIME Email and TNEF Email messages.
-
-
-%package -n libqtmultimediakit1
-Summary:    Qt Mobility MultimediaKit module
-Group:      System/Libraries
-Requires:   %{name} = %{version}-%{release}
-Requires(post): /sbin/ldconfig
-Requires(postun): /sbin/ldconfig
-
-%description -n libqtmultimediakit1
-Qt Mobility delivers a set of new APIs for mobile device functionality.
-
-This package contains a set of APIs to play and record media, and manage a
-collection of media content.
-
-
-%package -n libqtorganizer1
-Summary:    Qt Mobility Organizer module
-Group:      System/Libraries
-Requires:   %{name} = %{version}-%{release}
-Requires(post): /sbin/ldconfig
-Requires(postun): /sbin/ldconfig
-
-%description -n libqtorganizer1
-Qt Mobility delivers a set of new APIs for mobile device functionality.
-
-This package contains an API for management of calendar, scheduling and
-personal data from local or remote backends. It includes the ability to create,
-edit, list, delete and lookup organizer information whether it is stored
-locally or remotely.
-
-
-%package -n libqtpublishsubscribe1
-Summary:    Qt Mobility Publish and Subscribe module
-Group:      System/Libraries
-Requires:   %{name} = %{version}-%{release}
-Requires(post): /sbin/ldconfig
-Requires(postun): /sbin/ldconfig
-
-%description -n libqtpublishsubscribe1
-Qt Mobility delivers a set of new APIs for mobile device functionality.
-
-This package contains the Publish and Subscribe API (containing Value Space).
-It enables applications to read item values, navigate through and subscribe to
-change notifications.
-
-
-%package -n libqtsensors1
-Summary:    Qt Mobility Sensors module
-Group:      System/Libraries
-Requires:   %{name} = %{version}-%{release}
-Requires:   libqtsql4-sqlite
-Requires:   sensorfw
-Requires(post): /sbin/ldconfig
-Requires(postun): /sbin/ldconfig
-
-%description -n libqtsensors1
-Qt Mobility delivers a set of new APIs for mobile device functionality.
-
-This package contains the Sensors API. It provides access to sensors.
-
-
-%package -n libqtserviceframework1
-Summary:    Qt Mobility Service Framework module
-Group:      System/Libraries
-Requires:   %{name} = %{version}-%{release}
-Requires(post): /sbin/ldconfig
-Requires(postun): /sbin/ldconfig
-
-%description -n libqtserviceframework1
-Qt Mobility delivers a set of new APIs for mobile device functionality.
-
-This package contains a set of APIs to that allows clients to discover and
-instantiate arbitrary services.
-
-
-%package -n libqtsysteminfo1
-Summary:    Qt Mobility System Information module
-Group:      System/Libraries
-Requires:   %{name} = %{version}-%{release}
-Requires(post): /sbin/ldconfig
-Requires(postun): /sbin/ldconfig
-
-%description -n libqtsysteminfo1
-Qt Mobility delivers a set of new APIs for mobile device functionality.
-
-This package contains a set of APIs to discover system related information and
-capabilities.
-
-
-%package -n libqtversit1
-Summary:    Qt Mobility Versit (vCard) module
-Group:      System/Libraries
-Requires:   %{name} = %{version}-%{release}
-Requires(post): /sbin/ldconfig
-Requires(postun): /sbin/ldconfig
-
-%description -n libqtversit1
-Qt Mobility delivers a set of new APIs for mobile device functionality.
-
-This package contains an API to manage Versit documents, such as vCards.
-
-
-%package -n libqtversitorganizer1
-Summary:    Qt Mobility Versit (Organizer) module
-Group:      System/Libraries
-Requires:   %{name} = %{version}-%{release}
-Requires(post): /sbin/ldconfig
-Requires(postun): /sbin/ldconfig
-
-%description -n libqtversitorganizer1
-Qt Mobility delivers a set of new APIs for mobile device functionality.
-
-This package contains an API to manage Versit documents, such as iCalendar
-documents. It interfaces the Organizer API and uses the same framework as for
-vCards.
-
-
-%package -n libdeclarative-contacts
-Summary:    Qt Mobility Contacts QML plugin
-Group:      System/Libraries
-Requires:   %{name} = %{version}-%{release}
-
-%description -n libdeclarative-contacts
-Qt Mobility delivers a set of new APIs for mobile device functionality.
-
-This package contains the Contacts QML plugin for QtDeclarative.
-
-
-%package -n libdeclarative-feedback
-Summary:    Qt Mobility Feedback QML plugin
-Group:      System/Libraries
-Requires:   %{name} = %{version}-%{release}
-
-%description -n libdeclarative-feedback
-Qt Mobility delivers a set of new APIs for mobile device functionality.
-
-This package contains the Feedback QML plugin for QtDeclarative.
-
-
-%package -n libdeclarative-gallery
-Summary:    Qt Mobility Document Gallery QML plugin
-Group:      System/Libraries
-Requires:   %{name} = %{version}-%{release}
-
-%description -n libdeclarative-gallery
-Qt Mobility delivers a set of new APIs for mobile device functionality.
-
-This package contains the Document Gallery QML plugin for QtDeclarative.
-
-
-%package -n libdeclarative-location
-Summary:    Qt Mobility Location QML plugin
-Group:      System/Libraries
-Requires:   %{name} = %{version}-%{release}
-
-%description -n libdeclarative-location
-Qt Mobility delivers a set of new APIs for mobile device functionality.
-
-This package contains the Location QML plugin for QtDeclarative.
-
-
-%package -n libdeclarative-messaging
-Summary:    Qt Mobility Messaging QML plugin
-Group:      System/Libraries
-Requires:   %{name} = %{version}-%{release}
-
-%description -n libdeclarative-messaging
-Qt Mobility delivers a set of new APIs for mobile device functionality.
-
-This package contains the Messaging QML plugin for QtDeclarative.
-
-
-%package -n libdeclarative-multimedia
-Summary:    Qt Mobility Multimedia QML plugin
-Group:      System/Libraries
-Requires:   %{name} = %{version}-%{release}
-
-%description -n libdeclarative-multimedia
-Qt Mobility delivers a set of new APIs for mobile device functionality.
-
-This package contains the Multimedia QML plugin for QtDeclarative.
-
-
-%package -n libdeclarative-organizer
-Summary:    Qt Mobility Organizer QML plugin
-Group:      System/Libraries
-Requires:   %{name} = %{version}-%{release}
-
-%description -n libdeclarative-organizer
-Qt Mobility delivers a set of new APIs for mobile device functionality.
-
-This package contains the Organizer QML plugin for QtDeclarative.
-
-
-%package -n libdeclarative-publishsubscribe
-Summary:    Qt Mobility Publish and Subscribe QML plugin
-Group:      System/Libraries
-Requires:   %{name} = %{version}-%{release}
-
-%description -n libdeclarative-publishsubscribe
-Qt Mobility delivers a set of new APIs for mobile device functionality.
-
-This package contains the Publish and Subscribe QML plugin for QtDeclarative.
-
-
-%package -n libdeclarative-sensors
-Summary:    Qt Mobility Sensors Framework QML plugin
-Group:      System/Libraries
-Requires:   %{name} = %{version}-%{release}
-
-%description -n libdeclarative-sensors
-Qt Mobility delivers a set of new APIs for mobile device functionality.
-
-This package contains the Sensors QML plugin for QtDeclarative.
-
-
-%package -n libdeclarative-serviceframework
-Summary:    Qt Mobility Service Framework QML plugin
-Group:      System/Libraries
-Requires:   %{name} = %{version}-%{release}
-
-%description -n libdeclarative-serviceframework
-Qt Mobility delivers a set of new APIs for mobile device functionality.
-
-This package contains the Service Framework QML plugin for QtDeclarative.
-
-
-%package -n libdeclarative-systeminfo
-Summary:    Qt Mobility System Information QML plugin
-Group:      System/Libraries
-Requires:   %{name} = %{version}-%{release}
-
-%description -n libdeclarative-systeminfo
-Qt Mobility delivers a set of new APIs for mobile device functionality.
-
-This package contains the System Information QML plugin for QtDeclarative.
-
-
-%package -n libdeclarative-connectivity
-Summary:    Qt Mobility Connectivity QML plugin
-Group:      System/Libraries
-Requires:   %{name} = %{version}-%{release}
-
-%description -n libdeclarative-connectivity
-Qt Mobility delivers a set of new APIs for mobile device functionality.
-
-This package contains the Connectivity QML plugin for QtDeclarative.
-
-
-%package -n servicefw
-Summary:    Qt Mobility Service Framework tool
-Group:      Development/Tools
-Requires:   %{name} = %{version}-%{release}
-
-%description -n servicefw
-Qt Mobility delivers a set of new APIs for mobile device functionality.
-
-This package contains the Service Framework tool (servicefw). It allows
-to register services and make them available over the Service Framework.
-
-
-%package examples
-Summary:    Qt Mobility examples
-Group:      System/X11
-Requires:   %{name} = %{version}-%{release}
-
-%description examples
-Qt Mobility delivers a set of new APIs for mobile device functionality.
-
-This package contains Qt Mobility examples.
-
-
-%package l10n
-Summary:    APIs for mobile device functionality - localization files
-Group:      System/I18n
-Requires:   %{name} = %{version}-%{release}
-
-%description l10n
-Qt Mobility delivers a set of new APIs for mobile device functionality.
-
-This package contains Qt Mobility translations.
-
-
-
-%prep
-%setup -q -n %{name}-opensource-src-%{version}
-
-# >> setup
-# << setup
-
-%build
-# >> build pre
-# QMF environment variables should be set
-export QMF_INCLUDEDIR=%{_includedir}/qmfclient
-export QMF_LIBDIR=%{_libdir}
-./configure \
--prefix "%{_prefix}" \
--headerdir "%{_includedir}" \
--libdir "%{_libdir}" \
--bindir "%{_bindir}" \
--plugindir "%{_libdir}/qt4/plugins" \
--demosdir "%{_libdir}/qtmobility/demos" \
--examplesdir "%{_libdir}/qtmobility/examples" \
--languages "ar cs da de es fr he hu ja pl pt ru sk sl sv zh_CN zh_TW" \
--examples \
--demos \
--modules "location contacts multimedia publishsubscribe versit messaging systeminfo serviceframework sensors gallery organizer feedback connectivity" \
--meego
-make %{?_smp_mflags}
-# << build pre
-
-
-
-# >> build post
-# << build post
-%install
-rm -rf %{buildroot}
-# >> install pre
-# << install pre
-
-# >> install post
-%qmake_install
-# Fix wrong path in pkgconfig files
-find %{buildroot}%{_libdir}/pkgconfig -type f -name '*.pc' \
--exec perl -pi -e "s, -L%{_builddir}/%{name}-opensource-src-\Q%{version}\E/?\S+,,g" {} \;
-# Fix executable permissions
-find %{buildroot}%{_libdir}/qtmobility -type f -perm /u+x,g+x,o+x \( -false \
--o -name \*.qml \
--o -name \*.sci \
--o -name qmldir \
--o -name \*.txt \
-\) -exec chmod -x \{\} +
-# Fix duplicate files
-%fdupes %{buildroot}%{_includedir}
-%fdupes %{buildroot}%{_libdir}/qtmobility
-# << install post
-%fdupes  %{buildroot}/%{_datadir}/qtmobility/translations
-
-
-
-
-
-
-
-
-
-
-%post -n libqtconnectivity1 -p /sbin/ldconfig
-
-%postun -n libqtconnectivity1 -p /sbin/ldconfig
-
-
-%post -n libqtcontacts1 -p /sbin/ldconfig
-
-%postun -n libqtcontacts1 -p /sbin/ldconfig
-
-
-%post -n libqtfeedback1 -p /sbin/ldconfig
-
-%postun -n libqtfeedback1 -p /sbin/ldconfig
-
-
-%post -n libqtgallery1 -p /sbin/ldconfig
-
-%postun -n libqtgallery1 -p /sbin/ldconfig
-
-
-%post -n libqtlocation1 -p /sbin/ldconfig
-
-%postun -n libqtlocation1 -p /sbin/ldconfig
-
-
-%post -n libqtmessaging1 -p /sbin/ldconfig
-
-%postun -n libqtmessaging1 -p /sbin/ldconfig
-
-
-%post -n libqtmultimediakit1 -p /sbin/ldconfig
-
-%postun -n libqtmultimediakit1 -p /sbin/ldconfig
-
-
-%post -n libqtorganizer1 -p /sbin/ldconfig
-
-%postun -n libqtorganizer1 -p /sbin/ldconfig
-
-
-%post -n libqtpublishsubscribe1 -p /sbin/ldconfig
-
-%postun -n libqtpublishsubscribe1 -p /sbin/ldconfig
-
-
-%post -n libqtsensors1 -p /sbin/ldconfig
-
-%postun -n libqtsensors1 -p /sbin/ldconfig
-
-
-%post -n libqtserviceframework1 -p /sbin/ldconfig
-
-%postun -n libqtserviceframework1 -p /sbin/ldconfig
-
-
-%post -n libqtsysteminfo1 -p /sbin/ldconfig
-
-%postun -n libqtsysteminfo1 -p /sbin/ldconfig
-
-
-%post -n libqtversit1 -p /sbin/ldconfig
-
-%postun -n libqtversit1 -p /sbin/ldconfig
-
-
-%post -n libqtversitorganizer1 -p /sbin/ldconfig
-
-%postun -n libqtversitorganizer1 -p /sbin/ldconfig
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-%files
-%defattr(-,root,root,-)
-# >> files
-# << files
-
-
-%files devel
-%defattr(-,root,root,-)
-# >> files devel
-%{_bindir}/icheck
-%{_bindir}/ndefhandlergen
-%{_bindir}/qcrmlgen
-%{_bindir}/servicedbgen
-%{_bindir}/servicexmlgen
-%{_bindir}/vsexplorer
-%{_includedir}/QtConnectivity/*.h
-%{_includedir}/QtConnectivity/QBluetoothAddress
-%{_includedir}/QtConnectivity/QBluetoothDeviceDiscoveryAgent
-%{_includedir}/QtConnectivity/QBluetoothDeviceInfo
-%{_includedir}/QtConnectivity/QBluetoothHostInfo
-%{_includedir}/QtConnectivity/QBluetoothLocalDevice
-%{_includedir}/QtConnectivity/QBluetoothServiceDiscoveryAgent
-%{_includedir}/QtConnectivity/QBluetoothServiceInfo
-%{_includedir}/QtConnectivity/QBluetoothSocket
-%{_includedir}/QtConnectivity/QBluetoothTransferManager
-%{_includedir}/QtConnectivity/QBluetoothTransferReply
-%{_includedir}/QtConnectivity/QBluetoothTransferRequest
-%{_includedir}/QtConnectivity/QBluetoothUuid
-%{_includedir}/QtConnectivity/QDeclarativeNdefRecord
-%{_includedir}/QtConnectivity/QL2capServer
-%{_includedir}/QtConnectivity/QL2capSocket
-%{_includedir}/QtConnectivity/QLlcpServer
-%{_includedir}/QtConnectivity/QLlcpSocket
-%{_includedir}/QtConnectivity/QNdefFilter
-%{_includedir}/QtConnectivity/QNdefMessage
-%{_includedir}/QtConnectivity/QNdefNfcTextRecord
-%{_includedir}/QtConnectivity/QNdefNfcUriRecord
-%{_includedir}/QtConnectivity/QNdefRecord
-%{_includedir}/QtConnectivity/QNearFieldManager
-%{_includedir}/QtConnectivity/QNearFieldTagType1
-%{_includedir}/QtConnectivity/QNearFieldTagType2
-%{_includedir}/QtConnectivity/QNearFieldTagType3
-%{_includedir}/QtConnectivity/QNearFieldTagType4
-%{_includedir}/QtConnectivity/QNearFieldTarget
-%{_includedir}/QtConnectivity/QRfcommServer
-%{_includedir}/QtConnectivity/QRfcommSocket
-%{_includedir}/QtContacts/*.h
-%{_includedir}/QtContacts/QContact
-%{_includedir}/QtContacts/QContactAbstractRequest
-%{_includedir}/QtContacts/QContactAction
-%{_includedir}/QtContacts/QContactActionDescriptor
-%{_includedir}/QtContacts/QContactActionFactory
-%{_includedir}/QtContacts/QContactActionFilter
-%{_includedir}/QtContacts/QContactActionTarget
-%{_includedir}/QtContacts/QContactAddress
-%{_includedir}/QtContacts/QContactAnniversary
-%{_includedir}/QtContacts/QContactAvatar
-%{_includedir}/QtContacts/QContactBirthday
-%{_includedir}/QtContacts/QContactChangeLogFilter
-%{_includedir}/QtContacts/QContactChangeSet
-%{_includedir}/QtContacts/QContactDetail
-%{_includedir}/QtContacts/QContactDetailDefinition
-%{_includedir}/QtContacts/QContactDetailDefinitionFetchRequest
-%{_includedir}/QtContacts/QContactDetailDefinitionRemoveRequest
-%{_includedir}/QtContacts/QContactDetailDefinitionSaveRequest
-%{_includedir}/QtContacts/QContactDetailFieldDefinition
-%{_includedir}/QtContacts/QContactDetailFilter
-%{_includedir}/QtContacts/QContactDetailRangeFilter
-%{_includedir}/QtContacts/QContactDisplayLabel
-%{_includedir}/QtContacts/QContactEmailAddress
-%{_includedir}/QtContacts/QContactFamily
-%{_includedir}/QtContacts/QContactFavorite
-%{_includedir}/QtContacts/QContactFetchByIdRequest
-%{_includedir}/QtContacts/QContactFetchHint
-%{_includedir}/QtContacts/QContactFetchRequest
-%{_includedir}/QtContacts/QContactFilter
-%{_includedir}/QtContacts/QContactGender
-%{_includedir}/QtContacts/QContactGeoLocation
-%{_includedir}/QtContacts/QContactGlobalPresence
-%{_includedir}/QtContacts/QContactGuid
-%{_includedir}/QtContacts/QContactHobby
-%{_includedir}/QtContacts/QContactId
-%{_includedir}/QtContacts/QContactIntersectionFilter
-%{_includedir}/QtContacts/QContactInvalidFilter
-%{_includedir}/QtContacts/QContactLocalIdFetchRequest
-%{_includedir}/QtContacts/QContactLocalIdFilter
-%{_includedir}/QtContacts/QContactManager
-%{_includedir}/QtContacts/QContactManagerEngine
-%{_includedir}/QtContacts/QContactManagerEngineFactory
-%{_includedir}/QtContacts/QContactManagerEngineV2
-%{_includedir}/QtContacts/QContactName
-%{_includedir}/QtContacts/QContactNickname
-%{_includedir}/QtContacts/QContactNote
-%{_includedir}/QtContacts/QContactObserver
-%{_includedir}/QtContacts/QContactOnlineAccount
-%{_includedir}/QtContacts/QContactOrganization
-%{_includedir}/QtContacts/QContactPhoneNumber
-%{_includedir}/QtContacts/QContactPresence
-%{_includedir}/QtContacts/QContactRelationship
-%{_includedir}/QtContacts/QContactRelationshipFetchRequest
-%{_includedir}/QtContacts/QContactRelationshipFilter
-%{_includedir}/QtContacts/QContactRelationshipRemoveRequest
-%{_includedir}/QtContacts/QContactRelationshipSaveRequest
-%{_includedir}/QtContacts/QContactRemoveRequest
-%{_includedir}/QtContacts/QContactRingtone
-%{_includedir}/QtContacts/QContactSaveRequest
-%{_includedir}/QtContacts/QContactSortOrder
-%{_includedir}/QtContacts/QContactSyncTarget
-%{_includedir}/QtContacts/QContactTag
-%{_includedir}/QtContacts/QContactThumbnail
-%{_includedir}/QtContacts/QContactTimestamp
-%{_includedir}/QtContacts/QContactType
-%{_includedir}/QtContacts/QContactUnionFilter
-%{_includedir}/QtContacts/QContactUrl
-%{_includedir}/QtFeedback/*.h
-%{_includedir}/QtFeedback/QFeedbackActuator
-%{_includedir}/QtFeedback/QFeedbackEffect
-%{_includedir}/QtFeedback/QFeedbackFileEffect
-%{_includedir}/QtFeedback/QFeedbackFileInterface
-%{_includedir}/QtFeedback/QFeedbackHapticsEffect
-%{_includedir}/QtFeedback/QFeedbackHapticsInterface
-%{_includedir}/QtFeedback/QFeedbackInterface
-%{_includedir}/QtFeedback/QFeedbackThemeInterface
-%{_includedir}/QtGallery/*.h
-%{_includedir}/QtGallery/QAbstractGallery
-%{_includedir}/QtGallery/QDocumentGallery
-%{_includedir}/QtGallery/QGalleryAbstractRequest
-%{_includedir}/QtGallery/QGalleryAbstractResponse
-%{_includedir}/QtGallery/QGalleryFilter
-%{_includedir}/QtGallery/QGalleryIntersectionFilter
-%{_includedir}/QtGallery/QGalleryItemRequest
-%{_includedir}/QtGallery/QGalleryMetaDataFilter
-%{_includedir}/QtGallery/QGalleryQueryModel
-%{_includedir}/QtGallery/QGalleryQueryRequest
-%{_includedir}/QtGallery/QGalleryResource
-%{_includedir}/QtGallery/QGalleryResultSet
-%{_includedir}/QtGallery/QGalleryTypeRequest
-%{_includedir}/QtGallery/QGalleryUnionFilter
-%{_includedir}/QtLocation/*.h
-%{_includedir}/QtLocation/QGeoAddress
-%{_includedir}/QtLocation/QGeoAreaMonitor
-%{_includedir}/QtLocation/QGeoBoundingArea
-%{_includedir}/QtLocation/QGeoBoundingBox
-%{_includedir}/QtLocation/QGeoBoundingCircle
-%{_includedir}/QtLocation/QGeoCoordinate
-%{_includedir}/QtLocation/QGeoManeuver
-%{_includedir}/QtLocation/QGeoMapCircleObject
-%{_includedir}/QtLocation/QGeoMapCustomObject
-%{_includedir}/QtLocation/QGeoMapData
-%{_includedir}/QtLocation/QGeoMapGroupObject
-%{_includedir}/QtLocation/QGeoMapObject
-%{_includedir}/QtLocation/QGeoMapObjectInfo
-%{_includedir}/QtLocation/QGeoMapOverlay
-%{_includedir}/QtLocation/QGeoMapPixmapObject
-%{_includedir}/QtLocation/QGeoMapPolygonObject
-%{_includedir}/QtLocation/QGeoMapPolylineObject
-%{_includedir}/QtLocation/QGeoMapRectangleObject
-%{_includedir}/QtLocation/QGeoMapRouteObject
-%{_includedir}/QtLocation/QGeoMapTextObject
-%{_includedir}/QtLocation/QGeoMappingManager
-%{_includedir}/QtLocation/QGeoMappingManagerEngine
-%{_includedir}/QtLocation/QGeoPlace
-%{_includedir}/QtLocation/QGeoPositionInfo
-%{_includedir}/QtLocation/QGeoPositionInfoSource
-%{_includedir}/QtLocation/QGeoPositionInfoSourceFactory
-%{_includedir}/QtLocation/QGeoRoute
-%{_includedir}/QtLocation/QGeoRouteReply
-%{_includedir}/QtLocation/QGeoRouteRequest
-%{_includedir}/QtLocation/QGeoRouteSegment
-%{_includedir}/QtLocation/QGeoRoutingManager
-%{_includedir}/QtLocation/QGeoRoutingManagerEngine
-%{_includedir}/QtLocation/QGeoSatelliteInfo
-%{_includedir}/QtLocation/QGeoSatelliteInfoSource
-%{_includedir}/QtLocation/QGeoSearchManager
-%{_includedir}/QtLocation/QGeoSearchManagerEngine
-%{_includedir}/QtLocation/QGeoSearchReply
-%{_includedir}/QtLocation/QGeoServiceProvider
-%{_includedir}/QtLocation/QGeoServiceProviderFactory
-%{_includedir}/QtLocation/QGeoTiledMapData
-%{_includedir}/QtLocation/QGeoTiledMapReply
-%{_includedir}/QtLocation/QGeoTiledMapRequest
-%{_includedir}/QtLocation/QGeoTiledMappingManagerEngine
-%{_includedir}/QtLocation/QGraphicsGeoMap
-%{_includedir}/QtLocation/QLandmark
-%{_includedir}/QtLocation/QLandmarkAbstractRequest
-%{_includedir}/QtLocation/QLandmarkAttributeFilter
-%{_includedir}/QtLocation/QLandmarkBoxFilter
-%{_includedir}/QtLocation/QLandmarkCategory
-%{_includedir}/QtLocation/QLandmarkCategoryFetchByIdRequest
-%{_includedir}/QtLocation/QLandmarkCategoryFetchRequest
-%{_includedir}/QtLocation/QLandmarkCategoryFilter
-%{_includedir}/QtLocation/QLandmarkCategoryId
-%{_includedir}/QtLocation/QLandmarkCategoryIdFetchRequest
-%{_includedir}/QtLocation/QLandmarkCategoryRemoveRequest
-%{_includedir}/QtLocation/QLandmarkCategorySaveRequest
-%{_includedir}/QtLocation/QLandmarkExportRequest
-%{_includedir}/QtLocation/QLandmarkFetchByIdRequest
-%{_includedir}/QtLocation/QLandmarkFetchRequest
-%{_includedir}/QtLocation/QLandmarkFilter
-%{_includedir}/QtLocation/QLandmarkId
-%{_includedir}/QtLocation/QLandmarkIdFetchRequest
-%{_includedir}/QtLocation/QLandmarkIdFilter
-%{_includedir}/QtLocation/QLandmarkImportRequest
-%{_includedir}/QtLocation/QLandmarkIntersectionFilter
-%{_includedir}/QtLocation/QLandmarkManager
-%{_includedir}/QtLocation/QLandmarkManagerEngine
-%{_includedir}/QtLocation/QLandmarkManagerEngineFactory
-%{_includedir}/QtLocation/QLandmarkNameFilter
-%{_includedir}/QtLocation/QLandmarkNameSort
-%{_includedir}/QtLocation/QLandmarkProximityFilter
-%{_includedir}/QtLocation/QLandmarkRemoveRequest
-%{_includedir}/QtLocation/QLandmarkSaveRequest
-%{_includedir}/QtLocation/QLandmarkSortOrder
-%{_includedir}/QtLocation/QLandmarkUnionFilter
-%{_includedir}/QtLocation/QNmeaPositionInfoSource
-%{_includedir}/QtMessaging/*.h
-%{_includedir}/QtMessaging/QMessage
-%{_includedir}/QtMessaging/QMessageAccount
-%{_includedir}/QtMessaging/QMessageAccountFilter
-%{_includedir}/QtMessaging/QMessageAccountId
-%{_includedir}/QtMessaging/QMessageAccountSortOrder
-%{_includedir}/QtMessaging/QMessageAddress
-%{_includedir}/QtMessaging/QMessageContentContainer
-%{_includedir}/QtMessaging/QMessageContentContainerId
-%{_includedir}/QtMessaging/QMessageDataComparator
-%{_includedir}/QtMessaging/QMessageFilter
-%{_includedir}/QtMessaging/QMessageFolder
-%{_includedir}/QtMessaging/QMessageFolderFilter
-%{_includedir}/QtMessaging/QMessageFolderId
-%{_includedir}/QtMessaging/QMessageFolderSortOrder
-%{_includedir}/QtMessaging/QMessageId
-%{_includedir}/QtMessaging/QMessageManager
-%{_includedir}/QtMessaging/QMessageService
-%{_includedir}/QtMessaging/QMessageSortOrder
-%{_includedir}/QtMobility/*.h
-%{_includedir}/QtMobility/QLatin1Constant
-%{_includedir}/QtMultimediaKit/*.h
-%{_includedir}/QtMultimediaKit/QAbstractAudioDeviceInfo
-%{_includedir}/QtMultimediaKit/QAbstractAudioInput
-%{_includedir}/QtMultimediaKit/QAbstractAudioOutput
-%{_includedir}/QtMultimediaKit/QAbstractVideoBuffer
-%{_includedir}/QtMultimediaKit/QAbstractVideoSurface
-%{_includedir}/QtMultimediaKit/QAudio
-%{_includedir}/QtMultimediaKit/QAudioCaptureSource
-%{_includedir}/QtMultimediaKit/QAudioDeviceInfo
-%{_includedir}/QtMultimediaKit/QAudioEncoderControl
-%{_includedir}/QtMultimediaKit/QAudioEncoderSettings
-%{_includedir}/QtMultimediaKit/QAudioEndpointSelector
-%{_includedir}/QtMultimediaKit/QAudioFormat
-%{_includedir}/QtMultimediaKit/QAudioInput
-%{_includedir}/QtMultimediaKit/QAudioOutput
-%{_includedir}/QtMultimediaKit/QAudioSystemPlugin
-%{_includedir}/QtMultimediaKit/QCamera
-%{_includedir}/QtMultimediaKit/QCameraControl
-%{_includedir}/QtMultimediaKit/QCameraExposure
-%{_includedir}/QtMultimediaKit/QCameraExposureControl
-%{_includedir}/QtMultimediaKit/QCameraFlashControl
-%{_includedir}/QtMultimediaKit/QCameraFocus
-%{_includedir}/QtMultimediaKit/QCameraFocusControl
-%{_includedir}/QtMultimediaKit/QCameraFocusZone
-%{_includedir}/QtMultimediaKit/QCameraImageCapture
-%{_includedir}/QtMultimediaKit/QCameraImageCaptureControl
-%{_includedir}/QtMultimediaKit/QCameraImageProcessing
-%{_includedir}/QtMultimediaKit/QCameraImageProcessingControl
-%{_includedir}/QtMultimediaKit/QCameraCaptureBufferFormatControl
-%{_includedir}/QtMultimediaKit/QCameraCaptureDestinationControl
-%{_includedir}/QtMultimediaKit/QCameraLocksControl
-%{_includedir}/QtMultimediaKit/QCameraViewfinder
-%{_includedir}/QtMultimediaKit/QGraphicsVideoItem
-%{_includedir}/QtMultimediaKit/QImageEncoderControl
-%{_includedir}/QtMultimediaKit/QImageEncoderSettings
-%{_includedir}/QtMultimediaKit/QLocalMediaPlaylistProvider
-%{_includedir}/QtMultimediaKit/QMediaBindableInterface
-%{_includedir}/QtMultimediaKit/QMediaContainerControl
-%{_includedir}/QtMultimediaKit/QMediaContent
-%{_includedir}/QtMultimediaKit/QMediaControl
-%{_includedir}/QtMultimediaKit/QMediaImageViewer
-%{_includedir}/QtMultimediaKit/QMediaObject
-%{_includedir}/QtMultimediaKit/QMediaPlayer
-%{_includedir}/QtMultimediaKit/QMediaPlayerControl
-%{_includedir}/QtMultimediaKit/QMediaPlaylist
-%{_includedir}/QtMultimediaKit/QMediaPlaylistControl
-%{_includedir}/QtMultimediaKit/QMediaPlaylistIOPlugin
-%{_includedir}/QtMultimediaKit/QMediaPlaylistNavigator
-%{_includedir}/QtMultimediaKit/QMediaPlaylistProvider
-%{_includedir}/QtMultimediaKit/QMediaPlaylistReader
-%{_includedir}/QtMultimediaKit/QMediaPlaylistSourceControl
-%{_includedir}/QtMultimediaKit/QMediaPlaylistWriter
-%{_includedir}/QtMultimediaKit/QMediaRecorder
-%{_includedir}/QtMultimediaKit/QMediaRecorderControl
-%{_includedir}/QtMultimediaKit/QMediaResource
-%{_includedir}/QtMultimediaKit/QMediaService
-%{_includedir}/QtMultimediaKit/QMediaServiceProvider
-%{_includedir}/QtMultimediaKit/QMediaServiceProviderHint
-%{_includedir}/QtMultimediaKit/QMediaServiceProviderPlugin
-%{_includedir}/QtMultimediaKit/QMediaStreamsControl
-%{_includedir}/QtMultimediaKit/QMediaTimeInterval
-%{_includedir}/QtMultimediaKit/QMediaTimeRange
-%{_includedir}/QtMultimediaKit/QMetaDataReaderControl
-%{_includedir}/QtMultimediaKit/QMetaDataWriterControl
-%{_includedir}/QtMultimediaKit/QRadioTuner
-%{_includedir}/QtMultimediaKit/QRadioTunerControl
-%{_includedir}/QtMultimediaKit/QVideoDeviceControl
-%{_includedir}/QtMultimediaKit/QVideoEncoderControl
-%{_includedir}/QtMultimediaKit/QVideoEncoderSettings
-%{_includedir}/QtMultimediaKit/QVideoFrame
-%{_includedir}/QtMultimediaKit/QVideoRendererControl
-%{_includedir}/QtMultimediaKit/QVideoSurfaceFormat
-%{_includedir}/QtMultimediaKit/QVideoWidget
-%{_includedir}/QtMultimediaKit/QVideoWidgetControl
-%{_includedir}/QtMultimediaKit/QVideoWindowControl
-%{_includedir}/QtMultimediaKit/QMediaNetworkAccessControl
-%{_includedir}/QtOrganizer/*.h
-%{_includedir}/QtOrganizer/QOrganizerAbstractRequest
-%{_includedir}/QtOrganizer/QOrganizerCollection
-%{_includedir}/QtOrganizer/QOrganizerCollectionChangeSet
-%{_includedir}/QtOrganizer/QOrganizerCollectionEngineId
-%{_includedir}/QtOrganizer/QOrganizerCollectionFetchRequest
-%{_includedir}/QtOrganizer/QOrganizerCollectionId
-%{_includedir}/QtOrganizer/QOrganizerCollectionRemoveRequest
-%{_includedir}/QtOrganizer/QOrganizerCollectionSaveRequest
-%{_includedir}/QtOrganizer/QOrganizerEvent
-%{_includedir}/QtOrganizer/QOrganizerEventOccurrence
-%{_includedir}/QtOrganizer/QOrganizerEventTime
-%{_includedir}/QtOrganizer/QOrganizerItem
-%{_includedir}/QtOrganizer/QOrganizerItemAudibleReminder
-%{_includedir}/QtOrganizer/QOrganizerItemChangeLogFilter
-%{_includedir}/QtOrganizer/QOrganizerItemChangeSet
-%{_includedir}/QtOrganizer/QOrganizerItemCollectionFilter
-%{_includedir}/QtOrganizer/QOrganizerItemComment
-%{_includedir}/QtOrganizer/QOrganizerItemDescription
-%{_includedir}/QtOrganizer/QOrganizerItemDetail
-%{_includedir}/QtOrganizer/QOrganizerItemDetailDefinition
-%{_includedir}/QtOrganizer/QOrganizerItemDetailDefinitionFetchRequest
-%{_includedir}/QtOrganizer/QOrganizerItemDetailDefinitionRemoveRequest
-%{_includedir}/QtOrganizer/QOrganizerItemDetailDefinitionSaveRequest
-%{_includedir}/QtOrganizer/QOrganizerItemDetailFieldDefinition
-%{_includedir}/QtOrganizer/QOrganizerItemDetailFilter
-%{_includedir}/QtOrganizer/QOrganizerItemDetailRangeFilter
-%{_includedir}/QtOrganizer/QOrganizerItemDisplayLabel
-%{_includedir}/QtOrganizer/QOrganizerItemEmailReminder
-%{_includedir}/QtOrganizer/QOrganizerItemEngineId
-%{_includedir}/QtOrganizer/QOrganizerItemFetchByIdRequest
-%{_includedir}/QtOrganizer/QOrganizerItemFetchForExportRequest
-%{_includedir}/QtOrganizer/QOrganizerItemFetchHint
-%{_includedir}/QtOrganizer/QOrganizerItemFetchRequest
-%{_includedir}/QtOrganizer/QOrganizerItemFilter
-%{_includedir}/QtOrganizer/QOrganizerItemGuid
-%{_includedir}/QtOrganizer/QOrganizerItemId
-%{_includedir}/QtOrganizer/QOrganizerItemIdFetchRequest
-%{_includedir}/QtOrganizer/QOrganizerItemIdFilter
-%{_includedir}/QtOrganizer/QOrganizerItemIntersectionFilter
-%{_includedir}/QtOrganizer/QOrganizerItemInvalidFilter
-%{_includedir}/QtOrganizer/QOrganizerItemLocation
-%{_includedir}/QtOrganizer/QOrganizerItemObserver
-%{_includedir}/QtOrganizer/QOrganizerItemOccurrenceFetchRequest
-%{_includedir}/QtOrganizer/QOrganizerItemParent
-%{_includedir}/QtOrganizer/QOrganizerItemPriority
-%{_includedir}/QtOrganizer/QOrganizerItemRecurrence
-%{_includedir}/QtOrganizer/QOrganizerItemReminder
-%{_includedir}/QtOrganizer/QOrganizerItemRemoveRequest
-%{_includedir}/QtOrganizer/QOrganizerItemSaveRequest
-%{_includedir}/QtOrganizer/QOrganizerItemSortOrder
-%{_includedir}/QtOrganizer/QOrganizerItemTag
-%{_includedir}/QtOrganizer/QOrganizerItemTimestamp
-%{_includedir}/QtOrganizer/QOrganizerItemType
-%{_includedir}/QtOrganizer/QOrganizerItemUnionFilter
-%{_includedir}/QtOrganizer/QOrganizerItemVisualReminder
-%{_includedir}/QtOrganizer/QOrganizerJournal
-%{_includedir}/QtOrganizer/QOrganizerJournalTime
-%{_includedir}/QtOrganizer/QOrganizerManager
-%{_includedir}/QtOrganizer/QOrganizerManagerEngine
-%{_includedir}/QtOrganizer/QOrganizerManagerEngineFactory
-%{_includedir}/QtOrganizer/QOrganizerManagerEngineV2
-%{_includedir}/QtOrganizer/QOrganizerNote
-%{_includedir}/QtOrganizer/QOrganizerRecurrenceRule
-%{_includedir}/QtOrganizer/QOrganizerTodo
-%{_includedir}/QtOrganizer/QOrganizerTodoOccurrence
-%{_includedir}/QtOrganizer/QOrganizerTodoProgress
-%{_includedir}/QtOrganizer/QOrganizerTodoTime
-%{_includedir}/QtPublishSubscribe/*.h
-%{_includedir}/QtPublishSubscribe/QValueSpace
-%{_includedir}/QtPublishSubscribe/QValueSpacePublisher
-%{_includedir}/QtPublishSubscribe/QValueSpaceSubscriber
-%{_includedir}/QtSensors/*.h
-%{_includedir}/QtSensors/QAccelerometer
-%{_includedir}/QtSensors/QAccelerometerFilter
-%{_includedir}/QtSensors/QAccelerometerReading
-%{_includedir}/QtSensors/QAmbientLightFilter
-%{_includedir}/QtSensors/QAmbientLightReading
-%{_includedir}/QtSensors/QAmbientLightSensor
-%{_includedir}/QtSensors/QCompass
-%{_includedir}/QtSensors/QCompassFilter
-%{_includedir}/QtSensors/QCompassReading
-%{_includedir}/QtSensors/QGyroscope
-%{_includedir}/QtSensors/QGyroscopeFilter
-%{_includedir}/QtSensors/QGyroscopeReading
-%{_includedir}/QtSensors/QLightFilter
-%{_includedir}/QtSensors/QLightReading
-%{_includedir}/QtSensors/QLightSensor
-%{_includedir}/QtSensors/QMagnetometer
-%{_includedir}/QtSensors/QMagnetometerFilter
-%{_includedir}/QtSensors/QMagnetometerReading
-%{_includedir}/QtSensors/QOrientationFilter
-%{_includedir}/QtSensors/QOrientationReading
-%{_includedir}/QtSensors/QOrientationSensor
-%{_includedir}/QtSensors/QProximityFilter
-%{_includedir}/QtSensors/QProximityReading
-%{_includedir}/QtSensors/QProximitySensor
-%{_includedir}/QtSensors/QRotationFilter
-%{_includedir}/QtSensors/QRotationReading
-%{_includedir}/QtSensors/QRotationSensor
-%{_includedir}/QtSensors/QSensor
-%{_includedir}/QtSensors/QSensorBackend
-%{_includedir}/QtSensors/QSensorBackendFactory
-%{_includedir}/QtSensors/QSensorChangesInterface
-%{_includedir}/QtSensors/QSensorFilter
-%{_includedir}/QtSensors/QSensorManager
-%{_includedir}/QtSensors/QSensorPluginInterface
-%{_includedir}/QtSensors/QSensorReading
-%{_includedir}/QtSensors/QTapFilter
-%{_includedir}/QtSensors/QTapReading
-%{_includedir}/QtSensors/QTapSensor
-%{_includedir}/QtServiceFramework/*.h
-%{_includedir}/QtServiceFramework/QAbstractSecuritySession
-%{_includedir}/QtServiceFramework/QRemoteServiceRegister
-%{_includedir}/QtServiceFramework/QService
-%{_includedir}/QtServiceFramework/QServiceContext
-%{_includedir}/QtServiceFramework/QServiceFilter
-%{_includedir}/QtServiceFramework/QServiceInterfaceDescriptor
-%{_includedir}/QtServiceFramework/QServiceManager
-%{_includedir}/QtServiceFramework/QServicePluginInterface
-%{_includedir}/QtSystemInfo/*.h
-%{_includedir}/QtSystemInfo/QSystemAlignedTimer
-%{_includedir}/QtSystemInfo/QSystemBatteryInfo
-%{_includedir}/QtSystemInfo/QSystemDeviceInfo
-%{_includedir}/QtSystemInfo/QSystemDisplayInfo
-%{_includedir}/QtSystemInfo/QSystemInfo
-%{_includedir}/QtSystemInfo/QSystemNetworkInfo
-%{_includedir}/QtSystemInfo/QSystemScreenSaver
-%{_includedir}/QtSystemInfo/QSystemStorageInfo
-%{_includedir}/QtVersit/*.h
-%{_includedir}/QtVersit/QVersitContactExporter
-%{_includedir}/QtVersit/QVersitContactExporterDetailHandler
-%{_includedir}/QtVersit/QVersitContactExporterDetailHandlerV2
-%{_includedir}/QtVersit/QVersitContactHandler
-%{_includedir}/QtVersit/QVersitContactHandlerFactory
-%{_includedir}/QtVersit/QVersitContactImporter
-%{_includedir}/QtVersit/QVersitContactImporterPropertyHandler
-%{_includedir}/QtVersit/QVersitContactImporterPropertyHandlerV2
-%{_includedir}/QtVersit/QVersitDefaultResourceHandler
-%{_includedir}/QtVersit/QVersitDocument
-%{_includedir}/QtVersit/QVersitProperty
-%{_includedir}/QtVersit/QVersitReader
-%{_includedir}/QtVersit/QVersitResourceHandler
-%{_includedir}/QtVersit/QVersitWriter
-%{_includedir}/QtVersitOrganizer/*.h
-%{_includedir}/QtVersitOrganizer/QVersitOrganizerExporter
-%{_includedir}/QtVersitOrganizer/QVersitOrganizerExporterDetailHandler
-%{_includedir}/QtVersitOrganizer/QVersitOrganizerHandler
-%{_includedir}/QtVersitOrganizer/QVersitOrganizerHandlerFactory
-%{_includedir}/QtVersitOrganizer/QVersitOrganizerImporter
-%{_includedir}/QtVersitOrganizer/QVersitOrganizerImporterPropertyHandler
-%{_includedir}/QtVersitOrganizer/QVersitTimeZoneHandler
-%{_libdir}/libQtConnectivity.prl
-%{_libdir}/libQtConnectivity.so
-%{_libdir}/libQtContacts.prl
-%{_libdir}/libQtContacts.so
-%{_libdir}/libQtFeedback.prl
-%{_libdir}/libQtFeedback.so
-%{_libdir}/libQtGallery.prl
-%{_libdir}/libQtGallery.so
-%{_libdir}/libQtLocation.prl
-%{_libdir}/libQtLocation.so
-%{_libdir}/libQtMessaging.prl
-%{_libdir}/libQtMessaging.so
-%{_libdir}/libQtMultimediaKit.prl
-%{_libdir}/libQtMultimediaKit.so
-%{_libdir}/libQtOrganizer.prl
-%{_libdir}/libQtOrganizer.so
-%{_libdir}/libQtPublishSubscribe.prl
-%{_libdir}/libQtPublishSubscribe.so
-%{_libdir}/libQtSensors.prl
-%{_libdir}/libQtSensors.so
-%{_libdir}/libQtServiceFramework.prl
-%{_libdir}/libQtServiceFramework.so
-%{_libdir}/libQtSystemInfo.prl
-%{_libdir}/libQtSystemInfo.so
-%{_libdir}/libQtVersit.prl
-%{_libdir}/libQtVersit.so
-%{_libdir}/libQtVersitOrganizer.prl
-%{_libdir}/libQtVersitOrganizer.so
-%{_libdir}/pkgconfig/QtConnectivity.pc
-%{_libdir}/pkgconfig/QtContacts.pc
-%{_libdir}/pkgconfig/QtFeedback.pc
-%{_libdir}/pkgconfig/QtGallery.pc
-%{_libdir}/pkgconfig/QtLocation.pc
-%{_libdir}/pkgconfig/QtMessaging.pc
-%{_libdir}/pkgconfig/QtMultimediaKit.pc
-%{_libdir}/pkgconfig/QtOrganizer.pc
-%{_libdir}/pkgconfig/QtPublishSubscribe.pc
-%{_libdir}/pkgconfig/QtSensors.pc
-%{_libdir}/pkgconfig/QtServiceFramework.pc
-%{_libdir}/pkgconfig/QtSystemInfo.pc
-%{_libdir}/pkgconfig/QtVersit.pc
-%{_libdir}/pkgconfig/QtVersitOrganizer.pc
-%{_datadir}/qt4/mkspecs/features/mobility.prf
-%{_datadir}/qt4/mkspecs/features/mobilityconfig.prf
-# << files devel
-
-%files -n libqtconnectivity1
-%defattr(-,root,root,-)
-# >> files libqtconnectivity1
-%{_libdir}/libQtConnectivity.so.*
-# << files libqtconnectivity1
-
-%files -n libqtcontacts1
-%defattr(-,root,root,-)
-# >> files libqtcontacts1
-%{_libdir}/libQtContacts.so.*
-%{_libdir}/qt4/plugins/contacts/libqtcontacts_serviceactionmanager.so
-# << files libqtcontacts1
-
-%files -n libqtfeedback1
-%defattr(-,root,root,-)
-# >> files libqtfeedback1
-%{_libdir}/libQtFeedback.so.*
-%{_libdir}/qt4/plugins/feedback/libqtfeedback_meegotouch.so
-%{_libdir}/qt4/plugins/feedback/libqtfeedback_mmk.so
-# << files libqtfeedback1
-
-%files -n libqtgallery1
-%defattr(-,root,root,-)
-# >> files libqtgallery1
-%{_libdir}/libQtGallery.so.*
-# << files libqtgallery1
-
-%files -n libqtlocation1
-%defattr(-,root,root,-)
-# >> files libqtlocation1
-%{_libdir}/libQtLocation.so.*
-%{_libdir}/qt4/plugins/geoservices/libqtgeoservices_nokia.so
-%{_libdir}/qt4/plugins/landmarks/libqtlandmarks_qsparql.so
-# << files libqtlocation1
-
-%files -n libqtmessaging1
-%defattr(-,root,root,-)
-# >> files libqtmessaging1
-%{_libdir}/libQtMessaging.so.*
-# << files libqtmessaging1
-
-%files -n libqtmultimediakit1
-%defattr(-,root,root,-)
-# >> files libqtmultimediakit1
-%{_libdir}/libQtMultimediaKit.so.*
-%{_libdir}/qt4/plugins/mediaservice/libqgstengine.so
-%{_libdir}/qt4/plugins/mediaservice/libqtmedia_v4lengine.so
-%{_libdir}/qt4/plugins/playlistformats/libqtmultimediakit_m3u.so
-%{_libdir}/qt4/plugins/audio/libqtmedia_pulse.so
-# << files libqtmultimediakit1
-
-%files -n libqtorganizer1
-%defattr(-,root,root,-)
-# >> files libqtorganizer1
-%{_libdir}/libQtOrganizer.so.*
-%{_libdir}/qt4/plugins/organizer/libqtorganizer_mkcal.so
-# << files libqtorganizer1
-
-%files -n libqtpublishsubscribe1
-%defattr(-,root,root,-)
-# >> files libqtpublishsubscribe1
-%{_libdir}/libQtPublishSubscribe.so.*
-# << files libqtpublishsubscribe1
-
-%files -n libqtsensors1
-%defattr(-,root,root,-)
-# >> files libqtsensors1
-%config %{_sysconfdir}/xdg/Nokia/Sensors.conf
-%{_libdir}/libQtSensors.so.*
-%{_libdir}/qt4/plugins/sensors/libqtsensors_generic.so
-%{_libdir}/qt4/plugins/sensors/libqtsensors_meego.so
-# << files libqtsensors1
-
-%files -n libqtserviceframework1
-%defattr(-,root,root,-)
-# >> files libqtserviceframework1
-%{_libdir}/libQtServiceFramework.so.*
-# << files libqtserviceframework1
-
-%files -n libqtsysteminfo1
-%defattr(-,root,root,-)
-# >> files libqtsysteminfo1
-%{_libdir}/libQtSystemInfo.so.*
-# << files libqtsysteminfo1
-
-%files -n libqtversit1
-%defattr(-,root,root,-)
-# >> files libqtversit1
-%{_libdir}/libQtVersit.so.*
-%{_libdir}/qt4/plugins/versit/libqtversit_backuphandler.so
-%{_libdir}/qt4/plugins/versit/libqtversit_vcardpreserver.so
-# << files libqtversit1
-
-%files -n libqtversitorganizer1
-%defattr(-,root,root,-)
-# >> files libqtversitorganizer1
-%{_libdir}/libQtVersitOrganizer.so.*
-# << files libqtversitorganizer1
-
-%files -n libdeclarative-contacts
-%defattr(-,root,root,-)
-# >> files libdeclarative-contacts
-%{_libdir}/qt4/imports/QtMobility/contacts/libdeclarative_contacts.so
-%{_libdir}/qt4/imports/QtMobility/contacts/qmldir
-# << files libdeclarative-contacts
-
-%files -n libdeclarative-feedback
-%defattr(-,root,root,-)
-# >> files libdeclarative-feedback
-%{_libdir}/qt4/imports/QtMobility/feedback/libdeclarative_feedback.so
-%{_libdir}/qt4/imports/QtMobility/feedback/qmldir
-# << files libdeclarative-feedback
-
-%files -n libdeclarative-gallery
-%defattr(-,root,root,-)
-# >> files libdeclarative-gallery
-%{_libdir}/qt4/imports/QtMobility/gallery/libdeclarative_gallery.so
-%{_libdir}/qt4/imports/QtMobility/gallery/qmldir
-# << files libdeclarative-gallery
-
-%files -n libdeclarative-location
-%defattr(-,root,root,-)
-# >> files libdeclarative-location
-%{_libdir}/qt4/imports/QtMobility/location/libdeclarative_location.so
-%{_libdir}/qt4/imports/QtMobility/location/qmldir
-# << files libdeclarative-location
-
-%files -n libdeclarative-messaging
-%defattr(-,root,root,-)
-# >> files libdeclarative-messaging
-%{_libdir}/qt4/imports/QtMobility/messaging/libdeclarative_messaging.so
-%{_libdir}/qt4/imports/QtMobility/messaging/qmldir
-# << files libdeclarative-messaging
-
-%files -n libdeclarative-multimedia
-%defattr(-,root,root,-)
-# >> files libdeclarative-multimedia
-%{_libdir}/qt4/imports/QtMultimediaKit/libdeclarative_multimedia.so
-%{_libdir}/qt4/imports/QtMultimediaKit/qmldir
-# << files libdeclarative-multimedia
-
-%files -n libdeclarative-organizer
-%defattr(-,root,root,-)
-# >> files libdeclarative-organizer
-%{_libdir}/qt4/imports/QtMobility/organizer/libdeclarative_organizer.so
-%{_libdir}/qt4/imports/QtMobility/organizer/qmldir
-# << files libdeclarative-organizer
-
-%files -n libdeclarative-publishsubscribe
-%defattr(-,root,root,-)
-# >> files libdeclarative-publishsubscribe
-%{_libdir}/qt4/imports/QtMobility/publishsubscribe/libdeclarative_publishsubscribe.so
-%{_libdir}/qt4/imports/QtMobility/publishsubscribe/qmldir
-# << files libdeclarative-publishsubscribe
-
-%files -n libdeclarative-sensors
-%defattr(-,root,root,-)
-# >> files libdeclarative-sensors
-%{_libdir}/qt4/imports/QtMobility/sensors/libdeclarative_sensors.so
-%{_libdir}/qt4/imports/QtMobility/sensors/qmldir
-# << files libdeclarative-sensors
-
-%files -n libdeclarative-serviceframework
-%defattr(-,root,root,-)
-# >> files libdeclarative-serviceframework
-%{_libdir}/qt4/imports/QtMobility/serviceframework/libdeclarative_serviceframework.so
-%{_libdir}/qt4/imports/QtMobility/serviceframework/qmldir
-# << files libdeclarative-serviceframework
-
-%files -n libdeclarative-systeminfo
-%defattr(-,root,root,-)
-# >> files libdeclarative-systeminfo
-%{_libdir}/qt4/imports/QtMobility/systeminfo/libdeclarative_systeminfo.so
-%{_libdir}/qt4/imports/QtMobility/systeminfo/qmldir
-# << files libdeclarative-systeminfo
-
-%files -n libdeclarative-connectivity
-%defattr(-,root,root,-)
-# >> files libdeclarative-connectivity
-%{_libdir}/qt4/imports/QtMobility/connectivity/libdeclarative_connectivity.so
-%{_libdir}/qt4/imports/QtMobility/connectivity/qmldir
-# << files libdeclarative-connectivity
-
-%files -n servicefw
-%defattr(-,root,root,-)
-# >> files servicefw
-%{_bindir}/servicefw
-# << files servicefw
-
-%files examples
-%defattr(-,root,root,-)
-# >> files examples
-%{_libdir}/qt4/plugins/sensors/libqtsensors_grueplugin.so
-%{_libdir}/qt4/plugins/serviceframework/libserviceframework_bluetoothtransferplugin.so
-%{_libdir}/qt4/plugins/serviceframework/libserviceframework_filemanagerplugin.so
-%{_libdir}/qt4/plugins/serviceframework/libserviceframework_landlinedialerservice.so
-%{_libdir}/qt4/plugins/serviceframework/libserviceframework_notesmanagerplugin.so
-%{_libdir}/qt4/plugins/serviceframework/libserviceframework_voipdialerservice.so
-%{_libdir}/qtmobility/demos/
-%{_libdir}/qtmobility/examples/
-# << files examples
-
-%files l10n
-%defattr(-,root,root,-)
-# >> files l10n
-%{_datadir}/qtmobility/translations/qtmobility_ar.qm
-%{_datadir}/qtmobility/translations/qtmobility_cs.qm
-%{_datadir}/qtmobility/translations/qtmobility_da.qm
-%{_datadir}/qtmobility/translations/qtmobility_de.qm
-%{_datadir}/qtmobility/translations/qtmobility_es.qm
-%{_datadir}/qtmobility/translations/qtmobility_fr.qm
-%{_datadir}/qtmobility/translations/qtmobility_he.qm
-%{_datadir}/qtmobility/translations/qtmobility_hu.qm
-%{_datadir}/qtmobility/translations/qtmobility_ja.qm
-%{_datadir}/qtmobility/translations/qtmobility_pl.qm
-%{_datadir}/qtmobility/translations/qtmobility_pt.qm
-%{_datadir}/qtmobility/translations/qtmobility_ru.qm
-%{_datadir}/qtmobility/translations/qtmobility_sk.qm
-%{_datadir}/qtmobility/translations/qtmobility_sl.qm
-%{_datadir}/qtmobility/translations/qtmobility_sv.qm
-#%{_datadir}/qtmobility/translations/qtmobility_uk.qm
-%{_datadir}/qtmobility/translations/qtmobility_zh_CN.qm
-%{_datadir}/qtmobility/translations/qtmobility_zh_TW.qm
-# << files l10n
-
diff --git a/src/meegoinstalls/qt-mobility.yaml b/src/meegoinstalls/qt-mobility.yaml
deleted file mode 100644
index 99c84c16c..000000000
--- a/src/meegoinstalls/qt-mobility.yaml
+++ /dev/null
@@ -1,353 +0,0 @@
-Name: qt-mobility
-Summary: APIs for mobile device functionality
-Version: 1.1.0+git2438
-Release: 1
-Group: System/Libraries
-License: LGPLv2.1 with exception or GPLv3
-URL: http://qt.gitorious.org/qt-mobility
-Sources:
-    - http://get.qt.nokia.com/qt/add-ons/%{name}-opensource-src-%{version}.tar.gz
-SourcePrefix: "%{name}-opensource-src-%{version}"
-Patches:
-Description: |
-    Qt Mobility delivers a set of new APIs for mobile device functionality. These
-    APIs allow the developer to use these features with ease from one framework and
-    apply them to phones, netbooks and non-mobile personal computers.
-Requires:
-    - libqtconnectivity1 = %{version}
-    - libqtcontacts1 = %{version}
-    - libqtfeedback1 = %{version}
-    - libqtgallery1 = %{version}
-    - libqtlocation1 = %{version}
-    - libqtmessaging1 = %{version}
-    - libqtmultimediakit1 = %{version}
-    - libqtorganizer1 = %{version}
-    - libqtpublishsubscribe1 = %{version}
-    - libqtsensors1 = %{version}
-    - libqtserviceframework1 = %{version}
-    - libqtsysteminfo1 = %{version}
-    - libqtversit1 = %{version}
-    - libqtversitorganizer1 = %{version}
-PkgConfigBR:
-    - QtGui
-    - QtOpenGL
-    - alsa
-    - blkid
-    - bluez
-    - connman
-    - contextsubscriber-1.0
-    - gconf-2.0
-    - geoclue
-    - gstreamer-plugins-bad-free-0.10
-    - gstreamer-plugins-base-0.10
-    - gypsy
-    - libiphb
-    - libpulse
-    - libmkcal
-    - meegotouch
-    - qttracker
-    - qmfclient
-    - sensord
-    - udev
-    - x11
-    - xext
-    - xrandr
-    - xrender
-    - xv
-    - QtSparql
-    - QtSparqlTrackerExtensions
-PkgBR:
-    - qt-devel-tools
-Configure: none
-Builder: none
-RunFdupes: "%{_datadir}/qtmobility/translations"
-SubPackages:
-    - Name: devel
-      Summary: APIs for mobile device functionality - development files
-      Group: Development/Libraries
-      Description: |
-          Qt Mobility delivers a set of new APIs for mobile device functionality.
-
-          This package contains the development files needed to build Qt applications
-          using Qt Mobility libraries.
-      Requires:
-          - servicefw
-
-    - Name: libqtconnectivity1
-      AsWholeName: yes
-      Summary: Qt Mobility Connectivity module
-      Group: System/Libraries
-      Description: |
-          Qt Mobility delivers a set of new APIs for mobile device functionality.
-
-          This package contains the Connectivity API. It provides APIs for working with
-          local devices.
-
-    - Name: libqtcontacts1
-      AsWholeName: yes
-      Summary: Qt Mobility Contacts module
-      Group: System/Libraries
-      Description: |
-          Qt Mobility delivers a set of new APIs for mobile device functionality.
-
-          This package contains an API enabling clients to request contact data from
-          local or remote backends.
-
-    - Name: libqtfeedback1
-      AsWholeName: yes
-      Summary: Qt Mobility Feedback module
-      Group: System/Libraries
-      Description: |
-          Qt Mobility delivers a set of new APIs for mobile device functionality.
-
-          This package contains the Feedback API. It enables a client to control
-          the vibration of the device or the piezo feedback from the screen.
-
-    - Name: libqtgallery1
-      AsWholeName: yes
-      Summary: Qt Mobility Document Gallery module
-      Group: System/Libraries
-      Description: |
-          Qt Mobility delivers a set of new APIs for mobile device functionality.
-
-          This package contains an API for accessing collections of documents and media
-          and their meta-data.
-
-    - Name: libqtlocation1
-      AsWholeName: yes
-      Summary: Qt Mobility Location module
-      Group: System/Libraries
-      Description: |
-          Qt Mobility delivers a set of new APIs for mobile device functionality.
-
-          This package contains the Location API. It provides a library for distributing
-          and receiving location data using arbitrary data sources.
-
-    - Name: libqtmessaging1
-      AsWholeName: yes
-      Summary: Qt Mobility Messaging module
-      Group: System/Libraries
-      Description: |
-          Qt Mobility delivers a set of new APIs for mobile device functionality.
-
-          This package contains the Messaging API. It is a common interface for handling
-          SMS, MMS, MIME Email and TNEF Email messages.
-
-    - Name: libqtmultimediakit1
-      AsWholeName: yes
-      Summary: Qt Mobility MultimediaKit module
-      Group: System/Libraries
-      Description: |
-          Qt Mobility delivers a set of new APIs for mobile device functionality.
-
-          This package contains a set of APIs to play and record media, and manage a
-          collection of media content.
-
-    - Name: libqtorganizer1
-      AsWholeName: yes
-      Summary: Qt Mobility Organizer module
-      Group: System/Libraries
-      Description: |
-          Qt Mobility delivers a set of new APIs for mobile device functionality.
-
-          This package contains an API for management of calendar, scheduling and
-          personal data from local or remote backends. It includes the ability to create,
-          edit, list, delete and lookup organizer information whether it is stored
-          locally or remotely.
-
-    - Name: libqtpublishsubscribe1
-      AsWholeName: yes
-      Summary: Qt Mobility Publish and Subscribe module
-      Group: System/Libraries
-      Description: |
-          Qt Mobility delivers a set of new APIs for mobile device functionality.
-
-          This package contains the Publish and Subscribe API (containing Value Space).
-          It enables applications to read item values, navigate through and subscribe to
-          change notifications.
-
-    - Name: libqtsensors1
-      AsWholeName: yes
-      Summary: Qt Mobility Sensors module
-      Group: System/Libraries
-      Description: |
-          Qt Mobility delivers a set of new APIs for mobile device functionality.
-
-          This package contains the Sensors API. It provides access to sensors.
-      Requires:
-          - libqtsql4-sqlite
-          - sensorfw
-
-    - Name: libqtserviceframework1
-      AsWholeName: yes
-      Summary: Qt Mobility Service Framework module
-      Group: System/Libraries
-      Description: |
-          Qt Mobility delivers a set of new APIs for mobile device functionality.
-
-          This package contains a set of APIs to that allows clients to discover and
-          instantiate arbitrary services.
-
-    - Name: libqtsysteminfo1
-      AsWholeName: yes
-      Summary: Qt Mobility System Information module
-      Group: System/Libraries
-      Description: |
-          Qt Mobility delivers a set of new APIs for mobile device functionality.
-
-          This package contains a set of APIs to discover system related information and
-          capabilities.
-
-    - Name: libqtversit1
-      AsWholeName: yes
-      Summary: Qt Mobility Versit (vCard) module
-      Group: System/Libraries
-      Description: |
-          Qt Mobility delivers a set of new APIs for mobile device functionality.
-
-          This package contains an API to manage Versit documents, such as vCards.
-
-    - Name: libqtversitorganizer1
-      AsWholeName: yes
-      Summary: Qt Mobility Versit (Organizer) module
-      Group: System/Libraries
-      Description: |
-          Qt Mobility delivers a set of new APIs for mobile device functionality.
-
-          This package contains an API to manage Versit documents, such as iCalendar
-          documents. It interfaces the Organizer API and uses the same framework as for
-          vCards.
-
-    - Name: libdeclarative-contacts
-      AsWholeName: yes
-      Summary: Qt Mobility Contacts QML plugin
-      Group: System/Libraries
-      Description: |
-          Qt Mobility delivers a set of new APIs for mobile device functionality.
-
-          This package contains the Contacts QML plugin for QtDeclarative.
-
-    - Name: libdeclarative-feedback
-      AsWholeName: yes
-      Summary: Qt Mobility Feedback QML plugin
-      Group: System/Libraries
-      Description: |
-          Qt Mobility delivers a set of new APIs for mobile device functionality.
-
-          This package contains the Feedback QML plugin for QtDeclarative.
-
-    - Name: libdeclarative-gallery
-      AsWholeName: yes
-      Summary: Qt Mobility Document Gallery QML plugin
-      Group: System/Libraries
-      Description: |
-          Qt Mobility delivers a set of new APIs for mobile device functionality.
-
-          This package contains the Document Gallery QML plugin for QtDeclarative.
-
-    - Name: libdeclarative-location
-      AsWholeName: yes
-      Summary: Qt Mobility Location QML plugin
-      Group: System/Libraries
-      Description: |
-          Qt Mobility delivers a set of new APIs for mobile device functionality.
-
-          This package contains the Location QML plugin for QtDeclarative.
-
-    - Name: libdeclarative-messaging
-      AsWholeName: yes
-      Summary: Qt Mobility Messaging QML plugin
-      Group: System/Libraries
-      Description: |
-          Qt Mobility delivers a set of new APIs for mobile device functionality.
-
-          This package contains the Messaging QML plugin for QtDeclarative.
-
-    - Name: libdeclarative-multimedia
-      AsWholeName: yes
-      Summary: Qt Mobility Multimedia QML plugin
-      Group: System/Libraries
-      Description: |
-          Qt Mobility delivers a set of new APIs for mobile device functionality.
-
-          This package contains the Multimedia QML plugin for QtDeclarative.
-
-    - Name: libdeclarative-organizer
-      AsWholeName: yes
-      Summary: Qt Mobility Organizer QML plugin
-      Group: System/Libraries
-      Description: |
-          Qt Mobility delivers a set of new APIs for mobile device functionality.
-
-          This package contains the Organizer QML plugin for QtDeclarative.
-
-    - Name: libdeclarative-publishsubscribe
-      AsWholeName: yes
-      Summary: Qt Mobility Publish and Subscribe QML plugin
-      Group: System/Libraries
-      Description: |
-          Qt Mobility delivers a set of new APIs for mobile device functionality.
-
-          This package contains the Publish and Subscribe QML plugin for QtDeclarative.
-
-    - Name: libdeclarative-sensors
-      AsWholeName: yes
-      Summary: Qt Mobility Sensors Framework QML plugin
-      Group: System/Libraries
-      Description: |
-          Qt Mobility delivers a set of new APIs for mobile device functionality.
-
-          This package contains the Sensors QML plugin for QtDeclarative.
-
-    - Name: libdeclarative-serviceframework
-      AsWholeName: yes
-      Summary: Qt Mobility Service Framework QML plugin
-      Group: System/Libraries
-      Description: |
-          Qt Mobility delivers a set of new APIs for mobile device functionality.
-
-          This package contains the Service Framework QML plugin for QtDeclarative.
-
-    - Name: libdeclarative-systeminfo
-      AsWholeName: yes
-      Summary: Qt Mobility System Information QML plugin
-      Group: System/Libraries
-      Description: |
-          Qt Mobility delivers a set of new APIs for mobile device functionality.
-
-          This package contains the System Information QML plugin for QtDeclarative.
-
-    - Name: libdeclarative-connectivity
-      AsWholeName: yes
-      Summary: Qt Mobility Connectivity QML plugin
-      Group: System/Libraries
-      Description: |
-          Qt Mobility delivers a set of new APIs for mobile device functionality.
-
-          This package contains the Connectivity QML plugin for QtDeclarative.
-
-    - Name: servicefw
-      AsWholeName: yes
-      Summary: Qt Mobility Service Framework tool
-      Group: Development/Tools
-      Description: |
-          Qt Mobility delivers a set of new APIs for mobile device functionality.
-
-          This package contains the Service Framework tool (servicefw). It allows
-          to register services and make them available over the Service Framework.
-
-    - Name: examples
-      Summary: Qt Mobility examples
-      Group: System/X11
-      Description: |
-          Qt Mobility delivers a set of new APIs for mobile device functionality.
-
-          This package contains Qt Mobility examples.
-
-    - Name: l10n
-      Summary: APIs for mobile device functionality - localization files
-      Group: System/I18n
-      Description: |
-          Qt Mobility delivers a set of new APIs for mobile device functionality.
-
-          This package contains Qt Mobility translations.
diff --git a/src/multimediakit/audio/audio.pri b/src/multimedia/audio/audio.pri
index 4bedbd4d5..4bedbd4d5 100644
--- a/src/multimediakit/audio/audio.pri
+++ b/src/multimedia/audio/audio.pri
diff --git a/src/multimediakit/audio/qaudio.cpp b/src/multimedia/audio/qaudio.cpp
index cc422cedd..bb18f8448 100644
--- a/src/multimediakit/audio/qaudio.cpp
+++ b/src/multimedia/audio/qaudio.cpp
@@ -65,7 +65,7 @@ public:
 /*
     \namespace QAudio
     \brief The QAudio namespace contains enums used by the audio classes.
-    \inmodule QtMultimediaKit
+    \inmodule QtMultimedia
     \ingroup multimedia
 */
 
diff --git a/src/multimediakit/audio/qaudio.h b/src/multimedia/audio/qaudio.h
index 16accfef9..fff1094c0 100644
--- a/src/multimediakit/audio/qaudio.h
+++ b/src/multimedia/audio/qaudio.h
@@ -43,7 +43,7 @@
 #ifndef QAUDIO_H
 #define QAUDIO_H
 
-#include <qtmultimediakitdefs.h>
+#include <qtmultimediadefs.h>
 #include <qtmedianamespace.h>
 
 #include <QtCore/qmetatype.h>
diff --git a/src/multimediakit/audio/qaudio_mac.cpp b/src/multimedia/audio/qaudio_mac.cpp
index 461508304..461508304 100644
--- a/src/multimediakit/audio/qaudio_mac.cpp
+++ b/src/multimedia/audio/qaudio_mac.cpp
diff --git a/src/multimediakit/audio/qaudio_mac_p.h b/src/multimedia/audio/qaudio_mac_p.h
index 06ce43010..06ce43010 100644
--- a/src/multimediakit/audio/qaudio_mac_p.h
+++ b/src/multimedia/audio/qaudio_mac_p.h
diff --git a/src/multimediakit/audio/qaudiodevicefactory.cpp b/src/multimedia/audio/qaudiodevicefactory.cpp
index 19071e78f..19071e78f 100644
--- a/src/multimediakit/audio/qaudiodevicefactory.cpp
+++ b/src/multimedia/audio/qaudiodevicefactory.cpp
diff --git a/src/multimediakit/audio/qaudiodevicefactory_p.h b/src/multimedia/audio/qaudiodevicefactory_p.h
index 16ddb573a..26b3a48e5 100644
--- a/src/multimediakit/audio/qaudiodevicefactory_p.h
+++ b/src/multimedia/audio/qaudiodevicefactory_p.h
@@ -56,7 +56,7 @@
 #include <QtCore/qbytearray.h>
 #include <QtCore/qlist.h>
 
-#include <qtmultimediakitdefs.h>
+#include <qtmultimediadefs.h>
 #include <qtmedianamespace.h>
 
 #include "qaudiodeviceinfo.h"
diff --git a/src/multimediakit/audio/qaudiodeviceinfo.cpp b/src/multimedia/audio/qaudiodeviceinfo.cpp
index 6b6f7951e..f45805dbc 100644
--- a/src/multimediakit/audio/qaudiodeviceinfo.cpp
+++ b/src/multimedia/audio/qaudiodeviceinfo.cpp
@@ -93,7 +93,7 @@ public:
 /*!
     \class QAudioDeviceInfo
     \brief The QAudioDeviceInfo class provides an interface to query audio devices and their functionality.
-    \inmodule QtMultimediaKit
+    \inmodule QtMultimedia
     \ingroup multimedia
 
     QAudioDeviceInfo lets you query for audio devices--such as sound
diff --git a/src/multimediakit/audio/qaudiodeviceinfo.h b/src/multimedia/audio/qaudiodeviceinfo.h
index e8616ce35..f16122b4d 100644
--- a/src/multimediakit/audio/qaudiodeviceinfo.h
+++ b/src/multimedia/audio/qaudiodeviceinfo.h
@@ -49,7 +49,7 @@
 #include <QtCore/qstringlist.h>
 #include <QtCore/qlist.h>
 
-#include <qtmultimediakitdefs.h>
+#include <qtmultimediadefs.h>
 #include <qtmedianamespace.h>
 
 #include <qaudio.h>
diff --git a/src/multimediakit/audio/qaudiodeviceinfo_alsa_p.cpp b/src/multimedia/audio/qaudiodeviceinfo_alsa_p.cpp
index 113b330d4..113b330d4 100644
--- a/src/multimediakit/audio/qaudiodeviceinfo_alsa_p.cpp
+++ b/src/multimedia/audio/qaudiodeviceinfo_alsa_p.cpp
diff --git a/src/multimediakit/audio/qaudiodeviceinfo_alsa_p.h b/src/multimedia/audio/qaudiodeviceinfo_alsa_p.h
index cf19d2554..cf19d2554 100644
--- a/src/multimediakit/audio/qaudiodeviceinfo_alsa_p.h
+++ b/src/multimedia/audio/qaudiodeviceinfo_alsa_p.h
diff --git a/src/multimediakit/audio/qaudiodeviceinfo_mac_p.cpp b/src/multimedia/audio/qaudiodeviceinfo_mac_p.cpp
index 4c7779f91..4c7779f91 100644
--- a/src/multimediakit/audio/qaudiodeviceinfo_mac_p.cpp
+++ b/src/multimedia/audio/qaudiodeviceinfo_mac_p.cpp
diff --git a/src/multimediakit/audio/qaudiodeviceinfo_mac_p.h b/src/multimedia/audio/qaudiodeviceinfo_mac_p.h
index 3b9ca4676..3b9ca4676 100644
--- a/src/multimediakit/audio/qaudiodeviceinfo_mac_p.h
+++ b/src/multimedia/audio/qaudiodeviceinfo_mac_p.h
diff --git a/src/multimediakit/audio/qaudiodeviceinfo_win32_p.cpp b/src/multimedia/audio/qaudiodeviceinfo_win32_p.cpp
index 10b9b777d..10b9b777d 100644
--- a/src/multimediakit/audio/qaudiodeviceinfo_win32_p.cpp
+++ b/src/multimedia/audio/qaudiodeviceinfo_win32_p.cpp
diff --git a/src/multimediakit/audio/qaudiodeviceinfo_win32_p.h b/src/multimedia/audio/qaudiodeviceinfo_win32_p.h
index 2d4e27106..2d4e27106 100644
--- a/src/multimediakit/audio/qaudiodeviceinfo_win32_p.h
+++ b/src/multimedia/audio/qaudiodeviceinfo_win32_p.h
diff --git a/src/multimediakit/audio/qaudioformat.cpp b/src/multimedia/audio/qaudioformat.cpp
index 833928f8c..6ed72516c 100644
--- a/src/multimediakit/audio/qaudioformat.cpp
+++ b/src/multimedia/audio/qaudioformat.cpp
@@ -92,7 +92,7 @@ public:
     \class QAudioFormat
     \brief The QAudioFormat class stores audio stream parameter information.
 
-    \inmodule QtMultimediaKit
+    \inmodule QtMultimedia
     \ingroup  multimedia
     \since 1.0
 
diff --git a/src/multimediakit/audio/qaudioformat.h b/src/multimedia/audio/qaudioformat.h
index c6600cdcf..087a16a9d 100644
--- a/src/multimediakit/audio/qaudioformat.h
+++ b/src/multimedia/audio/qaudioformat.h
@@ -46,7 +46,7 @@
 #include <QtCore/qobject.h>
 #include <QtCore/qshareddata.h>
 
-#include <qtmultimediakitdefs.h>
+#include <qtmultimediadefs.h>
 #include <qtmedianamespace.h>
 
 QT_BEGIN_HEADER
diff --git a/src/multimediakit/audio/qaudioinput.cpp b/src/multimedia/audio/qaudioinput.cpp
index 4a6bfaefd..2a5cefcc5 100644
--- a/src/multimediakit/audio/qaudioinput.cpp
+++ b/src/multimedia/audio/qaudioinput.cpp
@@ -53,7 +53,7 @@ QT_BEGIN_NAMESPACE
     \class QAudioInput
     \brief The QAudioInput class provides an interface for receiving audio data from an audio input device.
 
-    \inmodule QtMultimediaKit
+    \inmodule QtMultimedia
     \ingroup  multimedia
     \since 1.0
 
diff --git a/src/multimediakit/audio/qaudioinput.h b/src/multimedia/audio/qaudioinput.h
index 8684a10fe..9c893ce95 100644
--- a/src/multimediakit/audio/qaudioinput.h
+++ b/src/multimedia/audio/qaudioinput.h
@@ -45,7 +45,7 @@
 
 #include <QtCore/qiodevice.h>
 
-#include <qtmultimediakitdefs.h>
+#include <qtmultimediadefs.h>
 #include <qtmedianamespace.h>
 
 #include <qaudio.h>
diff --git a/src/multimediakit/audio/qaudioinput_alsa_p.cpp b/src/multimedia/audio/qaudioinput_alsa_p.cpp
index 044458cd0..044458cd0 100644
--- a/src/multimediakit/audio/qaudioinput_alsa_p.cpp
+++ b/src/multimedia/audio/qaudioinput_alsa_p.cpp
diff --git a/src/multimediakit/audio/qaudioinput_alsa_p.h b/src/multimedia/audio/qaudioinput_alsa_p.h
index a05f6954d..a05f6954d 100644
--- a/src/multimediakit/audio/qaudioinput_alsa_p.h
+++ b/src/multimedia/audio/qaudioinput_alsa_p.h
diff --git a/src/multimediakit/audio/qaudioinput_mac_p.cpp b/src/multimedia/audio/qaudioinput_mac_p.cpp
index 5a4053220..184935add 100644
--- a/src/multimediakit/audio/qaudioinput_mac_p.cpp
+++ b/src/multimedia/audio/qaudioinput_mac_p.cpp
@@ -63,7 +63,7 @@
 QT_BEGIN_NAMESPACE
 
 
-namespace QtMultimediaKitInternal
+namespace QtMultimediaInternal
 {
 
 static const int default_buffer_size = 4 * 1024;
@@ -526,7 +526,7 @@ QAudioInputPrivate::QAudioInputPrivate(const QByteArray& device)
         startTime = 0;
         totalFrames = 0;
         audioBuffer = 0;
-        internalBufferSize = QtMultimediaKitInternal::default_buffer_size;
+        internalBufferSize = QtMultimediaInternal::default_buffer_size;
         clockFrequency = AudioGetHostClockFrequency() / 1000;
         errorCode = QAudio::NoError;
         stateCode = QAudio::StoppedState;
@@ -677,13 +677,13 @@ bool QAudioInputPrivate::open()
     else
         internalBufferSize -= internalBufferSize % streamFormat.mBytesPerFrame;
 
-    audioBuffer = new QtMultimediaKitInternal::QAudioInputBuffer(internalBufferSize,
+    audioBuffer = new QtMultimediaInternal::QAudioInputBuffer(internalBufferSize,
                                         periodSizeBytes,
                                         deviceFormat,
                                         streamFormat,
                                         this);
 
-    audioIO = new QtMultimediaKitInternal::MacInputDevice(audioBuffer, this);
+    audioIO = new QtMultimediaInternal::MacInputDevice(audioBuffer, this);
 
     // Init
     if (AudioUnitInitialize(audioUnit) != noErr) {
diff --git a/src/multimediakit/audio/qaudioinput_mac_p.h b/src/multimedia/audio/qaudioinput_mac_p.h
index 99e8ad061..99aaba978 100644
--- a/src/multimediakit/audio/qaudioinput_mac_p.h
+++ b/src/multimedia/audio/qaudioinput_mac_p.h
@@ -79,7 +79,7 @@ class QTimer;
 class QIODevice;
 class QAbstractAudioDeviceInfo;
 
-namespace QtMultimediaKitInternal
+namespace QtMultimediaInternal
 {
 class QAudioInputBuffer;
 }
@@ -101,7 +101,7 @@ public:
     UInt64          startTime;
     QAudio::Error   errorCode;
     QAudio::State   stateCode;
-    QtMultimediaKitInternal::QAudioInputBuffer*   audioBuffer;
+    QtMultimediaInternal::QAudioInputBuffer*   audioBuffer;
     QMutex          mutex;
     QWaitCondition  threadFinished;
     QAtomicInt      audioThreadState;
diff --git a/src/multimediakit/audio/qaudioinput_win32_p.cpp b/src/multimedia/audio/qaudioinput_win32_p.cpp
index 718656ba3..718656ba3 100644
--- a/src/multimediakit/audio/qaudioinput_win32_p.cpp
+++ b/src/multimedia/audio/qaudioinput_win32_p.cpp
diff --git a/src/multimediakit/audio/qaudioinput_win32_p.h b/src/multimedia/audio/qaudioinput_win32_p.h
index 10d41a552..10d41a552 100644
--- a/src/multimediakit/audio/qaudioinput_win32_p.h
+++ b/src/multimedia/audio/qaudioinput_win32_p.h
diff --git a/src/multimediakit/audio/qaudiooutput.cpp b/src/multimedia/audio/qaudiooutput.cpp
index d4a2d7fed..05db98bd6 100644
--- a/src/multimediakit/audio/qaudiooutput.cpp
+++ b/src/multimedia/audio/qaudiooutput.cpp
@@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE
     \class QAudioOutput
     \brief The QAudioOutput class provides an interface for sending audio data to an audio output device.
 
-    \inmodule QtMultimediaKit
+    \inmodule QtMultimedia
     \ingroup  multimedia
     \since 1.0
 
diff --git a/src/multimediakit/audio/qaudiooutput.h b/src/multimedia/audio/qaudiooutput.h
index f146c800a..3edec1b4a 100644
--- a/src/multimediakit/audio/qaudiooutput.h
+++ b/src/multimedia/audio/qaudiooutput.h
@@ -45,7 +45,7 @@
 
 #include <QtCore/qiodevice.h>
 
-#include <qtmultimediakitdefs.h>
+#include <qtmultimediadefs.h>
 #include <qtmedianamespace.h>
 
 #include <qaudio.h>
diff --git a/src/multimediakit/audio/qaudiooutput_alsa_p.cpp b/src/multimedia/audio/qaudiooutput_alsa_p.cpp
index 8ef4e2819..8ef4e2819 100644
--- a/src/multimediakit/audio/qaudiooutput_alsa_p.cpp
+++ b/src/multimedia/audio/qaudiooutput_alsa_p.cpp
diff --git a/src/multimediakit/audio/qaudiooutput_alsa_p.h b/src/multimedia/audio/qaudiooutput_alsa_p.h
index f914ded2c..f914ded2c 100644
--- a/src/multimediakit/audio/qaudiooutput_alsa_p.h
+++ b/src/multimedia/audio/qaudiooutput_alsa_p.h
diff --git a/src/multimediakit/audio/qaudiooutput_mac_p.cpp b/src/multimedia/audio/qaudiooutput_mac_p.cpp
index cace401d6..5e0c1cb07 100644
--- a/src/multimediakit/audio/qaudiooutput_mac_p.cpp
+++ b/src/multimedia/audio/qaudiooutput_mac_p.cpp
@@ -70,7 +70,7 @@
 QT_BEGIN_NAMESPACE
 
 
-namespace QtMultimediaKitInternal
+namespace QtMultimediaInternal
 {
 
 static const int default_buffer_size = 8 * 1024;
@@ -243,7 +243,7 @@ class MacOutputDevice : public QIODevice
     Q_OBJECT
 
 public:
-    MacOutputDevice(QtMultimediaKitInternal::QAudioOutputBuffer* audioBuffer, QObject* parent):
+    MacOutputDevice(QtMultimediaInternal::QAudioOutputBuffer* audioBuffer, QObject* parent):
         QIODevice(parent),
         m_audioBuffer(audioBuffer)
     {
@@ -269,7 +269,7 @@ public:
     }
 
 private:
-    QtMultimediaKitInternal::QAudioOutputBuffer*    m_audioBuffer;
+    QtMultimediaInternal::QAudioOutputBuffer*    m_audioBuffer;
 };
 
 
@@ -291,7 +291,7 @@ QAudioOutputPrivate::QAudioOutputPrivate(const QByteArray& device)
         startTime = 0;
         totalFrames = 0;
         audioBuffer = 0;
-        internalBufferSize = QtMultimediaKitInternal::default_buffer_size;
+        internalBufferSize = QtMultimediaInternal::default_buffer_size;
         clockFrequency = AudioGetHostClockFrequency() / 1000;
         errorCode = QAudio::NoError;
         stateCode = QAudio::StoppedState;
@@ -395,7 +395,7 @@ bool QAudioOutputPrivate::open()
     else
         internalBufferSize -= internalBufferSize % streamFormat.mBytesPerFrame;
 
-    audioBuffer = new QtMultimediaKitInternal::QAudioOutputBuffer(internalBufferSize, periodSizeBytes, audioFormat);
+    audioBuffer = new QtMultimediaInternal::QAudioOutputBuffer(internalBufferSize, periodSizeBytes, audioFormat);
     connect(audioBuffer, SIGNAL(readyRead()), SLOT(inputReady()));  // Pull
 
     audioIO = new MacOutputDevice(audioBuffer, this);
diff --git a/src/multimediakit/audio/qaudiooutput_mac_p.h b/src/multimedia/audio/qaudiooutput_mac_p.h
index d1cf680b1..ded618cbb 100644
--- a/src/multimediakit/audio/qaudiooutput_mac_p.h
+++ b/src/multimedia/audio/qaudiooutput_mac_p.h
@@ -78,7 +78,7 @@ QT_MODULE(Multimedia)
 class QIODevice;
 class QAbstractAudioDeviceInfo;
 
-namespace QtMultimediaKitInternal
+namespace QtMultimediaInternal
 {
 class QAudioOutputBuffer;
 }
@@ -100,7 +100,7 @@ public:
     UInt64          startTime;
     AudioStreamBasicDescription deviceFormat;
     AudioStreamBasicDescription streamFormat;
-    QtMultimediaKitInternal::QAudioOutputBuffer*   audioBuffer;
+    QtMultimediaInternal::QAudioOutputBuffer*   audioBuffer;
     QAtomicInt      audioThreadState;
     QWaitCondition  threadFinished;
     QMutex          mutex;
diff --git a/src/multimediakit/audio/qaudiooutput_win32_p.cpp b/src/multimedia/audio/qaudiooutput_win32_p.cpp
index d5b31a30f..d5b31a30f 100644
--- a/src/multimediakit/audio/qaudiooutput_win32_p.cpp
+++ b/src/multimedia/audio/qaudiooutput_win32_p.cpp
diff --git a/src/multimediakit/audio/qaudiooutput_win32_p.h b/src/multimedia/audio/qaudiooutput_win32_p.h
index aa86d4e9b..aa86d4e9b 100644
--- a/src/multimediakit/audio/qaudiooutput_win32_p.h
+++ b/src/multimedia/audio/qaudiooutput_win32_p.h
diff --git a/src/multimediakit/audio/qaudiopluginloader.cpp b/src/multimedia/audio/qaudiopluginloader.cpp
index 58006356a..58006356a 100644
--- a/src/multimediakit/audio/qaudiopluginloader.cpp
+++ b/src/multimedia/audio/qaudiopluginloader.cpp
diff --git a/src/multimediakit/audio/qaudiopluginloader_p.h b/src/multimedia/audio/qaudiopluginloader_p.h
index a0f130fd1..2e6fdbdd7 100644
--- a/src/multimediakit/audio/qaudiopluginloader_p.h
+++ b/src/multimedia/audio/qaudiopluginloader_p.h
@@ -53,7 +53,7 @@
 // We mean it.
 //
 
-#include <qtmultimediakitdefs.h>
+#include <qtmultimediadefs.h>
 #include <QObject>
 #include <QtCore/qstring.h>
 #include <QtCore/qmap.h>
diff --git a/src/multimediakit/audio/qaudiosystem.cpp b/src/multimedia/audio/qaudiosystem.cpp
index 0c0475e1c..a8837b06f 100644
--- a/src/multimediakit/audio/qaudiosystem.cpp
+++ b/src/multimedia/audio/qaudiosystem.cpp
@@ -48,7 +48,7 @@ QT_BEGIN_NAMESPACE
     \brief The QAbstractAudioDeviceInfo class is a base class for audio backends.
 
     \ingroup multimedia
-    \inmodule QtMultimediaKit
+    \inmodule QtMultimedia
     \internal
     \since 1.0
 
@@ -123,7 +123,7 @@ QT_BEGIN_NAMESPACE
     \since 1.0
 
     \ingroup multimedia
-    \inmodule QtMultimediaKit
+    \inmodule QtMultimedia
     \internal
 
     QAbstractAudioOutput implements audio functionality for
@@ -287,7 +287,7 @@ QT_BEGIN_NAMESPACE
     \since 1.0
 
     \ingroup multimedia
-    \inmodule QtMultimediaKit
+    \inmodule QtMultimedia
     \internal
 
     QAudioDeviceInput keeps an instance of QAbstractAudioInput and
diff --git a/src/multimediakit/audio/qaudiosystem.h b/src/multimedia/audio/qaudiosystem.h
index 72dbffa47..59b4eb432 100644
--- a/src/multimediakit/audio/qaudiosystem.h
+++ b/src/multimedia/audio/qaudiosystem.h
@@ -42,7 +42,7 @@
 #ifndef QAUDIOSYSTEM_H
 #define QAUDIOSYSTEM_H
 
-#include <qtmultimediakitdefs.h>
+#include <qtmultimediadefs.h>
 #include <qtmedianamespace.h>
 
 #include "qaudio.h"
diff --git a/src/multimediakit/audio/qaudiosystemplugin.cpp b/src/multimedia/audio/qaudiosystemplugin.cpp
index 3347a6d44..5cbcf1d60 100644
--- a/src/multimediakit/audio/qaudiosystemplugin.cpp
+++ b/src/multimedia/audio/qaudiosystemplugin.cpp
@@ -50,7 +50,7 @@ QT_BEGIN_NAMESPACE
     \since 1.0
 
     \ingroup multimedia
-    \inmodule QtMultimediaKit
+    \inmodule QtMultimedia
     \internal
 
     Writing a audio plugin is achieved by subclassing this base class,
@@ -63,7 +63,7 @@ QT_BEGIN_NAMESPACE
     \sa QAbstractAudioDeviceInfo, QAbstractAudioOutput, QAbstractAudioInput
 
     Qt supports win32, linux(alsa) and Mac OS X standard (builtin to the
-    QtMultimediaKit library at compile time).
+    QtMultimedia library at compile time).
 
     You can support other backends other than these predefined ones by
     creating a plugin subclassing QAudioSystemPlugin, QAbstractAudioDeviceInfo,
@@ -73,11 +73,11 @@ QT_BEGIN_NAMESPACE
     audio device to be provided by your plugin.
 
     -audio-backend configure option will force compiling in of the builtin backend
-    into the QtMultimediaKit library at compile time. This is automatic by default
+    into the QtMultimedia library at compile time. This is automatic by default
     and will only be compiled into the library if the dependencies are installed.
     eg. alsa-devel package installed for linux.
 
-    If the builtin backend is not compiled into the QtMultimediaKit library and
+    If the builtin backend is not compiled into the QtMultimedia library and
     no audio plugins are available a fallback dummy backend will be used.
     This should print out warnings if this is the case when you try and use QAudioInput or QAudioOutput. To fix this problem
     reconfigure Qt using -audio-backend or create your own plugin with a default
diff --git a/src/multimediakit/audio/qaudiosystemplugin.h b/src/multimedia/audio/qaudiosystemplugin.h
index 5a876dedb..f61dbcfd1 100644
--- a/src/multimediakit/audio/qaudiosystemplugin.h
+++ b/src/multimedia/audio/qaudiosystemplugin.h
@@ -47,7 +47,7 @@
 #include <QtCore/qplugin.h>
 #include <QtCore/qfactoryinterface.h>
 
-#include <qtmultimediakitdefs.h>
+#include <qtmultimediadefs.h>
 #include <qtmedianamespace.h>
 
 #include "qaudioformat.h"
diff --git a/src/multimediakit/effects/effects.pri b/src/multimedia/effects/effects.pri
index 48c9906b6..48c9906b6 100644
--- a/src/multimediakit/effects/effects.pri
+++ b/src/multimedia/effects/effects.pri
diff --git a/src/multimediakit/effects/qsamplecache_p.cpp b/src/multimedia/effects/qsamplecache_p.cpp
index 1610a4382..1610a4382 100644
--- a/src/multimediakit/effects/qsamplecache_p.cpp
+++ b/src/multimedia/effects/qsamplecache_p.cpp
diff --git a/src/multimediakit/effects/qsamplecache_p.h b/src/multimedia/effects/qsamplecache_p.h
index 91ca457e6..91ca457e6 100644
--- a/src/multimediakit/effects/qsamplecache_p.h
+++ b/src/multimedia/effects/qsamplecache_p.h
diff --git a/src/multimediakit/effects/qsoundeffect.cpp b/src/multimedia/effects/qsoundeffect.cpp
index b3c7706a6..b1137a22e 100644
--- a/src/multimediakit/effects/qsoundeffect.cpp
+++ b/src/multimedia/effects/qsoundeffect.cpp
@@ -56,9 +56,9 @@ QT_BEGIN_NAMESPACE
     \brief The SoundEffect element provides a way to play sound effects in QML.
     \since 1.0
 
-    \inmodule QtMultimediaKit
+    \inmodule QtMultimedia
 
-    This element is part of the \bold{QtMultimediaKit 1.1} module.
+    This element is part of the \bold{QtMultimedia 4.0} module.
 
     The following example plays a WAV file on mouse click.
 
diff --git a/src/multimediakit/effects/qsoundeffect_p.h b/src/multimedia/effects/qsoundeffect_p.h
index 4d6764742..93248184a 100644
--- a/src/multimediakit/effects/qsoundeffect_p.h
+++ b/src/multimedia/effects/qsoundeffect_p.h
@@ -53,7 +53,7 @@
 // We mean it.
 //
 
-#include <qtmultimediakitdefs.h>
+#include <qtmultimediadefs.h>
 #include <QtCore/qobject.h>
 #include <QtCore/qurl.h>
 #include <QtCore/qstringlist.h>
diff --git a/src/multimediakit/effects/qsoundeffect_pulse_p.cpp b/src/multimedia/effects/qsoundeffect_pulse_p.cpp
index 4570f8fd5..4570f8fd5 100644
--- a/src/multimediakit/effects/qsoundeffect_pulse_p.cpp
+++ b/src/multimedia/effects/qsoundeffect_pulse_p.cpp
diff --git a/src/multimediakit/effects/qsoundeffect_pulse_p.h b/src/multimedia/effects/qsoundeffect_pulse_p.h
index c78bcdec5..c78bcdec5 100644
--- a/src/multimediakit/effects/qsoundeffect_pulse_p.h
+++ b/src/multimedia/effects/qsoundeffect_pulse_p.h
diff --git a/src/multimediakit/effects/qsoundeffect_qmedia_p.cpp b/src/multimedia/effects/qsoundeffect_qmedia_p.cpp
index dfd56b09c..dfd56b09c 100644
--- a/src/multimediakit/effects/qsoundeffect_qmedia_p.cpp
+++ b/src/multimedia/effects/qsoundeffect_qmedia_p.cpp
diff --git a/src/multimediakit/effects/qsoundeffect_qmedia_p.h b/src/multimedia/effects/qsoundeffect_qmedia_p.h
index adafa04a2..adafa04a2 100644
--- a/src/multimediakit/effects/qsoundeffect_qmedia_p.h
+++ b/src/multimedia/effects/qsoundeffect_qmedia_p.h
diff --git a/src/multimediakit/effects/qsoundeffect_qsound_p.cpp b/src/multimedia/effects/qsoundeffect_qsound_p.cpp
index 0b9082eb5..0b9082eb5 100644
--- a/src/multimediakit/effects/qsoundeffect_qsound_p.cpp
+++ b/src/multimedia/effects/qsoundeffect_qsound_p.cpp
diff --git a/src/multimediakit/effects/qsoundeffect_qsound_p.h b/src/multimedia/effects/qsoundeffect_qsound_p.h
index c98ad79ce..c98ad79ce 100644
--- a/src/multimediakit/effects/qsoundeffect_qsound_p.h
+++ b/src/multimedia/effects/qsoundeffect_qsound_p.h
diff --git a/src/multimediakit/effects/qwavedecoder_p.cpp b/src/multimedia/effects/qwavedecoder_p.cpp
index 19b262adc..19b262adc 100644
--- a/src/multimediakit/effects/qwavedecoder_p.cpp
+++ b/src/multimedia/effects/qwavedecoder_p.cpp
diff --git a/src/multimediakit/effects/qwavedecoder_p.h b/src/multimedia/effects/qwavedecoder_p.h
index 6c4c00c25..6c4c00c25 100644
--- a/src/multimediakit/effects/qwavedecoder_p.h
+++ b/src/multimedia/effects/qwavedecoder_p.h
diff --git a/src/multimediakit/multimediakit.pro b/src/multimedia/multimedia.pro
index 968832651..b955e71a0 100644
--- a/src/multimediakit/multimediakit.pro
+++ b/src/multimedia/multimedia.pro
@@ -1,12 +1,11 @@
 load(qt_module)
 
-# distinct from QtMultimedia
-TARGET = QtMultimediaKit
+TARGET = QtMultimedia
 QPRO_PWD = $$PWD
 QT = core network gui
 
 CONFIG += module
-MODULE_PRI += ../../modules/qt_multimediakit.pri
+MODULE_PRI += ../../modules/qt_multimedia.pri
 
 contains(QT_CONFIG, opengl) | contains(QT_CONFIG, opengles2) {
 } else {
@@ -18,7 +17,7 @@ DEFINES += QT_BUILD_MULTIMEDIA_LIB
 
 load(qt_module_config)
 
-HEADERS += qtmultimediakitversion.h
+HEADERS += qtmultimediaversion.h
 
 
 PRIVATE_HEADERS += \
@@ -71,7 +70,7 @@ PUBLIC_HEADERS += \
     qmediatimerange.h \
     qmedianetworkaccesscontrol.h \
     qmediaenumdebug.h \
-    qtmultimediakitdefs.h
+    qtmultimediadefs.h
 
 SOURCES += qmediacontrol.cpp \
     qmediaobject.cpp \
diff --git a/src/multimediakit/qaudiocapturesource.cpp b/src/multimedia/qaudiocapturesource.cpp
index efd6a6245..469617123 100644
--- a/src/multimediakit/qaudiocapturesource.cpp
+++ b/src/multimedia/qaudiocapturesource.cpp
@@ -48,7 +48,7 @@ QT_BEGIN_NAMESPACE
 /*!
     \class QAudioCaptureSource
     \brief The QAudioCaptureSource class provides an interface to query and select an audio input endpoint.
-    \inmodule QtMultimediaKit
+    \inmodule QtMultimedia
     \ingroup multimedia
     \since 1.0
 
@@ -93,14 +93,14 @@ public:
                        SIGNAL(availableAudioInputsChanged()));
             q->connect(audioEndpointSelector, SIGNAL(availableEndpointsChanged()),
                        SLOT(statusChanged()));
-            errorState = QtMultimediaKit::NoError;
+            errorState = QtMultimedia::NoError;
         }
     }
 
-    QAudioCaptureSourcePrivate():provider(0), audioEndpointSelector(0), errorState(QtMultimediaKit::ServiceMissingError) {}
+    QAudioCaptureSourcePrivate():provider(0), audioEndpointSelector(0), errorState(QtMultimedia::ServiceMissingError) {}
     QMediaServiceProvider *provider;
     QAudioEndpointSelector   *audioEndpointSelector;
-    QtMultimediaKit::AvailabilityError errorState;
+    QtMultimedia::AvailabilityError errorState;
 };
 
 /*!
@@ -137,7 +137,7 @@ QAudioCaptureSource::~QAudioCaptureSource()
     \since 1.0
 */
 
-QtMultimediaKit::AvailabilityError QAudioCaptureSource::availabilityError() const
+QtMultimedia::AvailabilityError QAudioCaptureSource::availabilityError() const
 {
     Q_D(const QAudioCaptureSource);
 
@@ -258,14 +258,14 @@ void QAudioCaptureSource::statusChanged()
 
     if (d->audioEndpointSelector) {
         if (d->audioEndpointSelector->availableEndpoints().size() > 0) {
-            d->errorState = QtMultimediaKit::NoError;
+            d->errorState = QtMultimedia::NoError;
             emit availabilityChanged(true);
         } else {
-            d->errorState = QtMultimediaKit::BusyError;
+            d->errorState = QtMultimedia::BusyError;
             emit availabilityChanged(false);
         }
     } else {
-        d->errorState = QtMultimediaKit::ServiceMissingError;
+        d->errorState = QtMultimedia::ServiceMissingError;
         emit availabilityChanged(false);
     }
 }
diff --git a/src/multimediakit/qaudiocapturesource.h b/src/multimedia/qaudiocapturesource.h
index e27450514..1571b4e8a 100644
--- a/src/multimediakit/qaudiocapturesource.h
+++ b/src/multimedia/qaudiocapturesource.h
@@ -73,7 +73,7 @@ public:
     ~QAudioCaptureSource();
 
     bool isAvailable() const;
-    QtMultimediaKit::AvailabilityError availabilityError() const;
+    QtMultimedia::AvailabilityError availabilityError() const;
 
     QList<QString> audioInputs() const;
 
diff --git a/src/multimediakit/qaudioencodercontrol.cpp b/src/multimedia/qaudioencodercontrol.cpp
index 3308ac639..62fa89371 100644
--- a/src/multimediakit/qaudioencodercontrol.cpp
+++ b/src/multimedia/qaudioencodercontrol.cpp
@@ -47,7 +47,7 @@ QT_BEGIN_NAMESPACE
 
 /*!
     \class QAudioEncoderControl
-    \inmodule QtMultimediaKit
+    \inmodule QtMultimedia
     \ingroup multimedia-serv
     \since 1.0
 
diff --git a/src/multimediakit/qaudioencodercontrol.h b/src/multimedia/qaudioencodercontrol.h
index 2e3a4bf87..2e3a4bf87 100644
--- a/src/multimediakit/qaudioencodercontrol.h
+++ b/src/multimedia/qaudioencodercontrol.h
diff --git a/src/multimediakit/qaudioendpointselector.cpp b/src/multimedia/qaudioendpointselector.cpp
index 8f2f28f56..ba02c8d15 100644
--- a/src/multimediakit/qaudioendpointselector.cpp
+++ b/src/multimedia/qaudioendpointselector.cpp
@@ -47,7 +47,7 @@ QT_BEGIN_NAMESPACE
     \class QAudioEndpointSelector
 
     \brief The QAudioEndpointSelector class provides an audio endpoint selector media control.
-    \inmodule QtMultimediaKit
+    \inmodule QtMultimedia
     \ingroup multimedia
     \since 1.0
 
diff --git a/src/multimediakit/qaudioendpointselector.h b/src/multimedia/qaudioendpointselector.h
index 00250bc54..00250bc54 100644
--- a/src/multimediakit/qaudioendpointselector.h
+++ b/src/multimedia/qaudioendpointselector.h
diff --git a/src/multimediakit/qaudionamespace.qdoc b/src/multimedia/qaudionamespace.qdoc
index a369e970c..86300b065 100644
--- a/src/multimediakit/qaudionamespace.qdoc
+++ b/src/multimedia/qaudionamespace.qdoc
@@ -30,7 +30,7 @@
 /*!
     \namespace QAudio
     \brief The QAudio namespace contains enums used by the audio classes.
-    \inmodule QtMultimediaKit
+    \inmodule QtMultimedia
     \ingroup multimedia
 */
 
diff --git a/src/multimediakit/qcamera.cpp b/src/multimedia/qcamera.cpp
index 7870c2494..2b187262b 100644
--- a/src/multimediakit/qcamera.cpp
+++ b/src/multimedia/qcamera.cpp
@@ -81,7 +81,7 @@ public:
 
     \brief The QCamera class provides interface for system camera devices.
 
-    \inmodule QtMultimediaKit
+    \inmodule QtMultimedia
     \ingroup camera
     \since 1.1
 
@@ -412,7 +412,7 @@ QCamera::~QCamera()
 */
 bool QCamera::isAvailable() const
 {
-    return availabilityError() == QtMultimediaKit::NoError;
+    return availabilityError() == QtMultimedia::NoError;
 }
 
 /*!
@@ -420,19 +420,19 @@ bool QCamera::isAvailable() const
     \since 1.1
 */
 
-QtMultimediaKit::AvailabilityError QCamera::availabilityError() const
+QtMultimedia::AvailabilityError QCamera::availabilityError() const
 {
     Q_D(const QCamera);
     if (d->control == NULL)
-        return QtMultimediaKit::ServiceMissingError;
+        return QtMultimedia::ServiceMissingError;
 
     if (d->deviceControl && d->deviceControl->deviceCount() == 0)
-        return QtMultimediaKit::ResourceError;
+        return QtMultimedia::ResourceError;
 
     if (d->error != QCamera::NoError)
-        return QtMultimediaKit::ResourceError;
+        return QtMultimedia::ResourceError;
 
-    return QtMultimediaKit::NoError;
+    return QtMultimedia::NoError;
 }
 
 
diff --git a/src/multimediakit/qcamera.h b/src/multimedia/qcamera.h
index 5091759ab..da009e161 100644
--- a/src/multimediakit/qcamera.h
+++ b/src/multimedia/qcamera.h
@@ -150,7 +150,7 @@ public:
     static QString deviceDescription(const QByteArray &device);
 
     bool isAvailable() const;
-    QtMultimediaKit::AvailabilityError availabilityError() const;
+    QtMultimedia::AvailabilityError availabilityError() const;
 
     State state() const;
     Status status() const;
diff --git a/src/multimediakit/qcameracapturebufferformatcontrol.cpp b/src/multimedia/qcameracapturebufferformatcontrol.cpp
index 2a1ca909b..536c8b329 100644
--- a/src/multimediakit/qcameracapturebufferformatcontrol.cpp
+++ b/src/multimedia/qcameracapturebufferformatcontrol.cpp
@@ -50,7 +50,7 @@ QT_BEGIN_NAMESPACE
 
     The format is of type QVideoFrame::PixelFormat.
 
-    \inmodule QtMultimediaKit
+    \inmodule QtMultimedia
     \ingroup multimedia-serv
 
     The interface name of QCameraCaptureBufferFormatControl is \c com.nokia.Qt.QCameraCaptureBufferFormatControl/1.0 as
diff --git a/src/multimediakit/qcameracapturebufferformatcontrol.h b/src/multimedia/qcameracapturebufferformatcontrol.h
index 81079a77d..81079a77d 100644
--- a/src/multimediakit/qcameracapturebufferformatcontrol.h
+++ b/src/multimedia/qcameracapturebufferformatcontrol.h
diff --git a/src/multimediakit/qcameracapturedestinationcontrol.cpp b/src/multimedia/qcameracapturedestinationcontrol.cpp
index 0c2055ddd..5072ae774 100644
--- a/src/multimediakit/qcameracapturedestinationcontrol.cpp
+++ b/src/multimedia/qcameracapturedestinationcontrol.cpp
@@ -51,7 +51,7 @@ QT_BEGIN_NAMESPACE
 
     Depending on backend capabilities capture to file, buffer or both can be supported.
 
-    \inmodule QtMultimediaKit
+    \inmodule QtMultimedia
     \ingroup multimedia-serv
 
 
diff --git a/src/multimediakit/qcameracapturedestinationcontrol.h b/src/multimedia/qcameracapturedestinationcontrol.h
index cdd769a4d..cdd769a4d 100644
--- a/src/multimediakit/qcameracapturedestinationcontrol.h
+++ b/src/multimedia/qcameracapturedestinationcontrol.h
diff --git a/src/multimediakit/qcameracontrol.cpp b/src/multimedia/qcameracontrol.cpp
index d091da711..df5c44cc1 100644
--- a/src/multimediakit/qcameracontrol.cpp
+++ b/src/multimedia/qcameracontrol.cpp
@@ -52,7 +52,7 @@ QT_BEGIN_NAMESPACE
     \brief The QCameraControl class is an abstract base class for
     classes that control still cameras or video cameras.
 
-    \inmodule QtMultimediaKit
+    \inmodule QtMultimedia
     \ingroup multimedia-serv
     \since 1.1
 
diff --git a/src/multimediakit/qcameracontrol.h b/src/multimedia/qcameracontrol.h
index dfc2b3743..dfc2b3743 100644
--- a/src/multimediakit/qcameracontrol.h
+++ b/src/multimedia/qcameracontrol.h
diff --git a/src/multimediakit/qcameraexposure.cpp b/src/multimedia/qcameraexposure.cpp
index e748560aa..580b1cad9 100644
--- a/src/multimediakit/qcameraexposure.cpp
+++ b/src/multimedia/qcameraexposure.cpp
@@ -57,7 +57,7 @@ QT_BEGIN_NAMESPACE
 
     \brief The QCameraExposure class provides interface for exposure related camera settings.
 
-    \inmodule QtMultimediaKit
+    \inmodule QtMultimedia
     \ingroup camera
     \since 1.1
 
diff --git a/src/multimediakit/qcameraexposure.h b/src/multimedia/qcameraexposure.h
index 088e7c036..088e7c036 100644
--- a/src/multimediakit/qcameraexposure.h
+++ b/src/multimedia/qcameraexposure.h
diff --git a/src/multimediakit/qcameraexposurecontrol.cpp b/src/multimedia/qcameraexposurecontrol.cpp
index edf127de5..4a6f655f8 100644
--- a/src/multimediakit/qcameraexposurecontrol.cpp
+++ b/src/multimedia/qcameraexposurecontrol.cpp
@@ -49,7 +49,7 @@ QT_BEGIN_NAMESPACE
 
     \brief The QCameraExposureControl class allows controlling camera exposure parameters.
 
-    \inmodule QtMultimediaKit
+    \inmodule QtMultimedia
     \ingroup multimedia-serv
     \since 1.1
 
diff --git a/src/multimediakit/qcameraexposurecontrol.h b/src/multimedia/qcameraexposurecontrol.h
index ff60784bf..ff60784bf 100644
--- a/src/multimediakit/qcameraexposurecontrol.h
+++ b/src/multimedia/qcameraexposurecontrol.h
diff --git a/src/multimediakit/qcameraflashcontrol.cpp b/src/multimedia/qcameraflashcontrol.cpp
index 66550baf5..34dcbdeb5 100644
--- a/src/multimediakit/qcameraflashcontrol.cpp
+++ b/src/multimedia/qcameraflashcontrol.cpp
@@ -50,10 +50,10 @@ QT_BEGIN_NAMESPACE
     \brief The QCameraFlashControl class allows controlling a camera's flash.
 
     \ingroup multimedia-serv
-    \inmodule QtMultimediaKit
+    \inmodule QtMultimedia
     \since 1.1
 
-    \inmodule QtMultimediaKit
+    \inmodule QtMultimedia
 
     You can set the type of flash effect used when an image is captured, and test to see
     if the flash hardware is ready to fire.
diff --git a/src/multimediakit/qcameraflashcontrol.h b/src/multimedia/qcameraflashcontrol.h
index 89b3b9d06..89b3b9d06 100644
--- a/src/multimediakit/qcameraflashcontrol.h
+++ b/src/multimedia/qcameraflashcontrol.h
diff --git a/src/multimediakit/qcamerafocus.cpp b/src/multimedia/qcamerafocus.cpp
index 8db33ff29..22a0bbcc9 100644
--- a/src/multimediakit/qcamerafocus.cpp
+++ b/src/multimedia/qcamerafocus.cpp
@@ -170,7 +170,7 @@ void QCameraFocusZone::setStatus(QCameraFocusZone::FocusZoneStatus status)
     \brief The QCameraFocus class provides interface for
     focus and zoom related camera settings.
 
-    \inmodule QtMultimediaKit
+    \inmodule QtMultimedia
     \ingroup camera
     \since 1.1
 
diff --git a/src/multimediakit/qcamerafocus.h b/src/multimedia/qcamerafocus.h
index 064af7aa1..064af7aa1 100644
--- a/src/multimediakit/qcamerafocus.h
+++ b/src/multimedia/qcamerafocus.h
diff --git a/src/multimediakit/qcamerafocuscontrol.cpp b/src/multimedia/qcamerafocuscontrol.cpp
index d48cd6c38..93c466814 100644
--- a/src/multimediakit/qcamerafocuscontrol.cpp
+++ b/src/multimedia/qcamerafocuscontrol.cpp
@@ -51,7 +51,7 @@ QT_BEGIN_NAMESPACE
     \brief The QCameraFocusControl class supplies control for
     focusing related camera parameters.
 
-    \inmodule QtMultimediaKit
+    \inmodule QtMultimedia
     \ingroup multimedia-serv
     \since 1.1
 
diff --git a/src/multimediakit/qcamerafocuscontrol.h b/src/multimedia/qcamerafocuscontrol.h
index 20ffe6af1..20ffe6af1 100644
--- a/src/multimediakit/qcamerafocuscontrol.h
+++ b/src/multimedia/qcamerafocuscontrol.h
diff --git a/src/multimediakit/qcameraimagecapture.cpp b/src/multimedia/qcameraimagecapture.cpp
index 28372790c..6b399b684 100644
--- a/src/multimediakit/qcameraimagecapture.cpp
+++ b/src/multimedia/qcameraimagecapture.cpp
@@ -58,7 +58,7 @@ QT_BEGIN_NAMESPACE
 
 /*!
     \class QCameraImageCapture
-    \inmodule QtMultimediaKit
+    \inmodule QtMultimedia
     \ingroup camera
     \since 1.1
 
@@ -205,8 +205,8 @@ bool QCameraImageCapture::setMediaObject(QMediaObject *mediaObject)
                        this, SIGNAL(imageCaptured(int,QImage)));
             disconnect(d->control, SIGNAL(imageAvailable(int,QVideoFrame)),
                        this, SIGNAL(imageAvailable(int,QVideoFrame)));
-            disconnect(d->control, SIGNAL(imageMetadataAvailable(int,QtMultimediaKit::MetaData,QVariant)),
-                       this, SIGNAL(imageMetadataAvailable(int,QtMultimediaKit::MetaData,QVariant)));
+            disconnect(d->control, SIGNAL(imageMetadataAvailable(int,QtMultimedia::MetaData,QVariant)),
+                       this, SIGNAL(imageMetadataAvailable(int,QtMultimedia::MetaData,QVariant)));
             disconnect(d->control, SIGNAL(imageMetadataAvailable(int,QString,QVariant)),
                        this, SIGNAL(imageMetadataAvailable(int,QString,QVariant)));
             disconnect(d->control, SIGNAL(imageSaved(int,QString)),
@@ -257,8 +257,8 @@ bool QCameraImageCapture::setMediaObject(QMediaObject *mediaObject)
                         this, SIGNAL(imageExposed(int)));
                 connect(d->control, SIGNAL(imageCaptured(int,QImage)),
                         this, SIGNAL(imageCaptured(int,QImage)));
-                connect(d->control, SIGNAL(imageMetadataAvailable(int,QtMultimediaKit::MetaData,QVariant)),
-                        this, SIGNAL(imageMetadataAvailable(int,QtMultimediaKit::MetaData,QVariant)));
+                connect(d->control, SIGNAL(imageMetadataAvailable(int,QtMultimedia::MetaData,QVariant)),
+                        this, SIGNAL(imageMetadataAvailable(int,QtMultimedia::MetaData,QVariant)));
                 connect(d->control, SIGNAL(imageMetadataAvailable(int,QString,QVariant)),
                         this, SIGNAL(imageMetadataAvailable(int,QString,QVariant)));
                 connect(d->control, SIGNAL(imageAvailable(int,QVideoFrame)),
@@ -313,12 +313,12 @@ bool QCameraImageCapture::isAvailable() const
     Returns the availability error code.
     \since 1.1
 */
-QtMultimediaKit::AvailabilityError QCameraImageCapture::availabilityError() const
+QtMultimedia::AvailabilityError QCameraImageCapture::availabilityError() const
 {
     if (d_func()->control != NULL)
-        return QtMultimediaKit::NoError;
+        return QtMultimedia::NoError;
     else
-        return QtMultimediaKit::ServiceMissingError;
+        return QtMultimedia::ServiceMissingError;
 }
 
 /*!
@@ -641,10 +641,10 @@ void QCameraImageCapture::cancelCapture()
 */
 
 /*!
-    \fn QCameraImageCapture::imageMetadataAvailable(int id, QtMultimediaKit::MetaData key, const QVariant &value)
+    \fn QCameraImageCapture::imageMetadataAvailable(int id, QtMultimedia::MetaData key, const QVariant &value)
 
     Signals that a metadata for an image with request \a id is available.
-    This signal is emitted for metadata \a value with a \a key listed in QtMultimediaKit::MetaData enum.
+    This signal is emitted for metadata \a value with a \a key listed in QtMultimedia::MetaData enum.
 
     This signal is emitted between imageExposed and imageSaved signals.
     \since 1.2
@@ -654,7 +654,7 @@ void QCameraImageCapture::cancelCapture()
     \fn QCameraImageCapture::imageMetadataAvailable(int id, const QString &key, const QVariant &value)
 
     Signals that a metadata for an image with request \a id is available.
-    This signal is emitted for extended metadata \a value with a \a key not listed in QtMultimediaKit::MetaData enum.
+    This signal is emitted for extended metadata \a value with a \a key not listed in QtMultimedia::MetaData enum.
 
     This signal is emitted between imageExposed and imageSaved signals.
     \since 1.2
diff --git a/src/multimediakit/qcameraimagecapture.h b/src/multimedia/qcameraimagecapture.h
index f4a5a9c11..bc4162287 100644
--- a/src/multimediakit/qcameraimagecapture.h
+++ b/src/multimedia/qcameraimagecapture.h
@@ -97,7 +97,7 @@ public:
     ~QCameraImageCapture();
 
     bool isAvailable() const;
-    QtMultimediaKit::AvailabilityError availabilityError() const;
+    QtMultimedia::AvailabilityError availabilityError() const;
 
     QMediaObject *mediaObject() const;
 
@@ -136,7 +136,7 @@ Q_SIGNALS:
 
     void imageExposed(int id);
     void imageCaptured(int id, const QImage &preview);
-    void imageMetadataAvailable(int id, QtMultimediaKit::MetaData key, const QVariant &value);
+    void imageMetadataAvailable(int id, QtMultimedia::MetaData key, const QVariant &value);
     void imageMetadataAvailable(int id, const QString &key, const QVariant &value);
     void imageAvailable(int id, const QVideoFrame &image);
     void imageSaved(int id, const QString &fileName);
diff --git a/src/multimediakit/qcameraimagecapturecontrol.cpp b/src/multimedia/qcameraimagecapturecontrol.cpp
index 00689ed63..ad4c55edb 100644
--- a/src/multimediakit/qcameraimagecapturecontrol.cpp
+++ b/src/multimedia/qcameraimagecapturecontrol.cpp
@@ -50,7 +50,7 @@ QT_BEGIN_NAMESPACE
     \brief The QCameraImageCaptureControl class provides a control interface
     for image capture services.
 
-    \inmodule QtMultimediaKit
+    \inmodule QtMultimedia
     \ingroup multimedia-serv
     \since 1.1
 
@@ -144,10 +144,10 @@ QCameraImageCaptureControl::~QCameraImageCaptureControl()
 */
 
 /*!
-    \fn QCameraImageCaptureControl::imageMetadataAvailable(int id, QtMultimediaKit::MetaData key, const QVariant &value)
+    \fn QCameraImageCaptureControl::imageMetadataAvailable(int id, QtMultimedia::MetaData key, const QVariant &value)
 
     Signals that a metadata for an image with request \a id is available.
-    This signal is emitted for metadata \a value with a \a key listed in QtMultimediaKit::MetaData enum.
+    This signal is emitted for metadata \a value with a \a key listed in QtMultimedia::MetaData enum.
 
     This signal should be emitted between imageExposed and imageSaved signals.
     \since 1.2
@@ -157,7 +157,7 @@ QCameraImageCaptureControl::~QCameraImageCaptureControl()
     \fn QCameraImageCaptureControl::imageMetadataAvailable(int id, const QString &key, const QVariant &value)
 
     Signals that a metadata for an image with request \a id is available.
-    This signal is emitted for extended metadata \a value with a \a key not listed in QtMultimediaKit::MetaData enum.
+    This signal is emitted for extended metadata \a value with a \a key not listed in QtMultimedia::MetaData enum.
 
     This signal should be emitted between imageExposed and imageSaved signals.
     \since 1.2
diff --git a/src/multimediakit/qcameraimagecapturecontrol.h b/src/multimedia/qcameraimagecapturecontrol.h
index b9ac599f6..0459c1417 100644
--- a/src/multimediakit/qcameraimagecapturecontrol.h
+++ b/src/multimedia/qcameraimagecapturecontrol.h
@@ -76,7 +76,7 @@ Q_SIGNALS:
 
     void imageExposed(int id);
     void imageCaptured(int id, const QImage &preview);
-    void imageMetadataAvailable(int id, QtMultimediaKit::MetaData key, const QVariant &value);
+    void imageMetadataAvailable(int id, QtMultimedia::MetaData key, const QVariant &value);
     void imageMetadataAvailable(int id, const QString &key, const QVariant &value);
     void imageAvailable(int id, const QVideoFrame &buffer);
     void imageSaved(int id, const QString &fileName);
diff --git a/src/multimediakit/qcameraimageprocessing.cpp b/src/multimedia/qcameraimageprocessing.cpp
index 79419a52b..600dfd885 100644
--- a/src/multimediakit/qcameraimageprocessing.cpp
+++ b/src/multimedia/qcameraimageprocessing.cpp
@@ -61,7 +61,7 @@ QT_BEGIN_NAMESPACE
     \brief The QCameraImageProcessing class provides interface for
     focus and zoom related camera settings.
 
-    \inmodule QtMultimediaKit
+    \inmodule QtMultimedia
     \ingroup camera
     \since 1.1
 
diff --git a/src/multimediakit/qcameraimageprocessing.h b/src/multimedia/qcameraimageprocessing.h
index 42a7eb589..42a7eb589 100644
--- a/src/multimediakit/qcameraimageprocessing.h
+++ b/src/multimedia/qcameraimageprocessing.h
diff --git a/src/multimediakit/qcameraimageprocessingcontrol.cpp b/src/multimedia/qcameraimageprocessingcontrol.cpp
index 453c2d575..5e318cc83 100644
--- a/src/multimediakit/qcameraimageprocessingcontrol.cpp
+++ b/src/multimedia/qcameraimageprocessingcontrol.cpp
@@ -46,7 +46,7 @@ QT_BEGIN_NAMESPACE
 
 /*!
     \class QCameraImageProcessingControl
-    \inmodule QtMultimediaKit
+    \inmodule QtMultimedia
     \ingroup multimedia-serv
     \since 1.1
 
diff --git a/src/multimediakit/qcameraimageprocessingcontrol.h b/src/multimedia/qcameraimageprocessingcontrol.h
index 8c739287c..8c739287c 100644
--- a/src/multimediakit/qcameraimageprocessingcontrol.h
+++ b/src/multimedia/qcameraimageprocessingcontrol.h
diff --git a/src/multimediakit/qcameralockscontrol.cpp b/src/multimedia/qcameralockscontrol.cpp
index 03a58b162..289a07bf5 100644
--- a/src/multimediakit/qcameralockscontrol.cpp
+++ b/src/multimedia/qcameralockscontrol.cpp
@@ -52,7 +52,7 @@ QT_BEGIN_NAMESPACE
     \brief The QCameraLocksControl class is an abstract base class for
     classes that control still cameras or video cameras.
 
-    \inmodule QtMultimediaKit
+    \inmodule QtMultimedia
     \ingroup multimedia-serv
     \since 1.1
 
diff --git a/src/multimediakit/qcameralockscontrol.h b/src/multimedia/qcameralockscontrol.h
index 93120ee1a..93120ee1a 100644
--- a/src/multimediakit/qcameralockscontrol.h
+++ b/src/multimedia/qcameralockscontrol.h
diff --git a/src/multimediakit/qimageencodercontrol.cpp b/src/multimedia/qimageencodercontrol.cpp
index 9eeb949ac..ee62a502d 100644
--- a/src/multimediakit/qimageencodercontrol.cpp
+++ b/src/multimedia/qimageencodercontrol.cpp
@@ -47,7 +47,7 @@ QT_BEGIN_NAMESPACE
 /*!
     \class QImageEncoderControl
 
-    \inmodule QtMultimediaKit
+    \inmodule QtMultimedia
     \ingroup multimedia-serv
     \since 1.0
 
diff --git a/src/multimediakit/qimageencodercontrol.h b/src/multimedia/qimageencodercontrol.h
index c8a8261a4..c8a8261a4 100644
--- a/src/multimediakit/qimageencodercontrol.h
+++ b/src/multimedia/qimageencodercontrol.h
diff --git a/src/multimediakit/qlocalmediaplaylistprovider.cpp b/src/multimedia/qlocalmediaplaylistprovider.cpp
index 84d54ecfd..84d54ecfd 100644
--- a/src/multimediakit/qlocalmediaplaylistprovider.cpp
+++ b/src/multimedia/qlocalmediaplaylistprovider.cpp
diff --git a/src/multimediakit/qlocalmediaplaylistprovider.h b/src/multimedia/qlocalmediaplaylistprovider.h
index e712a3f73..e712a3f73 100644
--- a/src/multimediakit/qlocalmediaplaylistprovider.h
+++ b/src/multimedia/qlocalmediaplaylistprovider.h
diff --git a/src/multimediakit/qmediabackgroundplaybackcontrol.cpp b/src/multimedia/qmediabackgroundplaybackcontrol.cpp
index 0413fba01..d7cbd380a 100644
--- a/src/multimediakit/qmediabackgroundplaybackcontrol.cpp
+++ b/src/multimedia/qmediabackgroundplaybackcontrol.cpp
@@ -47,7 +47,7 @@ QT_BEGIN_NAMESPACE
 
 /*!
     \class QMediaBackgroundPlaybackControl
-    \inmodule QtMultimediaKit
+    \inmodule QtMultimedia
     \ingroup multimedia
     \since 5.0
 
diff --git a/src/multimediakit/qmediabackgroundplaybackcontrol.h b/src/multimedia/qmediabackgroundplaybackcontrol.h
index 2cf8d1935..2cf8d1935 100644
--- a/src/multimediakit/qmediabackgroundplaybackcontrol.h
+++ b/src/multimedia/qmediabackgroundplaybackcontrol.h
diff --git a/src/multimediakit/qmediabindableinterface.cpp b/src/multimedia/qmediabindableinterface.cpp
index 28b713457..f5be34dac 100644
--- a/src/multimediakit/qmediabindableinterface.cpp
+++ b/src/multimedia/qmediabindableinterface.cpp
@@ -45,7 +45,7 @@ QT_BEGIN_NAMESPACE
 
 /*!
     \class QMediaBindableInterface
-    \inmodule QtMultimediaKit
+    \inmodule QtMultimedia
     \ingroup multimedia
     \since 1.0
 
diff --git a/src/multimediakit/qmediabindableinterface.h b/src/multimedia/qmediabindableinterface.h
index 02b5b1a21..02b5b1a21 100644
--- a/src/multimediakit/qmediabindableinterface.h
+++ b/src/multimedia/qmediabindableinterface.h
diff --git a/src/multimediakit/qmediacontainercontrol.cpp b/src/multimedia/qmediacontainercontrol.cpp
index 1c317d915..5a4e618f2 100644
--- a/src/multimediakit/qmediacontainercontrol.cpp
+++ b/src/multimedia/qmediacontainercontrol.cpp
@@ -49,7 +49,7 @@ QT_BEGIN_NAMESPACE
 
     \brief The QMediaContainerControl class provides access to the output container format of a QMediaService
 
-    \inmodule QtMultimediaKit
+    \inmodule QtMultimedia
     \ingroup multimedia-serv
     \since 1.0
 
diff --git a/src/multimediakit/qmediacontainercontrol.h b/src/multimedia/qmediacontainercontrol.h
index af48605d0..af48605d0 100644
--- a/src/multimediakit/qmediacontainercontrol.h
+++ b/src/multimedia/qmediacontainercontrol.h
diff --git a/src/multimediakit/qmediacontent.cpp b/src/multimedia/qmediacontent.cpp
index 8cd7e2d95..8cd97bbe0 100644
--- a/src/multimediakit/qmediacontent.cpp
+++ b/src/multimedia/qmediacontent.cpp
@@ -75,7 +75,7 @@ private:
 
     \brief The QMediaContent class provides access to the resources relating to a media content.
 
-    \inmodule QtMultimediaKit
+    \inmodule QtMultimedia
     \ingroup multimedia
     \since 1.0
 
diff --git a/src/multimediakit/qmediacontent.h b/src/multimedia/qmediacontent.h
index 99471f305..cfd109d84 100644
--- a/src/multimediakit/qmediacontent.h
+++ b/src/multimedia/qmediacontent.h
@@ -47,7 +47,7 @@
 
 #include "qmediaresource.h"
 
-#include <qtmultimediakitdefs.h>
+#include <qtmultimediadefs.h>
 
 
 QT_BEGIN_HEADER
diff --git a/src/multimediakit/qmediacontrol.cpp b/src/multimedia/qmediacontrol.cpp
index dc823a4b9..0cde2cddd 100644
--- a/src/multimediakit/qmediacontrol.cpp
+++ b/src/multimedia/qmediacontrol.cpp
@@ -51,7 +51,7 @@ QT_BEGIN_NAMESPACE
 
 /*!
     \class QMediaControl
-    \inmodule QtMultimediaKit
+    \inmodule QtMultimedia
     \ingroup multimedia-serv
     \since 1.0
 
diff --git a/src/multimediakit/qmediacontrol.h b/src/multimedia/qmediacontrol.h
index 47cc13524..3d27026c5 100644
--- a/src/multimediakit/qmediacontrol.h
+++ b/src/multimedia/qmediacontrol.h
@@ -42,7 +42,7 @@
 #ifndef QABSTRACTMEDIACONTROL_H
 #define QABSTRACTMEDIACONTROL_H
 
-#include <qtmultimediakitdefs.h>
+#include <qtmultimediadefs.h>
 
 #include <QtCore/qobject.h>
 #include <QtCore/qstring.h>
diff --git a/src/multimediakit/qmediacontrol_p.h b/src/multimedia/qmediacontrol_p.h
index cde6cc688..05693a028 100644
--- a/src/multimediakit/qmediacontrol_p.h
+++ b/src/multimedia/qmediacontrol_p.h
@@ -53,7 +53,7 @@
 // We mean it.
 //
 
-#include <qtmultimediakitdefs.h>
+#include <qtmultimediadefs.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/multimediakit/qmediaencodersettings.cpp b/src/multimedia/qmediaencodersettings.cpp
index a87ed6883..5f85eec37 100644
--- a/src/multimediakit/qmediaencodersettings.cpp
+++ b/src/multimedia/qmediaencodersettings.cpp
@@ -48,11 +48,11 @@ class QAudioEncoderSettingsPrivate  : public QSharedData
 public:
     QAudioEncoderSettingsPrivate() :
         isNull(true),
-        encodingMode(QtMultimediaKit::ConstantQualityEncoding),
+        encodingMode(QtMultimedia::ConstantQualityEncoding),
         bitrate(-1),
         sampleRate(-1),
         channels(-1),
-        quality(QtMultimediaKit::NormalQuality)
+        quality(QtMultimedia::NormalQuality)
     {
     }
 
@@ -69,12 +69,12 @@ public:
     }
 
     bool isNull;
-    QtMultimediaKit::EncodingMode encodingMode;
+    QtMultimedia::EncodingMode encodingMode;
     QString codec;
     int bitrate;
     int sampleRate;
     int channels;
-    QtMultimediaKit::EncodingQuality quality;
+    QtMultimedia::EncodingQuality quality;
 
 private:
     QAudioEncoderSettingsPrivate& operator=(const QAudioEncoderSettingsPrivate &other);
@@ -85,7 +85,7 @@ private:
 
     \brief The QAudioEncoderSettings class provides a set of audio encoder settings.
 
-    \inmodule QtMultimediaKit
+    \inmodule QtMultimedia
     \ingroup multimedia
     \since 1.0
 
@@ -188,9 +188,9 @@ bool QAudioEncoderSettings::isNull() const
     Returns the audio encoding mode.
 
     \since 1.0
-    \sa QtMultimediaKit::EncodingMode
+    \sa QtMultimedia::EncodingMode
 */
-QtMultimediaKit::EncodingMode QAudioEncoderSettings::encodingMode() const
+QtMultimedia::EncodingMode QAudioEncoderSettings::encodingMode() const
 {
     return d->encodingMode;
 }
@@ -198,7 +198,7 @@ QtMultimediaKit::EncodingMode QAudioEncoderSettings::encodingMode() const
 /*!
     Sets the audio encoding \a mode setting.
 
-    If QtMultimediaKit::ConstantQualityEncoding is set, the quality
+    If QtMultimedia::ConstantQualityEncoding is set, the quality
     encoding parameter is used and bit rate is ignored,
     otherwise the bitrate is used.
 
@@ -206,9 +206,9 @@ QtMultimediaKit::EncodingMode QAudioEncoderSettings::encodingMode() const
     the encoding modes.
 
     \since 1.0
-    \sa encodingMode(), QtMultimediaKit::EncodingMode
+    \sa encodingMode(), QtMultimedia::EncodingMode
 */
-void QAudioEncoderSettings::setEncodingMode(QtMultimediaKit::EncodingMode mode)
+void QAudioEncoderSettings::setEncodingMode(QtMultimedia::EncodingMode mode)
 {
     d->encodingMode = mode;
 }
@@ -300,7 +300,7 @@ void QAudioEncoderSettings::setSampleRate(int rate)
     \since 1.0
 */
 
-QtMultimediaKit::EncodingQuality QAudioEncoderSettings::quality() const
+QtMultimedia::EncodingQuality QAudioEncoderSettings::quality() const
 {
     return d->quality;
 }
@@ -312,10 +312,10 @@ QtMultimediaKit::EncodingQuality QAudioEncoderSettings::quality() const
     set of encoding parameters to achieve the desired quality level.
 
     The \a quality settings parameter is only used in the
-    \l {QtMultimediaKit::ConstantQualityEncoding}{constant quality} \l{encodingMode()}{encoding mode}.
+    \l {QtMultimedia::ConstantQualityEncoding}{constant quality} \l{encodingMode()}{encoding mode}.
     \since 1.0
 */
-void QAudioEncoderSettings::setQuality(QtMultimediaKit::EncodingQuality quality)
+void QAudioEncoderSettings::setQuality(QtMultimedia::EncodingQuality quality)
 {
     d->isNull = false;
     d->quality = quality;
@@ -326,10 +326,10 @@ class QVideoEncoderSettingsPrivate  : public QSharedData
 public:
     QVideoEncoderSettingsPrivate() :
         isNull(true),
-        encodingMode(QtMultimediaKit::ConstantQualityEncoding),
+        encodingMode(QtMultimedia::ConstantQualityEncoding),
         bitrate(-1),
         frameRate(0),
-        quality(QtMultimediaKit::NormalQuality)
+        quality(QtMultimedia::NormalQuality)
     {
     }
 
@@ -346,12 +346,12 @@ public:
     }
 
     bool isNull;
-    QtMultimediaKit::EncodingMode encodingMode;
+    QtMultimedia::EncodingMode encodingMode;
     QString codec;
     int bitrate;
     QSize resolution;
     qreal frameRate;
-    QtMultimediaKit::EncodingQuality quality;
+    QtMultimedia::EncodingQuality quality;
 
 private:
     QVideoEncoderSettingsPrivate& operator=(const QVideoEncoderSettingsPrivate &other);
@@ -457,9 +457,9 @@ bool QVideoEncoderSettings::isNull() const
     Returns the video encoding mode.
 
     \since 1.0
-    \sa QtMultimediaKit::EncodingMode
+    \sa QtMultimedia::EncodingMode
 */
-QtMultimediaKit::EncodingMode QVideoEncoderSettings::encodingMode() const
+QtMultimedia::EncodingMode QVideoEncoderSettings::encodingMode() const
 {
     return d->encodingMode;
 }
@@ -467,16 +467,16 @@ QtMultimediaKit::EncodingMode QVideoEncoderSettings::encodingMode() const
 /*!
     Sets the video encoding \a mode.
 
-    If QtMultimediaKit::ConstantQualityEncoding is set,
+    If QtMultimedia::ConstantQualityEncoding is set,
     the quality encoding parameter is used and bit rate is ignored,
     otherwise the bitrate is used.
 
     The rest of encoding settings are respected regardless of encoding mode.
 
     \since 1.0
-    \sa QtMultimediaKit::EncodingMode
+    \sa QtMultimedia::EncodingMode
 */
-void QVideoEncoderSettings::setEncodingMode(QtMultimediaKit::EncodingMode mode)
+void QVideoEncoderSettings::setEncodingMode(QtMultimedia::EncodingMode mode)
 {
     d->isNull = false;
     d->encodingMode = mode;
@@ -589,7 +589,7 @@ void QVideoEncoderSettings::setResolution(int width, int height)
     \since 1.0
 */
 
-QtMultimediaKit::EncodingQuality QVideoEncoderSettings::quality() const
+QtMultimedia::EncodingQuality QVideoEncoderSettings::quality() const
 {
     return d->quality;
 }
@@ -601,14 +601,14 @@ QtMultimediaKit::EncodingQuality QVideoEncoderSettings::quality() const
     set of encoding parameters to achieve the desired quality level.
 
     The \a quality settings parameter is only used in the
-    \l {QtMultimediaKit::ConstantQualityEncoding}{constant quality} \l{encodingMode()}{encoding mode}.
+    \l {QtMultimedia::ConstantQualityEncoding}{constant quality} \l{encodingMode()}{encoding mode}.
     The \a quality settings parameter is only used in the \l
-    {QtMultimediaKit::ConstantQualityEncoding}{constant quality}
+    {QtMultimedia::ConstantQualityEncoding}{constant quality}
     \l{encodingMode()}{encoding mode}.
     \since 1.0
 */
 
-void QVideoEncoderSettings::setQuality(QtMultimediaKit::EncodingQuality quality)
+void QVideoEncoderSettings::setQuality(QtMultimedia::EncodingQuality quality)
 {
     d->isNull = false;
     d->quality = quality;
@@ -621,7 +621,7 @@ class QImageEncoderSettingsPrivate  : public QSharedData
 public:
     QImageEncoderSettingsPrivate() :
         isNull(true),
-        quality(QtMultimediaKit::NormalQuality)
+        quality(QtMultimedia::NormalQuality)
     {
     }
 
@@ -637,7 +637,7 @@ public:
     bool isNull;
     QString codec;
     QSize resolution;
-    QtMultimediaKit::EncodingQuality quality;
+    QtMultimedia::EncodingQuality quality;
 
 private:
     QImageEncoderSettingsPrivate& operator=(const QImageEncoderSettingsPrivate &other);
@@ -803,7 +803,7 @@ void QImageEncoderSettings::setResolution(int width, int height)
     \since 1.0
 */
 
-QtMultimediaKit::EncodingQuality QImageEncoderSettings::quality() const
+QtMultimedia::EncodingQuality QImageEncoderSettings::quality() const
 {
     return d->quality;
 }
@@ -813,7 +813,7 @@ QtMultimediaKit::EncodingQuality QImageEncoderSettings::quality() const
     \since 1.0
 */
 
-void QImageEncoderSettings::setQuality(QtMultimediaKit::EncodingQuality quality)
+void QImageEncoderSettings::setQuality(QtMultimedia::EncodingQuality quality)
 {
     d->isNull = false;
     d->quality = quality;
diff --git a/src/multimediakit/qmediaencodersettings.h b/src/multimedia/qmediaencodersettings.h
index 14edc08f3..28bf6d6c8 100644
--- a/src/multimediakit/qmediaencodersettings.h
+++ b/src/multimedia/qmediaencodersettings.h
@@ -45,7 +45,7 @@
 #include <QtCore/qsharedpointer.h>
 #include <QtCore/qstring.h>
 #include <QtCore/qsize.h>
-#include <qtmultimediakitdefs.h>
+#include <qtmultimediadefs.h>
 #include "qtmedianamespace.h"
 
 QT_BEGIN_HEADER
@@ -71,8 +71,8 @@ public:
 
     bool isNull() const;
 
-    QtMultimediaKit::EncodingMode encodingMode() const;
-    void setEncodingMode(QtMultimediaKit::EncodingMode);
+    QtMultimedia::EncodingMode encodingMode() const;
+    void setEncodingMode(QtMultimedia::EncodingMode);
 
     QString codec() const;
     void setCodec(const QString& codec);
@@ -86,8 +86,8 @@ public:
     int sampleRate() const;
     void setSampleRate(int rate);
 
-    QtMultimediaKit::EncodingQuality quality() const;
-    void setQuality(QtMultimediaKit::EncodingQuality quality);
+    QtMultimedia::EncodingQuality quality() const;
+    void setQuality(QtMultimedia::EncodingQuality quality);
 
 private:
     QSharedDataPointer<QAudioEncoderSettingsPrivate> d;
@@ -108,8 +108,8 @@ public:
 
     bool isNull() const;
 
-    QtMultimediaKit::EncodingMode encodingMode() const;
-    void setEncodingMode(QtMultimediaKit::EncodingMode);
+    QtMultimedia::EncodingMode encodingMode() const;
+    void setEncodingMode(QtMultimedia::EncodingMode);
 
     QString codec() const;
     void setCodec(const QString &);
@@ -124,8 +124,8 @@ public:
     int bitRate() const;
     void setBitRate(int bitrate);
 
-    QtMultimediaKit::EncodingQuality quality() const;
-    void setQuality(QtMultimediaKit::EncodingQuality quality);
+    QtMultimedia::EncodingQuality quality() const;
+    void setQuality(QtMultimedia::EncodingQuality quality);
 
 private:
     QSharedDataPointer<QVideoEncoderSettingsPrivate> d;
@@ -153,8 +153,8 @@ public:
     void setResolution(const QSize &);
     void setResolution(int width, int height);
 
-    QtMultimediaKit::EncodingQuality quality() const;
-    void setQuality(QtMultimediaKit::EncodingQuality quality);
+    QtMultimedia::EncodingQuality quality() const;
+    void setQuality(QtMultimedia::EncodingQuality quality);
 
 private:
     QSharedDataPointer<QImageEncoderSettingsPrivate> d;
diff --git a/src/multimediakit/qmediaenumdebug.h b/src/multimedia/qmediaenumdebug.h
index 3fa7ee820..3fa7ee820 100644
--- a/src/multimediakit/qmediaenumdebug.h
+++ b/src/multimedia/qmediaenumdebug.h
diff --git a/src/multimediakit/qmediaimageviewer.cpp b/src/multimedia/qmediaimageviewer.cpp
index cac508f8d..01265dc2f 100644
--- a/src/multimediakit/qmediaimageviewer.cpp
+++ b/src/multimedia/qmediaimageviewer.cpp
@@ -135,7 +135,7 @@ void QMediaImageViewerPrivate::_q_playlistDestroyed()
 /*!
     \class QMediaImageViewer
     \brief The QMediaImageViewer class provides a means of viewing image media.
-    \inmodule QtMultimediaKit
+    \inmodule QtMultimedia
     \ingroup multimedia
     \since 1.0
 
diff --git a/src/multimediakit/qmediaimageviewer.h b/src/multimedia/qmediaimageviewer.h
index 7010fad3f..7010fad3f 100644
--- a/src/multimediakit/qmediaimageviewer.h
+++ b/src/multimedia/qmediaimageviewer.h
diff --git a/src/multimediakit/qmediaimageviewerservice.cpp b/src/multimedia/qmediaimageviewerservice.cpp
index 65de7a81b..65de7a81b 100644
--- a/src/multimediakit/qmediaimageviewerservice.cpp
+++ b/src/multimedia/qmediaimageviewerservice.cpp
diff --git a/src/multimediakit/qmediaimageviewerservice_p.h b/src/multimedia/qmediaimageviewerservice_p.h
index e40cdc5f4..d1b6956d9 100644
--- a/src/multimediakit/qmediaimageviewerservice_p.h
+++ b/src/multimedia/qmediaimageviewerservice_p.h
@@ -53,7 +53,7 @@
 // We mean it.
 //
 
-#include <qtmultimediakitdefs.h>
+#include <qtmultimediadefs.h>
 #include <qmediaservice.h>
 #include <qmediaimageviewer.h>
 #include <qvideorenderercontrol.h>
diff --git a/src/multimediakit/qmedianetworkaccesscontrol.cpp b/src/multimedia/qmedianetworkaccesscontrol.cpp
index 3a18fab7a..a976859ed 100644
--- a/src/multimediakit/qmedianetworkaccesscontrol.cpp
+++ b/src/multimedia/qmedianetworkaccesscontrol.cpp
@@ -48,7 +48,7 @@ QT_BEGIN_NAMESPACE
     \preliminary
     \brief The QMediaNetworkAccessControl class allows the setting of the Network Access Point for media related activities.
     \ingroup multimedia-serv
-    \inmodule QtMultimediaKit
+    \inmodule QtMultimedia
     \since 1.2
 
     The functionality provided by this control allows the
diff --git a/src/multimediakit/qmedianetworkaccesscontrol.h b/src/multimedia/qmedianetworkaccesscontrol.h
index 22ee95711..22ee95711 100644
--- a/src/multimediakit/qmedianetworkaccesscontrol.h
+++ b/src/multimedia/qmedianetworkaccesscontrol.h
diff --git a/src/multimediakit/qmediaobject.cpp b/src/multimedia/qmediaobject.cpp
index 2f6840e04..7eb1a2dfa 100644
--- a/src/multimediakit/qmediaobject.cpp
+++ b/src/multimedia/qmediaobject.cpp
@@ -70,7 +70,7 @@ void QMediaObjectPrivate::_q_notify()
 
     \brief The QMediaObject class provides a common base for multimedia objects.
 
-    \inmodule QtMultimediaKit
+    \inmodule QtMultimedia
     \ingroup multimedia
     \since 1.0
 
@@ -102,9 +102,9 @@ QMediaObject::~QMediaObject()
     \since 1.0
 */
 
-QtMultimediaKit::AvailabilityError QMediaObject::availabilityError() const
+QtMultimedia::AvailabilityError QMediaObject::availabilityError() const
 {
-    return d_func()->service == 0 ? QtMultimediaKit::ServiceMissingError : QtMultimediaKit::NoError;
+    return d_func()->service == 0 ? QtMultimedia::ServiceMissingError : QtMultimedia::NoError;
 }
 
 /*!
@@ -334,7 +334,7 @@ bool QMediaObject::isMetaDataAvailable() const
     Returns the value associated with a meta-data \a key.
     \since 1.0
 */
-QVariant QMediaObject::metaData(QtMultimediaKit::MetaData key) const
+QVariant QMediaObject::metaData(QtMultimedia::MetaData key) const
 {
     Q_D(const QMediaObject);
 
@@ -347,13 +347,13 @@ QVariant QMediaObject::metaData(QtMultimediaKit::MetaData key) const
     Returns a list of keys there is meta-data available for.
     \since 1.0
 */
-QList<QtMultimediaKit::MetaData> QMediaObject::availableMetaData() const
+QList<QtMultimedia::MetaData> QMediaObject::availableMetaData() const
 {
     Q_D(const QMediaObject);
 
     return d->metaDataControl
             ? d->metaDataControl->availableMetaData()
-            : QList<QtMultimediaKit::MetaData>();
+            : QList<QtMultimedia::MetaData>();
 }
 
 /*!
diff --git a/src/multimediakit/qmediaobject.h b/src/multimedia/qmediaobject.h
index 0fcf4cdee..aba8f7021 100644
--- a/src/multimediakit/qmediaobject.h
+++ b/src/multimedia/qmediaobject.h
@@ -45,7 +45,7 @@
 #include <QtCore/qobject.h>
 #include <QtCore/qstringlist.h>
 
-#include <qtmultimediakitdefs.h>
+#include <qtmultimediadefs.h>
 #include "qtmedianamespace.h"
 
 QT_BEGIN_HEADER
@@ -67,7 +67,7 @@ public:
     ~QMediaObject();
 
     virtual bool isAvailable() const;
-    virtual QtMultimediaKit::AvailabilityError availabilityError() const;
+    virtual QtMultimedia::AvailabilityError availabilityError() const;
 
     virtual QMediaService* service() const;
 
@@ -79,8 +79,8 @@ public:
 
     bool isMetaDataAvailable() const;
 
-    QVariant metaData(QtMultimediaKit::MetaData key) const;
-    QList<QtMultimediaKit::MetaData> availableMetaData() const;
+    QVariant metaData(QtMultimedia::MetaData key) const;
+    QList<QtMultimedia::MetaData> availableMetaData() const;
 
     QVariant extendedMetaData(const QString &key) const;
     QStringList availableExtendedMetaData() const;
diff --git a/src/multimediakit/qmediaobject_p.h b/src/multimedia/qmediaobject_p.h
index f27420cf0..f27420cf0 100644
--- a/src/multimediakit/qmediaobject_p.h
+++ b/src/multimedia/qmediaobject_p.h
diff --git a/src/multimediakit/qmediaplayer.cpp b/src/multimedia/qmediaplayer.cpp
index 4e87e9c42..5d5a7a7a3 100644
--- a/src/multimediakit/qmediaplayer.cpp
+++ b/src/multimedia/qmediaplayer.cpp
@@ -63,7 +63,7 @@ QT_BEGIN_NAMESPACE
 /*!
     \class QMediaPlayer
     \brief The QMediaPlayer class allows the playing of a media source.
-    \inmodule QtMultimediaKit
+    \inmodule QtMultimedia
     \ingroup multimedia
     \since 1.0
 
@@ -701,7 +701,7 @@ void QMediaPlayer::unbind(QObject *obj)
     specified.
     \since 1.0
 */
-QtMultimediaKit::SupportEstimate QMediaPlayer::hasSupport(const QString &mimeType,
+QtMultimedia::SupportEstimate QMediaPlayer::hasSupport(const QString &mimeType,
                                                const QStringList& codecs,
                                                Flags flags)
 {
diff --git a/src/multimediakit/qmediaplayer.h b/src/multimedia/qmediaplayer.h
index 6bd318483..f53b50ceb 100644
--- a/src/multimediakit/qmediaplayer.h
+++ b/src/multimedia/qmediaplayer.h
@@ -126,7 +126,7 @@ public:
     QMediaPlayer(QObject *parent = 0, Flags flags = 0, QMediaServiceProvider *provider = QMediaServiceProvider::defaultServiceProvider());
     ~QMediaPlayer();
 
-    static QtMultimediaKit::SupportEstimate hasSupport(const QString &mimeType,
+    static QtMultimedia::SupportEstimate hasSupport(const QString &mimeType,
                                             const QStringList& codecs = QStringList(),
                                             Flags flags = 0);
     static QStringList supportedMimeTypes(Flags flags = 0);
diff --git a/src/multimediakit/qmediaplayercontrol.cpp b/src/multimedia/qmediaplayercontrol.cpp
index 4062306a2..2585b044c 100644
--- a/src/multimediakit/qmediaplayercontrol.cpp
+++ b/src/multimedia/qmediaplayercontrol.cpp
@@ -48,7 +48,7 @@ QT_BEGIN_NAMESPACE
 
 /*!
     \class QMediaPlayerControl
-    \inmodule QtMultimediaKit
+    \inmodule QtMultimedia
     \ingroup multimedia-serv
     \since 1.0
 
diff --git a/src/multimediakit/qmediaplayercontrol.h b/src/multimedia/qmediaplayercontrol.h
index a6e02ee9a..a6e02ee9a 100644
--- a/src/multimediakit/qmediaplayercontrol.h
+++ b/src/multimedia/qmediaplayercontrol.h
diff --git a/src/multimediakit/qmediaplaylist.cpp b/src/multimedia/qmediaplaylist.cpp
index a1690ba24..a5618ad5c 100644
--- a/src/multimediakit/qmediaplaylist.cpp
+++ b/src/multimedia/qmediaplaylist.cpp
@@ -64,7 +64,7 @@ Q_GLOBAL_STATIC_WITH_ARGS(QMediaPluginLoader, playlistIOLoader,
 
 /*!
     \class QMediaPlaylist
-    \inmodule QtMultimediaKit
+    \inmodule QtMultimedia
     \ingroup multimedia
     \since 1.0
 
diff --git a/src/multimediakit/qmediaplaylist.h b/src/multimedia/qmediaplaylist.h
index 7b4b62260..7b4b62260 100644
--- a/src/multimediakit/qmediaplaylist.h
+++ b/src/multimedia/qmediaplaylist.h
diff --git a/src/multimediakit/qmediaplaylist_p.h b/src/multimedia/qmediaplaylist_p.h
index c04483c02..c04483c02 100644
--- a/src/multimediakit/qmediaplaylist_p.h
+++ b/src/multimedia/qmediaplaylist_p.h
diff --git a/src/multimediakit/qmediaplaylistcontrol.cpp b/src/multimedia/qmediaplaylistcontrol.cpp
index cf1513863..dc2348956 100644
--- a/src/multimediakit/qmediaplaylistcontrol.cpp
+++ b/src/multimedia/qmediaplaylistcontrol.cpp
@@ -47,7 +47,7 @@ QT_BEGIN_NAMESPACE
 
 /*!
     \class QMediaPlaylistControl
-    \inmodule QtMultimediaKit
+    \inmodule QtMultimedia
     \ingroup multimedia-serv
     \since 1.0
 
diff --git a/src/multimediakit/qmediaplaylistcontrol.h b/src/multimedia/qmediaplaylistcontrol.h
index 2cce448fa..2cce448fa 100644
--- a/src/multimediakit/qmediaplaylistcontrol.h
+++ b/src/multimedia/qmediaplaylistcontrol.h
diff --git a/src/multimediakit/qmediaplaylistioplugin.cpp b/src/multimedia/qmediaplaylistioplugin.cpp
index 28afbc7bd..80fe0ef6b 100644
--- a/src/multimediakit/qmediaplaylistioplugin.cpp
+++ b/src/multimedia/qmediaplaylistioplugin.cpp
@@ -47,7 +47,7 @@ QT_BEGIN_NAMESPACE
     \class QMediaPlaylistReader
 
     \brief The QMediaPlaylistReader class provides an interface for reading a playlist file.
-    \inmodule QtMultimediaKit
+    \inmodule QtMultimedia
     \since 1.0
 
     \sa QMediaPlaylistIOPlugin
diff --git a/src/multimediakit/qmediaplaylistioplugin.h b/src/multimedia/qmediaplaylistioplugin.h
index 4234fb8ea..97ded8b43 100644
--- a/src/multimediakit/qmediaplaylistioplugin.h
+++ b/src/multimedia/qmediaplaylistioplugin.h
@@ -46,7 +46,7 @@
 #include <QtCore/qplugin.h>
 #include <QtCore/qfactoryinterface.h>
 
-#include <qtmultimediakitdefs.h>
+#include <qtmultimediadefs.h>
 
 #include "qmediacontent.h"
 
diff --git a/src/multimediakit/qmediaplaylistnavigator.cpp b/src/multimedia/qmediaplaylistnavigator.cpp
index a4d38e4a1..d78e6ef42 100644
--- a/src/multimediakit/qmediaplaylistnavigator.cpp
+++ b/src/multimedia/qmediaplaylistnavigator.cpp
@@ -194,7 +194,7 @@ int QMediaPlaylistNavigatorPrivate::previousItemPos(int steps) const
     \class QMediaPlaylistNavigator
 
     \brief The QMediaPlaylistNavigator class provides navigation for a media playlist.
-    \inmodule QtMultimediaKit
+    \inmodule QtMultimedia
     \ingroup multimedia
     \since 1.0
 
diff --git a/src/multimediakit/qmediaplaylistnavigator.h b/src/multimedia/qmediaplaylistnavigator.h
index 72e452072..72e452072 100644
--- a/src/multimediakit/qmediaplaylistnavigator.h
+++ b/src/multimedia/qmediaplaylistnavigator.h
diff --git a/src/multimediakit/qmediaplaylistprovider.cpp b/src/multimedia/qmediaplaylistprovider.cpp
index 81cd7a7fc..75e927b39 100644
--- a/src/multimediakit/qmediaplaylistprovider.cpp
+++ b/src/multimedia/qmediaplaylistprovider.cpp
@@ -50,7 +50,7 @@ QT_BEGIN_NAMESPACE
     \class QMediaPlaylistProvider
 
     \brief The QMediaPlaylistProvider class provides an abstract list of media.
-    \inmodule QtMultimediaKit
+    \inmodule QtMultimedia
     \since 1.0
 
     \sa QMediaPlaylist
diff --git a/src/multimediakit/qmediaplaylistprovider.h b/src/multimedia/qmediaplaylistprovider.h
index 79167e8ba..79167e8ba 100644
--- a/src/multimediakit/qmediaplaylistprovider.h
+++ b/src/multimedia/qmediaplaylistprovider.h
diff --git a/src/multimediakit/qmediaplaylistprovider_p.h b/src/multimedia/qmediaplaylistprovider_p.h
index 71fb86f20..71fb86f20 100644
--- a/src/multimediakit/qmediaplaylistprovider_p.h
+++ b/src/multimedia/qmediaplaylistprovider_p.h
diff --git a/src/multimediakit/qmediaplaylistsourcecontrol.cpp b/src/multimedia/qmediaplaylistsourcecontrol.cpp
index 3a788f486..ca90feda2 100644
--- a/src/multimediakit/qmediaplaylistsourcecontrol.cpp
+++ b/src/multimedia/qmediaplaylistsourcecontrol.cpp
@@ -47,7 +47,7 @@ QT_BEGIN_NAMESPACE
 
 /*!
     \class QMediaPlaylistSourceControl
-    \inmodule QtMultimediaKit
+    \inmodule QtMultimedia
     \ingroup multimedia-serv
     \since 1.0
 
diff --git a/src/multimediakit/qmediaplaylistsourcecontrol.h b/src/multimedia/qmediaplaylistsourcecontrol.h
index 040bb6431..040bb6431 100644
--- a/src/multimediakit/qmediaplaylistsourcecontrol.h
+++ b/src/multimedia/qmediaplaylistsourcecontrol.h
diff --git a/src/multimediakit/qmediapluginloader.cpp b/src/multimedia/qmediapluginloader.cpp
index 32f336959..32f336959 100644
--- a/src/multimediakit/qmediapluginloader.cpp
+++ b/src/multimedia/qmediapluginloader.cpp
diff --git a/src/multimediakit/qmediapluginloader_p.h b/src/multimedia/qmediapluginloader_p.h
index 2f0a4d939..1800a41e7 100644
--- a/src/multimediakit/qmediapluginloader_p.h
+++ b/src/multimedia/qmediapluginloader_p.h
@@ -53,7 +53,7 @@
 // We mean it.
 //
 
-#include <qtmultimediakitdefs.h>
+#include <qtmultimediadefs.h>
 #include <QtCore/qobject.h>
 #include <QtCore/qstring.h>
 #include <QtCore/qstringlist.h>
diff --git a/src/multimediakit/qmediarecorder.cpp b/src/multimedia/qmediarecorder.cpp
index 2584359ef..bcbae5708 100644
--- a/src/multimediakit/qmediarecorder.cpp
+++ b/src/multimedia/qmediarecorder.cpp
@@ -63,7 +63,7 @@ QT_BEGIN_NAMESPACE
 
 /*!
     \class QMediaRecorder
-    \inmodule QtMultimediaKit
+    \inmodule QtMultimedia
     \ingroup multimedia
     \since 1.0
 
@@ -372,12 +372,12 @@ bool QMediaRecorder::isAvailable() const
     Returns the availability error code.
     \since 1.0
 */
-QtMultimediaKit::AvailabilityError QMediaRecorder::availabilityError() const
+QtMultimedia::AvailabilityError QMediaRecorder::availabilityError() const
 {
     if (d_func()->control != NULL)
-        return QtMultimediaKit::NoError;
+        return QtMultimedia::NoError;
     else
-        return QtMultimediaKit::ServiceMissingError;
+        return QtMultimedia::ServiceMissingError;
 }
 
 QUrl QMediaRecorder::outputLocation() const
@@ -811,7 +811,7 @@ bool QMediaRecorder::isMetaDataWritable() const
     Returns the value associated with a meta-data \a key.
     \since 1.0
 */
-QVariant QMediaRecorder::metaData(QtMultimediaKit::MetaData key) const
+QVariant QMediaRecorder::metaData(QtMultimedia::MetaData key) const
 {
     Q_D(const QMediaRecorder);
 
@@ -827,7 +827,7 @@ QVariant QMediaRecorder::metaData(QtMultimediaKit::MetaData key) const
     Once the recording is stopped, any meta data set will be attached to the next recording.
     \since 1.0
 */
-void QMediaRecorder::setMetaData(QtMultimediaKit::MetaData key, const QVariant &value)
+void QMediaRecorder::setMetaData(QtMultimedia::MetaData key, const QVariant &value)
 {
     Q_D(QMediaRecorder);
 
@@ -839,13 +839,13 @@ void QMediaRecorder::setMetaData(QtMultimediaKit::MetaData key, const QVariant &
     Returns a list of keys there is meta-data available for.
     \since 1.0
 */
-QList<QtMultimediaKit::MetaData> QMediaRecorder::availableMetaData() const
+QList<QtMultimedia::MetaData> QMediaRecorder::availableMetaData() const
 {
     Q_D(const QMediaRecorder);
 
     return d->metaDataControl
             ? d->metaDataControl->availableMetaData()
-            : QList<QtMultimediaKit::MetaData>();
+            : QList<QtMultimedia::MetaData>();
 }
 
 /*!
diff --git a/src/multimediakit/qmediarecorder.h b/src/multimedia/qmediarecorder.h
index 1e99b95c6..fbd47ddde 100644
--- a/src/multimediakit/qmediarecorder.h
+++ b/src/multimedia/qmediarecorder.h
@@ -101,7 +101,7 @@ public:
     QMediaObject *mediaObject() const;
 
     bool isAvailable() const;
-    QtMultimediaKit::AvailabilityError availabilityError() const;
+    QtMultimedia::AvailabilityError availabilityError() const;
 
     QUrl outputLocation() const;
     bool setOutputLocation(const QUrl &location);
@@ -145,9 +145,9 @@ public:
     bool isMetaDataAvailable() const;
     bool isMetaDataWritable() const;
 
-    QVariant metaData(QtMultimediaKit::MetaData key) const;
-    void setMetaData(QtMultimediaKit::MetaData key, const QVariant &value);
-    QList<QtMultimediaKit::MetaData> availableMetaData() const;
+    QVariant metaData(QtMultimedia::MetaData key) const;
+    void setMetaData(QtMultimedia::MetaData key, const QVariant &value);
+    QList<QtMultimedia::MetaData> availableMetaData() const;
 
     QVariant extendedMetaData(const QString &key) const;
     void setExtendedMetaData(const QString &key, const QVariant &value);
diff --git a/src/multimediakit/qmediarecordercontrol.cpp b/src/multimedia/qmediarecordercontrol.cpp
index 1f98d65ac..ffc51021b 100644
--- a/src/multimediakit/qmediarecordercontrol.cpp
+++ b/src/multimedia/qmediarecordercontrol.cpp
@@ -46,7 +46,7 @@ QT_BEGIN_NAMESPACE
 
 /*!
     \class QMediaRecorderControl
-    \inmodule QtMultimediaKit
+    \inmodule QtMultimedia
     \ingroup multimedia-serv
     \since 1.0
 
diff --git a/src/multimediakit/qmediarecordercontrol.h b/src/multimedia/qmediarecordercontrol.h
index 26f244c08..26f244c08 100644
--- a/src/multimediakit/qmediarecordercontrol.h
+++ b/src/multimedia/qmediarecordercontrol.h
diff --git a/src/multimediakit/qmediaresource.cpp b/src/multimedia/qmediaresource.cpp
index 84f4e6c68..a80168830 100644
--- a/src/multimediakit/qmediaresource.cpp
+++ b/src/multimedia/qmediaresource.cpp
@@ -51,7 +51,7 @@ QT_BEGIN_NAMESPACE
     \class QMediaResource
 
     \brief The QMediaResource class provides a description of a media resource.
-    \inmodule QtMultimediaKit
+    \inmodule QtMultimedia
     \ingroup multimedia
     \since 1.0
 
diff --git a/src/multimediakit/qmediaresource.h b/src/multimedia/qmediaresource.h
index 02469e04c..b06c61dcb 100644
--- a/src/multimediakit/qmediaresource.h
+++ b/src/multimedia/qmediaresource.h
@@ -46,7 +46,7 @@
 #include <QtCore/qmetatype.h>
 #include <QtNetwork/qnetworkrequest.h>
 
-#include <qtmultimediakitdefs.h>
+#include <qtmultimediadefs.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/multimediakit/qmediaservice.cpp b/src/multimedia/qmediaservice.cpp
index 1a7fca360..d97b3613c 100644
--- a/src/multimediakit/qmediaservice.cpp
+++ b/src/multimedia/qmediaservice.cpp
@@ -53,7 +53,7 @@ QT_BEGIN_NAMESPACE
     \class QMediaService
     \brief The QMediaService class provides a common base class for media
     service implementations.
-    \inmodule QtMultimediaKit
+    \inmodule QtMultimedia
     \ingroup multimedia-serv
     \since 1.0
 
diff --git a/src/multimediakit/qmediaservice.h b/src/multimedia/qmediaservice.h
index 7bf90ba4f..64aa7099f 100644
--- a/src/multimediakit/qmediaservice.h
+++ b/src/multimedia/qmediaservice.h
@@ -42,7 +42,7 @@
 #ifndef QABSTRACTMEDIASERVICE_H
 #define QABSTRACTMEDIASERVICE_H
 
-#include <qtmultimediakitdefs.h>
+#include <qtmultimediadefs.h>
 #include <QtCore/qobject.h>
 #include <QtCore/qstringlist.h>
 
diff --git a/src/multimediakit/qmediaservice_p.h b/src/multimedia/qmediaservice_p.h
index 83fd7287f..83fd7287f 100644
--- a/src/multimediakit/qmediaservice_p.h
+++ b/src/multimedia/qmediaservice_p.h
diff --git a/src/multimediakit/qmediaserviceprovider.cpp b/src/multimedia/qmediaserviceprovider.cpp
index 33ed3fbbd..0017349c4 100644
--- a/src/multimediakit/qmediaserviceprovider.cpp
+++ b/src/multimedia/qmediaserviceprovider.cpp
@@ -84,7 +84,7 @@ public:
 
     \brief The QMediaServiceProviderHint class describes what is required of a QMediaService.
 
-    \inmodule QtMultimediaKit
+    \inmodule QtMultimedia
     \ingroup multimedia-serv
     \since 1.0
 
@@ -358,9 +358,9 @@ public:
                 }
                 break;
             case QMediaServiceProviderHint::ContentType: {
-                    QtMultimediaKit::SupportEstimate estimate = QtMultimediaKit::NotSupported;
+                    QtMultimedia::SupportEstimate estimate = QtMultimedia::NotSupported;
                     foreach (QMediaServiceProviderPlugin *currentPlugin, plugins) {
-                        QtMultimediaKit::SupportEstimate currentEstimate = QtMultimediaKit::MaybeSupported;
+                        QtMultimedia::SupportEstimate currentEstimate = QtMultimedia::MaybeSupported;
                         QMediaServiceSupportedFormatsInterface *iface =
                                 qobject_cast<QMediaServiceSupportedFormatsInterface*>(currentPlugin);
 
@@ -371,7 +371,7 @@ public:
                             estimate = currentEstimate;
                             plugin = currentPlugin;
 
-                            if (currentEstimate == QtMultimediaKit::PreferredService)
+                            if (currentEstimate == QtMultimedia::PreferredService)
                                 break;
                         }
                     }
@@ -402,7 +402,7 @@ public:
         }
     }
 
-    QtMultimediaKit::SupportEstimate hasSupport(const QByteArray &serviceType,
+    QtMultimedia::SupportEstimate hasSupport(const QByteArray &serviceType,
                                      const QString &mimeType,
                                      const QStringList& codecs,
                                      int flags) const
@@ -410,10 +410,10 @@ public:
         QList<QObject*> instances = loader()->instances(QLatin1String(serviceType));
 
         if (instances.isEmpty())
-            return QtMultimediaKit::NotSupported;
+            return QtMultimedia::NotSupported;
 
         bool allServicesProvideInterface = true;
-        QtMultimediaKit::SupportEstimate supportEstimate = QtMultimediaKit::NotSupported;
+        QtMultimedia::SupportEstimate supportEstimate = QtMultimedia::NotSupported;
 
         foreach(QObject *obj, instances) {
             QMediaServiceSupportedFormatsInterface *iface =
@@ -447,12 +447,12 @@ public:
         }
 
         //don't return PreferredService
-        supportEstimate = qMin(supportEstimate, QtMultimediaKit::ProbablySupported);
+        supportEstimate = qMin(supportEstimate, QtMultimedia::ProbablySupported);
 
         //Return NotSupported only if no services are available of serviceType
         //or all the services returned NotSupported, otherwise return at least MaybeSupported
         if (!allServicesProvideInterface)
-            supportEstimate = qMax(QtMultimediaKit::MaybeSupported, supportEstimate);
+            supportEstimate = qMax(QtMultimedia::MaybeSupported, supportEstimate);
 
         return supportEstimate;
     }
@@ -567,7 +567,7 @@ Q_GLOBAL_STATIC(QPluginServiceProvider, pluginProvider);
 */
 
 /*!
-    \fn QtMultimediaKit::SupportEstimate QMediaServiceProvider::hasSupport(const QByteArray &serviceType, const QString &mimeType, const QStringList& codecs, int flags) const
+    \fn QtMultimedia::SupportEstimate QMediaServiceProvider::hasSupport(const QByteArray &serviceType, const QString &mimeType, const QStringList& codecs, int flags) const
 
     Returns how confident a media service provider is that is can provide a \a
     serviceType service that is able to play media of a specific \a mimeType
@@ -575,7 +575,7 @@ Q_GLOBAL_STATIC(QPluginServiceProvider, pluginProvider);
     identified in \a flags.
     \since 1.0
 */
-QtMultimediaKit::SupportEstimate QMediaServiceProvider::hasSupport(const QByteArray &serviceType,
+QtMultimedia::SupportEstimate QMediaServiceProvider::hasSupport(const QByteArray &serviceType,
                                                         const QString &mimeType,
                                                         const QStringList& codecs,
                                                         int flags) const
@@ -585,7 +585,7 @@ QtMultimediaKit::SupportEstimate QMediaServiceProvider::hasSupport(const QByteAr
     Q_UNUSED(codecs);
     Q_UNUSED(flags);
 
-    return QtMultimediaKit::MaybeSupported;
+    return QtMultimedia::MaybeSupported;
 }
 
 /*!
diff --git a/src/multimediakit/qmediaserviceprovider.h b/src/multimedia/qmediaserviceprovider.h
index 01a7e3461..8ad2e2f6c 100644
--- a/src/multimediakit/qmediaserviceprovider.h
+++ b/src/multimedia/qmediaserviceprovider.h
@@ -44,7 +44,7 @@
 
 #include <QtCore/qobject.h>
 #include <QtCore/qshareddata.h>
-#include <qtmultimediakitdefs.h>
+#include <qtmultimediadefs.h>
 #include "qtmedianamespace.h"
 
 QT_BEGIN_HEADER
@@ -110,7 +110,7 @@ public:
     virtual QMediaService* requestService(const QByteArray &type, const QMediaServiceProviderHint &hint = QMediaServiceProviderHint()) = 0;
     virtual void releaseService(QMediaService *service) = 0;
 
-    virtual QtMultimediaKit::SupportEstimate hasSupport(const QByteArray &serviceType,
+    virtual QtMultimedia::SupportEstimate hasSupport(const QByteArray &serviceType,
                                              const QString &mimeType,
                                              const QStringList& codecs,
                                              int flags = 0) const;
diff --git a/src/multimediakit/qmediaserviceproviderplugin.h b/src/multimedia/qmediaserviceproviderplugin.h
index 5d150a22b..669723e2b 100644
--- a/src/multimediakit/qmediaserviceproviderplugin.h
+++ b/src/multimedia/qmediaserviceproviderplugin.h
@@ -45,7 +45,7 @@
 #include <QtCore/qstringlist.h>
 #include <QtCore/qplugin.h>
 #include <QtCore/qfactoryinterface.h>
-#include <qtmultimediakitdefs.h>
+#include <qtmultimediadefs.h>
 #include "qmediaserviceprovider.h"
 
 #ifdef Q_MOC_RUN
@@ -76,7 +76,7 @@ Q_DECLARE_INTERFACE(QMediaServiceProviderFactoryInterface, QMediaServiceProvider
 struct Q_MULTIMEDIA_EXPORT QMediaServiceSupportedFormatsInterface
 {
     virtual ~QMediaServiceSupportedFormatsInterface() {}
-    virtual QtMultimediaKit::SupportEstimate hasSupport(const QString &mimeType, const QStringList& codecs) const = 0;
+    virtual QtMultimedia::SupportEstimate hasSupport(const QString &mimeType, const QStringList& codecs) const = 0;
     virtual QStringList supportedMimeTypes() const = 0;
 };
 
diff --git a/src/multimediakit/qmediastreamscontrol.cpp b/src/multimedia/qmediastreamscontrol.cpp
index 58b935355..65614b612 100644
--- a/src/multimediakit/qmediastreamscontrol.cpp
+++ b/src/multimedia/qmediastreamscontrol.cpp
@@ -48,11 +48,10 @@ QT_BEGIN_NAMESPACE
     \class QMediaStreamsControl
     \preliminary
 
-    \inmodule QtMultimediaKit
+    \inmodule QtMultimedia
     \ingroup multimedia-serv
     \brief The QMediaStreamsControl class provides a media stream selection control.
 
-    \ingroup multimedia-serv
     \since 1.0
 
     The QMediaStreamsControl class provides descriptions of the available media streams
@@ -117,11 +116,11 @@ QMediaStreamsControl::~QMediaStreamsControl()
 */
 
 /*!
-    \fn QMediaStreamsControl::metaData(int stream, QtMultimediaKit::MetaData key)
+    \fn QMediaStreamsControl::metaData(int stream, QtMultimedia::MetaData key)
 
     Returns the meta-data value of \a key for a given \a stream.
 
-    Useful metadata keya are QtMultimediaKit::Title, QtMultimediaKit::Description and QtMultimediaKit::Language.
+    Useful metadata keya are QtMultimedia::Title, QtMultimedia::Description and QtMultimedia::Language.
     \since 1.0
 */
 
diff --git a/src/multimediakit/qmediastreamscontrol.h b/src/multimedia/qmediastreamscontrol.h
index 10c38e130..bbd8a2a43 100644
--- a/src/multimediakit/qmediastreamscontrol.h
+++ b/src/multimedia/qmediastreamscontrol.h
@@ -45,7 +45,7 @@
 
 #include "qmediacontrol.h"
 #include "qtmedianamespace.h"
-#include "qtmultimediakitdefs.h"
+#include "qtmultimediadefs.h"
 #include <qmediaenumdebug.h>
 
 QT_BEGIN_HEADER
@@ -67,7 +67,7 @@ public:
     virtual int streamCount() = 0;
     virtual StreamType streamType(int streamNumber) = 0;
 
-    virtual QVariant metaData(int streamNumber, QtMultimediaKit::MetaData key) = 0;
+    virtual QVariant metaData(int streamNumber, QtMultimedia::MetaData key) = 0;
 
     virtual bool isActive(int streamNumber) = 0;
     virtual void setActive(int streamNumber, bool state) = 0;
diff --git a/src/multimediakit/qmediatimerange.cpp b/src/multimedia/qmediatimerange.cpp
index 6da9fd640..34252de37 100644
--- a/src/multimediakit/qmediatimerange.cpp
+++ b/src/multimedia/qmediatimerange.cpp
@@ -48,7 +48,7 @@ QT_BEGIN_NAMESPACE
 /*!
     \class QMediaTimeInterval
     \brief The QMediaTimeInterval class represents a time interval with integer precision.
-    \inmodule QtMultimediaKit
+    \inmodule QtMultimedia
     \ingroup multimedia
     \since 1.0
 
diff --git a/src/multimediakit/qmediatimerange.h b/src/multimedia/qmediatimerange.h
index 927801f34..d506bbe52 100644
--- a/src/multimediakit/qmediatimerange.h
+++ b/src/multimedia/qmediatimerange.h
@@ -42,7 +42,7 @@
 #ifndef QMEDIATIMERANGE_H
 #define QMEDIATIMERANGE_H
 
-#include <qtmultimediakitdefs.h>
+#include <qtmultimediadefs.h>
 #include "qtmedianamespace.h"
 #include <QtCore/qshareddata.h>
 
diff --git a/src/multimediakit/qmetadatareadercontrol.cpp b/src/multimedia/qmetadatareadercontrol.cpp
index c877201d8..a15cf6d7e 100644
--- a/src/multimediakit/qmetadatareadercontrol.cpp
+++ b/src/multimedia/qmetadatareadercontrol.cpp
@@ -47,7 +47,7 @@ QT_BEGIN_NAMESPACE
 
 /*!
     \class QMetaDataReaderControl
-    \inmodule QtMultimediaKit
+    \inmodule QtMultimedia
     \ingroup multimedia-serv
     \since 1.0
 
@@ -59,7 +59,7 @@ QT_BEGIN_NAMESPACE
     its current media it will implement QMetaDataReaderControl.  This control
     provides functions for both retrieving and setting meta-data values.
     Meta-data may be addressed by the well defined keys in the
-    QtMultimediaKit::MetaData enumeration using the metaData() functions, or by
+    QtMultimedia::MetaData enumeration using the metaData() functions, or by
     string keys using the extendedMetaData() functions.
 
     The functionality provided by this control is exposed to application
@@ -112,7 +112,7 @@ QMetaDataReaderControl::~QMetaDataReaderControl()
 */
 
 /*!
-    \fn QVariant QMetaDataReaderControl::metaData(QtMultimediaKit::MetaData key) const
+    \fn QVariant QMetaDataReaderControl::metaData(QtMultimedia::MetaData key) const
 
     Returns the meta-data for the given \a key.
     \since 1.0
diff --git a/src/multimediakit/qmetadatareadercontrol.h b/src/multimedia/qmetadatareadercontrol.h
index 4689e30bc..0d370b5c4 100644
--- a/src/multimediakit/qmetadatareadercontrol.h
+++ b/src/multimedia/qmetadatareadercontrol.h
@@ -47,7 +47,7 @@
 
 #include <qmediaresource.h>
 
-#include <qtmultimediakitdefs.h>
+#include <qtmultimediadefs.h>
 #include "qtmedianamespace.h"
 
 QT_BEGIN_HEADER
@@ -66,8 +66,8 @@ public:
 
     virtual bool isMetaDataAvailable() const = 0;
 
-    virtual QVariant metaData(QtMultimediaKit::MetaData key) const = 0;
-    virtual QList<QtMultimediaKit::MetaData> availableMetaData() const = 0;
+    virtual QVariant metaData(QtMultimedia::MetaData key) const = 0;
+    virtual QList<QtMultimedia::MetaData> availableMetaData() const = 0;
 
     virtual QVariant extendedMetaData(const QString &key) const = 0;
     virtual QStringList availableExtendedMetaData() const = 0;
diff --git a/src/multimediakit/qmetadatawritercontrol.cpp b/src/multimedia/qmetadatawritercontrol.cpp
index 3e5bf42e3..0888bcfae 100644
--- a/src/multimediakit/qmetadatawritercontrol.cpp
+++ b/src/multimedia/qmetadatawritercontrol.cpp
@@ -47,7 +47,7 @@ QT_BEGIN_NAMESPACE
 
 /*!
     \class QMetaDataWriterControl
-    \inmodule QtMultimediaKit
+    \inmodule QtMultimedia
     \ingroup multimedia-serv
     \since 1.0
 
@@ -59,7 +59,7 @@ QT_BEGIN_NAMESPACE
     current media it will implement QMetaDataWriterControl.  This control
     provides functions for both retrieving and setting meta-data values.
     Meta-data may be addressed by the well defined keys in the
-    QtMultimediaKit::MetaData enumeration using the metaData() functions, or
+    QtMultimedia::MetaData enumeration using the metaData() functions, or
     by string keys using the extendedMetaData() functions.
 
     The functionality provided by this control is exposed to application code
@@ -120,14 +120,14 @@ QMetaDataWriterControl::~QMetaDataWriterControl()
 */
 
 /*!
-    \fn QVariant QMetaDataWriterControl::metaData(QtMultimediaKit::MetaData key) const
+    \fn QVariant QMetaDataWriterControl::metaData(QtMultimedia::MetaData key) const
 
     Returns the meta-data for the given \a key.
     \since 1.0
 */
 
 /*!
-    \fn void QMetaDataWriterControl::setMetaData(QtMultimediaKit::MetaData key, const QVariant &value)
+    \fn void QMetaDataWriterControl::setMetaData(QtMultimedia::MetaData key, const QVariant &value)
 
     Sets the \a value of the meta-data element with the given \a key.
     \since 1.0
diff --git a/src/multimediakit/qmetadatawritercontrol.h b/src/multimedia/qmetadatawritercontrol.h
index 41a2fbba7..3f8b8c3f4 100644
--- a/src/multimediakit/qmetadatawritercontrol.h
+++ b/src/multimedia/qmetadatawritercontrol.h
@@ -47,7 +47,7 @@
 
 #include "qmediaresource.h"
 
-#include <qtmultimediakitdefs.h>
+#include <qtmultimediadefs.h>
 #include "qtmedianamespace.h"
 
 QT_BEGIN_HEADER
@@ -67,9 +67,9 @@ public:
     virtual bool isWritable() const = 0;
     virtual bool isMetaDataAvailable() const = 0;
 
-    virtual QVariant metaData(QtMultimediaKit::MetaData key) const = 0;
-    virtual void setMetaData(QtMultimediaKit::MetaData key, const QVariant &value) = 0;
-    virtual QList<QtMultimediaKit::MetaData> availableMetaData() const = 0;
+    virtual QVariant metaData(QtMultimedia::MetaData key) const = 0;
+    virtual void setMetaData(QtMultimedia::MetaData key, const QVariant &value) = 0;
+    virtual QList<QtMultimedia::MetaData> availableMetaData() const = 0;
 
     virtual QVariant extendedMetaData(const QString &key) const = 0;
     virtual void setExtendedMetaData(const QString &key, const QVariant &value) = 0;
diff --git a/src/multimediakit/qradiotuner.cpp b/src/multimedia/qradiotuner.cpp
index 6398e2ba9..25f76b83a 100644
--- a/src/multimediakit/qradiotuner.cpp
+++ b/src/multimedia/qradiotuner.cpp
@@ -53,7 +53,7 @@ QT_BEGIN_NAMESPACE
     \class QRadioTuner
     \brief The QRadioTuner class provides an interface to the systems analog radio device.
 
-    \inmodule QtMultimediaKit
+    \inmodule QtMultimedia
     \ingroup multimedia
     \since 1.0
 
@@ -141,12 +141,12 @@ bool QRadioTuner::isAvailable() const
     Returns the availability error state.
     \since 1.0
 */
-QtMultimediaKit::AvailabilityError QRadioTuner::availabilityError() const
+QtMultimedia::AvailabilityError QRadioTuner::availabilityError() const
 {
     if (d_func()->control != NULL)
         return d_func()->control->availabilityError();
     else
-        return QtMultimediaKit::ServiceMissingError;
+        return QtMultimedia::ServiceMissingError;
 }
 
 /*!
diff --git a/src/multimediakit/qradiotuner.h b/src/multimedia/qradiotuner.h
index c0f94125f..78852638c 100644
--- a/src/multimediakit/qradiotuner.h
+++ b/src/multimedia/qradiotuner.h
@@ -85,7 +85,7 @@ public:
     ~QRadioTuner();
 
     bool isAvailable() const;
-    QtMultimediaKit::AvailabilityError availabilityError() const;
+    QtMultimedia::AvailabilityError availabilityError() const;
 
     State state() const;
 
diff --git a/src/multimediakit/qradiotunercontrol.cpp b/src/multimedia/qradiotunercontrol.cpp
index d468b0348..97ffd2396 100644
--- a/src/multimediakit/qradiotunercontrol.cpp
+++ b/src/multimedia/qradiotunercontrol.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include <qtmultimediakitdefs.h>
+#include <qtmultimediadefs.h>
 #include "qradiotunercontrol.h"
 #include "qmediacontrol_p.h"
 
@@ -48,7 +48,7 @@ QT_BEGIN_NAMESPACE
 
 /*!
     \class QRadioTunerControl
-    \inmodule QtMultimediaKit
+    \inmodule QtMultimedia
     \ingroup multimedia-serv
     \since 1.0
 
@@ -106,7 +106,7 @@ QRadioTunerControl::~QRadioTunerControl()
 */
 
 /*!
-    \fn QtMultimediaKit::AvailabilityError QRadioTunerControl::availabilityError() const
+    \fn QtMultimedia::AvailabilityError QRadioTunerControl::availabilityError() const
 
     Returns the error state of the radio service.
     \since 1.0
diff --git a/src/multimediakit/qradiotunercontrol.h b/src/multimedia/qradiotunercontrol.h
index ae6990ddc..04812be48 100644
--- a/src/multimediakit/qradiotunercontrol.h
+++ b/src/multimedia/qradiotunercontrol.h
@@ -60,7 +60,7 @@ public:
     ~QRadioTunerControl();
 
     virtual bool isAvailable() const = 0;
-    virtual QtMultimediaKit::AvailabilityError availabilityError() const = 0;
+    virtual QtMultimedia::AvailabilityError availabilityError() const = 0;
 
     virtual QRadioTuner::State state() const = 0;
 
diff --git a/src/multimediakit/qtmedianamespace.h b/src/multimedia/qtmedianamespace.h
index cadbc28d9..4296b188d 100644
--- a/src/multimediakit/qtmedianamespace.h
+++ b/src/multimedia/qtmedianamespace.h
@@ -45,7 +45,7 @@
 #include <QtCore/qpair.h>
 #include <QtCore/qmetatype.h>
 
-#include <qtmultimediakitdefs.h>
+#include <qtmultimediadefs.h>
 
 QT_BEGIN_HEADER
 
@@ -53,8 +53,12 @@ QT_BEGIN_NAMESPACE
 
 QT_MODULE(Multimedia)
 
-
-namespace QtMultimediaKit
+// For now, for backwards source compatibility
+// we have a copy of these enums
+// But if you add a new enum value, you won't need
+// to copy it to the QtMMK enums since it can't have
+// been used before.
+namespace QtMultimedia
 {
     enum MetaData
     {
@@ -190,6 +194,143 @@ namespace QtMultimediaKit
 
 }
 
+// For legacy support
+namespace QtMultimediaKit
+{
+    enum MetaData
+    {
+        // Common
+        Title = QtMultimedia::Title,
+        SubTitle,
+        Author,
+        Comment,
+        Description,
+        Category,
+        Genre,
+        Year,
+        Date,
+        UserRating,
+        Keywords,
+        Language,
+        Publisher,
+        Copyright,
+        ParentalRating,
+        RatingOrganisation,
+
+        // Media
+        Size,
+        MediaType,
+        Duration,
+
+        // Audio
+        AudioBitRate,
+        AudioCodec,
+        AverageLevel,
+        ChannelCount,
+        PeakValue,
+        SampleRate,
+
+        // Music
+        AlbumTitle,
+        AlbumArtist,
+        ContributingArtist,
+        Composer,
+        Conductor,
+        Lyrics,
+        Mood,
+        TrackNumber,
+        TrackCount,
+
+        CoverArtUrlSmall,
+        CoverArtUrlLarge,
+
+        // Image/Video
+        Resolution,
+        PixelAspectRatio,
+
+        // Video
+        VideoFrameRate,
+        VideoBitRate,
+        VideoCodec,
+
+        PosterUrl,
+
+        // Movie
+        ChapterNumber,
+        Director,
+        LeadPerformer,
+        Writer,
+
+        // Photos
+        CameraManufacturer,
+        CameraModel,
+        Event,
+        Subject,
+        Orientation,
+        ExposureTime,
+        FNumber,
+        ExposureProgram,
+        ISOSpeedRatings,
+        ExposureBiasValue,
+        DateTimeOriginal,
+        DateTimeDigitized,
+        SubjectDistance,
+        MeteringMode,
+        LightSource,
+        Flash,
+        FocalLength,
+        ExposureMode,
+        WhiteBalance,
+        DigitalZoomRatio,
+        FocalLengthIn35mmFilm,
+        SceneCaptureType,
+        GainControl,
+        Contrast,
+        Saturation,
+        Sharpness,
+        DeviceSettingDescription,
+
+        PosterImage,
+        CoverArtImage,
+        ThumbnailImage
+
+    };
+
+    enum SupportEstimate
+    {
+        NotSupported = QtMultimedia::NotSupported,
+        MaybeSupported,
+        ProbablySupported,
+        PreferredService
+    };
+
+    enum EncodingQuality
+    {
+        VeryLowQuality = QtMultimedia::VeryLowQuality,
+        LowQuality,
+        NormalQuality,
+        HighQuality,
+        VeryHighQuality
+    };
+
+    enum EncodingMode
+    {
+        ConstantQualityEncoding = QtMultimedia::ConstantQualityEncoding,
+        ConstantBitRateEncoding,
+        AverageBitRateEncoding,
+        TwoPassEncoding
+    };
+
+    enum AvailabilityError
+    {
+        NoError = QtMultimedia::NoError,
+        ServiceMissingError,
+        BusyError,
+        ResourceError
+    };
+
+}
+
 QT_END_NAMESPACE
 
 QT_END_HEADER
diff --git a/src/multimediakit/qtmedianamespace.qdoc b/src/multimedia/qtmedianamespace.qdoc
index dd6a1e44b..bc998e930 100644
--- a/src/multimediakit/qtmedianamespace.qdoc
+++ b/src/multimedia/qtmedianamespace.qdoc
@@ -26,20 +26,20 @@
 ****************************************************************************/
 
 /*!
-    \namespace QtMultimediaKit
+    \namespace QtMultimedia
     \ingroup multimedia
-    \inmodule QtMultimediaKit
+    \inmodule QtMultimedia
 
-    \brief The QtMultimediaKit namespace contains miscellaneous identifiers used throughout the Qt Media services library.
+    \brief The QtMultimedia namespace contains miscellaneous identifiers used throughout the Qt Media services library.
 
-    QtMultimediaKit is a module containing the low level, low latency,
+    QtMultimedia is a module containing the low level, low latency,
     Multimedia APIs which were introduced in Qt 4.6 and also includes the
     high level QtMultimedia APIs which were introduced in QtMobility 1.0.
 
 */
 
 /*!
-    \enum QtMultimediaKit::MetaData
+    \enum QtMultimedia::MetaData
 
     This enum provides identifiers for meta-data attributes.
 
@@ -163,7 +163,7 @@
 */
 
 /*!
-    \enum QtMultimediaKit::SupportEstimate
+    \enum QtMultimedia::SupportEstimate
 
     Enumerates the levels of support a media service provider may have for a feature.
 
@@ -174,7 +174,7 @@
 */
 
 /*!
-    \enum QtMultimediaKit::EncodingQuality
+    \enum QtMultimedia::EncodingQuality
 
     Enumerates quality encoding levels.
 
@@ -186,7 +186,7 @@
 */
 
 /*!
-    \enum QtMultimediaKit::EncodingMode
+    \enum QtMultimedia::EncodingMode
 
     Enumerates encoding modes.
 
@@ -197,7 +197,7 @@
 */
 
 /*!
-    \enum QtMultimediaKit::AvailabilityError
+    \enum QtMultimedia::AvailabilityError
 
     Enumerates Service status errors.
 
diff --git a/src/multimediakit/qtmultimediakitdefs.h b/src/multimedia/qtmultimediadefs.h
index c7ba7101d..313503929 100644
--- a/src/multimediakit/qtmultimediakitdefs.h
+++ b/src/multimedia/qtmultimediadefs.h
@@ -50,8 +50,8 @@
 // We mean it.
 //
 
-#ifndef QTMULTIMEDIAKIT_P_H
-#define QTMULTIMEDIAKIT_P_H
+#ifndef QTMULTIMEDIA_P_H
+#define QTMULTIMEDIA_P_H
 
 #include <QtCore/qglobal.h>
 
@@ -86,5 +86,5 @@ QT_BEGIN_HEADER
 QT_END_HEADER
 
 
-#endif // QMULTIMEDIAKIT_P_H
+#endif // QMULTIMEDIA_P_H
 
diff --git a/src/multimediakit/qvideodevicecontrol.cpp b/src/multimedia/qvideodevicecontrol.cpp
index e1c5f099d..a864fd580 100644
--- a/src/multimediakit/qvideodevicecontrol.cpp
+++ b/src/multimedia/qvideodevicecontrol.cpp
@@ -47,7 +47,7 @@ QT_BEGIN_NAMESPACE
     \class QVideoDeviceControl
 
     \brief The QVideoDeviceControl class provides an video device selector media control.
-    \inmodule QtMultimediaKit
+    \inmodule QtMultimedia
     \ingroup multimedia-serv
     \since 1.0
 
diff --git a/src/multimediakit/qvideodevicecontrol.h b/src/multimedia/qvideodevicecontrol.h
index 6f44c4671..6f44c4671 100644
--- a/src/multimediakit/qvideodevicecontrol.h
+++ b/src/multimedia/qvideodevicecontrol.h
diff --git a/src/multimediakit/qvideoencodercontrol.cpp b/src/multimedia/qvideoencodercontrol.cpp
index b747f0ef6..1551f2cf7 100644
--- a/src/multimediakit/qvideoencodercontrol.cpp
+++ b/src/multimedia/qvideoencodercontrol.cpp
@@ -48,7 +48,7 @@ QT_BEGIN_NAMESPACE
 /*!
     \class QVideoEncoderControl
 
-    \inmodule QtMultimediaKit
+    \inmodule QtMultimedia
     \ingroup multimedia-serv
     \since 1.0
 
diff --git a/src/multimediakit/qvideoencodercontrol.h b/src/multimedia/qvideoencodercontrol.h
index 343af8039..343af8039 100644
--- a/src/multimediakit/qvideoencodercontrol.h
+++ b/src/multimedia/qvideoencodercontrol.h
diff --git a/src/multimediakit/qvideorenderercontrol.cpp b/src/multimedia/qvideorenderercontrol.cpp
index 0025d187f..99142261a 100644
--- a/src/multimediakit/qvideorenderercontrol.cpp
+++ b/src/multimedia/qvideorenderercontrol.cpp
@@ -52,7 +52,7 @@ QT_BEGIN_NAMESPACE
     \brief The QVideoRendererControl class provides a control for rendering
     to a video surface.
 
-    \inmodule QtMultimediaKit
+    \inmodule QtMultimedia
     \ingroup multimedia-serv
     \since 1.0
 
diff --git a/src/multimediakit/qvideorenderercontrol.h b/src/multimedia/qvideorenderercontrol.h
index b3a70837c..b3a70837c 100644
--- a/src/multimediakit/qvideorenderercontrol.h
+++ b/src/multimedia/qvideorenderercontrol.h
diff --git a/src/multimediakit/qvideosurfaceoutput.cpp b/src/multimedia/qvideosurfaceoutput.cpp
index cdbec5596..cdbec5596 100644
--- a/src/multimediakit/qvideosurfaceoutput.cpp
+++ b/src/multimedia/qvideosurfaceoutput.cpp
diff --git a/src/multimediakit/qvideosurfaceoutput_p.h b/src/multimedia/qvideosurfaceoutput_p.h
index 76ec5e84d..76ec5e84d 100644
--- a/src/multimediakit/qvideosurfaceoutput_p.h
+++ b/src/multimedia/qvideosurfaceoutput_p.h
diff --git a/src/multimediakit/video/qabstractvideobuffer.cpp b/src/multimedia/video/qabstractvideobuffer.cpp
index 88c00f6a5..6480bc850 100644
--- a/src/multimediakit/video/qabstractvideobuffer.cpp
+++ b/src/multimedia/video/qabstractvideobuffer.cpp
@@ -49,7 +49,7 @@ QT_BEGIN_NAMESPACE
     \class QAbstractVideoBuffer
     \brief The QAbstractVideoBuffer class is an abstraction for video data.
     \since 1.0
-    \inmodule QtMultimediaKit
+    \inmodule QtMultimedia
 
     The QVideoFrame class makes use of a QAbstractVideoBuffer internally to reference a buffer of
     video data.  Creating a subclass of QAbstractVideoBuffer will allow you to construct video
diff --git a/src/multimediakit/video/qabstractvideobuffer.h b/src/multimedia/video/qabstractvideobuffer.h
index 5662ee140..2c66dfd65 100644
--- a/src/multimediakit/video/qabstractvideobuffer.h
+++ b/src/multimedia/video/qabstractvideobuffer.h
@@ -42,7 +42,7 @@
 #ifndef QABSTRACTVIDEOBUFFER_H
 #define QABSTRACTVIDEOBUFFER_H
 
-#include <qtmultimediakitdefs.h>
+#include <qtmultimediadefs.h>
 #include <qtmedianamespace.h>
 
 
diff --git a/src/multimediakit/video/qabstractvideobuffer_p.h b/src/multimedia/video/qabstractvideobuffer_p.h
index 80c37222b..b808e5d91 100644
--- a/src/multimediakit/video/qabstractvideobuffer_p.h
+++ b/src/multimedia/video/qabstractvideobuffer_p.h
@@ -56,7 +56,7 @@
 #include <QtCore/qshareddata.h>
 #include "qabstractvideobuffer.h"
 
-#include <qtmultimediakitdefs.h>
+#include <qtmultimediadefs.h>
 #include <qtmedianamespace.h>
 
 
diff --git a/src/multimediakit/video/qabstractvideosurface.cpp b/src/multimedia/video/qabstractvideosurface.cpp
index 62a8acf57..4d65d7eaa 100644
--- a/src/multimediakit/video/qabstractvideosurface.cpp
+++ b/src/multimedia/video/qabstractvideosurface.cpp
@@ -56,7 +56,7 @@ Q_DECLARE_METATYPE(QAbstractVideoSurface::Error)
     \class QAbstractVideoSurface
     \brief The QAbstractVideoSurface class is a base class for video presentation surfaces.
     \since 1.0
-    \inmodule QtMultimediaKit
+    \inmodule QtMultimedia
 
     A video surface presents a continuous stream of identically formatted frames, where the format
     of each frame is compatible with a stream format supplied when starting a presentation.
diff --git a/src/multimediakit/video/qabstractvideosurface.h b/src/multimedia/video/qabstractvideosurface.h
index 37c4d385f..37c4d385f 100644
--- a/src/multimediakit/video/qabstractvideosurface.h
+++ b/src/multimedia/video/qabstractvideosurface.h
diff --git a/src/multimediakit/video/qimagevideobuffer.cpp b/src/multimedia/video/qimagevideobuffer.cpp
index e16abc30b..e16abc30b 100644
--- a/src/multimediakit/video/qimagevideobuffer.cpp
+++ b/src/multimedia/video/qimagevideobuffer.cpp
diff --git a/src/multimediakit/video/qimagevideobuffer_p.h b/src/multimedia/video/qimagevideobuffer_p.h
index dae952ed4..dae952ed4 100644
--- a/src/multimediakit/video/qimagevideobuffer_p.h
+++ b/src/multimedia/video/qimagevideobuffer_p.h
diff --git a/src/multimediakit/video/qmemoryvideobuffer.cpp b/src/multimedia/video/qmemoryvideobuffer.cpp
index d3516182a..d3516182a 100644
--- a/src/multimediakit/video/qmemoryvideobuffer.cpp
+++ b/src/multimedia/video/qmemoryvideobuffer.cpp
diff --git a/src/multimediakit/video/qmemoryvideobuffer_p.h b/src/multimedia/video/qmemoryvideobuffer_p.h
index d5bc4e3c8..d5bc4e3c8 100644
--- a/src/multimediakit/video/qmemoryvideobuffer_p.h
+++ b/src/multimedia/video/qmemoryvideobuffer_p.h
diff --git a/src/multimediakit/video/qvideoframe.cpp b/src/multimedia/video/qvideoframe.cpp
index 7c6bbdb11..eaef644e9 100644
--- a/src/multimediakit/video/qvideoframe.cpp
+++ b/src/multimedia/video/qvideoframe.cpp
@@ -116,7 +116,7 @@ private:
     \class QVideoFrame
     \brief The QVideoFrame class provides a representation of a frame of video data.
     \since 1.0
-    \inmodule QtMultimediaKit
+    \inmodule QtMultimedia
 
     A QVideoFrame encapsulates the data of a video frame, and information about the frame.
 
diff --git a/src/multimediakit/video/qvideoframe.h b/src/multimedia/video/qvideoframe.h
index 6dffaf59d..6dffaf59d 100644
--- a/src/multimediakit/video/qvideoframe.h
+++ b/src/multimedia/video/qvideoframe.h
diff --git a/src/multimediakit/video/qvideosurfaceformat.cpp b/src/multimedia/video/qvideosurfaceformat.cpp
index 4d198e186..8286d18e1 100644
--- a/src/multimediakit/video/qvideosurfaceformat.cpp
+++ b/src/multimedia/video/qvideosurfaceformat.cpp
@@ -137,7 +137,7 @@ public:
     \brief The QVideoSurfaceFormat class specifies the stream format of a video presentation
     surface.
     \since 1.0
-    \inmodule QtMultimediaKit
+    \inmodule QtMultimedia
 
     A video surface presents a stream of video frames.  The surface's format describes the type of
     the frames and determines how they should be presented.
diff --git a/src/multimediakit/video/qvideosurfaceformat.h b/src/multimedia/video/qvideosurfaceformat.h
index f830b80a6..f830b80a6 100644
--- a/src/multimediakit/video/qvideosurfaceformat.h
+++ b/src/multimedia/video/qvideosurfaceformat.h
diff --git a/src/multimediakit/video/video.pri b/src/multimedia/video/video.pri
index accaa3371..accaa3371 100644
--- a/src/multimediakit/video/video.pri
+++ b/src/multimedia/video/video.pri
diff --git a/src/multimediakitwidgets/multimediakitwidgets.pro b/src/multimediawidgets/multimediawidgets.pro
index 37ea4d8ba..9251f2f71 100644
--- a/src/multimediakitwidgets/multimediakitwidgets.pro
+++ b/src/multimediawidgets/multimediawidgets.pro
@@ -1,12 +1,12 @@
 load(qt_module)
 
-# distinct from QtMultimediaKit
-TARGET = QtMultimediaKitWidgets
+# distinct from QtMultimedia
+TARGET = QtMultimediaWidgets
 QPRO_PWD = $$PWD
-QT = core gui multimediakit-private widgets
+QT = core gui multimedia-private widgets
 
 CONFIG += module no_private_qt_headers_warning
-MODULE_PRI += ../../modules/qt_multimediakitwidgets.pri
+MODULE_PRI += ../../modules/qt_multimediawidgets.pri
 
 contains(QT_CONFIG, opengl) | contains(QT_CONFIG, opengles2) {
    QT += opengl
@@ -24,8 +24,8 @@ PRIVATE_HEADERS += \
     qpaintervideosurface_p.h \
 
 PUBLIC_HEADERS += \
-    qtmultimediakitwidgetdefs.h \
-    qtmultimediakitwidgetsversion.h \
+    qtmultimediawidgetdefs.h \
+    qtmultimediawidgetsversion.h \
     qcameraviewfinder.h \
     qgraphicsvideoitem.h \
     qvideowidgetcontrol.h \
diff --git a/src/multimediakitwidgets/qcameraviewfinder.cpp b/src/multimediawidgets/qcameraviewfinder.cpp
index 42167ebb4..1d3f18549 100644
--- a/src/multimediakitwidgets/qcameraviewfinder.cpp
+++ b/src/multimediawidgets/qcameraviewfinder.cpp
@@ -56,7 +56,7 @@ QT_USE_NAMESPACE
 
     \brief The QCameraViewfinder class provides a camera viewfinder widget.
 
-    \inmodule QtMultimediaKit
+    \inmodule QtMultimedia
     \ingroup camera
     \since 1.1
 
diff --git a/src/multimediakitwidgets/qcameraviewfinder.h b/src/multimediawidgets/qcameraviewfinder.h
index 4ac39ebb9..4ac39ebb9 100644
--- a/src/multimediakitwidgets/qcameraviewfinder.h
+++ b/src/multimediawidgets/qcameraviewfinder.h
diff --git a/src/multimediakitwidgets/qeglimagetexturesurface.cpp b/src/multimediawidgets/qeglimagetexturesurface.cpp
index dfab86c90..dfab86c90 100644
--- a/src/multimediakitwidgets/qeglimagetexturesurface.cpp
+++ b/src/multimediawidgets/qeglimagetexturesurface.cpp
diff --git a/src/multimediakitwidgets/qeglimagetexturesurface_p.h b/src/multimediawidgets/qeglimagetexturesurface_p.h
index 9e941049d..f56c9da78 100644
--- a/src/multimediakitwidgets/qeglimagetexturesurface_p.h
+++ b/src/multimediawidgets/qeglimagetexturesurface_p.h
@@ -53,7 +53,7 @@
 // We mean it.
 //
 
-#include <qtmultimediakitwidgetdefs.h>
+#include <qtmultimediawidgetdefs.h>
 #include <QtCore/qsize.h>
 #include <QtGui/qimage.h>
 #include <QtGui/qmatrix4x4.h>
diff --git a/src/multimediakitwidgets/qgraphicsvideoitem.cpp b/src/multimediawidgets/qgraphicsvideoitem.cpp
index 1f8f6db61..120a24f26 100644
--- a/src/multimediakitwidgets/qgraphicsvideoitem.cpp
+++ b/src/multimediawidgets/qgraphicsvideoitem.cpp
@@ -176,7 +176,7 @@ void QGraphicsVideoItemPrivate::_q_serviceDestroyed()
 
     \brief The QGraphicsVideoItem class provides a graphics item which display video produced by a QMediaObject.
 
-    \inmodule QtMultimediaKit
+    \inmodule QtMultimedia
     \ingroup multimedia
     \since 1.0
 
diff --git a/src/multimediakitwidgets/qgraphicsvideoitem.h b/src/multimediawidgets/qgraphicsvideoitem.h
index cf8913417..cf8913417 100644
--- a/src/multimediakitwidgets/qgraphicsvideoitem.h
+++ b/src/multimediawidgets/qgraphicsvideoitem.h
diff --git a/src/multimediakitwidgets/qgraphicsvideoitem_maemo6.cpp b/src/multimediawidgets/qgraphicsvideoitem_maemo6.cpp
index 387a25042..aa55f0420 100644
--- a/src/multimediakitwidgets/qgraphicsvideoitem_maemo6.cpp
+++ b/src/multimediawidgets/qgraphicsvideoitem_maemo6.cpp
@@ -67,7 +67,7 @@ namespace
 {
 //XInitThreads is necessary for gltexturesink element.
 //To ensure it's called before main() it's better to link to
-//libQtMultimediaKit.so directly, not when QML multimedia plugin is loaded.
+//libQtMultimedia.so directly, not when QML multimedia plugin is loaded.
 class InitThreads
 {
 public:
@@ -202,7 +202,7 @@ void QGraphicsVideoItemPrivate::_q_serviceDestroyed()
 
     \brief The QGraphicsVideoItem class provides a graphics item which display video produced by a QMediaObject.
 
-    \inmodule QtMultimediaKit
+    \inmodule QtMultimedia
     \ingroup multimedia
 
     Attaching a QGraphicsVideoItem to a QMediaObject allows it to display
diff --git a/src/multimediakitwidgets/qpaintervideosurface.cpp b/src/multimediawidgets/qpaintervideosurface.cpp
index bd82f7841..bd82f7841 100644
--- a/src/multimediakitwidgets/qpaintervideosurface.cpp
+++ b/src/multimediawidgets/qpaintervideosurface.cpp
diff --git a/src/multimediakitwidgets/qpaintervideosurface_mac.mm b/src/multimediawidgets/qpaintervideosurface_mac.mm
index 02eabfe7d..02eabfe7d 100644
--- a/src/multimediakitwidgets/qpaintervideosurface_mac.mm
+++ b/src/multimediawidgets/qpaintervideosurface_mac.mm
diff --git a/src/multimediakitwidgets/qpaintervideosurface_mac_p.h b/src/multimediawidgets/qpaintervideosurface_mac_p.h
index d650d9ad7..d650d9ad7 100644
--- a/src/multimediakitwidgets/qpaintervideosurface_mac_p.h
+++ b/src/multimediawidgets/qpaintervideosurface_mac_p.h
diff --git a/src/multimediakitwidgets/qpaintervideosurface_p.h b/src/multimediawidgets/qpaintervideosurface_p.h
index 9b46e0395..a8b535b59 100644
--- a/src/multimediakitwidgets/qpaintervideosurface_p.h
+++ b/src/multimediawidgets/qpaintervideosurface_p.h
@@ -53,7 +53,7 @@
 // We mean it.
 //
 
-#include <qtmultimediakitwidgetdefs.h>
+#include <qtmultimediawidgetdefs.h>
 #include <QtCore/qsize.h>
 #include <QtGui/qimage.h>
 #include <QtGui/qmatrix4x4.h>
diff --git a/src/multimediakitwidgets/qtmultimediakitwidgetdefs.h b/src/multimediawidgets/qtmultimediawidgetdefs.h
index 6001629c6..57ce226a1 100644
--- a/src/multimediakitwidgets/qtmultimediakitwidgetdefs.h
+++ b/src/multimediawidgets/qtmultimediawidgetdefs.h
@@ -50,8 +50,8 @@
 // We mean it.
 //
 
-#ifndef QTMULTIMEDIAKITWIDGETS_P_H
-#define QTMULTIMEDIAKITWIDGETS_P_H
+#ifndef QTMULTIMEDIAWIDGETS_P_H
+#define QTMULTIMEDIAWIDGETS_P_H
 
 #include <QtCore/qglobal.h>
 
@@ -85,5 +85,5 @@ QT_BEGIN_HEADER
 
 QT_END_HEADER
 
-#endif // QMULTIMEDIAKITWIDGETS_P_H
+#endif // QMULTIMEDIAWIDGETS_P_H
 
diff --git a/src/multimediakitwidgets/qvideowidget.cpp b/src/multimediawidgets/qvideowidget.cpp
index 6ed9209c2..f31144cb0 100644
--- a/src/multimediakitwidgets/qvideowidget.cpp
+++ b/src/multimediawidgets/qvideowidget.cpp
@@ -584,10 +584,10 @@ void QVideoWidgetPrivate::_q_dimensionsChanged()
     \brief The QVideoWidget class provides a widget which presents video
     produced by a media object.
     \ingroup multimedia
-    \inmodule QtMultimediaKit
+    \inmodule QtMultimedia
     \since 1.0
 
-    \inmodule QtMultimediaKit
+    \inmodule QtMultimedia
 
     Attaching a QVideoWidget to a QMediaObject allows it to display the
     video or image output of that media object.  A QVideoWidget is attached
diff --git a/src/multimediakitwidgets/qvideowidget.h b/src/multimediawidgets/qvideowidget.h
index c0675c6e2..c4c6f8d3f 100644
--- a/src/multimediakitwidgets/qvideowidget.h
+++ b/src/multimediawidgets/qvideowidget.h
@@ -44,7 +44,7 @@
 
 #include <QtWidgets/qwidget.h>
 
-#include <qtmultimediakitwidgetdefs.h>
+#include <qtmultimediawidgetdefs.h>
 #include <qmediabindableinterface.h>
 
 QT_BEGIN_HEADER
diff --git a/src/multimediakitwidgets/qvideowidget_p.h b/src/multimediawidgets/qvideowidget_p.h
index ca9bc767a..df1d86df0 100644
--- a/src/multimediakitwidgets/qvideowidget_p.h
+++ b/src/multimediawidgets/qvideowidget_p.h
@@ -53,7 +53,7 @@
 // We mean it.
 //
 
-#include <qtmultimediakitwidgetdefs.h>
+#include <qtmultimediawidgetdefs.h>
 #include "qvideowidget.h"
 
 #ifndef QT_NO_OPENGL
diff --git a/src/multimediakitwidgets/qvideowidgetcontrol.cpp b/src/multimediawidgets/qvideowidgetcontrol.cpp
index acc4100df..e153030f2 100644
--- a/src/multimediakitwidgets/qvideowidgetcontrol.cpp
+++ b/src/multimediawidgets/qvideowidgetcontrol.cpp
@@ -51,7 +51,7 @@ QT_BEGIN_NAMESPACE
     \brief The QVideoWidgetControl class provides a media control which
     implements a video widget.
 
-    \inmodule QtMultimediaKit
+    \inmodule QtMultimedia
     \ingroup multimedia-serv
     \since 1.0
 
diff --git a/src/multimediakitwidgets/qvideowidgetcontrol.h b/src/multimediawidgets/qvideowidgetcontrol.h
index c5ac880fa..c5ac880fa 100644
--- a/src/multimediakitwidgets/qvideowidgetcontrol.h
+++ b/src/multimediawidgets/qvideowidgetcontrol.h
diff --git a/src/multimediakitwidgets/qvideowindowcontrol.cpp b/src/multimediawidgets/qvideowindowcontrol.cpp
index 26604496e..d96391947 100644
--- a/src/multimediakitwidgets/qvideowindowcontrol.cpp
+++ b/src/multimediawidgets/qvideowindowcontrol.cpp
@@ -46,7 +46,7 @@ QT_BEGIN_NAMESPACE
 /*!
     \class QVideoWindowControl
 
-    \inmodule QtMultimediaKit
+    \inmodule QtMultimedia
     \ingroup multimedia-serv
     \brief The QVideoWindowControl class provides a media control for rendering video to a window.
     \since 1.0
diff --git a/src/multimediakitwidgets/qvideowindowcontrol.h b/src/multimediawidgets/qvideowindowcontrol.h
index 590ce64be..590ce64be 100644
--- a/src/multimediakitwidgets/qvideowindowcontrol.h
+++ b/src/multimediawidgets/qvideowindowcontrol.h
diff --git a/src/plugins/audiocapture/audiocapture.pro b/src/plugins/audiocapture/audiocapture.pro
index a776b7e22..8b30b2aa7 100644
--- a/src/plugins/audiocapture/audiocapture.pro
+++ b/src/plugins/audiocapture/audiocapture.pro
@@ -1,11 +1,11 @@
 load(qt_module)
 
 TARGET = qtmedia_audioengine
-QT += multimediakit-private
+QT += multimedia-private
 PLUGIN_TYPE=mediaservice
 
 load(qt_plugin)
-DESTDIR = $$QT.multimediakit.plugins/$${PLUGIN_TYPE}
+DESTDIR = $$QT.multimedia.plugins/$${PLUGIN_TYPE}
 
 # Input
 HEADERS += audioencodercontrol.h \
diff --git a/src/plugins/audiocapture/audioencodercontrol.cpp b/src/plugins/audiocapture/audioencodercontrol.cpp
index df8526694..ce2ab42e8 100644
--- a/src/plugins/audiocapture/audioencodercontrol.cpp
+++ b/src/plugins/audiocapture/audioencodercontrol.cpp
@@ -60,12 +60,12 @@ AudioEncoderControl::AudioEncoderControl(QObject *parent)
     fmt.setByteOrder(QAudioFormat::LittleEndian);
     m_session->setFormat(fmt);
 
-    m_settings.setEncodingMode(QtMultimediaKit::ConstantQualityEncoding);
+    m_settings.setEncodingMode(QtMultimedia::ConstantQualityEncoding);
     m_settings.setCodec("audio/pcm");
     m_settings.setBitRate(8000);
     m_settings.setChannelCount(1);
     m_settings.setSampleRate(8000);
-    m_settings.setQuality(QtMultimediaKit::LowQuality);
+    m_settings.setQuality(QtMultimedia::LowQuality);
 }
 
 AudioEncoderControl::~AudioEncoderControl()
@@ -130,14 +130,14 @@ void AudioEncoderControl::setAudioSettings(const QAudioEncoderSettings &settings
 {
     QAudioFormat fmt = m_session->format();
 
-    if (settings.encodingMode() == QtMultimediaKit::ConstantQualityEncoding) {
-        if (settings.quality() == QtMultimediaKit::LowQuality) {
+    if (settings.encodingMode() == QtMultimedia::ConstantQualityEncoding) {
+        if (settings.quality() == QtMultimedia::LowQuality) {
             fmt.setSampleSize(8);
             fmt.setChannels(1);
             fmt.setFrequency(8000);
             fmt.setSampleType(QAudioFormat::UnSignedInt);
 
-        } else if (settings.quality() == QtMultimediaKit::NormalQuality) {
+        } else if (settings.quality() == QtMultimedia::NormalQuality) {
             fmt.setSampleSize(16);
             fmt.setChannels(1);
             fmt.setFrequency(22050);
diff --git a/src/plugins/directshow/directshow.pro b/src/plugins/directshow/directshow.pro
index e2a37e612..80d588fd9 100644
--- a/src/plugins/directshow/directshow.pro
+++ b/src/plugins/directshow/directshow.pro
@@ -6,11 +6,8 @@ TARGET = $$qtLibraryTarget(dsengine)
 PLUGIN_TYPE=mediaservice
 
 include (../../../common.pri)
-INCLUDEPATH+=../../multimediakit \
-             ../../multimediakit/audio \
-             ../../multimediakit/video
 
-qtAddLibrary(QtMultimediaKit)
+QT += multimedia
 
 DEPENDPATH += .
 
diff --git a/src/plugins/directshow/player/directshowmetadatacontrol.cpp b/src/plugins/directshow/player/directshowmetadatacontrol.cpp
index 7d7b3cef5..3bf2a32a3 100644
--- a/src/plugins/directshow/player/directshowmetadatacontrol.cpp
+++ b/src/plugins/directshow/player/directshowmetadatacontrol.cpp
@@ -54,76 +54,76 @@ namespace
 {
     struct QWMMetaDataKeyLookup
     {
-        QtMultimediaKit::MetaData key;
+        QtMultimedia::MetaData key;
         const wchar_t *token;
     };
 }
 
 static const QWMMetaDataKeyLookup qt_wmMetaDataKeys[] =
 {
-    { QtMultimediaKit::Title, L"Title" },
-    { QtMultimediaKit::SubTitle, L"WM/SubTitle" },
-    { QtMultimediaKit::Author, L"Author" },
-    { QtMultimediaKit::Comment, L"Comment" },
-    { QtMultimediaKit::Description, L"Description" },
-    { QtMultimediaKit::Category, L"WM/Category" },
-    { QtMultimediaKit::Genre, L"WM/Genre" },
-    //{ QtMultimediaKit::Date, 0 },
-    { QtMultimediaKit::Year, L"WM/Year" },
-    { QtMultimediaKit::UserRating, L"UserRating" },
-    //{ QtMultimediaKit::MetaDatawords, 0 },
-    { QtMultimediaKit::Language, L"Language" },
-    { QtMultimediaKit::Publisher, L"WM/Publisher" },
-    { QtMultimediaKit::Copyright, L"Copyright" },
-    { QtMultimediaKit::ParentalRating, L"ParentalRating" },
-    { QtMultimediaKit::RatingOrganisation, L"RatingOrganisation" },
+    { QtMultimedia::Title, L"Title" },
+    { QtMultimedia::SubTitle, L"WM/SubTitle" },
+    { QtMultimedia::Author, L"Author" },
+    { QtMultimedia::Comment, L"Comment" },
+    { QtMultimedia::Description, L"Description" },
+    { QtMultimedia::Category, L"WM/Category" },
+    { QtMultimedia::Genre, L"WM/Genre" },
+    //{ QtMultimedia::Date, 0 },
+    { QtMultimedia::Year, L"WM/Year" },
+    { QtMultimedia::UserRating, L"UserRating" },
+    //{ QtMultimedia::MetaDatawords, 0 },
+    { QtMultimedia::Language, L"Language" },
+    { QtMultimedia::Publisher, L"WM/Publisher" },
+    { QtMultimedia::Copyright, L"Copyright" },
+    { QtMultimedia::ParentalRating, L"ParentalRating" },
+    { QtMultimedia::RatingOrganisation, L"RatingOrganisation" },
 
     // Media
-    { QtMultimediaKit::Size, L"FileSize" },
-    { QtMultimediaKit::MediaType, L"MediaType" },
-    { QtMultimediaKit::Duration, L"Duration" },
+    { QtMultimedia::Size, L"FileSize" },
+    { QtMultimedia::MediaType, L"MediaType" },
+    { QtMultimedia::Duration, L"Duration" },
 
     // Audio
-    { QtMultimediaKit::AudioBitRate, L"AudioBitRate" },
-    { QtMultimediaKit::AudioCodec, L"AudioCodec" },
-    { QtMultimediaKit::ChannelCount, L"ChannelCount" },
-    { QtMultimediaKit::SampleRate, L"Frequency" },
+    { QtMultimedia::AudioBitRate, L"AudioBitRate" },
+    { QtMultimedia::AudioCodec, L"AudioCodec" },
+    { QtMultimedia::ChannelCount, L"ChannelCount" },
+    { QtMultimedia::SampleRate, L"Frequency" },
 
     // Music
-    { QtMultimediaKit::AlbumTitle, L"WM/AlbumTitle" },
-    { QtMultimediaKit::AlbumArtist, L"WM/AlbumArtist" },
-    { QtMultimediaKit::ContributingArtist, L"Author" },
-    { QtMultimediaKit::Composer, L"WM/Composer" },
-    { QtMultimediaKit::Conductor, L"WM/Conductor" },
-    { QtMultimediaKit::Lyrics, L"WM/Lyrics" },
-    { QtMultimediaKit::Mood, L"WM/Mood" },
-    { QtMultimediaKit::TrackNumber, L"WM/TrackNumber" },
-    //{ QtMultimediaKit::TrackCount, 0 },
-    //{ QtMultimediaKit::CoverArtUriSmall, 0 },
-    //{ QtMultimediaKit::CoverArtUriLarge, 0 },
+    { QtMultimedia::AlbumTitle, L"WM/AlbumTitle" },
+    { QtMultimedia::AlbumArtist, L"WM/AlbumArtist" },
+    { QtMultimedia::ContributingArtist, L"Author" },
+    { QtMultimedia::Composer, L"WM/Composer" },
+    { QtMultimedia::Conductor, L"WM/Conductor" },
+    { QtMultimedia::Lyrics, L"WM/Lyrics" },
+    { QtMultimedia::Mood, L"WM/Mood" },
+    { QtMultimedia::TrackNumber, L"WM/TrackNumber" },
+    //{ QtMultimedia::TrackCount, 0 },
+    //{ QtMultimedia::CoverArtUriSmall, 0 },
+    //{ QtMultimedia::CoverArtUriLarge, 0 },
 
     // Image/Video
-    //{ QtMultimediaKit::Resolution, 0 },
-    //{ QtMultimediaKit::PixelAspectRatio, 0 },
+    //{ QtMultimedia::Resolution, 0 },
+    //{ QtMultimedia::PixelAspectRatio, 0 },
 
     // Video
-    //{ QtMultimediaKit::FrameRate, 0 },
-    { QtMultimediaKit::VideoBitRate, L"VideoBitRate" },
-    { QtMultimediaKit::VideoCodec, L"VideoCodec" },
+    //{ QtMultimedia::FrameRate, 0 },
+    { QtMultimedia::VideoBitRate, L"VideoBitRate" },
+    { QtMultimedia::VideoCodec, L"VideoCodec" },
 
-    //{ QtMultimediaKit::PosterUri, 0 },
+    //{ QtMultimedia::PosterUri, 0 },
 
     // Movie
-    { QtMultimediaKit::ChapterNumber, L"ChapterNumber" },
-    { QtMultimediaKit::Director, L"WM/Director" },
-    { QtMultimediaKit::LeadPerformer, L"LeadPerformer" },
-    { QtMultimediaKit::Writer, L"WM/Writer" },
+    { QtMultimedia::ChapterNumber, L"ChapterNumber" },
+    { QtMultimedia::Director, L"WM/Director" },
+    { QtMultimedia::LeadPerformer, L"LeadPerformer" },
+    { QtMultimedia::Writer, L"WM/Writer" },
 
     // Photos
-    { QtMultimediaKit::CameraManufacturer, L"CameraManufacturer" },
-    { QtMultimediaKit::CameraModel, L"CameraModel" },
-    { QtMultimediaKit::Event, L"Event" },
-    { QtMultimediaKit::Subject, L"Subject" }
+    { QtMultimedia::CameraManufacturer, L"CameraManufacturer" },
+    { QtMultimedia::CameraModel, L"CameraModel" },
+    { QtMultimedia::Event, L"Event" },
+    { QtMultimedia::Subject, L"Subject" }
 };
 
 static QVariant getValue(IWMHeaderInfo *header, const wchar_t *key)
@@ -249,7 +249,7 @@ bool DirectShowMetaDataControl::isMetaDataAvailable() const
 #endif
 }
 
-QVariant DirectShowMetaDataControl::metaData(QtMultimediaKit::MetaData key) const
+QVariant DirectShowMetaDataControl::metaData(QtMultimedia::MetaData key) const
 {
     QVariant value;
 
@@ -269,19 +269,19 @@ QVariant DirectShowMetaDataControl::metaData(QtMultimediaKit::MetaData key) cons
         BSTR string = 0;
 
         switch (key) {
-        case QtMultimediaKit::Author:
+        case QtMultimedia::Author:
             m_content->get_AuthorName(&string);
             break;
-        case QtMultimediaKit::Title:
+        case QtMultimedia::Title:
             m_content->get_Title(&string);
             break;
-        case QtMultimediaKit::ParentalRating:
+        case QtMultimedia::ParentalRating:
             m_content->get_Rating(&string);
             break;
-        case QtMultimediaKit::Description:
+        case QtMultimedia::Description:
             m_content->get_Description(&string);
             break;
-        case QtMultimediaKit::Copyright:
+        case QtMultimedia::Copyright:
             m_content->get_Copyright(&string);
             break;
         default:
@@ -297,9 +297,9 @@ QVariant DirectShowMetaDataControl::metaData(QtMultimediaKit::MetaData key) cons
     return value;
 }
 
-QList<QtMultimediaKit::MetaData> DirectShowMetaDataControl::availableMetaData() const
+QList<QtMultimedia::MetaData> DirectShowMetaDataControl::availableMetaData() const
 {
-    return QList<QtMultimediaKit::MetaData>();
+    return QList<QtMultimedia::MetaData>();
 }
 
 QVariant DirectShowMetaDataControl::extendedMetaData(const QString &) const
diff --git a/src/plugins/directshow/player/directshowmetadatacontrol.h b/src/plugins/directshow/player/directshowmetadatacontrol.h
index d7b046510..f5c65f12c 100644
--- a/src/plugins/directshow/player/directshowmetadatacontrol.h
+++ b/src/plugins/directshow/player/directshowmetadatacontrol.h
@@ -67,8 +67,8 @@ public:
 
     bool isMetaDataAvailable() const;
 
-    QVariant metaData(QtMultimediaKit::MetaData key) const;
-    QList<QtMultimediaKit::MetaData> availableMetaData() const;
+    QVariant metaData(QtMultimedia::MetaData key) const;
+    QList<QtMultimedia::MetaData> availableMetaData() const;
 
     QVariant extendedMetaData(const QString &key) const;
     QStringList availableExtendedMetaData() const;
diff --git a/src/plugins/fakeradio/fakeradio.pro b/src/plugins/fakeradio/fakeradio.pro
index f6a495aac..a91ebb927 100644
--- a/src/plugins/fakeradio/fakeradio.pro
+++ b/src/plugins/fakeradio/fakeradio.pro
@@ -1,11 +1,11 @@
 load(qt_module)
 
 TARGET = qtmedia_fakeradio
-QT += multimediakit-private
+QT += multimedia-private
 PLUGIN_TYPE = mediaservice
 
 load(qt_plugin)
-DESTDIR = $$QT.multimediakit.plugins/$${PLUGIN_TYPE}
+DESTDIR = $$QT.multimedia.plugins/$${PLUGIN_TYPE}
 
 HEADERS += \
   fakeradioserviceplugin.h \
diff --git a/src/plugins/fakeradio/fakeradiotunercontrol.cpp b/src/plugins/fakeradio/fakeradiotunercontrol.cpp
index e36d816b0..d88d90ce6 100644
--- a/src/plugins/fakeradio/fakeradiotunercontrol.cpp
+++ b/src/plugins/fakeradio/fakeradiotunercontrol.cpp
@@ -79,9 +79,9 @@ bool FakeRadioTunerControl::isAvailable() const
     return true;
 }
 
-QtMultimediaKit::AvailabilityError FakeRadioTunerControl::availabilityError() const
+QtMultimedia::AvailabilityError FakeRadioTunerControl::availabilityError() const
 {
-    return QtMultimediaKit::NoError;
+    return QtMultimedia::NoError;
 }
 
 QRadioTuner::State FakeRadioTunerControl::state() const
diff --git a/src/plugins/fakeradio/fakeradiotunercontrol.h b/src/plugins/fakeradio/fakeradiotunercontrol.h
index a2faf2c02..abb45cf53 100644
--- a/src/plugins/fakeradio/fakeradiotunercontrol.h
+++ b/src/plugins/fakeradio/fakeradiotunercontrol.h
@@ -60,7 +60,7 @@ public:
     ~FakeRadioTunerControl();
 
     bool isAvailable() const;
-    QtMultimediaKit::AvailabilityError availabilityError() const;
+    QtMultimedia::AvailabilityError availabilityError() const;
 
     QRadioTuner::State state() const;
 
diff --git a/src/plugins/gstreamer/camerabin/camerabinimagecapture.cpp b/src/plugins/gstreamer/camerabin/camerabinimagecapture.cpp
index f22b2642a..a73ec4bc7 100644
--- a/src/plugins/gstreamer/camerabin/camerabinimagecapture.cpp
+++ b/src/plugins/gstreamer/camerabin/camerabinimagecapture.cpp
@@ -55,7 +55,7 @@
 #define IMAGE_DONE_SIGNAL "image-done"
 
 Q_DECLARE_METATYPE(QVideoFrame)
-Q_DECLARE_METATYPE(QtMultimediaKit::MetaData)
+Q_DECLARE_METATYPE(QtMultimedia::MetaData)
 
 namespace
 {
@@ -65,7 +65,7 @@ public:
     CameraRegisterMetaTypes()
     {
         qRegisterMetaType<QVideoFrame>("QVideoFrame");
-        qRegisterMetaType<QtMultimediaKit::MetaData>("QtMultimediaKit::MetaData");
+        qRegisterMetaType<QtMultimedia::MetaData>("QtMultimedia::MetaData");
     }
 } _registerCameraMetaTypes;
 }
@@ -140,26 +140,26 @@ gboolean CameraBinImageCapture::metadataEventProbe(GstPad *pad, GstEvent *event,
         qDebug() << "Capture event probe" << extendedTags;
 #endif
 
-        QMap<QtMultimediaKit::MetaData, QVariant> tags;
-        tags[QtMultimediaKit::ISOSpeedRatings] = extendedTags.value("capturing-iso-speed");
-        tags[QtMultimediaKit::DigitalZoomRatio] = extendedTags.value("capturing-digital-zoom-ratio");
-        tags[QtMultimediaKit::ExposureTime] = extendedTags.value("capturing-shutter-speed");
-        tags[QtMultimediaKit::WhiteBalance] = extendedTags.value("capturing-white-balance");
-        tags[QtMultimediaKit::Flash] = extendedTags.value("capturing-flash-fired");
-        tags[QtMultimediaKit::FocalLengthIn35mmFilm] = extendedTags.value("capturing-focal-length");
-        tags[QtMultimediaKit::MeteringMode] = extendedTags.value("capturing-metering-mode");
-        tags[QtMultimediaKit::ExposureMode] = extendedTags.value("capturing-exposure-mode");
-        tags[QtMultimediaKit::FNumber] = extendedTags.value("capturing-focal-ratio");
-        tags[QtMultimediaKit::ExposureMode] = extendedTags.value("capturing-exposure-mode");
-
-        QMapIterator<QtMultimediaKit::MetaData, QVariant> i(tags);
+        QMap<QtMultimedia::MetaData, QVariant> tags;
+        tags[QtMultimedia::ISOSpeedRatings] = extendedTags.value("capturing-iso-speed");
+        tags[QtMultimedia::DigitalZoomRatio] = extendedTags.value("capturing-digital-zoom-ratio");
+        tags[QtMultimedia::ExposureTime] = extendedTags.value("capturing-shutter-speed");
+        tags[QtMultimedia::WhiteBalance] = extendedTags.value("capturing-white-balance");
+        tags[QtMultimedia::Flash] = extendedTags.value("capturing-flash-fired");
+        tags[QtMultimedia::FocalLengthIn35mmFilm] = extendedTags.value("capturing-focal-length");
+        tags[QtMultimedia::MeteringMode] = extendedTags.value("capturing-metering-mode");
+        tags[QtMultimedia::ExposureMode] = extendedTags.value("capturing-exposure-mode");
+        tags[QtMultimedia::FNumber] = extendedTags.value("capturing-focal-ratio");
+        tags[QtMultimedia::ExposureMode] = extendedTags.value("capturing-exposure-mode");
+
+        QMapIterator<QtMultimedia::MetaData, QVariant> i(tags);
         while (i.hasNext()) {
             i.next();
             if (i.value().isValid()) {
                 QMetaObject::invokeMethod(self, "imageMetadataAvailable",
                                           Qt::QueuedConnection,
                                           Q_ARG(int, self->m_requestId),
-                                          Q_ARG(QtMultimediaKit::MetaData, i.key()),
+                                          Q_ARG(QtMultimedia::MetaData, i.key()),
                                           Q_ARG(QVariant, i.value()));
             }
         }
diff --git a/src/plugins/gstreamer/camerabin/camerabinmetadata.cpp b/src/plugins/gstreamer/camerabin/camerabinmetadata.cpp
index 9cfcde4e1..235f5b08e 100644
--- a/src/plugins/gstreamer/camerabin/camerabinmetadata.cpp
+++ b/src/plugins/gstreamer/camerabin/camerabinmetadata.cpp
@@ -46,77 +46,77 @@
 
 struct QGstreamerMetaDataKeyLookup
 {
-    QtMultimediaKit::MetaData key;
+    QtMultimedia::MetaData key;
     const char *token;
 };
 
 static const QGstreamerMetaDataKeyLookup qt_gstreamerMetaDataKeys[] =
 {
-    { QtMultimediaKit::Title, GST_TAG_TITLE },
-    //{ QtMultimediaKit::SubTitle, 0 },
-    //{ QtMultimediaKit::Author, 0 },
-    { QtMultimediaKit::Comment, GST_TAG_COMMENT },
-    { QtMultimediaKit::Description, GST_TAG_DESCRIPTION },
-    //{ QtMultimediaKit::Category, 0 },
-    { QtMultimediaKit::Genre, GST_TAG_GENRE },
-    //{ QtMultimediaKit::Year, 0 },
-    //{ QtMultimediaKit::UserRating, 0 },
-
-    { QtMultimediaKit::Language, GST_TAG_LANGUAGE_CODE },
-
-    { QtMultimediaKit::Publisher, GST_TAG_ORGANIZATION },
-    { QtMultimediaKit::Copyright, GST_TAG_COPYRIGHT },
-    //{ QtMultimediaKit::ParentalRating, 0 },
-    //{ QtMultimediaKit::RatingOrganisation, 0 },
+    { QtMultimedia::Title, GST_TAG_TITLE },
+    //{ QtMultimedia::SubTitle, 0 },
+    //{ QtMultimedia::Author, 0 },
+    { QtMultimedia::Comment, GST_TAG_COMMENT },
+    { QtMultimedia::Description, GST_TAG_DESCRIPTION },
+    //{ QtMultimedia::Category, 0 },
+    { QtMultimedia::Genre, GST_TAG_GENRE },
+    //{ QtMultimedia::Year, 0 },
+    //{ QtMultimedia::UserRating, 0 },
+
+    { QtMultimedia::Language, GST_TAG_LANGUAGE_CODE },
+
+    { QtMultimedia::Publisher, GST_TAG_ORGANIZATION },
+    { QtMultimedia::Copyright, GST_TAG_COPYRIGHT },
+    //{ QtMultimedia::ParentalRating, 0 },
+    //{ QtMultimedia::RatingOrganisation, 0 },
 
     // Media
-    //{ QtMultimediaKit::Size, 0 },
-    //{ QtMultimediaKit::MediaType, 0 },
-    { QtMultimediaKit::Duration, GST_TAG_DURATION },
+    //{ QtMultimedia::Size, 0 },
+    //{ QtMultimedia::MediaType, 0 },
+    { QtMultimedia::Duration, GST_TAG_DURATION },
 
     // Audio
-    { QtMultimediaKit::AudioBitRate, GST_TAG_BITRATE },
-    { QtMultimediaKit::AudioCodec, GST_TAG_AUDIO_CODEC },
-    //{ QtMultimediaKit::ChannelCount, 0 },
-    //{ QtMultimediaKit::SampleRate, 0 },
+    { QtMultimedia::AudioBitRate, GST_TAG_BITRATE },
+    { QtMultimedia::AudioCodec, GST_TAG_AUDIO_CODEC },
+    //{ QtMultimedia::ChannelCount, 0 },
+    //{ QtMultimedia::SampleRate, 0 },
 
     // Music
-    { QtMultimediaKit::AlbumTitle, GST_TAG_ALBUM },
-    { QtMultimediaKit::AlbumArtist,  GST_TAG_ARTIST},
-    { QtMultimediaKit::ContributingArtist, GST_TAG_PERFORMER },
+    { QtMultimedia::AlbumTitle, GST_TAG_ALBUM },
+    { QtMultimedia::AlbumArtist,  GST_TAG_ARTIST},
+    { QtMultimedia::ContributingArtist, GST_TAG_PERFORMER },
 #if (GST_VERSION_MAJOR >= 0) && (GST_VERSION_MINOR >= 10) && (GST_VERSION_MICRO >= 19)
-    { QtMultimediaKit::Composer, GST_TAG_COMPOSER },
+    { QtMultimedia::Composer, GST_TAG_COMPOSER },
 #endif
-    //{ QtMultimediaKit::Conductor, 0 },
-    //{ QtMultimediaKit::Lyrics, 0 },
-    //{ QtMultimediaKit::Mood, 0 },
-    { QtMultimediaKit::TrackNumber, GST_TAG_TRACK_NUMBER },
+    //{ QtMultimedia::Conductor, 0 },
+    //{ QtMultimedia::Lyrics, 0 },
+    //{ QtMultimedia::Mood, 0 },
+    { QtMultimedia::TrackNumber, GST_TAG_TRACK_NUMBER },
 
-    //{ QtMultimediaKit::CoverArtUrlSmall, 0 },
-    //{ QtMultimediaKit::CoverArtUrlLarge, 0 },
+    //{ QtMultimedia::CoverArtUrlSmall, 0 },
+    //{ QtMultimedia::CoverArtUrlLarge, 0 },
 
     // Image/Video
-    //{ QtMultimediaKit::Resolution, 0 },
-    //{ QtMultimediaKit::PixelAspectRatio, 0 },
+    //{ QtMultimedia::Resolution, 0 },
+    //{ QtMultimedia::PixelAspectRatio, 0 },
 
     // Video
-    //{ QtMultimediaKit::VideoFrameRate, 0 },
-    //{ QtMultimediaKit::VideoBitRate, 0 },
-    { QtMultimediaKit::VideoCodec, GST_TAG_VIDEO_CODEC },
+    //{ QtMultimedia::VideoFrameRate, 0 },
+    //{ QtMultimedia::VideoBitRate, 0 },
+    { QtMultimedia::VideoCodec, GST_TAG_VIDEO_CODEC },
 
-    //{ QtMultimediaKit::PosterUrl, 0 },
+    //{ QtMultimedia::PosterUrl, 0 },
 
     // Movie
-    //{ QtMultimediaKit::ChapterNumber, 0 },
-    //{ QtMultimediaKit::Director, 0 },
-    { QtMultimediaKit::LeadPerformer, GST_TAG_PERFORMER },
-    //{ QtMultimediaKit::Writer, 0 },
+    //{ QtMultimedia::ChapterNumber, 0 },
+    //{ QtMultimedia::Director, 0 },
+    { QtMultimedia::LeadPerformer, GST_TAG_PERFORMER },
+    //{ QtMultimedia::Writer, 0 },
 
     // Photos
-    //{ QtMultimediaKit::CameraManufacturer, 0 },
-    //{ QtMultimediaKit::CameraModel, 0 },
-    //{ QtMultimediaKit::Event, 0 },
-    //{ QtMultimediaKit::Subject, 0 }
+    //{ QtMultimedia::CameraManufacturer, 0 },
+    //{ QtMultimedia::CameraModel, 0 },
+    //{ QtMultimedia::Event, 0 },
+    //{ QtMultimedia::Subject, 0 }
 };
 
 CameraBinMetaData::CameraBinMetaData(QObject *parent)
@@ -124,7 +124,7 @@ CameraBinMetaData::CameraBinMetaData(QObject *parent)
 {
 }
 
-QVariant CameraBinMetaData::metaData(QtMultimediaKit::MetaData key) const
+QVariant CameraBinMetaData::metaData(QtMultimedia::MetaData key) const
 {
     static const int count = sizeof(qt_gstreamerMetaDataKeys) / sizeof(QGstreamerMetaDataKeyLookup);
 
@@ -138,7 +138,7 @@ QVariant CameraBinMetaData::metaData(QtMultimediaKit::MetaData key) const
     return QVariant();
 }
 
-void CameraBinMetaData::setMetaData(QtMultimediaKit::MetaData key, const QVariant &value)
+void CameraBinMetaData::setMetaData(QtMultimedia::MetaData key, const QVariant &value)
 {
     static const int count = sizeof(qt_gstreamerMetaDataKeys) / sizeof(QGstreamerMetaDataKeyLookup);
 
@@ -156,9 +156,9 @@ void CameraBinMetaData::setMetaData(QtMultimediaKit::MetaData key, const QVarian
     }
 }
 
-QList<QtMultimediaKit::MetaData> CameraBinMetaData::availableMetaData() const
+QList<QtMultimedia::MetaData> CameraBinMetaData::availableMetaData() const
 {
-    static QMap<QByteArray, QtMultimediaKit::MetaData> keysMap;
+    static QMap<QByteArray, QtMultimedia::MetaData> keysMap;
     if (keysMap.isEmpty()) {
         const int count = sizeof(qt_gstreamerMetaDataKeys) / sizeof(QGstreamerMetaDataKeyLookup);
         for (int i = 0; i < count; ++i) {
@@ -166,9 +166,9 @@ QList<QtMultimediaKit::MetaData> CameraBinMetaData::availableMetaData() const
         }
     }
 
-    QList<QtMultimediaKit::MetaData> res;
+    QList<QtMultimedia::MetaData> res;
     foreach (const QByteArray &key, m_values.keys()) {
-        QtMultimediaKit::MetaData tag = keysMap.value(key, QtMultimediaKit::MetaData(-1));
+        QtMultimedia::MetaData tag = keysMap.value(key, QtMultimedia::MetaData(-1));
         if (tag != -1)
             res.append(tag);
     }
diff --git a/src/plugins/gstreamer/camerabin/camerabinmetadata.h b/src/plugins/gstreamer/camerabin/camerabinmetadata.h
index 710d2bf0d..16a86a626 100644
--- a/src/plugins/gstreamer/camerabin/camerabinmetadata.h
+++ b/src/plugins/gstreamer/camerabin/camerabinmetadata.h
@@ -57,9 +57,9 @@ public:
     bool isMetaDataAvailable() const { return true; }
     bool isWritable() const { return true; }
 
-    QVariant metaData(QtMultimediaKit::MetaData key) const;
-    void setMetaData(QtMultimediaKit::MetaData key, const QVariant &value);
-    QList<QtMultimediaKit::MetaData> availableMetaData() const;
+    QVariant metaData(QtMultimedia::MetaData key) const;
+    void setMetaData(QtMultimedia::MetaData key, const QVariant &value);
+    QList<QtMultimedia::MetaData> availableMetaData() const;
 
     QVariant extendedMetaData(QString const &name) const;
     void setExtendedMetaData(QString const &name, QVariant const &value);
diff --git a/src/plugins/gstreamer/gstreamer.pro b/src/plugins/gstreamer/gstreamer.pro
index 550040ecf..baec7175c 100644
--- a/src/plugins/gstreamer/gstreamer.pro
+++ b/src/plugins/gstreamer/gstreamer.pro
@@ -2,11 +2,11 @@
 load(qt_module)
 
 TARGET = qgstengine
-QT += multimediakit-private network multimediakitwidgets-private
+QT += multimedia-private network multimediawidgets-private
 PLUGIN_TYPE=mediaservice
 
 load(qt_plugin)
-DESTDIR = $$QT.multimediakit.plugins/$${PLUGIN_TYPE}
+DESTDIR = $$QT.multimedia.plugins/$${PLUGIN_TYPE}
 
 unix:!maemo*:contains(QT_CONFIG, alsa) {
 DEFINES += HAVE_ALSA
diff --git a/src/plugins/gstreamer/mediacapture/qgstreameraudioencode.cpp b/src/plugins/gstreamer/mediacapture/qgstreameraudioencode.cpp
index e69494d00..2f7c6a8c8 100644
--- a/src/plugins/gstreamer/mediacapture/qgstreameraudioencode.cpp
+++ b/src/plugins/gstreamer/mediacapture/qgstreameraudioencode.cpp
@@ -199,8 +199,8 @@ GstElement *QGstreamerAudioEncode::createEncoder()
     }
 
     if (encoderElement) {
-        if (m_audioSettings.encodingMode() == QtMultimediaKit::ConstantQualityEncoding) {
-            QtMultimediaKit::EncodingQuality qualityValue = m_audioSettings.quality();
+        if (m_audioSettings.encodingMode() == QtMultimedia::ConstantQualityEncoding) {
+            QtMultimedia::EncodingQuality qualityValue = m_audioSettings.quality();
 
             if (codec == QLatin1String("audio/vorbis")) {
                 double qualityTable[] = {
diff --git a/src/plugins/gstreamer/mediacapture/qgstreamercapturemetadatacontrol.cpp b/src/plugins/gstreamer/mediacapture/qgstreamercapturemetadatacontrol.cpp
index cc8bdeee1..b874afc7f 100644
--- a/src/plugins/gstreamer/mediacapture/qgstreamercapturemetadatacontrol.cpp
+++ b/src/plugins/gstreamer/mediacapture/qgstreamercapturemetadatacontrol.cpp
@@ -46,77 +46,77 @@
 
 struct QGstreamerMetaDataKeyLookup
 {
-    QtMultimediaKit::MetaData key;
+    QtMultimedia::MetaData key;
     const char *token;
 };
 
 static const QGstreamerMetaDataKeyLookup qt_gstreamerMetaDataKeys[] =
 {
-    { QtMultimediaKit::Title, GST_TAG_TITLE },
-    //{ QtMultimediaKit::SubTitle, 0 },
-    //{ QtMultimediaKit::Author, 0 },
-    { QtMultimediaKit::Comment, GST_TAG_COMMENT },
-    { QtMultimediaKit::Description, GST_TAG_DESCRIPTION },
-    //{ QtMultimediaKit::Category, 0 },
-    { QtMultimediaKit::Genre, GST_TAG_GENRE },
-    //{ QtMultimediaKit::Year, 0 },
-    //{ QtMultimediaKit::UserRating, 0 },
-
-    { QtMultimediaKit::Language, GST_TAG_LANGUAGE_CODE },
-
-    { QtMultimediaKit::Publisher, GST_TAG_ORGANIZATION },
-    { QtMultimediaKit::Copyright, GST_TAG_COPYRIGHT },
-    //{ QtMultimediaKit::ParentalRating, 0 },
-    //{ QtMultimediaKit::RatingOrganisation, 0 },
+    { QtMultimedia::Title, GST_TAG_TITLE },
+    //{ QtMultimedia::SubTitle, 0 },
+    //{ QtMultimedia::Author, 0 },
+    { QtMultimedia::Comment, GST_TAG_COMMENT },
+    { QtMultimedia::Description, GST_TAG_DESCRIPTION },
+    //{ QtMultimedia::Category, 0 },
+    { QtMultimedia::Genre, GST_TAG_GENRE },
+    //{ QtMultimedia::Year, 0 },
+    //{ QtMultimedia::UserRating, 0 },
+
+    { QtMultimedia::Language, GST_TAG_LANGUAGE_CODE },
+
+    { QtMultimedia::Publisher, GST_TAG_ORGANIZATION },
+    { QtMultimedia::Copyright, GST_TAG_COPYRIGHT },
+    //{ QtMultimedia::ParentalRating, 0 },
+    //{ QtMultimedia::RatingOrganisation, 0 },
 
     // Media
-    //{ QtMultimediaKit::Size, 0 },
-    //{ QtMultimediaKit::MediaType, 0 },
-    { QtMultimediaKit::Duration, GST_TAG_DURATION },
+    //{ QtMultimedia::Size, 0 },
+    //{ QtMultimedia::MediaType, 0 },
+    { QtMultimedia::Duration, GST_TAG_DURATION },
 
     // Audio
-    { QtMultimediaKit::AudioBitRate, GST_TAG_BITRATE },
-    { QtMultimediaKit::AudioCodec, GST_TAG_AUDIO_CODEC },
-    //{ QtMultimediaKit::ChannelCount, 0 },
-    //{ QtMultimediaKit::SampleRate, 0 },
+    { QtMultimedia::AudioBitRate, GST_TAG_BITRATE },
+    { QtMultimedia::AudioCodec, GST_TAG_AUDIO_CODEC },
+    //{ QtMultimedia::ChannelCount, 0 },
+    //{ QtMultimedia::SampleRate, 0 },
 
     // Music
-    { QtMultimediaKit::AlbumTitle, GST_TAG_ALBUM },
-    { QtMultimediaKit::AlbumArtist,  GST_TAG_ARTIST},
-    { QtMultimediaKit::ContributingArtist, GST_TAG_PERFORMER },
+    { QtMultimedia::AlbumTitle, GST_TAG_ALBUM },
+    { QtMultimedia::AlbumArtist,  GST_TAG_ARTIST},
+    { QtMultimedia::ContributingArtist, GST_TAG_PERFORMER },
 #if (GST_VERSION_MAJOR >= 0) && (GST_VERSION_MINOR >= 10) && (GST_VERSION_MICRO >= 19)
-    { QtMultimediaKit::Composer, GST_TAG_COMPOSER },
+    { QtMultimedia::Composer, GST_TAG_COMPOSER },
 #endif
-    //{ QtMultimediaKit::Conductor, 0 },
-    //{ QtMultimediaKit::Lyrics, 0 },
-    //{ QtMultimediaKit::Mood, 0 },
-    { QtMultimediaKit::TrackNumber, GST_TAG_TRACK_NUMBER },
+    //{ QtMultimedia::Conductor, 0 },
+    //{ QtMultimedia::Lyrics, 0 },
+    //{ QtMultimedia::Mood, 0 },
+    { QtMultimedia::TrackNumber, GST_TAG_TRACK_NUMBER },
 
-    //{ QtMultimediaKit::CoverArtUrlSmall, 0 },
-    //{ QtMultimediaKit::CoverArtUrlLarge, 0 },
+    //{ QtMultimedia::CoverArtUrlSmall, 0 },
+    //{ QtMultimedia::CoverArtUrlLarge, 0 },
 
     // Image/Video
-    //{ QtMultimediaKit::Resolution, 0 },
-    //{ QtMultimediaKit::PixelAspectRatio, 0 },
+    //{ QtMultimedia::Resolution, 0 },
+    //{ QtMultimedia::PixelAspectRatio, 0 },
 
     // Video
-    //{ QtMultimediaKit::VideoFrameRate, 0 },
-    //{ QtMultimediaKit::VideoBitRate, 0 },
-    { QtMultimediaKit::VideoCodec, GST_TAG_VIDEO_CODEC },
+    //{ QtMultimedia::VideoFrameRate, 0 },
+    //{ QtMultimedia::VideoBitRate, 0 },
+    { QtMultimedia::VideoCodec, GST_TAG_VIDEO_CODEC },
 
-    //{ QtMultimediaKit::PosterUrl, 0 },
+    //{ QtMultimedia::PosterUrl, 0 },
 
     // Movie
-    //{ QtMultimediaKit::ChapterNumber, 0 },
-    //{ QtMultimediaKit::Director, 0 },
-    { QtMultimediaKit::LeadPerformer, GST_TAG_PERFORMER },
-    //{ QtMultimediaKit::Writer, 0 },
+    //{ QtMultimedia::ChapterNumber, 0 },
+    //{ QtMultimedia::Director, 0 },
+    { QtMultimedia::LeadPerformer, GST_TAG_PERFORMER },
+    //{ QtMultimedia::Writer, 0 },
 
     // Photos
-    //{ QtMultimediaKit::CameraManufacturer, 0 },
-    //{ QtMultimediaKit::CameraModel, 0 },
-    //{ QtMultimediaKit::Event, 0 },
-    //{ QtMultimediaKit::Subject, 0 }
+    //{ QtMultimedia::CameraManufacturer, 0 },
+    //{ QtMultimedia::CameraModel, 0 },
+    //{ QtMultimedia::Event, 0 },
+    //{ QtMultimedia::Subject, 0 }
 };
 
 QGstreamerCaptureMetaDataControl::QGstreamerCaptureMetaDataControl(QObject *parent)
@@ -124,7 +124,7 @@ QGstreamerCaptureMetaDataControl::QGstreamerCaptureMetaDataControl(QObject *pare
 {
 }
 
-QVariant QGstreamerCaptureMetaDataControl::metaData(QtMultimediaKit::MetaData key) const
+QVariant QGstreamerCaptureMetaDataControl::metaData(QtMultimedia::MetaData key) const
 {
     static const int count = sizeof(qt_gstreamerMetaDataKeys) / sizeof(QGstreamerMetaDataKeyLookup);
 
@@ -138,7 +138,7 @@ QVariant QGstreamerCaptureMetaDataControl::metaData(QtMultimediaKit::MetaData ke
     return QVariant();
 }
 
-void QGstreamerCaptureMetaDataControl::setMetaData(QtMultimediaKit::MetaData key, const QVariant &value)
+void QGstreamerCaptureMetaDataControl::setMetaData(QtMultimedia::MetaData key, const QVariant &value)
 {
     static const int count = sizeof(qt_gstreamerMetaDataKeys) / sizeof(QGstreamerMetaDataKeyLookup);
 
@@ -156,9 +156,9 @@ void QGstreamerCaptureMetaDataControl::setMetaData(QtMultimediaKit::MetaData key
     }
 }
 
-QList<QtMultimediaKit::MetaData> QGstreamerCaptureMetaDataControl::availableMetaData() const
+QList<QtMultimedia::MetaData> QGstreamerCaptureMetaDataControl::availableMetaData() const
 {
-    static QMap<QByteArray, QtMultimediaKit::MetaData> keysMap;
+    static QMap<QByteArray, QtMultimedia::MetaData> keysMap;
     if (keysMap.isEmpty()) {
         const int count = sizeof(qt_gstreamerMetaDataKeys) / sizeof(QGstreamerMetaDataKeyLookup);
         for (int i = 0; i < count; ++i) {
@@ -166,9 +166,9 @@ QList<QtMultimediaKit::MetaData> QGstreamerCaptureMetaDataControl::availableMeta
         }
     }
 
-    QList<QtMultimediaKit::MetaData> res;
+    QList<QtMultimedia::MetaData> res;
     foreach (const QByteArray &key, m_values.keys()) {
-        QtMultimediaKit::MetaData tag = keysMap.value(key, QtMultimediaKit::MetaData(-1));
+        QtMultimedia::MetaData tag = keysMap.value(key, QtMultimedia::MetaData(-1));
         if (tag != -1)
             res.append(tag);
     }
diff --git a/src/plugins/gstreamer/mediacapture/qgstreamercapturemetadatacontrol.h b/src/plugins/gstreamer/mediacapture/qgstreamercapturemetadatacontrol.h
index 4ee46eaa5..031f630d5 100644
--- a/src/plugins/gstreamer/mediacapture/qgstreamercapturemetadatacontrol.h
+++ b/src/plugins/gstreamer/mediacapture/qgstreamercapturemetadatacontrol.h
@@ -57,9 +57,9 @@ public:
     bool isMetaDataAvailable() const { return true; }
     bool isWritable() const { return true; }
 
-    QVariant metaData(QtMultimediaKit::MetaData key) const;
-    void setMetaData(QtMultimediaKit::MetaData key, const QVariant &value);
-    QList<QtMultimediaKit::MetaData> availableMetaData() const;
+    QVariant metaData(QtMultimedia::MetaData key) const;
+    void setMetaData(QtMultimedia::MetaData key, const QVariant &value);
+    QList<QtMultimedia::MetaData> availableMetaData() const;
 
     QVariant extendedMetaData(QString const &name) const;
     void setExtendedMetaData(QString const &name, QVariant const &value);
diff --git a/src/plugins/gstreamer/mediacapture/qgstreamervideoencode.cpp b/src/plugins/gstreamer/mediacapture/qgstreamervideoencode.cpp
index a3c724347..a2f139e90 100644
--- a/src/plugins/gstreamer/mediacapture/qgstreamervideoencode.cpp
+++ b/src/plugins/gstreamer/mediacapture/qgstreamervideoencode.cpp
@@ -171,8 +171,8 @@ GstElement *QGstreamerVideoEncode::createEncoder()
     gst_object_unref(GST_OBJECT(pad));
 
     if (encoderElement) {
-        if (m_videoSettings.encodingMode() == QtMultimediaKit::ConstantQualityEncoding) {
-            QtMultimediaKit::EncodingQuality qualityValue = m_videoSettings.quality();
+        if (m_videoSettings.encodingMode() == QtMultimedia::ConstantQualityEncoding) {
+            QtMultimedia::EncodingQuality qualityValue = m_videoSettings.quality();
 
             if (codec == QLatin1String("video/h264")) {
                 //constant quantizer mode
diff --git a/src/plugins/gstreamer/mediaplayer/qgstreamermetadataprovider.cpp b/src/plugins/gstreamer/mediaplayer/qgstreamermetadataprovider.cpp
index 00d766bd6..667067234 100644
--- a/src/plugins/gstreamer/mediaplayer/qgstreamermetadataprovider.cpp
+++ b/src/plugins/gstreamer/mediaplayer/qgstreamermetadataprovider.cpp
@@ -47,77 +47,77 @@
 
 struct QGstreamerMetaDataKeyLookup
 {
-    QtMultimediaKit::MetaData key;
+    QtMultimedia::MetaData key;
     const char *token;
 };
 
 static const QGstreamerMetaDataKeyLookup qt_gstreamerMetaDataKeys[] =
 {
-    { QtMultimediaKit::Title, GST_TAG_TITLE },
-    //{ QtMultimediaKit::SubTitle, 0 },
-    //{ QtMultimediaKit::Author, 0 },
-    { QtMultimediaKit::Comment, GST_TAG_COMMENT },
-    { QtMultimediaKit::Description, GST_TAG_DESCRIPTION },
-    //{ QtMultimediaKit::Category, 0 },
-    { QtMultimediaKit::Genre, GST_TAG_GENRE },
-    { QtMultimediaKit::Year, "year" },
-    //{ QtMultimediaKit::UserRating, 0 },
-
-    { QtMultimediaKit::Language, GST_TAG_LANGUAGE_CODE },
-
-    { QtMultimediaKit::Publisher, GST_TAG_ORGANIZATION },
-    { QtMultimediaKit::Copyright, GST_TAG_COPYRIGHT },
-    //{ QtMultimediaKit::ParentalRating, 0 },
-    //{ QtMultimediaKit::RatingOrganisation, 0 },
+    { QtMultimedia::Title, GST_TAG_TITLE },
+    //{ QtMultimedia::SubTitle, 0 },
+    //{ QtMultimedia::Author, 0 },
+    { QtMultimedia::Comment, GST_TAG_COMMENT },
+    { QtMultimedia::Description, GST_TAG_DESCRIPTION },
+    //{ QtMultimedia::Category, 0 },
+    { QtMultimedia::Genre, GST_TAG_GENRE },
+    { QtMultimedia::Year, "year" },
+    //{ QtMultimedia::UserRating, 0 },
+
+    { QtMultimedia::Language, GST_TAG_LANGUAGE_CODE },
+
+    { QtMultimedia::Publisher, GST_TAG_ORGANIZATION },
+    { QtMultimedia::Copyright, GST_TAG_COPYRIGHT },
+    //{ QtMultimedia::ParentalRating, 0 },
+    //{ QtMultimedia::RatingOrganisation, 0 },
 
     // Media
-    //{ QtMultimediaKit::Size, 0 },
-    //{ QtMultimediaKit::MediaType, 0 },
-    { QtMultimediaKit::Duration, GST_TAG_DURATION },
+    //{ QtMultimedia::Size, 0 },
+    //{ QtMultimedia::MediaType, 0 },
+    { QtMultimedia::Duration, GST_TAG_DURATION },
 
     // Audio
-    { QtMultimediaKit::AudioBitRate, GST_TAG_BITRATE },
-    { QtMultimediaKit::AudioCodec, GST_TAG_AUDIO_CODEC },
-    //{ QtMultimediaKit::ChannelCount, 0 },
-    //{ QtMultimediaKit::SampleRate, 0 },
+    { QtMultimedia::AudioBitRate, GST_TAG_BITRATE },
+    { QtMultimedia::AudioCodec, GST_TAG_AUDIO_CODEC },
+    //{ QtMultimedia::ChannelCount, 0 },
+    //{ QtMultimedia::SampleRate, 0 },
 
     // Music
-    { QtMultimediaKit::AlbumTitle, GST_TAG_ALBUM },
-    { QtMultimediaKit::AlbumArtist,  GST_TAG_ARTIST},
-    { QtMultimediaKit::ContributingArtist, GST_TAG_PERFORMER },
+    { QtMultimedia::AlbumTitle, GST_TAG_ALBUM },
+    { QtMultimedia::AlbumArtist,  GST_TAG_ARTIST},
+    { QtMultimedia::ContributingArtist, GST_TAG_PERFORMER },
 #if (GST_VERSION_MAJOR >= 0) && (GST_VERSION_MINOR >= 10) && (GST_VERSION_MICRO >= 19)
-    { QtMultimediaKit::Composer, GST_TAG_COMPOSER },
+    { QtMultimedia::Composer, GST_TAG_COMPOSER },
 #endif
-    //{ QtMultimediaKit::Conductor, 0 },
-    //{ QtMultimediaKit::Lyrics, 0 },
-    //{ QtMultimediaKit::Mood, 0 },
-    { QtMultimediaKit::TrackNumber, GST_TAG_TRACK_NUMBER },
+    //{ QtMultimedia::Conductor, 0 },
+    //{ QtMultimedia::Lyrics, 0 },
+    //{ QtMultimedia::Mood, 0 },
+    { QtMultimedia::TrackNumber, GST_TAG_TRACK_NUMBER },
 
-    //{ QtMultimediaKit::CoverArtUrlSmall, 0 },
-    //{ QtMultimediaKit::CoverArtUrlLarge, 0 },
+    //{ QtMultimedia::CoverArtUrlSmall, 0 },
+    //{ QtMultimedia::CoverArtUrlLarge, 0 },
 
     // Image/Video
-    { QtMultimediaKit::Resolution, "resolution" },
-    { QtMultimediaKit::PixelAspectRatio, "pixel-aspect-ratio" },
+    { QtMultimedia::Resolution, "resolution" },
+    { QtMultimedia::PixelAspectRatio, "pixel-aspect-ratio" },
 
     // Video
-    //{ QtMultimediaKit::VideoFrameRate, 0 },
-    //{ QtMultimediaKit::VideoBitRate, 0 },
-    { QtMultimediaKit::VideoCodec, GST_TAG_VIDEO_CODEC },
+    //{ QtMultimedia::VideoFrameRate, 0 },
+    //{ QtMultimedia::VideoBitRate, 0 },
+    { QtMultimedia::VideoCodec, GST_TAG_VIDEO_CODEC },
 
-    //{ QtMultimediaKit::PosterUrl, 0 },
+    //{ QtMultimedia::PosterUrl, 0 },
 
     // Movie
-    //{ QtMultimediaKit::ChapterNumber, 0 },
-    //{ QtMultimediaKit::Director, 0 },
-    { QtMultimediaKit::LeadPerformer, GST_TAG_PERFORMER },
-    //{ QtMultimediaKit::Writer, 0 },
+    //{ QtMultimedia::ChapterNumber, 0 },
+    //{ QtMultimedia::Director, 0 },
+    { QtMultimedia::LeadPerformer, GST_TAG_PERFORMER },
+    //{ QtMultimedia::Writer, 0 },
 
     // Photos
-    //{ QtMultimediaKit::CameraManufacturer, 0 },
-    //{ QtMultimediaKit::CameraModel, 0 },
-    //{ QtMultimediaKit::Event, 0 },
-    //{ QtMultimediaKit::Subject, 0 }
+    //{ QtMultimedia::CameraManufacturer, 0 },
+    //{ QtMultimedia::CameraModel, 0 },
+    //{ QtMultimedia::Event, 0 },
+    //{ QtMultimedia::Subject, 0 }
 };
 
 QGstreamerMetaDataProvider::QGstreamerMetaDataProvider(QGstreamerPlayerSession *session, QObject *parent)
@@ -140,7 +140,7 @@ bool QGstreamerMetaDataProvider::isWritable() const
     return false;
 }
 
-QVariant QGstreamerMetaDataProvider::metaData(QtMultimediaKit::MetaData key) const
+QVariant QGstreamerMetaDataProvider::metaData(QtMultimedia::MetaData key) const
 {
     static const int count = sizeof(qt_gstreamerMetaDataKeys) / sizeof(QGstreamerMetaDataKeyLookup);
 
@@ -152,9 +152,9 @@ QVariant QGstreamerMetaDataProvider::metaData(QtMultimediaKit::MetaData key) con
     return QVariant();
 }
 
-QList<QtMultimediaKit::MetaData> QGstreamerMetaDataProvider::availableMetaData() const
+QList<QtMultimedia::MetaData> QGstreamerMetaDataProvider::availableMetaData() const
 {
-    static QMap<QByteArray, QtMultimediaKit::MetaData> keysMap;
+    static QMap<QByteArray, QtMultimedia::MetaData> keysMap;
     if (keysMap.isEmpty()) {
         const int count = sizeof(qt_gstreamerMetaDataKeys) / sizeof(QGstreamerMetaDataKeyLookup);
         for (int i = 0; i < count; ++i) {
@@ -162,9 +162,9 @@ QList<QtMultimediaKit::MetaData> QGstreamerMetaDataProvider::availableMetaData()
         }
     }
 
-    QList<QtMultimediaKit::MetaData> res;
+    QList<QtMultimedia::MetaData> res;
     foreach (const QByteArray &key, m_session->tags().keys()) {
-        QtMultimediaKit::MetaData tag = keysMap.value(key, QtMultimediaKit::MetaData(-1));
+        QtMultimedia::MetaData tag = keysMap.value(key, QtMultimedia::MetaData(-1));
         if (tag != -1)
             res.append(tag);
     }
diff --git a/src/plugins/gstreamer/mediaplayer/qgstreamermetadataprovider.h b/src/plugins/gstreamer/mediaplayer/qgstreamermetadataprovider.h
index aac44f5a2..efba79c6b 100644
--- a/src/plugins/gstreamer/mediaplayer/qgstreamermetadataprovider.h
+++ b/src/plugins/gstreamer/mediaplayer/qgstreamermetadataprovider.h
@@ -58,8 +58,8 @@ public:
     bool isMetaDataAvailable() const;
     bool isWritable() const;
 
-    QVariant metaData(QtMultimediaKit::MetaData key) const;
-    QList<QtMultimediaKit::MetaData> availableMetaData() const;
+    QVariant metaData(QtMultimedia::MetaData key) const;
+    QList<QtMultimedia::MetaData> availableMetaData() const;
 
     QVariant extendedMetaData(const QString &key) const ;
     QStringList availableExtendedMetaData() const;
diff --git a/src/plugins/gstreamer/mediaplayer/qgstreamerplayersession.cpp b/src/plugins/gstreamer/mediaplayer/qgstreamerplayersession.cpp
index 7fb5599c2..7aef9065e 100644
--- a/src/plugins/gstreamer/mediaplayer/qgstreamerplayersession.cpp
+++ b/src/plugins/gstreamer/mediaplayer/qgstreamerplayersession.cpp
@@ -1219,7 +1219,7 @@ void QGstreamerPlayerSession::getStreamsInfo()
 
         for (int i=0; i<m_streamTypes.count(); i++) {
             QMediaStreamsControl::StreamType streamType = m_streamTypes[i];
-            QMap<QtMultimediaKit::MetaData, QVariant> streamProperties;
+            QMap<QtMultimedia::MetaData, QVariant> streamProperties;
 
             int streamIndex = i - m_playbin2StreamOffset[streamType];
 
@@ -1241,7 +1241,7 @@ void QGstreamerPlayerSession::getStreamsInfo()
             if (tags && gst_is_tag_list(tags)) {
                 gchar *languageCode = 0;
                 if (gst_tag_list_get_string(tags, GST_TAG_LANGUAGE_CODE, &languageCode))
-                    streamProperties[QtMultimediaKit::Language] = QString::fromUtf8(languageCode);
+                    streamProperties[QtMultimedia::Language] = QString::fromUtf8(languageCode);
 
                 //qDebug() << "language for setream" << i << QString::fromUtf8(languageCode);
                 g_free (languageCode);
@@ -1301,8 +1301,8 @@ void QGstreamerPlayerSession::getStreamsInfo()
                 break;
             }
 
-            QMap<QtMultimediaKit::MetaData, QVariant> streamProperties;
-            streamProperties[QtMultimediaKit::Language] = QString::fromUtf8(languageCode);
+            QMap<QtMultimedia::MetaData, QVariant> streamProperties;
+            streamProperties[QtMultimedia::Language] = QString::fromUtf8(languageCode);
 
             m_streamProperties.append(streamProperties);
             m_streamTypes.append(streamType);
diff --git a/src/plugins/gstreamer/mediaplayer/qgstreamerplayersession.h b/src/plugins/gstreamer/mediaplayer/qgstreamerplayersession.h
index e89c1521c..208f0b5de 100644
--- a/src/plugins/gstreamer/mediaplayer/qgstreamerplayersession.h
+++ b/src/plugins/gstreamer/mediaplayer/qgstreamerplayersession.h
@@ -103,7 +103,7 @@ public:
     QMediaTimeRange availablePlaybackRanges() const;
 
     QMap<QByteArray ,QVariant> tags() const { return m_tags; }
-    QMap<QtMultimediaKit::MetaData,QVariant> streamProperties(int streamNumber) const { return m_streamProperties[streamNumber]; }
+    QMap<QtMultimedia::MetaData,QVariant> streamProperties(int streamNumber) const { return m_streamProperties[streamNumber]; }
     int streamCount() const { return m_streamProperties.count(); }
     QMediaStreamsControl::StreamType streamType(int streamNumber) { return m_streamTypes.value(streamNumber, QMediaStreamsControl::UnknownStream); }
 
@@ -195,7 +195,7 @@ private:
 #endif
 
     QMap<QByteArray, QVariant> m_tags;
-    QList< QMap<QtMultimediaKit::MetaData,QVariant> > m_streamProperties;
+    QList< QMap<QtMultimedia::MetaData,QVariant> > m_streamProperties;
     QList<QMediaStreamsControl::StreamType> m_streamTypes;
     QMap<QMediaStreamsControl::StreamType, int> m_playbin2StreamOffset;
 
diff --git a/src/plugins/gstreamer/mediaplayer/qgstreamerstreamscontrol.cpp b/src/plugins/gstreamer/mediaplayer/qgstreamerstreamscontrol.cpp
index 0b594bd42..a5ba87192 100644
--- a/src/plugins/gstreamer/mediaplayer/qgstreamerstreamscontrol.cpp
+++ b/src/plugins/gstreamer/mediaplayer/qgstreamerstreamscontrol.cpp
@@ -62,7 +62,7 @@ QMediaStreamsControl::StreamType QGstreamerStreamsControl::streamType(int stream
     return m_session->streamType(streamNumber);
 }
 
-QVariant QGstreamerStreamsControl::metaData(int streamNumber, QtMultimediaKit::MetaData key)
+QVariant QGstreamerStreamsControl::metaData(int streamNumber, QtMultimedia::MetaData key)
 {
     return m_session->streamProperties(streamNumber).value(key);
 }
diff --git a/src/plugins/gstreamer/mediaplayer/qgstreamerstreamscontrol.h b/src/plugins/gstreamer/mediaplayer/qgstreamerstreamscontrol.h
index c46709e91..77f0f2d93 100644
--- a/src/plugins/gstreamer/mediaplayer/qgstreamerstreamscontrol.h
+++ b/src/plugins/gstreamer/mediaplayer/qgstreamerstreamscontrol.h
@@ -58,7 +58,7 @@ public:
     virtual int streamCount();
     virtual StreamType streamType(int streamNumber);
 
-    virtual QVariant metaData(int streamNumber, QtMultimediaKit::MetaData key);
+    virtual QVariant metaData(int streamNumber, QtMultimedia::MetaData key);
 
     virtual bool isActive(int streamNumber);
     virtual void setActive(int streamNumber, bool state);
diff --git a/src/plugins/gstreamer/qgstreamerserviceplugin.cpp b/src/plugins/gstreamer/qgstreamerserviceplugin.cpp
index baa5bae06..64d71c550 100644
--- a/src/plugins/gstreamer/qgstreamerserviceplugin.cpp
+++ b/src/plugins/gstreamer/qgstreamerserviceplugin.cpp
@@ -260,7 +260,7 @@ namespace {
     }
 }
 
-QtMultimediaKit::SupportEstimate QGstreamerServicePlugin::hasSupport(const QString &mimeType,
+QtMultimedia::SupportEstimate QGstreamerServicePlugin::hasSupport(const QString &mimeType,
                                                                      const QStringList& codecs) const
 {
     if (m_supportedMimeTypeSet.isEmpty())
@@ -294,12 +294,12 @@ QtMultimediaKit::SupportEstimate QGstreamerServicePlugin::hasSupport(const QStri
         }
     }
     if (supportedCodecCount > 0 && supportedCodecCount == codecs.size())
-        return QtMultimediaKit::ProbablySupported;
+        return QtMultimedia::ProbablySupported;
 
     if (supportedCodecCount == 0 && !containsMimeType)
-        return QtMultimediaKit::NotSupported;
+        return QtMultimedia::NotSupported;
 
-    return QtMultimediaKit::MaybeSupported;
+    return QtMultimedia::MaybeSupported;
 }
 
 void QGstreamerServicePlugin::updateSupportedMimeTypes() const
diff --git a/src/plugins/gstreamer/qgstreamerserviceplugin.h b/src/plugins/gstreamer/qgstreamerserviceplugin.h
index 5c0cf0075..ddb5dc124 100644
--- a/src/plugins/gstreamer/qgstreamerserviceplugin.h
+++ b/src/plugins/gstreamer/qgstreamerserviceplugin.h
@@ -70,7 +70,7 @@ public:
     QString deviceDescription(const QByteArray &service, const QByteArray &device);
     QVariant deviceProperty(const QByteArray &service, const QByteArray &device, const QByteArray &property);
 
-    QtMultimediaKit::SupportEstimate hasSupport(const QString &mimeType, const QStringList& codecs) const;
+    QtMultimedia::SupportEstimate hasSupport(const QString &mimeType, const QStringList& codecs) const;
     QStringList supportedMimeTypes() const;
 
 private:
diff --git a/src/plugins/m3u/m3u.pro b/src/plugins/m3u/m3u.pro
index c66f10b7d..cd73b1405 100644
--- a/src/plugins/m3u/m3u.pro
+++ b/src/plugins/m3u/m3u.pro
@@ -1,11 +1,11 @@
 load(qt_module)
 
-TARGET = qtmultimediakit_m3u
-QT += multimediakit-private
+TARGET = qtmultimedia_m3u
+QT += multimedia-private
 PLUGIN_TYPE=playlistformats
 
 load(qt_plugin)
-DESTDIR = $$QT.multimediakit.plugins/$${PLUGIN_TYPE}
+DESTDIR = $$QT.multimedia.plugins/$${PLUGIN_TYPE}
 
 
 HEADERS += qm3uhandler.h
diff --git a/src/plugins/m3u/main.cpp b/src/plugins/m3u/main.cpp
index b098050c2..f322001a6 100644
--- a/src/plugins/m3u/main.cpp
+++ b/src/plugins/m3u/main.cpp
@@ -44,4 +44,4 @@
 
 
 Q_EXPORT_STATIC_PLUGIN(QM3uPlaylistPlugin)
-Q_EXPORT_PLUGIN2(qtmultimediakit_m3u, QM3uPlaylistPlugin)
+Q_EXPORT_PLUGIN2(qtmultimedia_m3u, QM3uPlaylistPlugin)
diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro
index 15a25b3d5..67cc6b701 100644
--- a/src/plugins/plugins.pro
+++ b/src/plugins/plugins.pro
@@ -1,6 +1,6 @@
 ######################################################################
 #
-# QtMultimediaKit
+# QtMultimedia
 #
 ######################################################################
 
diff --git a/src/plugins/pulseaudio/pulseaudio.pro b/src/plugins/pulseaudio/pulseaudio.pro
index b5db8f690..9b786b43d 100644
--- a/src/plugins/pulseaudio/pulseaudio.pro
+++ b/src/plugins/pulseaudio/pulseaudio.pro
@@ -1,11 +1,11 @@
 load(qt_module)
 
 TARGET = qtmedia_pulse
-QT += multimediakit-private
+QT += multimedia-private
 PLUGIN_TYPE = audio
 
 load(qt_plugin)
-DESTDIR = $$QT.multimediakit.plugins/$${PLUGIN_TYPE}
+DESTDIR = $$QT.multimedia.plugins/$${PLUGIN_TYPE}
 
 CONFIG += link_pkgconfig
 PKGCONFIG += libpulse
diff --git a/src/plugins/qt7/mediaplayer/qt7playermetadata.h b/src/plugins/qt7/mediaplayer/qt7playermetadata.h
index 49d9b8e01..c5984a425 100644
--- a/src/plugins/qt7/mediaplayer/qt7playermetadata.h
+++ b/src/plugins/qt7/mediaplayer/qt7playermetadata.h
@@ -58,8 +58,8 @@ public:
     bool isMetaDataAvailable() const;
     bool isWritable() const;
 
-    QVariant metaData(QtMultimediaKit::MetaData key) const;
-    QList<QtMultimediaKit::MetaData> availableMetaData() const;
+    QVariant metaData(QtMultimedia::MetaData key) const;
+    QList<QtMultimedia::MetaData> availableMetaData() const;
 
     QVariant extendedMetaData(const QString &key) const ;
     QStringList availableExtendedMetaData() const;
@@ -69,7 +69,7 @@ private slots:
 
 private:
     QT7PlayerSession *m_session;
-    QMap<QtMultimediaKit::MetaData, QVariant> m_tags;
+    QMap<QtMultimedia::MetaData, QVariant> m_tags;
 };
 
 QT_END_NAMESPACE
diff --git a/src/plugins/qt7/mediaplayer/qt7playermetadata.mm b/src/plugins/qt7/mediaplayer/qt7playermetadata.mm
index 313a009ed..743243113 100644
--- a/src/plugins/qt7/mediaplayer/qt7playermetadata.mm
+++ b/src/plugins/qt7/mediaplayer/qt7playermetadata.mm
@@ -72,12 +72,12 @@ bool QT7PlayerMetaDataControl::isWritable() const
     return false;
 }
 
-QVariant QT7PlayerMetaDataControl::metaData(QtMultimediaKit::MetaData key) const
+QVariant QT7PlayerMetaDataControl::metaData(QtMultimedia::MetaData key) const
 {
     return m_tags.value(key);
 }
 
-QList<QtMultimediaKit::MetaData> QT7PlayerMetaDataControl::availableMetaData() const
+QList<QtMultimedia::MetaData> QT7PlayerMetaDataControl::availableMetaData() const
 {
     return m_tags.keys();
 }
@@ -244,13 +244,13 @@ void QT7PlayerMetaDataControl::updateTags()
         metaMap.insert(QLatin1String("nam"), QString::fromUtf8([name UTF8String]));
 #endif // QUICKTIME_C_API_AVAILABLE
 
-        m_tags.insert(QtMultimediaKit::AlbumArtist, metaMap.value(QLatin1String("ART")));
-        m_tags.insert(QtMultimediaKit::AlbumTitle, metaMap.value(QLatin1String("alb")));
-        m_tags.insert(QtMultimediaKit::Title, metaMap.value(QLatin1String("nam")));
-        m_tags.insert(QtMultimediaKit::Date, metaMap.value(QLatin1String("day")));
-        m_tags.insert(QtMultimediaKit::Genre, metaMap.value(QLatin1String("gnre")));
-        m_tags.insert(QtMultimediaKit::TrackNumber, metaMap.value(QLatin1String("trk")));
-        m_tags.insert(QtMultimediaKit::Description, metaMap.value(QLatin1String("des")));
+        m_tags.insert(QtMultimedia::AlbumArtist, metaMap.value(QLatin1String("ART")));
+        m_tags.insert(QtMultimedia::AlbumTitle, metaMap.value(QLatin1String("alb")));
+        m_tags.insert(QtMultimedia::Title, metaMap.value(QLatin1String("nam")));
+        m_tags.insert(QtMultimedia::Date, metaMap.value(QLatin1String("day")));
+        m_tags.insert(QtMultimedia::Genre, metaMap.value(QLatin1String("gnre")));
+        m_tags.insert(QtMultimedia::TrackNumber, metaMap.value(QLatin1String("trk")));
+        m_tags.insert(QtMultimedia::Description, metaMap.value(QLatin1String("des")));
     }
 
     if (!wasEmpty || !m_tags.isEmpty())
diff --git a/src/plugins/qt7/qcvdisplaylink.h b/src/plugins/qt7/qcvdisplaylink.h
index aa71f4cc3..46462eccb 100644
--- a/src/plugins/qt7/qcvdisplaylink.h
+++ b/src/plugins/qt7/qcvdisplaylink.h
@@ -45,7 +45,7 @@
 #include <QtCore/qobject.h>
 #include <QtCore/qmutex.h>
 
-#include <qtmultimediakitdefs.h>
+#include <qtmultimediadefs.h>
 
 #include <QuartzCore/CVDisplayLink.h>
 
diff --git a/src/plugins/qt7/qt7.pro b/src/plugins/qt7/qt7.pro
index 5be085eb2..34e54cfc5 100644
--- a/src/plugins/qt7/qt7.pro
+++ b/src/plugins/qt7/qt7.pro
@@ -1,11 +1,11 @@
 load(qt_module)
 
 TARGET = qqt7engine
-QT += multimediakit-private multimediakitwidgets-private network
+QT += multimedia-private multimediawidgets-private network
 PLUGIN_TYPE = mediaservice
 
 load(qt_plugin)
-DESTDIR = $$QT.multimediakit.plugins/$${PLUGIN_TYPE}
+DESTDIR = $$QT.multimedia.plugins/$${PLUGIN_TYPE}
 
 !simulator {
 QT += opengl
diff --git a/src/plugins/qt7/qt7backend.h b/src/plugins/qt7/qt7backend.h
index 0c2c5d8cf..67ff53abb 100644
--- a/src/plugins/qt7/qt7backend.h
+++ b/src/plugins/qt7/qt7backend.h
@@ -42,7 +42,7 @@
 #ifndef QT7BACKEND_H
 #define QT7BACKEND_H
 
-#include "qtmultimediakitdefs.h"
+#include "qtmultimediadefs.h"
 
 #include <QtCore/QString>
 
diff --git a/src/plugins/qt7/qt7serviceplugin.h b/src/plugins/qt7/qt7serviceplugin.h
index 36077c703..7ff1249eb 100644
--- a/src/plugins/qt7/qt7serviceplugin.h
+++ b/src/plugins/qt7/qt7serviceplugin.h
@@ -61,7 +61,7 @@ public:
     void release(QMediaService *service);
 
     QMediaServiceProviderHint::Features supportedFeatures(const QByteArray &service) const;
-    QtMultimediaKit::SupportEstimate hasSupport(const QString &mimeType, const QStringList& codecs) const;
+    QtMultimedia::SupportEstimate hasSupport(const QString &mimeType, const QStringList& codecs) const;
     QStringList supportedMimeTypes() const;
 
 private:
diff --git a/src/plugins/qt7/qt7serviceplugin.mm b/src/plugins/qt7/qt7serviceplugin.mm
index b2941100b..843ab41b2 100644
--- a/src/plugins/qt7/qt7serviceplugin.mm
+++ b/src/plugins/qt7/qt7serviceplugin.mm
@@ -96,14 +96,14 @@ QMediaServiceProviderHint::Features QT7ServicePlugin::supportedFeatures(
         return QMediaServiceProviderHint::Features();
 }
 
-QtMultimediaKit::SupportEstimate QT7ServicePlugin::hasSupport(const QString &mimeType, const QStringList& codecs) const
+QtMultimedia::SupportEstimate QT7ServicePlugin::hasSupport(const QString &mimeType, const QStringList& codecs) const
 {
     Q_UNUSED(codecs);
 
     if (m_supportedMimeTypes.contains(mimeType))
-        return QtMultimediaKit::ProbablySupported;
+        return QtMultimedia::ProbablySupported;
 
-    return QtMultimediaKit::MaybeSupported;
+    return QtMultimedia::MaybeSupported;
 }
 
 QStringList QT7ServicePlugin::supportedMimeTypes() const
diff --git a/src/plugins/simulator/qsimulatormultimediadata_p.h b/src/plugins/simulator/qsimulatormultimediadata_p.h
index 22b0d73a0..b814f5c37 100644
--- a/src/plugins/simulator/qsimulatormultimediadata_p.h
+++ b/src/plugins/simulator/qsimulatormultimediadata_p.h
@@ -53,7 +53,7 @@
 // We mean it.
 //
 
-#include "qtmultimediakitdefs.h"
+#include "qtmultimediadefs.h"
 #include <QtCore/QMetaType>
 #include <QtCore/QDateTime>
 #include <qcamera.h>
diff --git a/src/plugins/v4l/radio/v4lradiocontrol.cpp b/src/plugins/v4l/radio/v4lradiocontrol.cpp
index fe5357ec9..49182d50b 100644
--- a/src/plugins/v4l/radio/v4lradiocontrol.cpp
+++ b/src/plugins/v4l/radio/v4lradiocontrol.cpp
@@ -88,12 +88,12 @@ bool V4LRadioControl::isAvailable() const
     return available;
 }
 
-QtMultimediaKit::AvailabilityError V4LRadioControl::availabilityError() const
+QtMultimedia::AvailabilityError V4LRadioControl::availabilityError() const
 {
     if (fd > 0)
-        return QtMultimediaKit::NoError;
+        return QtMultimedia::NoError;
     else
-        return QtMultimediaKit::ResourceError;
+        return QtMultimedia::ResourceError;
 }
 
 QRadioTuner::State V4LRadioControl::state() const
diff --git a/src/plugins/v4l/radio/v4lradiocontrol.h b/src/plugins/v4l/radio/v4lradiocontrol.h
index 36e86f960..4e9f6eb57 100644
--- a/src/plugins/v4l/radio/v4lradiocontrol.h
+++ b/src/plugins/v4l/radio/v4lradiocontrol.h
@@ -65,7 +65,7 @@ public:
     ~V4LRadioControl();
 
     bool isAvailable() const;
-    QtMultimediaKit::AvailabilityError availabilityError() const;
+    QtMultimedia::AvailabilityError availabilityError() const;
 
     QRadioTuner::State state() const;
 
diff --git a/src/plugins/v4l/v4l.pro b/src/plugins/v4l/v4l.pro
index 063a4c7ac..bc5c3d4a0 100644
--- a/src/plugins/v4l/v4l.pro
+++ b/src/plugins/v4l/v4l.pro
@@ -1,11 +1,11 @@
 load(qt_module)
 
 TARGET = qtmedia_v4lengine
-QT += multimediakit-private
+QT += multimedia-private
 PLUGIN_TYPE = mediaservice
 
 load(qt_plugin)
-DESTDIR = $$QT.multimediakit.plugins/$${PLUGIN_TYPE}
+DESTDIR = $$QT.multimedia.plugins/$${PLUGIN_TYPE}
 
 HEADERS += v4lserviceplugin.h
 SOURCES += v4lserviceplugin.cpp
diff --git a/src/plugins/wmf/player/mfmetadatacontrol.cpp b/src/plugins/wmf/player/mfmetadatacontrol.cpp
index 4d62b9091..4e6270606 100644
--- a/src/plugins/wmf/player/mfmetadatacontrol.cpp
+++ b/src/plugins/wmf/player/mfmetadatacontrol.cpp
@@ -65,7 +65,7 @@ bool MFMetaDataControl::isMetaDataAvailable() const
     return m_content || m_metaData;
 }
 
-QVariant MFMetaDataControl::metaData(QtMultimediaKit::MetaData key) const
+QVariant MFMetaDataControl::metaData(QtMultimedia::MetaData key) const
 {
     QVariant value;
     if (!isMetaDataAvailable())
@@ -113,7 +113,7 @@ QVariant MFMetaDataControl::convertValue(const PROPVARIANT& var) const
     return value;
 }
 
-QList<QtMultimediaKit::MetaData> MFMetaDataControl::availableMetaData() const
+QList<QtMultimedia::MetaData> MFMetaDataControl::availableMetaData() const
 {
     return m_availableMetaDatas;
 }
@@ -173,15 +173,15 @@ void MFMetaDataControl::updateSource(IMFPresentationDescriptor* sourcePD, IMFMed
                     continue;
                 bool common = true;
                 if (key == PKEY_Author) {
-                    m_availableMetaDatas.push_back(QtMultimediaKit::Author);
+                    m_availableMetaDatas.push_back(QtMultimedia::Author);
                 } else if (key == PKEY_Title) {
-                    m_availableMetaDatas.push_back(QtMultimediaKit::Title);
+                    m_availableMetaDatas.push_back(QtMultimedia::Title);
                 } else if (key == PKEY_ParentalRating) {
-                    m_availableMetaDatas.push_back(QtMultimediaKit::ParentalRating);
+                    m_availableMetaDatas.push_back(QtMultimedia::ParentalRating);
                 } else if (key == PKEY_Comment) {
-                    m_availableMetaDatas.push_back(QtMultimediaKit::Description);
+                    m_availableMetaDatas.push_back(QtMultimedia::Description);
                 } else if (key == PKEY_Copyright) {
-                    m_availableMetaDatas.push_back(QtMultimediaKit::Copyright);
+                    m_availableMetaDatas.push_back(QtMultimedia::Copyright);
                 //TODO: add more common keys
                 } else {
                     common = false;
@@ -213,15 +213,15 @@ void MFMetaDataControl::updateSource(IMFPresentationDescriptor* sourcePD, IMFMed
 #endif
                         bool common = true;
                         if (wcscmp(sName, L"Author") == 0) {
-                            m_availableMetaDatas.push_back(QtMultimediaKit::Author);
+                            m_availableMetaDatas.push_back(QtMultimedia::Author);
                         } else if (wcscmp(sName, L"Title") == 0) {
-                            m_availableMetaDatas.push_back(QtMultimediaKit::Title);
+                            m_availableMetaDatas.push_back(QtMultimedia::Title);
                         } else if (wcscmp(sName, L"Rating") == 0) {
-                            m_availableMetaDatas.push_back(QtMultimediaKit::ParentalRating);
+                            m_availableMetaDatas.push_back(QtMultimedia::ParentalRating);
                         } else if (wcscmp(sName, L"Description") == 0) {
-                            m_availableMetaDatas.push_back(QtMultimediaKit::Description);
+                            m_availableMetaDatas.push_back(QtMultimedia::Description);
                         } else if (wcscmp(sName, L"Copyright") == 0) {
-                            m_availableMetaDatas.push_back(QtMultimediaKit::Copyright);
+                            m_availableMetaDatas.push_back(QtMultimedia::Copyright);
                             //TODO: add more common keys
                         } else {
                             common = false;
diff --git a/src/plugins/wmf/player/mfmetadatacontrol.h b/src/plugins/wmf/player/mfmetadatacontrol.h
index c666aaf5b..a73b7788d 100644
--- a/src/plugins/wmf/player/mfmetadatacontrol.h
+++ b/src/plugins/wmf/player/mfmetadatacontrol.h
@@ -56,8 +56,8 @@ public:
 
     bool isMetaDataAvailable() const;
 
-    QVariant metaData(QtMultimediaKit::MetaData key) const;
-    QList<QtMultimediaKit::MetaData> availableMetaData() const;
+    QVariant metaData(QtMultimedia::MetaData key) const;
+    QList<QtMultimedia::MetaData> availableMetaData() const;
 
     QVariant extendedMetaData(const QString &key) const;
     QStringList availableExtendedMetaData() const;
@@ -69,7 +69,7 @@ private:
     IPropertyStore  *m_content;  //for Windows7
     IMFMetadata        *m_metaData; //for Vista
 
-    QList<QtMultimediaKit::MetaData> m_availableMetaDatas;
+    QList<QtMultimedia::MetaData> m_availableMetaDatas;
     QList<PROPERTYKEY> m_commonKeys; //for Windows7
     QStringList        m_commonNames; //for Vista
 
diff --git a/src/plugins/wmf/wmf.pro b/src/plugins/wmf/wmf.pro
index 0bb1743a7..d0b4ec347 100644
--- a/src/plugins/wmf/wmf.pro
+++ b/src/plugins/wmf/wmf.pro
@@ -1,12 +1,12 @@
 load(qt_module)
 
 TARGET = wmfengine
-QT += multimediakit-private network multimediakitwidgets-private
+QT += multimedia-private network multimediawidgets-private
 PLUGIN_TYPE=mediaservice
 
 load(qt_plugin)
 
-DESTDIR = $$QT.multimediakit.plugins/$${PLUGIN_TYPE}
+DESTDIR = $$QT.multimedia.plugins/$${PLUGIN_TYPE}
 
 DEPENDPATH += .
 
diff --git a/src/src.pro b/src/src.pro
index cad13103e..735967f2b 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -2,11 +2,11 @@
 TEMPLATE = subdirs
 CONFIG += ordered
 
-library_qtmmkwidgets.subdir = $$IN_PWD/multimediakitwidgets
-library_qtmmkwidgets.depends = multimediakit
+library_qtmmwidgets.subdir = $$IN_PWD/multimediawidgets
+library_qtmmwidgets.depends = multimedia
 
-SUBDIRS += multimediakit
-SUBDIRS += library_qtmmkwidgets
+SUBDIRS += multimedia
+SUBDIRS += library_qtmmwidgets
 SUBDIRS += imports
 SUBDIRS += plugins
 
diff --git a/sync.profile b/sync.profile
index 57945b1b2..6e444dcdf 100644
--- a/sync.profile
+++ b/sync.profile
@@ -1,14 +1,14 @@
 %modules = ( # path to module name map
-    "QtMultimediaKit" => "$basedir/src/multimediakit",
-    "QtMultimediaKitWidgets" => "$basedir/src/multimediakitwidgets",
+    "QtMultimedia" => "$basedir/src/multimedia",
+    "QtMultimediaWidgets" => "$basedir/src/multimediawidgets",
 );
 
 %moduleheaders = ( # restrict the module headers to those found in relative path
 );
 
 %classnames = (
-    "qtmultimediakitversion.h" => "QtMultimediaKitVersion",
-    "qtmultimediakitwidgetsversion.h" => "QtMultimediaKitWidgetsVersion",
+    "qtmultimediaversion.h" => "QtMultimediaVersion",
+    "qtmultimediawidgetsversion.h" => "QtMultimediaWidgetsVersion",
 );
 
 %mastercontent = (
@@ -18,8 +18,8 @@
 );
 
 %modulepris = (
-    "QtMultimediaKit" => "$basedir/modules/qt_multimediakit.pri",
-    "QtMultimediaKitWidgets" => "$basedir/modules/qt_multimediakitwidgets.pri",
+    "QtMultimedia" => "$basedir/modules/qt_multimedia.pri",
+    "QtMultimediaWidgets" => "$basedir/modules/qt_multimediawidgets.pri",
 );
 
 # Module dependencies.
@@ -31,7 +31,6 @@
 %dependencies = (
     "qtbase" => "refs/heads/master",
     "qtsvg" => "refs/heads/master",
-    "qtscript" => "refs/heads/master",
     "qtxmlpatterns" => "refs/heads/master",
     "qtdeclarative" => "refs/heads/master",
 );
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"