diff options
| author | Jerome Pasion <jerome.pasion@digia.com> | 2014-10-05 15:17:56 +0200 |
|---|---|---|
| committer | Jerome Pasion <jerome.pasion@digia.com> | 2014-10-21 16:59:52 +0200 |
| commit | 7366ecd053e2f791598d2b5b28b225e21b8ea97d (patch) | |
| tree | 6b9cd7ef50305c1446dfaec404d05e11eccbbea9 | |
| parent | 754beccc8843ccd2201d63f987891f1f85135918 (diff) | |
| download | qtdoc-7366ecd053e2f791598d2b5b28b225e21b8ea97d.tar.gz | |
Doc: Added information about WebSockets in connectivity article.
-better integration and visibility to Qt WebSockets.
Task-number: QTBUG-40901
Change-Id: I1791b2ccb686e08e12c2eaa36a4d0a92debd21bc
Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
| -rw-r--r-- | doc/src/connectivity.qdoc | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/doc/src/connectivity.qdoc b/doc/src/connectivity.qdoc index 4c9b3e6f..968e0f3b 100644 --- a/doc/src/connectivity.qdoc +++ b/doc/src/connectivity.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the documentation of the Qt Toolkit. @@ -104,6 +104,14 @@ Related Topics: \li \l {Resource Loading and Network Transparency} - network and URL transparency in QML \endlist +\section1 WebSockets + +An alternative to direct TCP or HTTP communication is to use the WebSocket +protocol (\l{http://tools.ietf.org/html/rfc6455}{RFC 6455}). It is a +two-way communication protocol on top of the TCP protocol to utilize existing +web infrastructure without having to create additional client-server based +communication. The \l{Qt WebSockets} module provides both a QML and C++ API, +in addition to several examples to demonstrate its use. \section1 World Wide Web Support |