3 files changed, 9 insertions, 7 deletions
diff --git a/src/imports/audioengine/qaudioengine_openal_p.h b/src/imports/audioengine/qaudioengine_openal_p.h
index c1dbf6aa2..92735ba86 100644
--- a/src/imports/audioengine/qaudioengine_openal_p.h
+++ b/src/imports/audioengine/qaudioengine_openal_p.h
@@ -91,12 +91,12 @@ public:
     StaticSoundBufferAL(QObject *parent, const QUrl &url, QSampleCache *sampleLoader);
     ~StaticSoundBufferAL();
 
-    State state() const Q_DECL_OVERRIDE;
+    State state() const override;
 
-    void load() Q_DECL_OVERRIDE;
+    void load() override;
 
-    void bindToSource(ALuint alSource) Q_DECL_OVERRIDE;
-    void unbindFromSource(ALuint alSource) Q_DECL_OVERRIDE;
+    void bindToSource(ALuint alSource) override;
+    void unbindFromSource(ALuint alSource) override;
 
     inline long addRef() { return ++m_ref; }
     inline long release() { return --m_ref; }
diff --git a/src/imports/audioengine/qdeclarative_playvariation_p.cpp b/src/imports/audioengine/qdeclarative_playvariation_p.cpp
index 36ffca668..e6d3697d0 100644
--- a/src/imports/audioengine/qdeclarative_playvariation_p.cpp
+++ b/src/imports/audioengine/qdeclarative_playvariation_p.cpp
@@ -41,6 +41,7 @@
 #include "qdeclarative_audioengine_p.h"
 #include "qsoundinstance_p.h"
 #include "qdebug.h"
+#include "qrandom.h"
 
 #define DEBUG_AUDIOENGINE
 
@@ -272,7 +273,7 @@ void QDeclarativePlayVariation::setSampleObject(QDeclarativeAudioSample *sampleO
 
 void QDeclarativePlayVariation::applyParameters(QSoundInstance *soundInstance)
 {
-    qreal pitch = qreal(qrand() % 1001) * 0.001f * (m_maxPitch - m_minPitch) + m_minPitch;
-    qreal gain = qreal(qrand() % 1001) * 0.001f * (m_maxGain - m_minGain) + m_minGain;
+    qreal pitch = QRandomGenerator::global()->bounded(1001 * 0.001f) * (m_maxPitch - m_minPitch) + m_minPitch;
+    qreal gain = QRandomGenerator::global()->bounded(1001 * 0.001f) * (m_maxGain - m_minGain) + m_minGain;
     soundInstance->updateVariationParameters(pitch, gain, m_looping);
 }
diff --git a/src/imports/audioengine/qdeclarative_sound_p.cpp b/src/imports/audioengine/qdeclarative_sound_p.cpp
index 0849215be..a11490cea 100644
--- a/src/imports/audioengine/qdeclarative_sound_p.cpp
+++ b/src/imports/audioengine/qdeclarative_sound_p.cpp
@@ -43,6 +43,7 @@
 #include "qdeclarative_soundinstance_p.h"
 #include "qdeclarative_audioengine_p.h"
 #include "qdebug.h"
+#include "qrandom.h"
 
 #define DEBUG_AUDIOENGINE
 
@@ -316,7 +317,7 @@ int QDeclarativeSound::genVariationIndex(int oldVariationIndex)
         case QDeclarativeSound::Random: {
             if (oldVariationIndex < 0)
                 oldVariationIndex = 0;
-            return (oldVariationIndex + (qrand() % (m_playlist.count() + 1))) % m_playlist.count();
+            return (oldVariationIndex + (QRandomGenerator::global()->bounded(m_playlist.count() + 1))) % m_playlist.count();
         }
         default:
             return (oldVariationIndex + 1) % m_playlist.count();