From 10cad9ece2cb380e26e03a1c03b900f8e3b4c801 Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Mon, 23 May 2016 11:45:35 +0200 Subject: Doc: Also mention QML Import in index page qtwebsockets-index.html is the entry point for both C++ and QML API. Change-Id: I81efb2d7b931cce0d63efc2f25ce89904abcbfad Reviewed-by: Leena Miettinen --- src/websockets/doc/src/index.qdoc | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'src') 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 \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 -- cgit v1.2.1 From e66dcd51d0e5517e88cd59912fd08501522a2902 Mon Sep 17 00:00:00 2001 From: Oleksandr Tymoshenko Date: Thu, 19 May 2016 11:34:05 -0700 Subject: Fixed erroneous detection of server disconnect condition QAbstractSocket::atEnd does not check actual connection state it only checks if data is ready to be read. Under some conditions (e.g. slow network) data may not be available yet but it doesn't mean the server dropped connection. When more data comes FSM will pick it up and handle as expected. The right way to check disconnect is to check for actual socket state. Task-number: QTBUG-51069 Change-Id: I17d7110fbefdba2d5378a71935ab5923f8c1bf3e Reviewed-by: Thiago Macieira --- src/websockets/qwebsocket_p.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/websockets/qwebsocket_p.cpp b/src/websockets/qwebsocket_p.cpp index 2fd52fe..3df969e 100644 --- a/src/websockets/qwebsocket_p.cpp +++ b/src/websockets/qwebsocket_p.cpp @@ -975,7 +975,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; } -- cgit v1.2.1