diff --git a/doc/config/qtdoc.qdocconf b/doc/config/qtdoc.qdocconf index 0c232fc5d2fbf51487e6890093757905407a8735..7c683581b9ed569b95fe4c79fd081cb5466445aa 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 c3aa5df0510abee498dd23826ee51dc2f272439f..92e76ee9ea795ce0eb8f82c20edf72618ac572bd 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 7e3a9d28ab83218952adc6d65b1e09482bf7c70d..bdbc9758734de7c2ef924a9c88324996d4c41b1e 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 499bb0d7faf3e21e7eb750549a32478f6d86a203..7cbc741b0012fec971277962e714f5c3043e5614 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