11 files changed, 63 insertions, 43 deletions
diff --git a/src/imports/multimedia/multimedia.cpp b/src/imports/multimedia/multimedia.cpp
index e63eecc49..8aed83d33 100644
--- a/src/imports/multimedia/multimedia.cpp
+++ b/src/imports/multimedia/multimedia.cpp
@@ -92,17 +92,17 @@ public:
         qmlRegisterType<QDeclarativeCamera>(uri, 5, 0, "Camera");
         qmlRegisterType<QDeclarativeTorch>(uri, 5, 0, "Torch");
         qmlRegisterUncreatableType<QDeclarativeCameraCapture>(uri, 5, 0, "CameraCapture",
-                                trUtf8("CameraCapture is provided by Camera"));
+                                tr("CameraCapture is provided by Camera"));
         qmlRegisterUncreatableType<QDeclarativeCameraRecorder>(uri, 5, 0, "CameraRecorder",
-                                trUtf8("CameraRecorder is provided by Camera"));
+                                tr("CameraRecorder is provided by Camera"));
         qmlRegisterUncreatableType<QDeclarativeCameraExposure>(uri, 5, 0, "CameraExposure",
-                                trUtf8("CameraExposure is provided by Camera"));
+                                tr("CameraExposure is provided by Camera"));
         qmlRegisterUncreatableType<QDeclarativeCameraFocus>(uri, 5, 0, "CameraFocus",
-                                trUtf8("CameraFocus is provided by Camera"));
+                                tr("CameraFocus is provided by Camera"));
         qmlRegisterUncreatableType<QDeclarativeCameraFlash>(uri, 5, 0, "CameraFlash",
-                                trUtf8("CameraFlash is provided by Camera"));
+                                tr("CameraFlash is provided by Camera"));
         qmlRegisterUncreatableType<QDeclarativeCameraImageProcessing>(uri, 5, 0, "CameraImageProcessing",
-                                trUtf8("CameraImageProcessing is provided by Camera"));
+                                tr("CameraImageProcessing is provided by Camera"));
 
         // 5.2 types
         qmlRegisterType<QDeclarativeVideoOutput, 2>(uri, 5, 2, "VideoOutput");
@@ -116,10 +116,10 @@ public:
         qmlRegisterSingletonType<QDeclarativeMultimediaGlobal>(uri, 5, 4, "QtMultimedia", multimedia_global_object);
         qmlRegisterType<QDeclarativeCamera, 1>(uri, 5, 4, "Camera");
         qmlRegisterUncreatableType<QDeclarativeCameraViewfinder>(uri, 5, 4, "CameraViewfinder",
-                                trUtf8("CameraViewfinder is provided by Camera"));
+                                tr("CameraViewfinder is provided by Camera"));
 
         // 5.5 types
-        qmlRegisterUncreatableType<QDeclarativeCameraImageProcessing, 1>(uri, 5, 5, "CameraImageProcessing", trUtf8("CameraImageProcessing is provided by Camera"));
+        qmlRegisterUncreatableType<QDeclarativeCameraImageProcessing, 1>(uri, 5, 5, "CameraImageProcessing", tr("CameraImageProcessing is provided by Camera"));
         qmlRegisterType<QDeclarativeCamera, 2>(uri, 5, 5, "Camera");
 
         // 5.6 types
@@ -131,7 +131,7 @@ public:
         // 5.7 types
         qmlRegisterType<QDeclarativePlaylist, 1>(uri, 5, 7, "Playlist");
         qmlRegisterUncreatableType<QDeclarativeCameraImageProcessing, 2>(uri, 5, 7, "CameraImageProcessing",
-                                trUtf8("CameraImageProcessing is provided by Camera"));
+                                tr("CameraImageProcessing is provided by Camera"));
 
         // 5.8 types (nothing new, re-register one of the types)
         qmlRegisterType<QSoundEffect>(uri, 5, 8, "SoundEffect");
