Doc: Fix module name format

Follow the conventions at
http://qt-project.org/wiki/Spelling_Module_Names_in_Qt_Documentation

QtMultimedia -> Qt Multimedia

(Also, QtMultimediaKit has been merged into Qt Multimedia in Qt 5)

Change-Id: I3c23435d5eceb946ea320756b835da937726db24
Reviewed-by: Laszlo Papp <lpapp@kde.org>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>

16 files changed, 21 insertions, 21 deletions

diff --git a/examples/multimedia/spectrum/README.txt b/examples/multimedia/spectrum/README.txt
index c39d4a709..b4f3b982a 100644
--- a/examples/multimedia/spectrum/README.txt
+++ b/examples/multimedia/spectrum/README.txt
@@ -4,7 +4,7 @@ Spectrum analyser demo app
 Introduction
 ------------
 
-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.
+This application is a demo which uses the Qt Multimedia 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 QtMultimedia is in the Engine class.
+The part of the application which interacts with Qt Multimedia 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/multimedia/spectrum/app/engine.h b/examples/multimedia/spectrum/app/engine.h
index 7508c0e6a..014492869 100644
--- a/examples/multimedia/spectrum/app/engine.h
+++ b/examples/multimedia/spectrum/app/engine.h
@@ -68,7 +68,7 @@ class QAudioOutput;
 QT_END_NAMESPACE
 
 /**
- * This class interfaces with the QtMultimedia audio classes, and also with
+ * This class interfaces with the Qt Multimedia 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/multimedia/spectrum/app/main.cpp b/examples/multimedia/spectrum/app/main.cpp
index a4bc76b5d..adb2b604c 100644
--- a/examples/multimedia/spectrum/app/main.cpp
+++ b/examples/multimedia/spectrum/app/main.cpp
@@ -44,7 +44,7 @@
 int main(int argc, char *argv[])
 {
     QApplication app(argc, argv);
-    app.setApplicationName("QtMultimedia spectrum analyzer");
+    app.setApplicationName("Qt Multimedia spectrum analyzer");
 
     MainWidget w;
     w.show();
diff --git a/examples/multimedia/spectrum/doc/src/spectrum.qdoc b/examples/multimedia/spectrum/doc/src/spectrum.qdoc
index 9760ac392..4c9ce60e8 100644
--- a/examples/multimedia/spectrum/doc/src/spectrum.qdoc
+++ b/examples/multimedia/spectrum/doc/src/spectrum.qdoc
@@ -36,7 +36,7 @@
 
     \image spectrum-demo.png
 
-    Because QtMultimedia allows the application to access the raw audio
+    Because Qt Multimedia allows the application to access the raw audio
     stream, the data can either be inspected or modified by the application.
     The Spectrum Analyzer example displays three pieces of information while
     audio is being either captured or played back:
diff --git a/examples/multimedia/video/qmlvideo/qml/qmlvideo/CameraDummy.qml b/examples/multimedia/video/qmlvideo/qml/qmlvideo/CameraDummy.qml
index f23fd01e5..baf69b706 100644
--- a/examples/multimedia/video/qmlvideo/qml/qmlvideo/CameraDummy.qml
+++ b/examples/multimedia/video/qmlvideo/qml/qmlvideo/CameraDummy.qml
@@ -41,7 +41,7 @@
 
 import QtQuick 2.0
 
-// Item which is loaded by CameraItem if QtMultimediaKit is not available
+// Item which is loaded by CameraItem if Qt Multimedia is not available
 Rectangle {
     id: root
     color: "grey"
@@ -56,7 +56,7 @@ Rectangle {
         anchors.margins: 10
         color: "white"
         horizontalAlignment: Text.AlignHCenter
-        text: "Failed to create Camera item\n\nCheck that QtMultimediaKit is installed"
+        text: "Failed to create Camera item\n\nCheck that Qt Multimedia is installed"
         verticalAlignment: Text.AlignVCenter
         wrapMode: Text.Wrap
     }
diff --git a/examples/multimedia/video/qmlvideo/qml/qmlvideo/VideoDummy.qml b/examples/multimedia/video/qmlvideo/qml/qmlvideo/VideoDummy.qml
index 0c7619119..cb71b9368 100644
--- a/examples/multimedia/video/qmlvideo/qml/qmlvideo/VideoDummy.qml
+++ b/examples/multimedia/video/qmlvideo/qml/qmlvideo/VideoDummy.qml
@@ -41,7 +41,7 @@
 
 import QtQuick 2.0
 
-// Item which is loaded by VideoItem if QtMultimediaKit is not available
+// Item which is loaded by VideoItem if Qt Multimedia is not available
 Rectangle {
     id: root
     color: "grey"
@@ -61,7 +61,7 @@ Rectangle {
         anchors.margins: 10
         color: "white"
         horizontalAlignment: Text.AlignHCenter
-        text: "Failed to create Video item\n\nCheck that QtMultimediaKit is installed"
+        text: "Failed to create Video item\n\nCheck that Qt Multimedia is installed"
         verticalAlignment: Text.AlignVCenter
         wrapMode: Text.Wrap
     }
diff --git a/examples/multimediawidgets/camera/doc/src/camera.qdoc b/examples/multimediawidgets/camera/doc/src/camera.qdoc
index ac4e9b2ea..a7bbf38cc 100644
--- a/examples/multimediawidgets/camera/doc/src/camera.qdoc
+++ b/examples/multimediawidgets/camera/doc/src/camera.qdoc
@@ -35,7 +35,7 @@
 \brief  The Camera Example shows how to use the API to capture a still image
 or video.
 
-The Camera Example demonstrates how you can use QtMultimedia to implement
+The Camera Example demonstrates how you can use Qt Multimedia to implement
 some basic Camera functionality to take still images and record video clips
 with audio.
 
diff --git a/examples/multimediawidgets/videographicsitem/doc/src/videographicsitem.qdoc b/examples/multimediawidgets/videographicsitem/doc/src/videographicsitem.qdoc
index 0aa5acbf2..2b1e44df0 100644
--- a/examples/multimediawidgets/videographicsitem/doc/src/videographicsitem.qdoc
+++ b/examples/multimediawidgets/videographicsitem/doc/src/videographicsitem.qdoc
@@ -32,7 +32,7 @@
 \brief This example demonstrates how to stream video on a graphics scene.
 
     The Video Graphics Item example shows how to implement a QGraphicsItem that displays video on a
-    graphics scene using QtMultimedia's QAbstractVideoSurface.
+    graphics scene using Qt Multimedia's QAbstractVideoSurface.
 
     \image video-videographicsitem.png
 
diff --git a/examples/multimediawidgets/videowidget/doc/src/videowidget.qdoc b/examples/multimediawidgets/videowidget/doc/src/videowidget.qdoc
index 790779423..765eb6b04 100644
--- a/examples/multimediawidgets/videowidget/doc/src/videowidget.qdoc
+++ b/examples/multimediawidgets/videowidget/doc/src/videowidget.qdoc
@@ -32,7 +32,7 @@
     \brief This example is a simple video player
 
     The Video Widget example denonstrates how to implement a video widget using
-    QtMultimedia's QAbstractVideoSurface.
+    Qt Multimedia's QAbstractVideoSurface.
 
     \image video-videowidget.png
 */
