diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-11-20 13:17:23 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-11-20 13:17:23 +0100 |
| commit | 45cbaf2a8158f5972e3362f7e777d3263d7c7916 (patch) | |
| tree | 329c9ccd8d6bb9c2e11d98ed9149c714c04ca987 /src/multimedia | |
| parent | cf43124fcbea64f15f0800f090fdf885e08019c7 (diff) | |
| parent | 5af70385a0b1a04e10d088f655ee33338ec014c5 (diff) | |
Merge remote-tracking branch 'origin/5.10' into dev
Change-Id: Icaf645e271b21320c4cb6269178d9e722092a263
Diffstat (limited to 'src/multimedia')
| -rw-r--r-- | src/multimedia/playback/qmedianetworkplaylistprovider.cpp | 2 | ||||
| -rw-r--r-- | src/multimedia/playback/qmediaplaylistnavigator.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/multimedia/playback/qmedianetworkplaylistprovider.cpp b/src/multimedia/playback/qmedianetworkplaylistprovider.cpp index 50db4fad2..3f24d0f55 100644 --- a/src/multimedia/playback/qmedianetworkplaylistprovider.cpp +++ b/src/multimedia/playback/qmedianetworkplaylistprovider.cpp @@ -267,7 +267,7 @@ void QMediaNetworkPlaylistProvider::shuffle() QList<QMediaContent> resources; while (!d->resources.isEmpty()) { - resources.append(d->resources.takeAt(QRandomGenerator::bounded(d->resources.size()))); + resources.append(d->resources.takeAt(QRandomGenerator::global()->bounded(d->resources.size()))); } d->resources = resources; diff --git a/src/multimedia/playback/qmediaplaylistnavigator.cpp b/src/multimedia/playback/qmediaplaylistnavigator.cpp index 0bacbf2ba..0966c9396 100644 --- a/src/multimedia/playback/qmediaplaylistnavigator.cpp +++ b/src/multimedia/playback/qmediaplaylistnavigator.cpp @@ -125,7 +125,7 @@ int QMediaPlaylistNavigatorPrivate::nextItemPos(int steps) const randomModePositions.append(-1); int res = randomModePositions[randomPositionsOffset+steps]; if (res<0 || res >= playlist->mediaCount()) { - res = QRandomGenerator::bounded(playlist->mediaCount()); + res = QRandomGenerator::global()->bounded(playlist->mediaCount()); randomModePositions[randomPositionsOffset+steps] = res; } @@ -178,7 +178,7 @@ int QMediaPlaylistNavigatorPrivate::previousItemPos(int steps) const int res = randomModePositions[randomPositionsOffset-steps]; if (res<0 || res >= playlist->mediaCount()) { - res = QRandomGenerator::bounded(playlist->mediaCount()); + res = QRandomGenerator::global()->bounded(playlist->mediaCount()); randomModePositions[randomPositionsOffset-steps] = res; } |