Move examples into 'websockets' folder

In the packaging process the content of all 'examples' folders are
copied together into one folder ... so modules are supposed to have
their submodule name as a sub-folder of 'examples'.

Change-Id: I9981b914e8268c932ca5a3d1c9fa73f8db0b6a5b
Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>

diff --git a/examples/examples.pro b/examples/examples.pro
index 76a0e9f..158e1ce 100644 (file)
--- 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
similarity index 100%
rename from examples/doc/echoclient.qdoc
rename to examples/websockets/doc/echoclient.qdoc

diff --git a/examples/doc/echoserver.qdoc b/examples/websockets/doc/echoserver.qdoc
similarity index 100%
rename from examples/doc/echoserver.qdoc
rename to examples/websockets/doc/echoserver.qdoc

diff --git a/examples/doc/examples.qdoc b/examples/websockets/doc/examples.qdoc
similarity index 100%
rename from examples/doc/examples.qdoc
rename to examples/websockets/doc/examples.qdoc

diff --git a/examples/doc/qmlwebsocketclient.qdoc b/examples/websockets/doc/qmlwebsocketclient.qdoc
similarity index 100%
rename from examples/doc/qmlwebsocketclient.qdoc
rename to examples/websockets/doc/qmlwebsocketclient.qdoc

diff --git a/examples/doc/simplechat.qdoc b/examples/websockets/doc/simplechat.qdoc
similarity index 100%
rename from examples/doc/simplechat.qdoc
rename to examples/websockets/doc/simplechat.qdoc

diff --git a/examples/doc/sslechoclient.qdoc b/examples/websockets/doc/sslechoclient.qdoc
similarity index 100%
rename from examples/doc/sslechoclient.qdoc
rename to examples/websockets/doc/sslechoclient.qdoc

diff --git a/examples/doc/sslechoserver.qdoc b/examples/websockets/doc/sslechoserver.qdoc
similarity index 100%
rename from examples/doc/sslechoserver.qdoc
rename to examples/websockets/doc/sslechoserver.qdoc

diff --git a/examples/echoclient/echoclient.cpp b/examples/websockets/echoclient/echoclient.cpp
similarity index 100%
rename from examples/echoclient/echoclient.cpp
rename to examples/websockets/echoclient/echoclient.cpp

diff --git a/examples/echoclient/echoclient.h b/examples/websockets/echoclient/echoclient.h
similarity index 100%
rename from examples/echoclient/echoclient.h
rename to examples/websockets/echoclient/echoclient.h

diff --git a/examples/echoclient/echoclient.pro b/examples/websockets/echoclient/echoclient.pro
similarity index 100%
rename from examples/echoclient/echoclient.pro
rename to examples/websockets/echoclient/echoclient.pro

diff --git a/examples/echoclient/main.cpp b/examples/websockets/echoclient/main.cpp
similarity index 100%
rename from examples/echoclient/main.cpp
rename to examples/websockets/echoclient/main.cpp

diff --git a/examples/echoserver/echoclient.html b/examples/websockets/echoserver/echoclient.html
similarity index 100%
rename from examples/echoserver/echoclient.html
rename to examples/websockets/echoserver/echoclient.html

diff --git a/examples/echoserver/echoserver.cpp b/examples/websockets/echoserver/echoserver.cpp
similarity index 100%
rename from examples/echoserver/echoserver.cpp
rename to examples/websockets/echoserver/echoserver.cpp

diff --git a/examples/echoserver/echoserver.h b/examples/websockets/echoserver/echoserver.h
similarity index 100%
rename from examples/echoserver/echoserver.h
rename to examples/websockets/echoserver/echoserver.h

diff --git a/examples/echoserver/echoserver.pro b/examples/websockets/echoserver/echoserver.pro
similarity index 100%
rename from examples/echoserver/echoserver.pro
rename to examples/websockets/echoserver/echoserver.pro

diff --git a/examples/echoserver/main.cpp b/examples/websockets/echoserver/main.cpp
similarity index 100%
rename from examples/echoserver/main.cpp
rename to examples/websockets/echoserver/main.cpp

diff --git a/examples/qmlwebsocketclient/data.qrc b/examples/websockets/qmlwebsocketclient/data.qrc
similarity index 100%
rename from examples/qmlwebsocketclient/data.qrc
rename to examples/websockets/qmlwebsocketclient/data.qrc

diff --git a/examples/qmlwebsocketclient/main.cpp b/examples/websockets/qmlwebsocketclient/main.cpp
similarity index 100%
rename from examples/qmlwebsocketclient/main.cpp
rename to examples/websockets/qmlwebsocketclient/main.cpp