diff --git a/src/imports/multimedia/qdeclarativecamera.cpp b/src/imports/multimedia/qdeclarativecamera.cpp
index 226b99277..5c416ab10 100644
--- a/src/imports/multimedia/qdeclarativecamera.cpp
+++ b/src/imports/multimedia/qdeclarativecamera.cpp
@@ -151,7 +151,7 @@ void QDeclarativeCamera::_q_availabilityChanged(QMultimedia::AvailabilityStatus
     Basic camera state management, error reporting, and simple zoom properties are
     available in the Camera itself.  For integration with C++ code, the
     \l mediaObject property allows you to
-    access the standard QtMultimedia camera controls.
+    access the standard Qt Multimedia camera controls.
 
     Many of the camera settings may take some time to apply, and might be limited
     to certain supported values depending on the hardware.  Some camera settings may be
diff --git a/src/multimedia/audio/qaudioformat.cpp b/src/multimedia/audio/qaudioformat.cpp
index b7778a819..b83256a10 100644
--- a/src/multimedia/audio/qaudioformat.cpp
+++ b/src/multimedia/audio/qaudioformat.cpp
@@ -159,7 +159,7 @@ public:
     In the common case of interleaved linear PCM data, the codec will
     be "audio/pcm", and the samples for all channels will be interleaved.
     One sample for each channel for the same instant in time is referred
-    to as a frame in QtMultimedia (and other places).
+    to as a frame in Qt Multimedia (and other places).
 */
 
 /*!
diff --git a/src/multimedia/doc/src/blackberry.qdoc b/src/multimedia/doc/src/blackberry.qdoc
index 2599bb560..ca35745a3 100644
--- a/src/multimedia/doc/src/blackberry.qdoc
+++ b/src/multimedia/doc/src/blackberry.qdoc
@@ -30,7 +30,7 @@
 \title BlackBerry
 \brief Platform notes for the BlackBerry Platform
 
-QtMultimedia supports BlackBerry devices that run the BB10 operating system.
+Qt Multimedia supports BlackBerry devices that run the BB10 operating system.
 This page covers the availibility of different features on BB10.
 
 \section1 Implementation
@@ -41,7 +41,7 @@ and video playback is \e mmrenderer. For low-latency output of raw audio samples
 three-dimensional positional audio playback, \e OpenAL is supported and present
 on BB10.
 
-The QtMultimedia BlackBerry backend uses mmrenderer for media playback.
+The Qt Multimedia BlackBerry backend uses mmrenderer for media playback.
 
 For the positional audio classes in the \l {Positional Audio} {QtAudioEngine} QML
 module, OpenAL is used as on all other platforms.
@@ -54,7 +54,7 @@ Since the playback is delegated to mmrenderer, the supported formats are the sam
 mmrenderer. As mmrenderer supports streaming from HTTP and other URLs, this is
 supported in QMediaPlayer as well. Playlists as sources are also supported.
 
-mmrenderer does not allow access to the pixel data of video frames, hence QtMultimedia
+mmrenderer does not allow access to the pixel data of video frames, hence Qt Multimedia
 classes like QVideoFrame and QAbstractVideoSurface will not work since they require access
 to the image data. QVideoWidget and the VideoOutput QML element are implemented with an overlay window;
 mmrenderer creates a seperate window displaying a video and puts that on top of the Qt application.
diff --git a/src/multimedia/doc/src/plugins/qml-multimedia.qdoc b/src/multimedia/doc/src/plugins/qml-multimedia.qdoc
index e6569c487..e1e5f8a64 100644
--- a/src/multimedia/doc/src/plugins/qml-multimedia.qdoc
+++ b/src/multimedia/doc/src/plugins/qml-multimedia.qdoc
@@ -48,7 +48,7 @@
     \section2 Audio
 
     \l Audio is an easy way to add audio playback to a Qt Quick
-    scene. QtMultimedia provides properties for control, methods (functions) and signals.
+    scene. Qt Multimedia provides properties for control, methods (functions) and signals.
 
     The code extract below shows the creation and use of an Audio instance.
 
diff --git a/src/multimedia/doc/src/qtmultimedia-cpp.qdoc b/src/multimedia/doc/src/qtmultimedia-cpp.qdoc
index dcc86c354..3405143e5 100644
--- a/src/multimedia/doc/src/qtmultimedia-cpp.qdoc
+++ b/src/multimedia/doc/src/qtmultimedia-cpp.qdoc
@@ -30,7 +30,7 @@
     \title Qt Multimedia C++ Classes
     \ingroup modules
 
-    \brief The \l {Qt Multimedia}{QtMultimedia} module provides audio, video, radio and camera functionality.
+    \brief The \l {Qt Multimedia} module provides audio, video, radio and camera functionality.
 
     The C++ classes provide more control over the multimedia content than the QML alternatives.
     If your application is serving complex use cases such as decoding media files, accessing video or audio buffers,
diff --git a/src/multimediawidgets/multimediawidgets.pro b/src/multimediawidgets/multimediawidgets.pro
index 65a18f775..8637bbff0 100644
--- a/src/multimediawidgets/multimediawidgets.pro
+++ b/src/multimediawidgets/multimediawidgets.pro
@@ -1,4 +1,4 @@
-# distinct from QtMultimedia
+# distinct from Qt Multimedia
 TARGET = QtMultimediaWidgets
 QT = core gui multimedia-private widgets-private
 qtHaveModule(opengl):!contains(QT_CONFIG, opengles1) {
diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro
index ecc6a55d5..24708e0bc 100644
--- a/src/plugins/plugins.pro
+++ b/src/plugins/plugins.pro
@@ -1,6 +1,6 @@
 ######################################################################
 #
-# QtMultimedia
+# Qt Multimedia
 #
 ######################################################################