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

Conflicts: .qmake.conf Change-Id: Iad73368a22c6d4662188e6f357a265d0c26756d0
2014-09-26 15:28:44 +02:00
parent 5c3a5cf810 e195b7fc05
commit 41a1c16340
21 changed files with 213 additions and 161 deletions
--- a/src/plugins/windowsaudio/qwindowsaudiooutput.cpp
+++ b/src/plugins/windowsaudio/qwindowsaudiooutput.cpp
@@ -674,7 +674,7 @@ qint64 QWindowsAudioOutput::elapsedUSecs() const
    if (deviceState == QAudio::StoppedState)
        return 0;

-    return timeStampOpened.elapsed()*1000;
+    return timeStampOpened.elapsed() * qint64(1000);
 }

 QAudio::Error QWindowsAudioOutput::error() const