diff options
| author | Topi Reinio <topi.reinio@digia.com> | 2014-03-20 13:46:48 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-03-20 15:07:11 +0100 |
| commit | d69a5d1adbea7e025d48b713358d18b3fad05823 (patch) | |
| tree | 8503c2633351df2563f9bdcd75ebeea548315911 | |
| parent | 626d2cf3971feb45b1ac8f2405724016c01f6b8d (diff) | |
| download | qtdoc-d69a5d1adbea7e025d48b713358d18b3fad05823.tar.gz | |
Revert "Doc: Added info on Qt WebSockets module"
This reverts commit 35c81567825c8bfb5c79f867d36a645e1a566a3a.
Information about Qt WebSockets was already added in a
another commit (74d71665).
Change-Id: I1ab4037bbb9f7e24dc60e4f880a44fd98b7f8998
Reviewed-by: Sergio Ahumada <sahumada@blackberry.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| -rw-r--r-- | doc/src/connectivity.qdoc | 6 | ||||
| -rw-r--r-- | doc/src/qtmodules.qdoc | 3 |
2 files changed, 0 insertions, 9 deletions
diff --git a/doc/src/connectivity.qdoc b/doc/src/connectivity.qdoc index ea02d583..e3a1ccdd 100644 --- a/doc/src/connectivity.qdoc +++ b/doc/src/connectivity.qdoc @@ -91,12 +91,6 @@ online/offline status or whether Wifi or 3G is used). Qt also offers HTTP support in QML by either using HTTP explicitly via XmlHttpRequest, or by transparently using HTTP URLs in e.g. Image sources. -For browser-based applications requiring two-way communication, Qt WebSockets provides -a communication mode between a client running untrusted code in a controlled environment -to a remote host that has opted-in to communications from that code. -The protocol consists of an opening handshake followed by basic message framing, -layered over TCP. - Related Topics: \list \li \l{Qt Network} - module documentation diff --git a/doc/src/qtmodules.qdoc b/doc/src/qtmodules.qdoc index 9bfcde97..4772ab1f 100644 --- a/doc/src/qtmodules.qdoc +++ b/doc/src/qtmodules.qdoc @@ -97,9 +97,6 @@ \row \li \l{Qt Widgets} \li Classes to extend Qt GUI with C++ widgets. - \row - \li \l{Qt WebSockets} - \li A QT implementation of the WebSocket protocol. \endtable If you use \l qmake to build your projects, the \l{Qt Core} and \l{Qt GUI} |