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

Conflicts:
	src/multimedia/playback/playlistfileparser.cpp
	src/plugins/windowsaudio/qwindowsaudiodeviceinfo.cpp

Change-Id: I52950def2b8283ae15797d05d4ead6a1256eba19

1 files changed, 3 insertions, 3 deletions

diff --git a/examples/multimedia/audioengine/qml/audioengine.qml b/examples/multimedia/audioengine/qml/audioengine.qml
index 52a72a4ef..e6e095dff 100644
--- a/examples/multimedia/audioengine/qml/audioengine.qml
+++ b/examples/multimedia/audioengine/qml/audioengine.qml
@@ -65,7 +65,7 @@ Rectangle {
             loops: Animation.Infinite
             running: true
             NumberAnimation {
-            duration: 8000
+            duration: 12000
             from: 0
             to: 1
             }
@@ -113,7 +113,7 @@ Rectangle {
         }
         velocity: {
             var speed = root.twoPi * root.radius / 4;
-            return shipSound.direction * speed;
+            return shipSound.direction.times(speed);
         }
 
         Component.onCompleted: shipSound.play()
@@ -137,7 +137,7 @@ Rectangle {
             color: "lightgreen"
         }
         Text {
-            text: " volume:" + volumeBar.volumeCtrl.volume * 100 +"%";
+            text: " volume:" + Math.round(volumeBar.volumeCtrl.volume * 100) +"%";
             font.pointSize: 16;
             font.italic: true;
             color: "black"