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, 9 insertions, 10 deletions

diff --git a/tests/auto/gui/text/qtextpiecetable/tst_qtextpiecetable.cpp b/tests/auto/gui/text/qtextpiecetable/tst_qtextpiecetable.cpp
index ca01e83dbe..39f5e9ecc3 100644
--- a/tests/auto/gui/text/qtextpiecetable/tst_qtextpiecetable.cpp
+++ b/tests/auto/gui/text/qtextpiecetable/tst_qtextpiecetable.cpp
@@ -145,7 +145,7 @@ void tst_QTextPieceTable::insertion3()
 {
     QString compare;
     for (int i = 0; i < 20000; ++i) {
-        int pos = rand() % (i+1);
+        int pos = QRandomGenerator::global()->bounded(i+1);
         QChar c((unsigned short)(i & 0xff) + 1);
         QString str;
         str += c;
@@ -159,7 +159,7 @@ void tst_QTextPieceTable::insertion4()
 {
     QString compare;
     for (int i = 0; i < 20000; ++i) {
-        int pos = rand() % (i+1);
+        int pos = QRandomGenerator::global()->generate() % (i+1);
         QChar c((unsigned short)((i % 26) + (i>25?'A':'a')));
         QString str;
         str += c;
@@ -178,7 +178,7 @@ void tst_QTextPieceTable::insertion5()
 {
     QString compare;
     for (int i = 0; i < 20000; ++i) {
-        int pos = rand() % (i+1);
+        int pos = QRandomGenerator::global()->generate() % (i+1);
         QChar c((unsigned short)((i % 26) + (i>25?'A':'a')));
         QString str;
         str += c;
@@ -236,8 +236,8 @@ void tst_QTextPieceTable::removal3()
     QString compare;
     int l = 0;
     for (int i = 0; i < 20000; ++i) {
-        bool remove = l && (rand() % 2);
-        int pos = rand() % (remove ? l : (l+1));
+        bool remove = l && (QRandomGenerator::global()->bounded(2));
+        int pos = QRandomGenerator::global()->bounded(remove ? l : (l+1));
         QChar c((unsigned short)((i % 26) + (i>25?'A':'a')));
         QString str;
         str += c;
@@ -263,8 +263,8 @@ void tst_QTextPieceTable::removal4()
     QString compare;
     int l = 0;
     for (int i = 0; i < 20000; ++i) {
-        bool remove = l && (rand() % 2);
-        int pos = (l > 1) ? rand() % (remove ? l-1 : l) : 0;
+        bool remove = l && (QRandomGenerator::global()->bounded(2));
+        int pos = (l > 1) ? QRandomGenerator::global()->bounded(remove ? l-1 : l) : 0;
         QChar c((unsigned short)((i % 26) + (i>25?'A':'a')));
         QString str;
         if (c != 'a') {
@@ -472,13 +472,12 @@ void tst_QTextPieceTable::undoRedo10()
 
 void tst_QTextPieceTable::undoRedo11()
 {
-    srand(3);
     const int loops = 20;
     QString compare;
     int l = 0;
     for (int i = 0; i < loops; ++i) {
-        bool remove = l && (rand() % 2);
-        int pos = (l > 1) ? rand() % (remove ? l-1 : l) : 0;
+        bool remove = l && (QRandomGenerator::global()->bounded(2));
+        int pos = (l > 1) ? QRandomGenerator::global()->bounded(remove ? l-1 : l) : 0;
         QChar c((unsigned short)((i % 26) + (i>25?'A':'a')));
         QString str;
         str += c;