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

Change-Id: I7215c289188462383799269aa9b736ae76db4d25

38 files changed, 15 insertions, 21 deletions

diff --git a/examples/examples.pro b/examples/examples.pro
index 76a0e9f..158e1ce 100644
--- a/examples/examples.pro
+++ b/examples/examples.pro
@@ -1,12 +1,3 @@
 TEMPLATE = subdirs
 
-SUBDIRS = echoclient \
-          echoserver \
-          simplechat
-qtHaveModule(quick): SUBDIRS += qmlwebsocketclient
-
-contains(QT_CONFIG, openssl) | contains(QT_CONFIG, openssl-linked) {
-SUBDIRS +=  \
-            sslechoserver \
-            sslechoclient
-}
+SUBDIRS = websockets
\ No newline at end of file
diff --git a/examples/doc/echoclient.qdoc b/examples/websockets/doc/echoclient.qdoc
index a6cb1a9..a6cb1a9 100644
--- a/examples/doc/echoclient.qdoc
+++ b/examples/websockets/doc/echoclient.qdoc
diff --git a/examples/doc/echoserver.qdoc b/examples/websockets/doc/echoserver.qdoc
index fcb0442..fcb0442 100644
--- a/examples/doc/echoserver.qdoc
+++ b/examples/websockets/doc/echoserver.qdoc
diff --git a/examples/examples.qdoc b/examples/websockets/doc/examples.qdoc
index bc1ad32..a9cc739 100644
--- a/examples/examples.qdoc
+++ b/examples/websockets/doc/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.
-
-    \list
-    \li \l echoclient
-    \li \l echoserver
-    \li \l qmlwebsocketclient
-    \li \l simplechat
-    \li \l sslechoclient
-    \li \l sslechoserver
-    \endlist
+    The examples below can be used as a guide to using the \l{Qt WebSockets} API.
 */
