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>

40 files changed, 80 insertions, 80 deletions

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