@@ -140,23 +140,26 @@ public:
         qmlRegisterType<QDeclarativeAudio, 2>(uri, 5, 9, "Audio");
         qmlRegisterType<QDeclarativeAudio, 2>(uri, 5, 9, "MediaPlayer");
         qmlRegisterUncreatableType<QDeclarativeCameraCapture, 1>(uri, 5, 9, "CameraCapture",
-                                trUtf8("CameraCapture is provided by Camera"));
+                                tr("CameraCapture is provided by Camera"));
         qmlRegisterUncreatableType<QDeclarativeCameraFlash, 1>(uri, 5, 9, "CameraFlash",
-                                trUtf8("CameraFlash is provided by Camera"));
+                                tr("CameraFlash is provided by Camera"));
 
         // 5.11 types
         qmlRegisterType<QDeclarativeAudio, 3>(uri, 5, 11, "Audio");
         qmlRegisterType<QDeclarativeAudio, 3>(uri, 5, 11, "MediaPlayer");
         qmlRegisterUncreatableType<QDeclarativeCameraFocus, 1>(uri, 5, 11, "CameraFocus",
-                                trUtf8("CameraFocus is provided by Camera"));
+                                tr("CameraFocus is provided by Camera"));
         qmlRegisterUncreatableType<QDeclarativeCameraExposure, 1>(uri, 5, 11, "CameraExposure",
-                                trUtf8("CameraExposure is provided by Camera"));
+                                tr("CameraExposure is provided by Camera"));
         qmlRegisterUncreatableType<QDeclarativeCameraImageProcessing, 3>(uri, 5, 11, "CameraImageProcessing",
-                                trUtf8("CameraImageProcessing is provided by Camera"));
+                                tr("CameraImageProcessing is provided by Camera"));
 
         qmlRegisterType<QDeclarativeMediaMetaData>();
         qmlRegisterType<QAbstractVideoFilter>();
 
+        // 5.13 types
+        qmlRegisterType<QDeclarativeVideoOutput, 13>(uri, 5, 13, "VideoOutput");
+
         // Auto-increment the import to stay in sync with ALL future QtQuick minor versions from 5.11 onward
         qmlRegisterModule(uri, 5, QT_VERSION_MINOR);
     }
diff --git a/src/imports/multimedia/plugins.qmltypes b/src/imports/multimedia/plugins.qmltypes
index 78d9cd373..4b5298b6a 100644
--- a/src/imports/multimedia/plugins.qmltypes
+++ b/src/imports/multimedia/plugins.qmltypes
@@ -4,7 +4,7 @@ import QtQuick.tooling 1.2
 // It is used for QML tooling purposes only.
 //
 // This file was auto-generated by:
