Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-beta1

Change-Id: I7ebcdc16a8b65103abfb9640c990eddbeccdef05

1 files changed, 126 insertions, 0 deletions

diff --git a/src/websockets/doc/src/external-resources.qdoc b/src/websockets/doc/src/external-resources.qdoc
new file mode 100644
index 0000000..933ef7f
--- /dev/null
+++ b/src/websockets/doc/src/external-resources.qdoc
@@ -0,0 +1,126 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:FDL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
+**
+** GNU Free Documentation License Usage
+** Alternatively, this file may be used under the terms of the GNU Free
+** Documentation License version 1.3 as published by the Free Software
+** Foundation and appearing in the file included in the packaging of
+** this file. Please review the following information to ensure
+** the GNU Free Documentation License version 1.3 requirements
+** will be met: http://www.gnu.org/copyleft/fdl.html.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \externalpage http://w2spconf.com/2011/papers/websocket.pdf
+    \title "Talking to Yourself for Fun and Profit" by Lin-Shung Huang et al
+*/
+
+/*!
+    \externalpage http://tools.ietf.org/html/rfc6454
+    \title RFC 6454
+*/
+
+/*!
+    \externalpage http://tools.ietf.org/html/rfc6455
+    \title RFC 6455
+*/
+
+/*!
+    \externalpage http://tools.ietf.org/html/rfc6455#section-10
+    \title WebSocket Security Considerations
+*/
+
+/*!
+    \externalpage http://tools.ietf.org/html/rfc6455#page-39
+    \title WebSocket Extensions
+*/
+
+/*!
+    \externalpage http://tools.ietf.org/html/rfc6455#page-12
+    \title WebSocket Subprotocols
+*/
+
+/*!
+    \externalpage http://tools.ietf.org/html/draft-hixie-thewebsocketprotocol-76
+    \title hixie76
+*/
+
+/*!
+    \externalpage http://tools.ietf.org/html/draft-ietf-hybi-thewebsocketprotocol-00
+    \title hybi-00
+*/
+
+/*!
+    \externalpage http://tools.ietf.org/id/draft-ietf-hybi-thewebsocketprotocol-04.txt
+    \title hybi-04
+*/
+
+/*!
+    \externalpage http://tools.ietf.org/id/draft-ietf-hybi-thewebsocketprotocol-05.txt
+    \title hybi-05
+*/
+
+/*!
+    \externalpage http://tools.ietf.org/html/draft-ietf-hybi-thewebsocketprotocol-07
+    \title hybi-07
+*/
+
+/*!
+    \externalpage https://github.com/google/pywebsocket/wiki/WebSocketProtocolSpec
+    \title pywebsocket's WebSocketProtocolSpec
+*/
+
+/*!
+    \externalpage http://autobahn.ws/testsuite/
+    \title Autobahn|Testsuite
+*/
+
+/*!
+    \externalpage http://autobahn.ws/testsuite/installation.html
+    \title Autobahn|Testsuite installation documentation
+*/
+
+/*!
+    \externalpage https://www.mozilla.org/firefox
+    \title Firefox
+*/
+
+/*!
+    \externalpage https://bugzilla.mozilla.org/show_bug.cgi?id=594502
+    \title Firefox bug 594502
+
+/*
+    This prevents autolinking of each occurrence of 'WebSocket'
+    To link to the WebSocket QML type, use explicit linking:
+        \l [QML] WebSocket
+        \sa {QtWebSockets::}{WebSocket}
+*/
+/*!
+    \externalpage nolink
+    \title WebSocket
+    \internal
+*/
+
+/*
+    Prevent linking to WebSockets section in "Networking and Connectivity"
+*/
+/*!
+    \externalpage nolink
+    \title WebSockets
+    \internal
+*/