Merge remote-tracking branch 'origin/stable' into dev

Change-Id: I7215c289188462383799269aa9b736ae76db4d25

Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I7215c289188462383799269aa9b736ae76db4d25
258d019d · Frederik Gladhorn · e66955ac · 29d9f1d8 · 258d019d · 258d019d
Commit 258d019d authored 11 years ago by Frederik Gladhorn
--- a/examples/examples.pro
+++ b/examples/examples.pro
 TEMPLATE = subdirs
-SUBDIRS = echoclient \
+SUBDIRS = websockets
-          echoserver \
\ No newline at end of file
-          simplechat
-qtHaveModule(quick): SUBDIRS += qmlwebsocketclient
-contains(QT_CONFIG, openssl) | contains(QT_CONFIG, openssl-linked) {
-SUBDIRS +=  \
-            sslechoserver \
-            sslechoclient
-}
--- a/examples/doc/echoclient.qdoc
+++ b/examples/doc/echoclient.qdoc
--- a/examples/doc/echoserver.qdoc
+++ b/examples/doc/echoserver.qdoc
--- a/examples/examples.qdoc
+++ b/examples/examples.qdoc
@@ -41,18 +41,9 @@
 /*!
+    \group qtwebsockets-examples
    \title Qt WebSockets Examples
-    \page examples.html
    \brief List of Qt WebSocket examples
-    The examples below can be used as a guide to using the API.
+    The examples below can be used as a guide to using the \l{Qt WebSockets} API.
-    \list
-    \li \l echoclient
-    \li \l echoserver
-    \li \l qmlwebsocketclient
-    \li \l simplechat
-    \li \l sslechoclient
-    \li \l sslechoserver
-    \endlist
 */
--- a/examples/doc/qmlwebsocketclient.qdoc
+++ b/examples/doc/qmlwebsocketclient.qdoc
--- a/examples/doc/simplechat.qdoc
+++ b/examples/doc/simplechat.qdoc
--- a/examples/doc/sslechoclient.qdoc
+++ b/examples/doc/sslechoclient.qdoc
--- a/examples/doc/sslechoserver.qdoc
+++ b/examples/doc/sslechoserver.qdoc
--- a/examples/echoclient/echoclient.cpp
+++ b/examples/echoclient/echoclient.cpp
--- a/examples/echoclient/echoclient.h
+++ b/examples/echoclient/echoclient.h
--- a/examples/echoclient/echoclient.pro
+++ b/examples/echoclient/echoclient.pro
--- a/examples/echoclient/main.cpp
+++ b/examples/echoclient/main.cpp
--- a/examples/echoserver/echoclient.html
+++ b/examples/echoserver/echoclient.html
--- a/examples/echoserver/echoserver.cpp
+++ b/examples/echoserver/echoserver.cpp
--- a/examples/echoserver/echoserver.h
+++ b/examples/echoserver/echoserver.h
--- a/examples/echoserver/echoserver.pro
+++ b/examples/echoserver/echoserver.pro
--- a/examples/echoserver/main.cpp
+++ b/examples/echoserver/main.cpp
--- a/examples/qmlwebsocketclient/data.qrc
+++ b/examples/qmlwebsocketclient/data.qrc
--- a/examples/qmlwebsocketclient/main.cpp
+++ b/examples/qmlwebsocketclient/main.cpp
--- a/examples/qmlwebsocketclient/qml/qmlwebsocketclient/main.qml
+++ b/examples/qmlwebsocketclient/qml/qmlwebsocketclient/main.qml