diff --git a/examples/doc/qmlwebsocketclient.qdoc b/examples/websockets/doc/qmlwebsocketclient.qdoc
index 776e486..776e486 100644
--- a/examples/doc/qmlwebsocketclient.qdoc
+++ b/examples/websockets/doc/qmlwebsocketclient.qdoc
diff --git a/examples/doc/simplechat.qdoc b/examples/websockets/doc/simplechat.qdoc
index 506d45a..506d45a 100644
--- a/examples/doc/simplechat.qdoc
+++ b/examples/websockets/doc/simplechat.qdoc
diff --git a/examples/doc/sslechoclient.qdoc b/examples/websockets/doc/sslechoclient.qdoc
index d7d1897..d7d1897 100644
--- a/examples/doc/sslechoclient.qdoc
+++ b/examples/websockets/doc/sslechoclient.qdoc
diff --git a/examples/doc/sslechoserver.qdoc b/examples/websockets/doc/sslechoserver.qdoc
index d158a68..d158a68 100644
--- a/examples/doc/sslechoserver.qdoc
+++ b/examples/websockets/doc/sslechoserver.qdoc
diff --git a/examples/echoclient/echoclient.cpp b/examples/websockets/echoclient/echoclient.cpp
index 9e8ba9b..9e8ba9b 100644
--- a/examples/echoclient/echoclient.cpp
+++ b/examples/websockets/echoclient/echoclient.cpp
diff --git a/examples/echoclient/echoclient.h b/examples/websockets/echoclient/echoclient.h
index b5a7709..b5a7709 100644
--- a/examples/echoclient/echoclient.h
+++ b/examples/websockets/echoclient/echoclient.h
diff --git a/examples/echoclient/echoclient.pro b/examples/websockets/echoclient/echoclient.pro
index 24848e7..24848e7 100644
--- a/examples/echoclient/echoclient.pro
+++ b/examples/websockets/echoclient/echoclient.pro
diff --git a/examples/echoclient/main.cpp b/examples/websockets/echoclient/main.cpp
index fccaed1..fccaed1 100644
--- a/examples/echoclient/main.cpp
+++ b/examples/websockets/echoclient/main.cpp
diff --git a/examples/echoserver/echoclient.html b/examples/websockets/echoserver/echoclient.html
index e9c55dc..e9c55dc 100644
--- a/examples/echoserver/echoclient.html
+++ b/examples/websockets/echoserver/echoclient.html
diff --git a/examples/echoserver/echoserver.cpp b/examples/websockets/echoserver/echoserver.cpp
index b35df53..b35df53 100644
--- a/examples/echoserver/echoserver.cpp
+++ b/examples/websockets/echoserver/echoserver.cpp
diff --git a/examples/echoserver/echoserver.h b/examples/websockets/echoserver/echoserver.h
index 521eccb..521eccb 100644
--- a/examples/echoserver/echoserver.h
+++ b/examples/websockets/echoserver/echoserver.h
diff --git a/examples/echoserver/echoserver.pro b/examples/websockets/echoserver/echoserver.pro
index 6d2360b..6d2360b 100644
--- a/examples/echoserver/echoserver.pro
+++ b/examples/websockets/echoserver/echoserver.pro
diff --git a/examples/echoserver/main.cpp b/examples/websockets/echoserver/main.cpp
index ff3993e..ff3993e 100644
--- a/examples/echoserver/main.cpp
+++ b/examples/websockets/echoserver/main.cpp
diff --git a/examples/qmlwebsocketclient/data.qrc b/examples/websockets/qmlwebsocketclient/data.qrc
index 3ac4604..3ac4604 100644
--- a/examples/qmlwebsocketclient/data.qrc
+++ b/examples/websockets/qmlwebsocketclient/data.qrc
diff --git a/examples/qmlwebsocketclient/main.cpp b/examples/websockets/qmlwebsocketclient/main.cpp
index 3aa1c95..3aa1c95 100644
--- a/examples/qmlwebsocketclient/main.cpp
+++ b/examples/websockets/qmlwebsocketclient/main.cpp
diff --git a/examples/qmlwebsocketclient/qml/qmlwebsocketclient/main.qml b/examples/websockets/qmlwebsocketclient/qml/qmlwebsocketclient/main.qml
index 5560c4c..5560c4c 100644
--- a/examples/qmlwebsocketclient/qml/qmlwebsocketclient/main.qml
+++ b/examples/websockets/qmlwebsocketclient/qml/qmlwebsocketclient/main.qml
diff --git a/examples/qmlwebsocketclient/qmlwebsocketclient.pro b/examples/websockets/qmlwebsocketclient/qmlwebsocketclient.pro
index e7dc82a..e7dc82a 100644
--- a/examples/qmlwebsocketclient/qmlwebsocketclient.pro
+++ b/examples/websockets/qmlwebsocketclient/qmlwebsocketclient.pro
diff --git a/examples/simplechat/chatclient.html b/examples/websockets/simplechat/chatclient.html
index 5b077f7..5b077f7 100644
--- a/examples/simplechat/chatclient.html
+++ b/examples/websockets/simplechat/chatclient.html
diff --git a/examples/simplechat/chatserver.cpp b/examples/websockets/simplechat/chatserver.cpp
index ba5c97c..ba5c97c 100644
--- a/examples/simplechat/chatserver.cpp
+++ b/examples/websockets/simplechat/chatserver.cpp
diff --git a/examples/simplechat/chatserver.h b/examples/websockets/simplechat/chatserver.h
index 41dad41..41dad41 100644
--- a/examples/simplechat/chatserver.h
+++ b/examples/websockets/simplechat/chatserver.h
diff --git a/examples/simplechat/main.cpp b/examples/websockets/simplechat/main.cpp
index a44f16e..a44f16e 100644
--- a/examples/simplechat/main.cpp
+++ b/examples/websockets/simplechat/main.cpp
diff --git a/examples/simplechat/simplechat.pro b/examples/websockets/simplechat/simplechat.pro
index 5cb6d4f..5cb6d4f 100644
--- a/examples/simplechat/simplechat.pro
+++ b/examples/websockets/simplechat/simplechat.pro
diff --git a/examples/sslechoclient/main.cpp b/examples/websockets/sslechoclient/main.cpp
index 228b37d..228b37d 100644
--- a/examples/sslechoclient/main.cpp
+++ b/examples/websockets/sslechoclient/main.cpp
diff --git a/examples/sslechoclient/sslechoclient.cpp b/examples/websockets/sslechoclient/sslechoclient.cpp
index 037990d..037990d 100644
--- a/examples/sslechoclient/sslechoclient.cpp
+++ b/examples/websockets/sslechoclient/sslechoclient.cpp
diff --git a/examples/sslechoclient/sslechoclient.h b/examples/websockets/sslechoclient/sslechoclient.h
index 7ec373b..7ec373b 100644
--- a/examples/sslechoclient/sslechoclient.h
+++ b/examples/websockets/sslechoclient/sslechoclient.h
diff --git a/examples/sslechoclient/sslechoclient.pro b/examples/websockets/sslechoclient/sslechoclient.pro
index 431301f..431301f 100644
--- a/examples/sslechoclient/sslechoclient.pro
+++ b/examples/websockets/sslechoclient/sslechoclient.pro
diff --git a/examples/sslechoserver/localhost.cert b/examples/websockets/sslechoserver/localhost.cert
index 7aa33a1..7aa33a1 100644
--- a/examples/sslechoserver/localhost.cert
+++ b/examples/websockets/sslechoserver/localhost.cert
diff --git a/examples/sslechoserver/localhost.key b/examples/websockets/sslechoserver/localhost.key
index dcc262c..dcc262c 100644
--- a/examples/sslechoserver/localhost.key
+++ b/examples/websockets/sslechoserver/localhost.key
diff --git a/examples/sslechoserver/main.cpp b/examples/websockets/sslechoserver/main.cpp
index 5b4ff4e..5b4ff4e 100644
--- a/examples/sslechoserver/main.cpp
+++ b/examples/websockets/sslechoserver/main.cpp
diff --git a/examples/sslechoserver/sslechoclient.html b/examples/websockets/sslechoserver/sslechoclient.html
index b9faa44..b9faa44 100644
--- a/examples/sslechoserver/sslechoclient.html
+++ b/examples/websockets/sslechoserver/sslechoclient.html
diff --git a/examples/sslechoserver/sslechoserver.cpp b/examples/websockets/sslechoserver/sslechoserver.cpp
index d93e5c6..d93e5c6 100644
--- a/examples/sslechoserver/sslechoserver.cpp
+++ b/examples/websockets/sslechoserver/sslechoserver.cpp
diff --git a/examples/sslechoserver/sslechoserver.h b/examples/websockets/sslechoserver/sslechoserver.h
index f4e9a9b..f4e9a9b 100644
--- a/examples/sslechoserver/sslechoserver.h
+++ b/examples/websockets/sslechoserver/sslechoserver.h
diff --git a/examples/sslechoserver/sslechoserver.pro b/examples/websockets/sslechoserver/sslechoserver.pro
index 2663872..2663872 100644
--- a/examples/sslechoserver/sslechoserver.pro
+++ b/examples/websockets/sslechoserver/sslechoserver.pro
diff --git a/examples/websockets/websockets.pro b/examples/websockets/websockets.pro
new file mode 100644
index 0000000..76a0e9f
--- /dev/null
+++ b/examples/websockets/websockets.pro
@@ -0,0 +1,12 @@
+TEMPLATE = subdirs
+
+SUBDIRS = echoclient \
+          echoserver \
+          simplechat
+qtHaveModule(quick): SUBDIRS += qmlwebsocketclient
+
+contains(QT_CONFIG, openssl) | contains(QT_CONFIG, openssl-linked) {
+SUBDIRS +=  \
+            sslechoserver \
+            sslechoclient
+}