diff --git a/examples/qmlwebsocketclient/qml/qmlwebsocketclient/main.qml b/examples/websockets/qmlwebsocketclient/qml/qmlwebsocketclient/main.qml
similarity index 100%
rename from examples/qmlwebsocketclient/qml/qmlwebsocketclient/main.qml
rename to examples/websockets/qmlwebsocketclient/qml/qmlwebsocketclient/main.qml

diff --git a/examples/qmlwebsocketclient/qmlwebsocketclient.pro b/examples/websockets/qmlwebsocketclient/qmlwebsocketclient.pro
similarity index 100%
rename from examples/qmlwebsocketclient/qmlwebsocketclient.pro
rename to examples/websockets/qmlwebsocketclient/qmlwebsocketclient.pro

diff --git a/examples/simplechat/chatclient.html b/examples/websockets/simplechat/chatclient.html
similarity index 100%
rename from examples/simplechat/chatclient.html
rename to examples/websockets/simplechat/chatclient.html

diff --git a/examples/simplechat/chatserver.cpp b/examples/websockets/simplechat/chatserver.cpp
similarity index 100%
rename from examples/simplechat/chatserver.cpp
rename to examples/websockets/simplechat/chatserver.cpp

diff --git a/examples/simplechat/chatserver.h b/examples/websockets/simplechat/chatserver.h
similarity index 100%
rename from examples/simplechat/chatserver.h
rename to examples/websockets/simplechat/chatserver.h

diff --git a/examples/simplechat/main.cpp b/examples/websockets/simplechat/main.cpp
similarity index 100%
rename from examples/simplechat/main.cpp
rename to examples/websockets/simplechat/main.cpp

diff --git a/examples/simplechat/simplechat.pro b/examples/websockets/simplechat/simplechat.pro
similarity index 100%
rename from examples/simplechat/simplechat.pro
rename to examples/websockets/simplechat/simplechat.pro

diff --git a/examples/sslechoclient/main.cpp b/examples/websockets/sslechoclient/main.cpp
similarity index 100%
rename from examples/sslechoclient/main.cpp
rename to examples/websockets/sslechoclient/main.cpp

diff --git a/examples/sslechoclient/sslechoclient.cpp b/examples/websockets/sslechoclient/sslechoclient.cpp
similarity index 100%
rename from examples/sslechoclient/sslechoclient.cpp
rename to examples/websockets/sslechoclient/sslechoclient.cpp

diff --git a/examples/sslechoclient/sslechoclient.h b/examples/websockets/sslechoclient/sslechoclient.h
similarity index 100%
rename from examples/sslechoclient/sslechoclient.h
rename to examples/websockets/sslechoclient/sslechoclient.h

diff --git a/examples/sslechoclient/sslechoclient.pro b/examples/websockets/sslechoclient/sslechoclient.pro
similarity index 100%
rename from examples/sslechoclient/sslechoclient.pro
rename to examples/websockets/sslechoclient/sslechoclient.pro

diff --git a/examples/sslechoserver/localhost.cert b/examples/websockets/sslechoserver/localhost.cert
similarity index 100%
rename from examples/sslechoserver/localhost.cert
rename to examples/websockets/sslechoserver/localhost.cert

diff --git a/examples/sslechoserver/localhost.key b/examples/websockets/sslechoserver/localhost.key
similarity index 100%
rename from examples/sslechoserver/localhost.key
rename to examples/websockets/sslechoserver/localhost.key

diff --git a/examples/sslechoserver/main.cpp b/examples/websockets/sslechoserver/main.cpp
similarity index 100%
rename from examples/sslechoserver/main.cpp
rename to examples/websockets/sslechoserver/main.cpp

diff --git a/examples/sslechoserver/sslechoclient.html b/examples/websockets/sslechoserver/sslechoclient.html
similarity index 100%
rename from examples/sslechoserver/sslechoclient.html
rename to examples/websockets/sslechoserver/sslechoclient.html

diff --git a/examples/sslechoserver/sslechoserver.cpp b/examples/websockets/sslechoserver/sslechoserver.cpp
similarity index 100%
rename from examples/sslechoserver/sslechoserver.cpp
rename to examples/websockets/sslechoserver/sslechoserver.cpp

diff --git a/examples/sslechoserver/sslechoserver.h b/examples/websockets/sslechoserver/sslechoserver.h
similarity index 100%
rename from examples/sslechoserver/sslechoserver.h
rename to examples/websockets/sslechoserver/sslechoserver.h

diff --git a/examples/sslechoserver/sslechoserver.pro b/examples/websockets/sslechoserver/sslechoserver.pro
similarity index 100%
rename from examples/sslechoserver/sslechoserver.pro
rename to examples/websockets/sslechoserver/sslechoserver.pro

diff --git a/examples/websockets/websockets.pro b/examples/websockets/websockets.pro
new file mode 100644 (file)
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
+}