From 45a74d7166590f4bd0fefb264417d9535817f8a0 Mon Sep 17 00:00:00 2001
From: Kurt Pattyn <pattyn.kurt@gmail.com>
Date: Sat, 8 Mar 2014 21:42:19 +0100
Subject: [PATCH] Add Qt WebSockets to add-ons and connectivity documentation
Change-Id: I1d09e8533a07a2776b5a9a6279e5f50d6995184f
Reviewed-by: Sze Howe Koh <szehowe.koh@gmail.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
---
doc/config/qtdoc.qdocconf | 1 +
doc/src/addons.qdoc | 4 ++++
doc/src/connectivity.qdoc | 5 +++++
doc/src/qtmodules.qdoc | 5 +++++
4 files changed, 15 insertions(+)
diff --git a/doc/config/qtdoc.qdocconf b/doc/config/qtdoc.qdocconf
index 0c232fc5..7c683581 100644
--- a/doc/config/qtdoc.qdocconf
+++ b/doc/config/qtdoc.qdocconf
@@ -42,6 +42,7 @@ depends += \
qtsvg \
qttestlib \
qtuitools \
+ qtwebsockets \
qtwidgets \
qtwinextras \
qtwebkit \
diff --git a/doc/src/addons.qdoc b/doc/src/addons.qdoc
index c3aa5df0..92e76ee9 100644
--- a/doc/src/addons.qdoc
+++ b/doc/src/addons.qdoc
@@ -105,6 +105,10 @@ with Qt easier. In particular there is the \l {Qt UI Tools} module which provide
the forms created in Qt Designer and the \l {Qt Help} module which can be used to integrate online
documentation in applications, similar to Qt Assistant.
+\section1 Qt WebSockets Module
+
+The \l {Qt WebSockets} module provides a WebSocket implementation (\l{http://tools.ietf.org/html/rfc6455}{RFC 6455}).
+
\section1 Qt XML Module
The \l {Qt XML} Module is provided for compatibility with older code. It has been superseded by
diff --git a/doc/src/connectivity.qdoc b/doc/src/connectivity.qdoc
index 7e3a9d28..bdbc9758 100644
--- a/doc/src/connectivity.qdoc
+++ b/doc/src/connectivity.qdoc
@@ -116,6 +116,11 @@ applications as well as embedding into Qt Quick QML applications.
For more information see \l {Integrating Web Content}.
+\section1 Qt WebSockets Module
+
+The \l {Qt WebSockets} Module provides a WebSocket implementation (\l{http://tools.ietf.org/html/rfc6455} {RFC 6455}).
+
+
\section1 Inter-Process Communication
Qt provides several ways to implement Inter-Process Communication
diff --git a/doc/src/qtmodules.qdoc b/doc/src/qtmodules.qdoc
index 499bb0d7..7cbc741b 100644
--- a/doc/src/qtmodules.qdoc
+++ b/doc/src/qtmodules.qdoc
@@ -224,6 +224,11 @@
\li All
\li
\li Classes for displaying the contents of SVG files.
+ \row
+ \li \l{Qt WebSockets}
+ \li All
+ \li All
+ \li Provides WebSocket communication compliant with \l{http://tools.ietf.org/html/rfc6455} {RFC 6455}.
\row
\li \l{Qt Windows Extras}
\li All
--
GitLab