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

 Conflicts:
	src/websockets/qwebsocket_p.cpp
	tests/auto/websockets/qwebsocketserver/tst_qwebsocketserver.cpp

Change-Id: I40922fab198a09a3fbba1b2f11b42f2d40e53720

1 files changed, 4 insertions, 4 deletions

diff --git a/src/websockets/qdefaultmaskgenerator_p.cpp b/src/websockets/qdefaultmaskgenerator_p.cpp
index 7dc0cee..7763868 100644
--- a/src/websockets/qdefaultmaskgenerator_p.cpp
+++ b/src/websockets/qdefaultmaskgenerator_p.cpp
@@ -48,7 +48,7 @@
     malicious scripts to attack bad behaving proxies.
     For more information about the importance of good masking,
     see \l {"Talking to Yourself for Fun and Profit" by Lin-Shung Huang et al}.
-    The default mask generator uses the reasonably secure QRandomGenerator::get32() function.
+    The default mask generator uses the reasonably secure QRandomGenerator::global()->generate() function.
     The best measure against attacks mentioned in the document above,
     is to use QWebSocket over a secure connection (\e wss://).
     In general, always be careful to not have 3rd party script access to
@@ -90,16 +90,16 @@ bool QDefaultMaskGenerator::seed() Q_DECL_NOEXCEPT
 }
 
 /*!
-    Generates a new random mask using the insecure QRandomGenerator::get32() method.
+    Generates a new random mask using the insecure QRandomGenerator::global()->generate() method.
 
     \internal
 */
 quint32 QDefaultMaskGenerator::nextMask() Q_DECL_NOEXCEPT
 {
-    quint32 value = QRandomGenerator::get32();
+    quint32 value = QRandomGenerator::global()->generate();
     while (Q_UNLIKELY(value == 0)) {
         // a mask of zero has a special meaning
-        value = QRandomGenerator::get32();
+        value = QRandomGenerator::global()->generate();
     }
     return value;
 }