Merge remote-tracking branch 'origin/5.5' into 5.6

Conflicts:
	src/imports/multimedia/qdeclarativeaudio.cpp

Change-Id: I57c6252b084e4ed796f6f308b2e0c717d0f59b13

5 files changed, 13 insertions, 20 deletions

diff --git a/src/multimedia/doc/src/cameraoverview.qdoc b/src/multimedia/doc/src/cameraoverview.qdoc
index 2a915a017..449dfebb4 100644
--- a/src/multimedia/doc/src/cameraoverview.qdoc
+++ b/src/multimedia/doc/src/cameraoverview.qdoc
@@ -102,9 +102,6 @@ In QML, use the \l{QtMultimedia::QtMultimedia::availableCameras}{QtMultimedia.av
 property:
 
 \qml
-import QtQuick 2.0
-import QtMultimedia 5.4
-
 Item {
     property bool isCameraAvailable: QtMultimedia.availableCameras.length > 0
 }
@@ -163,9 +160,6 @@ In QML, you can use \l Camera and \l VideoOutput together to show a
 simple viewfinder:
 
 \qml
-import QtQuick 2.0
-import QtMultimedia 5.4
-
 VideoOutput {
     source: camera
 
diff --git a/src/multimedia/doc/src/multimedia.qdoc b/src/multimedia/doc/src/multimedia.qdoc
index 1988cc92c..23c2ee431 100644
--- a/src/multimedia/doc/src/multimedia.qdoc
+++ b/src/multimedia/doc/src/multimedia.qdoc
@@ -177,7 +177,7 @@ what changed, and what you might need to change when porting code.
 \section2 QML Types
 The QML types are accessed by using:
 \code
-import QtMultimedia 5.4
+import QtMultimedia 5.5
 \endcode
 \annotatedlist multimedia_qml
 The following types are accessed by using \l{Qt Audio Engine QML Types}{Qt Audio Engine}:
diff --git a/src/multimedia/doc/src/plugins/qml-multimedia.qdoc b/src/multimedia/doc/src/plugins/qml-multimedia.qdoc
index c15ff9048..15c6d3c1d 100644
--- a/src/multimedia/doc/src/plugins/qml-multimedia.qdoc
+++ b/src/multimedia/doc/src/plugins/qml-multimedia.qdoc
@@ -54,10 +54,6 @@
 
     \qml
 
-    import QtQuick 2.0
-    import QtMultimedia 5.0
-    // ...
-
     Item {
         width: 640
         height: 360
@@ -196,9 +192,6 @@
 
     \qml
 
-    import QtQuick 2.0
-    import QtMultimedia 5.0
-
     Item {
         width: 640
         height: 360
diff --git a/src/multimedia/doc/src/qtmultimedia-index.qdoc b/src/multimedia/doc/src/qtmultimedia-index.qdoc
index cf26f6509..0e2750872 100644
--- a/src/multimedia/doc/src/qtmultimedia-index.qdoc
+++ b/src/multimedia/doc/src/qtmultimedia-index.qdoc
@@ -46,7 +46,7 @@
     import statement in your \c {.qml} file.
 
     \code
-     import QtMultimedia 5.4
+     import QtMultimedia 5.5
     \endcode
 
     If you intend to use the C++ classes in your application, include the C++
@@ -105,11 +105,17 @@
      \li QAudioOutput
      \li Sends audio data to an audio output device
     \row
+     \li QAudioRecorder
+     \li Record media content from an audio source.
+    \row
      \li QCamera
      \li Access camera viewfinder.
     \row
      \li QCameraImageCapture
-     \li Record media content. Intended to be used with QCamera to record media.
+     \li Capture still images with a camera.
+    \row
+     \li QMediaRecorder
+     \li Record media content from a camera or radio tuner source.
     \row
      \li QMediaPlayer
      \li Playback media from a source.
@@ -120,8 +126,8 @@
      \li QRadioTuner
      \li Access radio device.
     \row
-     \li QVideoRendererControl
-     \li Control video data.
+     \li QAbstractVideoSurface
+     \li Base class for video presentation.
     \endtable
 
     \section1 Related Information
diff --git a/src/multimedia/doc/src/qtmultimedia5.qdoc b/src/multimedia/doc/src/qtmultimedia5.qdoc
index 0cdd54a2b..0d3e087a0 100644
--- a/src/multimedia/doc/src/qtmultimedia5.qdoc
+++ b/src/multimedia/doc/src/qtmultimedia5.qdoc
@@ -26,7 +26,7 @@
 ****************************************************************************/
 
 /*!
-\qmlmodule QtMultimedia 5.4
+\qmlmodule QtMultimedia 5.5
 \title Qt Multimedia QML Types
 \ingroup qmlmodules
 \brief Provides QML types for multimedia support.
@@ -42,7 +42,7 @@ The QML types for \l{Qt Multimedia} support the basic use cases such as:
 The QML types can be imported into your application using the following import
 statement in your .qml file:
 \code
-import QtMultimedia 5.4
+import QtMultimedia 5.5
 \endcode
 
 \section1 QML types