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

Conflicts:
	.qmake.conf

Change-Id: I593c47e7aeebb7997f42a7408a8d22704d2713a1

6 files changed, 51 insertions, 8 deletions

diff --git a/LICENSE.GPLv3 b/LICENSE.GPLv3
index 4e49b12..71c4ad4 100644
--- a/LICENSE.GPLv3
+++ b/LICENSE.GPLv3
@@ -3,7 +3,7 @@
  The Qt Toolkit is Copyright (C) 2015 The Qt Company Ltd.
  Contact: http://www.qt.io/licensing/
 
- You may use, distribute and copy the Qt GUI Toolkit under the terms of
+ You may use, distribute and copy the Qt Toolkit under the terms of
  GNU Lesser General Public License version 3. That license references
  the General Public License version 3, that is displayed below. Other
  portions of the Qt Toolkit may be licensed directly under this license.
diff --git a/LICENSE.LGPLv21 b/LICENSE.LGPLv21
index 6e18461..dfcab5e 100644
--- a/LICENSE.LGPLv21
+++ b/LICENSE.LGPLv21
@@ -3,7 +3,7 @@
  The Qt Toolkit is Copyright (C) 2015 The Qt Company Ltd.
  Contact: http://www.qt.io/licensing/
 
- You may use, distribute and copy the Qt GUI Toolkit under the terms of
+ You may use, distribute and copy the Qt Toolkit under the terms of
  GNU Lesser General Public License version 2.1, which is displayed below.
 
 -------------------------------------------------------------------------
diff --git a/LICENSE.LGPLv3 b/LICENSE.LGPLv3
index 4d67bac..6bf924c 100644
--- a/LICENSE.LGPLv3
+++ b/LICENSE.LGPLv3
@@ -3,7 +3,7 @@
  The Qt Toolkit is Copyright (C) 2015 The Qt Company Ltd.
  Contact: http://www.qt.io/licensing/
 
- You may use, distribute and copy the Qt GUI Toolkit under the terms of
+ You may use, distribute and copy the Qt Toolkit under the terms of
  GNU Lesser General Public License version 3, which is displayed below.
  This license makes reference to the version 3 of the GNU General
  Public License, which you can find in the LICENSE.GPLv3 file.
diff --git a/dist/changes-5.7.0 b/dist/changes-5.7.0
new file mode 100644
index 0000000..b85aa40
--- /dev/null
+++ b/dist/changes-5.7.0
@@ -0,0 +1,37 @@
+Qt 5.7 introduces many new features and improvements as well as bugfixes
+over the 5.6.x series. Also, there is a change in the licensing terms.
+For more details, refer to the online documentation included in this
+distribution. The documentation is also available online:
+
+   http://doc.qt.io/qt-5.7
+
+The Qt version 5.7 series is binary compatible with the 5.6.x series.
+Applications compiled for 5.6 will continue to run with 5.7.
+
+Some of the changes listed in this file include issue tracking numbers
+corresponding to tasks in the Qt Bug Tracker:
+
+  http://bugreports.qt.io/
+
+Each of these identifiers can be entered in the bug tracker to obtain more
+information about a particular change.
+
+****************************************************************************
+*                          Important License Changes                       *
+****************************************************************************
+
+  This module is no longer available under LGPLv2.1. The libraries are
+  now available under the following licenses:
+    * Commercial License
+    * GNU General Public License v2.0 (LICENSE.GPL2) and later
+    * GNU Lesser General Public License v3.0 (LICENSE.LGPL3)
+
+  The tools are now available under the following licenses:
+    * Commercial License
+    * GNU General Public License 3.0 (LICENSE.GPL3) with exceptions
+      described in The Qt Company GPL Exception 1.0 (LICENSE.GPL3-EXCEPT)
+
+****************************************************************************
+*                                 General                                  *
+****************************************************************************
+ - This release contains only minor improvements.
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;
             }