-// 'qmlplugindump -nonrelocatable QtMultimedia 5.12'
+// 'qmlplugindump -nonrelocatable QtMultimedia 5.13'
 
 Module {
     dependencies: ["QtQuick 2.0"]
@@ -1750,9 +1750,18 @@ Module {
         prototype: "QQuickItem"
         exports: [
             "QtMultimedia/VideoOutput 5.0",
+            "QtMultimedia/VideoOutput 5.13",
             "QtMultimedia/VideoOutput 5.2"
         ]
-        exportMetaObjectRevisions: [0, 2]
+        exportMetaObjectRevisions: [0, 13, 2]
+        Enum {
+            name: "FlushMode"
+            values: {
+                "EmptyFrame": 0,
+                "FirstFrame": 1,
+                "LastFrame": 2
+            }
+        }
         Enum {
             name: "FillMode"
             values: {
@@ -1768,6 +1777,7 @@ Module {
         Property { name: "sourceRect"; type: "QRectF"; isReadonly: true }
         Property { name: "contentRect"; type: "QRectF"; isReadonly: true }
         Property { name: "filters"; type: "QAbstractVideoFilter"; isList: true; isReadonly: true }
+        Property { name: "flushMode"; revision: 13; type: "FlushMode" }
         Signal {
             name: "fillModeChanged"
             Parameter { type: "QDeclarativeVideoOutput::FillMode" }
diff --git a/src/imports/multimedia/qdeclarativeaudio.cpp b/src/imports/multimedia/qdeclarativeaudio.cpp
index 7c2e5e8a4..9d41c77fa 100644
--- a/src/imports/multimedia/qdeclarativeaudio.cpp
+++ b/src/imports/multimedia/qdeclarativeaudio.cpp
@@ -999,11 +999,13 @@ void QDeclarativeAudio::_q_mediaChanged(const QMediaContent &media)
 /*!
     \qmlsignal QtMultimedia::Audio::error(error, errorString)
 
-    This signal is emitted when an \l {QMediaPlayer::Error}{error} has
-    occurred.  The errorString parameter may contain more detailed
+    This signal is emitted when an \a error has
+    occurred.  The \a errorString parameter may contain more detailed
     information about the error.
 
     The corresponding handler is \c onError.
+
+    \sa QMediaPlayer::Error
 */
 
 /*!
@@ -1541,11 +1543,13 @@ void QDeclarativeAudio::_q_mediaChanged(const QMediaContent &media)
 /*!
     \qmlsignal QtMultimedia::MediaPlayer::error(error, errorString)
 
-    This signal is emitted when an \l {QMediaPlayer::Error}{error} has
-    occurred.  The errorString parameter may contain more detailed
+    This signal is emitted when an \a error has
+    occurred.  The \a errorString parameter may contain more detailed
     information about the error.
 
     The corresponding handler is \c onError.
+
+    \sa QMediaPlayer::Error
 */
 
 /*!
diff --git a/src/imports/multimedia/qdeclarativecamera.cpp b/src/imports/multimedia/qdeclarativecamera.cpp
index c499de3b6..6d36e462d 100644
--- a/src/imports/multimedia/qdeclarativecamera.cpp
+++ b/src/imports/multimedia/qdeclarativecamera.cpp
@@ -181,8 +181,8 @@ QDeclarativeCamera::QDeclarativeCamera(QObject *parent) :
     m_pendingState(ActiveState),
     m_componentComplete(false)
 {
-    m_camera = new QCamera;
-    m_currentCameraInfo = QCameraInfo(*m_camera);
+    m_currentCameraInfo = QCameraInfo::defaultCamera();
+    m_camera = new QCamera(m_currentCameraInfo);
 
     m_imageCapture = new QDeclarativeCameraCapture(m_camera);
     m_videoRecorder = new QDeclarativeCameraRecorder(m_camera);
@@ -251,7 +251,7 @@ void QDeclarativeCamera::componentComplete()
     preserved when changing the camera device.
 
     \sa displayName, position
-    \since QtMultimedia 5.4
+    \since 5.4
 */
 
 QString QDeclarativeCamera::deviceId() const
@@ -292,7 +292,7 @@ void QDeclarativeCamera::setDeviceId(const QString &name)
     preserved when changing the camera device.
 
     \sa deviceId
-    \since QtMultimedia 5.4
+    \since 5.4
 */
 
 QDeclarativeCamera::Position QDeclarativeCamera::position() const
@@ -329,7 +329,7 @@ void QDeclarativeCamera::setPosition(Position position)
 
     \readonly
     \sa deviceId
-    \since QtMultimedia 5.4
+    \since 5.4
 */
 
 QString QDeclarativeCamera::displayName() const
@@ -353,7 +353,7 @@ QString QDeclarativeCamera::displayName() const
 
     \readonly
     \sa VideoOutput::orientation
-    \since QtMultimedia 5.4
+    \since 5.4
 */
 
 int QDeclarativeCamera::orientation() const
@@ -967,7 +967,7 @@ QDeclarativeCameraViewfinder *QDeclarativeCamera::viewfinder()
 }
 
 /*!
-    \qmlmethod list<size> QtMultimedia::Camera::supportedViewfinderResolutions(real minimumFrameRate = undefined, real maximumFrameRate = undefined)
+    \qmlmethod list<size> QtMultimedia::Camera::supportedViewfinderResolutions(real minimumFrameRate, real maximumFrameRate)
 
     Returns a list of supported viewfinder resolutions.
 
@@ -1003,7 +1003,7 @@ QJSValue QDeclarativeCamera::supportedViewfinderResolutions(qreal minimumFrameRa
 }
 
 /*!
-    \qmlmethod list<object> QtMultimedia::Camera::supportedViewfinderFrameRateRanges(size resolution = undefined)
+    \qmlmethod list<object> QtMultimedia::Camera::supportedViewfinderFrameRateRanges(size resolution)
 
     Returns a list of supported viewfinder frame rate ranges.
 
diff --git a/src/imports/multimedia/qdeclarativecameraflash.cpp b/src/imports/multimedia/qdeclarativecameraflash.cpp
index 551b88aef..5ce4a5d06 100644
--- a/src/imports/multimedia/qdeclarativecameraflash.cpp
+++ b/src/imports/multimedia/qdeclarativecameraflash.cpp
@@ -181,13 +181,13 @@ QVariantList QDeclarativeCameraFlash::supportedModes() const
 }
 
 /*!
-    \qmlsignal QtMultimedia::CameraFlash::flashModeChanged(int)
+    \qmlsignal QtMultimedia::CameraFlash::flashModeChanged()
     This signal is emitted when the \c flashMode property is changed.
     The corresponding handler is \c onFlashModeChanged.
 */
 
 /*!
-    \qmlsignal QtMultimedia::CameraFlash::flashReady(bool)
+    \qmlsignal QtMultimedia::CameraFlash::flashReady()
     This signal is emitted when QCameraExposure indicates that
     the flash is ready to use.
     The corresponding handler is \c onFlashReadyChanged.
diff --git a/src/imports/multimedia/qdeclarativecamerafocus.cpp b/src/imports/multimedia/qdeclarativecamerafocus.cpp
index 1dd216467..61c22c066 100644
--- a/src/imports/multimedia/qdeclarativecamerafocus.cpp
+++ b/src/imports/multimedia/qdeclarativecamerafocus.cpp
@@ -397,10 +397,6 @@ void QDeclarativeCameraFocus::updateFocusZones()
 FocusZonesModel::FocusZonesModel(QObject *parent)
     :QAbstractListModel(parent)
 {
-    QHash<int, QByteArray> roles;
-    roles[StatusRole] = "status";
-    roles[AreaRole] = "area";
-    setRoleNames(roles);
 }
 
 int FocusZonesModel::rowCount(const QModelIndex &parent) const
@@ -427,6 +423,12 @@ QVariant FocusZonesModel::data(const QModelIndex &index, int role) const
     return QVariant();
 }
 
+QHash<int,QByteArray> FocusZonesModel::roleNames() const
+{
+    return {{StatusRole, QByteArrayLiteral("status")},
+            {AreaRole, QByteArrayLiteral("area")}};
+}
+
 void FocusZonesModel::setFocusZones(const QCameraFocusZoneList &zones)
 {
     beginResetModel();
diff --git a/src/imports/multimedia/qdeclarativecamerafocus_p.h b/src/imports/multimedia/qdeclarativecamerafocus_p.h
index e3a1c28b7..bd5d54d48 100644
--- a/src/imports/multimedia/qdeclarativecamerafocus_p.h
+++ b/src/imports/multimedia/qdeclarativecamerafocus_p.h
@@ -145,6 +145,7 @@ public:
 
     int rowCount(const QModelIndex &parent = QModelIndex()) const override;
     QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
+    QHash<int,QByteArray> roleNames() const override;
 
 public slots:
     void setFocusZones(const QCameraFocusZoneList &zones);
diff --git a/src/imports/multimedia/qdeclarativecameraimageprocessing.cpp b/src/imports/multimedia/qdeclarativecameraimageprocessing.cpp
index 8e14a7945..908afea27 100644
--- a/src/imports/multimedia/qdeclarativecameraimageprocessing.cpp
+++ b/src/imports/multimedia/qdeclarativecameraimageprocessing.cpp
@@ -343,14 +343,14 @@ void QDeclarativeCameraImageProcessing::setColorFilter(ColorFilter filter)
 }
 
 /*!
-    \qmlsignal QtMultimedia::Camera::whiteBalanceModeChanged(Camera::WhiteBalanceMode)
+    \qmlsignal QtMultimedia::Camera::whiteBalanceModeChanged()
     This signal is emitted when the \c whiteBalanceMode property is changed.
 
     The corresponding handler is \c onWhiteBalanceModeChanged.
 */
 
 /*!
-    \qmlsignal QtMultimedia::Camera::manualWhiteBalanceChanged(qreal)
+    \qmlsignal QtMultimedia::Camera::manualWhiteBalanceChanged()
     This signal is emitted when the \c manualWhiteBalance property is changed.
 
     The corresponding handler is \c onManualWhiteBalanceChanged.
diff --git a/src/imports/multimedia/qdeclarativemultimediaglobal.cpp b/src/imports/multimedia/qdeclarativemultimediaglobal.cpp
index 999f086d5..ac7a6496f 100644
--- a/src/imports/multimedia/qdeclarativemultimediaglobal.cpp
+++ b/src/imports/multimedia/qdeclarativemultimediaglobal.cpp
@@ -48,7 +48,7 @@ QT_BEGIN_NAMESPACE
 \qmltype QtMultimedia
 \inqmlmodule QtMultimedia
 \ingroup multimedia_qml
-\since QtMultimedia 5.4
+\since 5.4
 \brief Provides a global object with useful functions from Qt Multimedia.
 
 The \c QtMultimedia object is a global object with utility functions and properties.
diff --git a/src/imports/multimedia/qdeclarativeplaylist.cpp b/src/imports/multimedia/qdeclarativeplaylist.cpp
index 549e0702d..b768f99e3 100644
--- a/src/imports/multimedia/qdeclarativeplaylist.cpp
+++ b/src/imports/multimedia/qdeclarativeplaylist.cpp
@@ -486,7 +486,7 @@ bool QDeclarativePlaylist::insertItems(int index, const QList<QUrl> &sources)
 
     Moves the item at index position \a from to index position \a to.
 
-    Returns true if the item is moved successfully.
+    Returns \c true if the item is moved successfully.
 
     \since 5.7
 */
@@ -498,9 +498,9 @@ bool QDeclarativePlaylist::moveItem(int from, int to)
 /*!
     \qmlmethod bool QtMultimedia::Playlist::removeItem(index)
 
-    Removed the item at the given \a index from the playlist.
+    Removes the item at the given \a index from the playlist.
 
-    Returns true if the \a source is removed successfully.
+    Returns \c true if the item is removed successfully.
 */
 bool QDeclarativePlaylist::removeItem(int index)
 {
@@ -512,7 +512,7 @@ bool QDeclarativePlaylist::removeItem(int index)
 
     Removes items in the playlist from \a start to \a end inclusive.
 
-    Returns true if the items are removed successfully.
+    Returns \c true if the items are removed successfully.
 
     \since 5.7
 */
@@ -526,7 +526,7 @@ bool QDeclarativePlaylist::removeItems(int start, int end)
 
     Removes all the items from the playlist.
 
-    Returns true if the operation is successful.
+    Returns \c true if the operation is successful.
 */
 bool QDeclarativePlaylist::clear()
 {
diff --git a/src/imports/multimedia/qdeclarativeradio.cpp b/src/imports/multimedia/qdeclarativeradio.cpp
index ec2d943ef..f92ddd91a 100644
--- a/src/imports/multimedia/qdeclarativeradio.cpp
+++ b/src/imports/multimedia/qdeclarativeradio.cpp
@@ -393,7 +393,7 @@ void QDeclarativeRadio::scanUp()
     \qmlmethod QtMultimedia::Radio::searchAllStations(enumeration searchMode)
 
     Start searching the complete frequency range for the current band, and save all the
-    radio stations found. The search mode can be either of the values described in the
+    radio stations found. The \a searchMode can be either of the values described in the
     table below.
 
     \table