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>

8 files changed, 20 insertions, 20 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!";