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

2 files changed, 8 insertions, 8 deletions

diff --git a/tests/auto/corelib/tools/qalgorithms/tst_qalgorithms.cpp b/tests/auto/corelib/tools/qalgorithms/tst_qalgorithms.cpp
index e13c2894af..72299402f0 100644
--- a/tests/auto/corelib/tools/qalgorithms/tst_qalgorithms.cpp
+++ b/tests/auto/corelib/tools/qalgorithms/tst_qalgorithms.cpp
@@ -37,6 +37,7 @@
 #include <qalgorithms.h>
 #include <QStringList>
 #include <QString>
+#include <QRandomGenerator>
 #include <QVector>
 
 #define Q_TEST_PERFORMANCE 0
@@ -133,7 +134,7 @@ QVector<DataType> generateData(QString dataSetType, const int length)
     QVector<DataType> container;
     if (dataSetType == "Random") {
         for (int i = 0; i < length; ++i)
-            container.append(rand());
+            container.append(QRandomGenerator::global()->generate());
     } else if (dataSetType == "Ascending") {
         for (int i = 0; i < length; ++i)
             container.append(i);
@@ -1082,12 +1083,12 @@ void tst_QAlgorithms::popCount_data_impl(size_t sizeof_T_Int)
     // and some random ones:
     if (sizeof_T_Int >= 8)
         for (size_t i = 0; i < 1000; ++i) {
-            const quint64 input = quint64(qrand()) << 32 | quint32(qrand());
+            const quint64 input = QRandomGenerator::global()->generate64();
             QTest::addRow("0x%016llx", input) << input << bitsSetInInt64(input);
         }
         else if (sizeof_T_Int >= 2)
             for (size_t i = 0; i < 1000 ; ++i) {
-                const quint32 input = qrand();
+                const quint32 input = QRandomGenerator::global()->generate();
                 if (sizeof_T_Int >= 4)
                     QTest::addRow("0x%08x", input) << quint64(input) << bitsSetInInt(input);
                 else
@@ -1129,7 +1130,7 @@ void tst_QAlgorithms::countTrailing_data_impl(size_t sizeof_T_Int)
     // and some random ones:
     for (uint i = 0; i < sizeof_T_Int*8; ++i) {
         for (uint j = 0; j < sizeof_T_Int*3; ++j) {  // 3 is arbitrary
-            const quint64 r = quint64(qrand()) << 32 | quint32(qrand());
+            const quint64 r = QRandomGenerator::global()->generate64();
             const quint64 b = Q_UINT64_C(1) << i;
             const quint64 mask = ((~(b-1)) ^ b) & type_mask;
             const quint64 input = (r&mask) | b;
@@ -1166,7 +1167,7 @@ void tst_QAlgorithms::countLeading_data_impl(size_t sizeof_T_Int)
     // and some random ones:
     for (uint i = 0; i < sizeof_T_Int*8; ++i) {
         for (uint j = 0; j < sizeof_T_Int*3; ++j) {  // 3 is arbitrary
-            const quint64 r = quint64(qrand()) << 32 | quint32(qrand());
+            const quint64 r = QRandomGenerator::global()->generate64();
             const quint64 b = Q_UINT64_C(1) << i;
             const quint64 mask = b-1;
             const quint64 input = (r&mask) | b;
diff --git a/tests/auto/corelib/tools/qsharedpointer/tst_qsharedpointer.cpp b/tests/auto/corelib/tools/qsharedpointer/tst_qsharedpointer.cpp
index c684af5418..203d9d8683 100644
--- a/tests/auto/corelib/tools/qsharedpointer/tst_qsharedpointer.cpp
+++ b/tests/auto/corelib/tools/qsharedpointer/tst_qsharedpointer.cpp
@@ -1898,7 +1898,7 @@ class StrongThread: public QThread
 protected:
     void run()
     {
-        usleep(rand() % 2000);
+        usleep(QRandomGenerator::global()->bounded(2000));
         ptr->ref();
         ptr.clear();
     }
@@ -1911,7 +1911,7 @@ class WeakThread: public QThread
 protected:
     void run()
     {
-        usleep(rand() % 2000);
+        usleep(QRandomGenerator::global()->bounded(2000));
         QSharedPointer<ThreadData> ptr = weak;
         if (ptr)
             ptr->ref();
@@ -1973,7 +1973,6 @@ void tst_QSharedPointer::threadStressTest()
 
         base.clear();
 
-        srand(time(NULL));
         // start threads
         for (int i = 0; i < allThreads.count(); ++i)
             if (allThreads[i]) allThreads[i]->start();