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, 6 insertions, 6 deletions

diff --git a/tests/auto/network/access/hpack/tst_hpack.cpp b/tests/auto/network/access/hpack/tst_hpack.cpp
index bd337c9f5f..810745a065 100644
--- a/tests/auto/network/access/hpack/tst_hpack.cpp
+++ b/tests/auto/network/access/hpack/tst_hpack.cpp
@@ -273,13 +273,13 @@ void tst_Hpack::bitstreamCompression()
     std::vector<uchar> buffer;
     BitOStream out(buffer);
     for (unsigned i = 0; i < nValues; ++i) {
-        const bool isString = std::rand() % 1000 > 500;
+        const bool isString = QRandomGenerator::global()->bounded(1000) > 500;
         isA.push_back(isString);
         if (!isString) {
-            integers.push_back(std::rand() % 1000);
+            integers.push_back(QRandomGenerator::global()->bounded(1000u));
             out.write(integers.back());
         } else {
-            const auto start = std::rand() % (bytes.length() / 2);
+            const auto start = QRandomGenerator::global()->bounded(uint(bytes.length()) / 2);
             auto end = start * 2;
             if (!end)
                 end = bytes.length() / 2;
@@ -287,7 +287,7 @@ void tst_Hpack::bitstreamCompression()
             const auto &s = strings.back();
             totalStringBytes += s.size();
             QByteArray data(s.c_str(), int(s.size()));
-            const bool compressed(std::rand() % 1000 > 500);
+            const bool compressed(QRandomGenerator::global()->bounded(1000) > 500);
             out.write(data, compressed);
         }
     }
@@ -442,8 +442,8 @@ void tst_Hpack::lookupTableDynamic()
         // Strings are repeating way too often, I want to
         // have at least some items really evicted and not found,
         // therefore these weird dances with start/len.
-        const quint32 start = std::rand() % (dataSize - 10);
-        quint32 len = std::rand() % (dataSize - start);
+        const quint32 start = QRandomGenerator::global()->bounded(dataSize - 10);
+        quint32 len = QRandomGenerator::global()->bounded(dataSize - start);
         if (!len)
             len = 1;