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

 Conflicts:
	src/network/access/qhttp2protocolhandler_p.h
	src/network/kernel/kernel.pri
	src/network/ssl/qsslkey_qt.cpp
	src/plugins/platforms/cocoa/qcocoascreen.mm
	src/plugins/platforms/windows/accessible/iaccessible2.cpp
	src/plugins/platforms/windows/accessible/iaccessible2.h
	src/plugins/platforms/windows/accessible/qwindowsaccessibility.cpp
	src/plugins/platforms/windows/accessible/qwindowsmsaaaccessible.cpp
	src/plugins/platforms/windows/accessible/qwindowsmsaaaccessible.h
	src/widgets/widgets/qmenu_p.h
	tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp
	tests/auto/other/qaccessibility/tst_qaccessibility.cpp
	tests/auto/testlib/selftests/expected_cmptest.lightxml
	tests/auto/testlib/selftests/expected_cmptest.teamcity
	tests/auto/testlib/selftests/expected_cmptest.txt
	tests/auto/testlib/selftests/expected_cmptest.xml

Done-with: Edward Welbourne <edward.welbourne@qt.io>
Change-Id: I4217cc7d840cbae3e3dd28574741544469c4c6b9

1 files changed, 7 insertions, 7 deletions

diff --git a/tests/auto/network/access/qnetworkdiskcache/tst_qnetworkdiskcache.cpp b/tests/auto/network/access/qnetworkdiskcache/tst_qnetworkdiskcache.cpp
index e996347a9a..856033fb63 100644
--- a/tests/auto/network/access/qnetworkdiskcache/tst_qnetworkdiskcache.cpp
+++ b/tests/auto/network/access/qnetworkdiskcache/tst_qnetworkdiskcache.cpp
@@ -30,6 +30,7 @@
 #include <QtTest/QtTest>
 #include <QtNetwork/QtNetwork>
 #include <qnetworkdiskcache.h>
+#include <qrandom.h>
 
 #include <algorithm>
 
@@ -693,25 +694,25 @@ public:
 
             if (write) {
                 QNetworkCacheMetaData m;
-                if (qrand() % 2 == 0)
+                if (QRandomGenerator::global()->bounded(2) == 0)
                     m = metaData;
                 else
                     m = metaData2;
 
-                if (qrand() % 20 == 1) {
+                if (QRandomGenerator::global()->bounded(20) == 1) {
                     //qDebug() << "write update";
                     cache.updateMetaData(m);
                     continue;
                 }
 
                 QIODevice *device = cache.prepare(m);
-                if (qrand() % 20 == 1) {
+                if (QRandomGenerator::global()->bounded(20) == 1) {
                     //qDebug() << "write remove";
                     cache.remove(url);
                     continue;
                 }
                 QVERIFY(device);
-                if (qrand() % 2 == 0)
+                if (QRandomGenerator::global()->bounded(2) == 0)
                     device->write(longString);
                 else
                     device->write(longString2);
@@ -740,9 +741,9 @@ public:
                     delete d;
                 }
             }
-            if (qrand() % 5 == 1)
+            if (QRandomGenerator::global()->bounded(5) == 1)
                 cache.remove(url);
-            if (qrand() % 5 == 1)
+            if (QRandomGenerator::global()->bounded(5) == 1)
                 cache.clear();
             sleep(0);
         }
@@ -791,7 +792,6 @@ void tst_QNetworkDiskCache::sync()
     return;
 
     QTime midnight(0, 0, 0);
-    qsrand(midnight.secsTo(QTime::currentTime()));
     Runner reader(tempDir.path());
     reader.dt = QDateTime::currentDateTime();
     reader.write = false;