Merge remote-tracking branch 'origin/5.8' into dev

Conflicts:
	src/imports/multimedia/multimedia.cpp

Change-Id: I38899391ec8d2fcec6f2d46514286759f7a27629

6 files changed, 63 insertions, 17 deletions

diff --git a/src/imports/audioengine/audioengine.cpp b/src/imports/audioengine/audioengine.cpp
index 8eb2dea33..a132af49a 100644
--- a/src/imports/audioengine/audioengine.cpp
+++ b/src/imports/audioengine/audioengine.cpp
@@ -63,7 +63,7 @@ QT_BEGIN_NAMESPACE
 class QAudioEngineDeclarativeModule : public QQmlExtensionPlugin
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface/1.0")
+    Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid)
 
 public:
     QAudioEngineDeclarativeModule(QObject *parent = 0) : QQmlExtensionPlugin(parent) { initResources(); }
diff --git a/src/imports/multimedia/Video.qml b/src/imports/multimedia/Video.qml
index 26dd12ca4..66b86c74b 100644
--- a/src/imports/multimedia/Video.qml
+++ b/src/imports/multimedia/Video.qml
@@ -360,7 +360,17 @@ Item {
     /*!
         \qmlproperty real Video::volume
 
-        This property holds the volume of the audio output, from 0.0 (silent) to 1.0 (maximum volume).
+        This property holds the audio volume.
+
+        The volume is scaled linearly from \c 0.0 (silence) to \c 1.0 (full volume). Values outside
+        this range will be clamped.
+
+        The default volume is \c 1.0.
+
+        UI volume controls should usually be scaled nonlinearly. For example, using a logarithmic
+        scale will produce linear changes in perceived loudness, which is what a user would normally
+        expect from a volume control. See \l {QtMultimedia::QtMultimedia::convertVolume()}{QtMultimedia.convertVolume()}
+        for more details.
     */
     property alias volume:          player.volume
 
diff --git a/src/imports/multimedia/multimedia.cpp b/src/imports/multimedia/multimedia.cpp
index 19e932fb9..1b8c87cc0 100644
--- a/src/imports/multimedia/multimedia.cpp
+++ b/src/imports/multimedia/multimedia.cpp
@@ -81,7 +81,7 @@ static QObject *multimedia_global_object(QQmlEngine *qmlEngine, QJSEngine *jsEng
 class QMultimediaDeclarativeModule : public QQmlExtensionPlugin
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface/1.0")
+    Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid)
 
 public:
     QMultimediaDeclarativeModule(QObject *parent = 0) : QQmlExtensionPlugin(parent) { initResources(); }
@@ -140,6 +140,9 @@ public:
         qmlRegisterUncreatableType<QDeclarativeCameraImageProcessing, 2>(uri, 5, 7, "CameraImageProcessing",
                                 trUtf8("CameraImageProcessing is provided by Camera"));
 
+        // 5.8 types (nothing new, re-register one of the types)
+        qmlRegisterType<QSoundEffect>(uri, 5, 8, "SoundEffect");
+
         // 5.9 types
         qmlRegisterType<QDeclarativeAudio, 2>(uri, 5, 9, "Audio");
         qmlRegisterType<QDeclarativeAudio, 2>(uri, 5, 9, "MediaPlayer");
diff --git a/src/imports/multimedia/plugins.qmltypes b/src/imports/multimedia/plugins.qmltypes
index 91fff02eb..20bbf7d3e 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.7'
+// 'qmlplugindump -nonrelocatable QtMultimedia 5.8'
 
 Module {
     dependencies: ["QtQuick 2.0"]
@@ -1248,8 +1248,24 @@ Module {
         isCreatable: false
         isSingleton: true
         exportMetaObjectRevisions: [0]
+        Enum {
+            name: "VolumeScale"
+            values: {
+                "LinearVolumeScale": 0,
+                "CubicVolumeScale": 1,
+                "LogarithmicVolumeScale": 2,
+                "DecibelVolumeScale": 3
+            }
+        }
         Property { name: "defaultCamera"; type: "QJSValue"; isReadonly: true }
         Property { name: "availableCameras"; type: "QJSValue"; isReadonly: true }
+        Method {
+            name: "convertVolume"
+            type: "double"
+            Parameter { name: "volume"; type: "double" }
+            Parameter { name: "from"; type: "VolumeScale" }
+            Parameter { name: "to"; type: "VolumeScale" }
+        }
     }
     Component {
         name: "QDeclarativePlaylist"
@@ -1794,9 +1810,10 @@ Module {
         prototype: "QObject"
         exports: [
             "QtMultimedia/SoundEffect 5.0",
-            "QtMultimedia/SoundEffect 5.3"
+            "QtMultimedia/SoundEffect 5.3",
+            "QtMultimedia/SoundEffect 5.8"
         ]
-        exportMetaObjectRevisions: [0, 0]
+        exportMetaObjectRevisions: [0, 0, 0]
         Enum {
             name: "Loop"
             values: {
diff --git a/src/imports/multimedia/qdeclarativeaudio.cpp b/src/imports/multimedia/qdeclarativeaudio.cpp
index 608337d54..75bb21ee5 100644
--- a/src/imports/multimedia/qdeclarativeaudio.cpp
+++ b/src/imports/multimedia/qdeclarativeaudio.cpp
@@ -718,9 +718,17 @@ QDeclarativeAudio::PlaybackState QDeclarativeAudio::playbackState() const
 /*!
     \qmlproperty real QtMultimedia::Audio::volume
 
-    This property holds the volume of the audio output, from 0.0 (silent) to 1.0 (maximum volume).
+    This property holds the audio volume.
 
-    Defaults to 1.0.
+    The volume is scaled linearly from \c 0.0 (silence) to \c 1.0 (full volume). Values outside this
+    range will be clamped.
+
+    The default volume is \c 1.0.
+
+    UI volume controls should usually be scaled nonlinearly. For example, using a logarithmic scale
+    will produce linear changes in perceived loudness, which is what a user would normally expect
+    from a volume control. See \l {QtMultimedia::QtMultimedia::convertVolume()}{QtMultimedia.convertVolume()}
+    for more details.
 */
 
 /*!
@@ -1355,9 +1363,17 @@ void QDeclarativeAudio::_q_mediaChanged(const QMediaContent &media)
 /*!
     \qmlproperty real QtMultimedia::MediaPlayer::volume
 
-    This property holds the volume of the audio output, from 0.0 (silent) to 1.0 (maximum volume).
+    This property holds the audio volume of the media player.
 
-    Defaults to 1.0.
+    The volume is scaled linearly from \c 0.0 (silence) to \c 1.0 (full volume). Values outside this
+    range will be clamped.
+
+    The default volume is \c 1.0.
+
+    UI volume controls should usually be scaled nonlinearly. For example, using a logarithmic scale
+    will produce linear changes in perceived loudness, which is what a user would normally expect
+    from a volume control. See \l {QtMultimedia::QtMultimedia::convertVolume()}{QtMultimedia.convertVolume()}
+    for more details.
 */
 
 /*!
diff --git a/src/imports/multimedia/qdeclarativeplaylist.cpp b/src/imports/multimedia/qdeclarativeplaylist.cpp
index 0620942bd..b338c33e5 100644
--- a/src/imports/multimedia/qdeclarativeplaylist.cpp
+++ b/src/imports/multimedia/qdeclarativeplaylist.cpp
@@ -597,7 +597,7 @@ void QDeclarativePlaylist::componentComplete()
 }
 
 /*!
-    \qmlsignal QtMultimedia::Audio::itemAboutToBeInserted(start, end)
+    \qmlsignal QtMultimedia::Playlist::itemAboutToBeInserted(start, end)
 
     This signal is emitted when items are to be inserted into the playlist at \a start and ending at
     \a end.
@@ -606,7 +606,7 @@ void QDeclarativePlaylist::componentComplete()
 */
 
 /*!
-    \qmlsignal QtMultimedia::Audio::itemInserted(start, end)
+    \qmlsignal QtMultimedia::Playlist::itemInserted(start, end)
 
     This signal is emitted after items have been inserted into the playlist. The new items are those
     between \a start and \a end inclusive.
@@ -615,7 +615,7 @@ void QDeclarativePlaylist::componentComplete()
 */
 
 /*!
-    \qmlsignal QtMultimedia::Audio::itemAboutToBeRemoved(start, end)
+    \qmlsignal QtMultimedia::Playlist::itemAboutToBeRemoved(start, end)
 
     This signal emitted when items are to be deleted from the playlist at \a start and ending at
     \a end.
@@ -624,7 +624,7 @@ void QDeclarativePlaylist::componentComplete()
 */
 
 /*!
-    \qmlsignal QtMultimedia::Audio::itemRemoved(start, end)
+    \qmlsignal QtMultimedia::Playlist::itemRemoved(start, end)
 
     This signal is emitted after items have been removed from the playlist. The removed items are
     those between \a start and \a end inclusive.
@@ -633,7 +633,7 @@ void QDeclarativePlaylist::componentComplete()
 */
 
 /*!
-    \qmlsignal QtMultimedia::Audio::itemChanged(start, end)
+    \qmlsignal QtMultimedia::Playlist::itemChanged(start, end)
 
     This signal is emitted after items have been changed in the playlist between \a start and
     \a end positions inclusive.
@@ -642,7 +642,7 @@ void QDeclarativePlaylist::componentComplete()
 */
 
 /*!
-    \qmlsignal QtMultimedia::Audio::loaded()
+    \qmlsignal QtMultimedia::Playlist::loaded()
 
     This signal is emitted when the playlist loading succeeded.
 
@@ -650,7 +650,7 @@ void QDeclarativePlaylist::componentComplete()
 */
 
 /*!
-    \qmlsignal QtMultimedia::Audio::loadFailed()
+    \qmlsignal QtMultimedia::Playlist::loadFailed()
 
     This signal is emitted when the playlist loading failed. \l error and \l errorString can be
     checked for more information on the failure.