Merge remote-tracking branch 'origin/5.6' into 5.7

Conflicts:
	.qmake.conf

Change-Id: I42592e133b25ebd271b387353a868b68825291d5

1 files changed, 2 insertions, 2 deletions

diff --git a/src/websockets/qwebsocketframe.cpp b/src/websockets/qwebsocketframe.cpp
index 73a0bc5..ebc3c33 100644
--- a/src/websockets/qwebsocketframe.cpp
+++ b/src/websockets/qwebsocketframe.cpp
@@ -528,10 +528,10 @@ bool QWebSocketFrame::checkValidity()
     } else if (isControlFrame()) {
         if (Q_UNLIKELY(m_length > 125)) {
             setError(QWebSocketProtocol::CloseCodeProtocolError,
-                     tr("Controle frame is larger than 125 bytes"));
+                     tr("Control frame is larger than 125 bytes"));
         } else if (Q_UNLIKELY(!m_isFinalFrame)) {
             setError(QWebSocketProtocol::CloseCodeProtocolError,
-                     tr("Controle frames cannot be fragmented"));
+                     tr("Control frames cannot be fragmented"));
         } else {
             m_isValid = true;
         }