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

Conflicts:
	.qmake.conf

Change-Id: I593c47e7aeebb7997f42a7408a8d22704d2713a1

2 files changed, 11 insertions, 5 deletions

diff --git a/src/websockets/doc/src/index.qdoc b/src/websockets/doc/src/index.qdoc
index 9e1c40c..4f25589 100644
--- a/src/websockets/doc/src/index.qdoc
+++ b/src/websockets/doc/src/index.qdoc
@@ -41,15 +41,21 @@
     Qt applications to act as a server that can process WebSocket requests,
     or a client that can consume data received from the server, or both.
 
-    To use this module in your application, use the following include
-    statement:
+    \section1 Getting Started
+
+    To include the definitions of the module's classes, use the following directive:
 
     \code
     #include <QtWebSockets/QtWebSockets>
     \endcode
 
-    To link against the module, add this line to your \l qmake \c
-    .pro file:
+    To  import the QML types into your application, use the following import statement in your .qml file:
+
+    \code
+    import QtWebSockets 1.0
+    \endcode
+
+    To link against the module, add this line to your qmake .pro file:
 
     \code
     QT += websockets
diff --git a/src/websockets/qwebsocket_p.cpp b/src/websockets/qwebsocket_p.cpp
index 74945f4..3a20b09 100644
--- a/src/websockets/qwebsocket_p.cpp
+++ b/src/websockets/qwebsocket_p.cpp
@@ -981,7 +981,7 @@ void QWebSocketPrivate::processHandshake(QTcpSocket *pSocket)
         }
 
         if (m_handshakeState != ParsingHeaderState) {
-            if (pSocket->atEnd()) {
+            if (pSocket->state() != QAbstractSocket::ConnectedState) {
                 errorDescription = QWebSocket::tr("QWebSocketPrivate::processHandshake: Connection closed while reading header.");
                 break;
             }