From 8b9b59f09f8f2edd053394540794dc6f755dfbd4 Mon Sep 17 00:00:00 2001 From: Sona Kurazyan Date: Mon, 15 Apr 2019 10:29:08 +0200 Subject: [PATCH] Move example folders to the 'coap' subdirectory Change-Id: Iebded58e8cfd307cd54fc3bdcca3a1002aa21bd4 Reviewed-by: Alex Blasche --- examples/coap/coap.pro | 5 +++++ examples/{ => coap}/consolecoapclient/coaphandler.cpp | 0 examples/{ => coap}/consolecoapclient/coaphandler.h | 0 examples/{ => coap}/consolecoapclient/consolecoapclient.pro | 2 +- examples/{ => coap}/consolecoapclient/main.cpp | 0 examples/{ => coap}/doc/consolecoapclient.qdoc | 0 examples/{ => coap}/doc/examples.qdoc | 0 examples/{ => coap}/doc/quickmulticastclient.qdoc | 0 examples/{ => coap}/doc/quicksecureclient.qdoc | 0 examples/{ => coap}/doc/simplecoapclient.qdoc | 0 examples/{ => coap}/simplecoapclient/main.cpp | 0 examples/{ => coap}/simplecoapclient/mainwindow.cpp | 0 examples/{ => coap}/simplecoapclient/mainwindow.h | 0 examples/{ => coap}/simplecoapclient/mainwindow.ui | 0 examples/{ => coap}/simplecoapclient/optiondialog.cpp | 0 examples/{ => coap}/simplecoapclient/optiondialog.h | 0 examples/{ => coap}/simplecoapclient/optiondialog.ui | 0 examples/{ => coap}/simplecoapclient/simplecoapclient.pro | 2 +- examples/examples.pro | 6 +----- src/coap/doc/qtcoap.qdocconf | 2 +- 20 files changed, 9 insertions(+), 8 deletions(-) create mode 100644 examples/coap/coap.pro rename examples/{ => coap}/consolecoapclient/coaphandler.cpp (100%) rename examples/{ => coap}/consolecoapclient/coaphandler.h (100%) rename examples/{ => coap}/consolecoapclient/consolecoapclient.pro (71%) rename examples/{ => coap}/consolecoapclient/main.cpp (100%) rename examples/{ => coap}/doc/consolecoapclient.qdoc (100%) rename examples/{ => coap}/doc/examples.qdoc (100%) rename examples/{ => coap}/doc/quickmulticastclient.qdoc (100%) rename examples/{ => coap}/doc/quicksecureclient.qdoc (100%) rename examples/{ => coap}/doc/simplecoapclient.qdoc (100%) rename examples/{ => coap}/simplecoapclient/main.cpp (100%) rename examples/{ => coap}/simplecoapclient/mainwindow.cpp (100%) rename examples/{ => coap}/simplecoapclient/mainwindow.h (100%) rename examples/{ => coap}/simplecoapclient/mainwindow.ui (100%) rename examples/{ => coap}/simplecoapclient/optiondialog.cpp (100%) rename examples/{ => coap}/simplecoapclient/optiondialog.h (100%) rename examples/{ => coap}/simplecoapclient/optiondialog.ui (100%) rename examples/{ => coap}/simplecoapclient/simplecoapclient.pro (94%) diff --git a/examples/coap/coap.pro b/examples/coap/coap.pro new file mode 100644 index 0000000..0a8f1c3 --- /dev/null +++ b/examples/coap/coap.pro @@ -0,0 +1,5 @@ +TEMPLATE = subdirs + +SUBDIRS += \ + simplecoapclient \ + consolecoapclient diff --git a/examples/consolecoapclient/coaphandler.cpp b/examples/coap/consolecoapclient/coaphandler.cpp similarity index 100% rename from examples/consolecoapclient/coaphandler.cpp rename to examples/coap/consolecoapclient/coaphandler.cpp diff --git a/examples/consolecoapclient/coaphandler.h b/examples/coap/consolecoapclient/coaphandler.h similarity index 100% rename from examples/consolecoapclient/coaphandler.h rename to examples/coap/consolecoapclient/coaphandler.h diff --git a/examples/consolecoapclient/consolecoapclient.pro b/examples/coap/consolecoapclient/consolecoapclient.pro similarity index 71% rename from examples/consolecoapclient/consolecoapclient.pro rename to examples/coap/consolecoapclient/consolecoapclient.pro index f594a16..9d271ed 100644 --- a/examples/consolecoapclient/consolecoapclient.pro +++ b/examples/coap/consolecoapclient/consolecoapclient.pro @@ -10,5 +10,5 @@ SOURCES += main.cpp \ coaphandler.cpp # install -target.path = $$[QT_INSTALL_EXAMPLES]/consolecoapclient +target.path = $$[QT_INSTALL_EXAMPLES]/coap/consolecoapclient INSTALLS += target diff --git a/examples/consolecoapclient/main.cpp b/examples/coap/consolecoapclient/main.cpp similarity index 100% rename from examples/consolecoapclient/main.cpp rename to examples/coap/consolecoapclient/main.cpp diff --git a/examples/doc/consolecoapclient.qdoc b/examples/coap/doc/consolecoapclient.qdoc similarity index 100% rename from examples/doc/consolecoapclient.qdoc rename to examples/coap/doc/consolecoapclient.qdoc diff --git a/examples/doc/examples.qdoc b/examples/coap/doc/examples.qdoc similarity index 100% rename from examples/doc/examples.qdoc rename to examples/coap/doc/examples.qdoc diff --git a/examples/doc/quickmulticastclient.qdoc b/examples/coap/doc/quickmulticastclient.qdoc similarity index 100% rename from examples/doc/quickmulticastclient.qdoc rename to examples/coap/doc/quickmulticastclient.qdoc diff --git a/examples/doc/quicksecureclient.qdoc b/examples/coap/doc/quicksecureclient.qdoc similarity index 100% rename from examples/doc/quicksecureclient.qdoc rename to examples/coap/doc/quicksecureclient.qdoc diff --git a/examples/doc/simplecoapclient.qdoc b/examples/coap/doc/simplecoapclient.qdoc similarity index 100% rename from examples/doc/simplecoapclient.qdoc rename to examples/coap/doc/simplecoapclient.qdoc diff --git a/examples/simplecoapclient/main.cpp b/examples/coap/simplecoapclient/main.cpp similarity index 100% rename from examples/simplecoapclient/main.cpp rename to examples/coap/simplecoapclient/main.cpp diff --git a/examples/simplecoapclient/mainwindow.cpp b/examples/coap/simplecoapclient/mainwindow.cpp similarity index 100% rename from examples/simplecoapclient/mainwindow.cpp rename to examples/coap/simplecoapclient/mainwindow.cpp diff --git a/examples/simplecoapclient/mainwindow.h b/examples/coap/simplecoapclient/mainwindow.h similarity index 100% rename from examples/simplecoapclient/mainwindow.h rename to examples/coap/simplecoapclient/mainwindow.h diff --git a/examples/simplecoapclient/mainwindow.ui b/examples/coap/simplecoapclient/mainwindow.ui similarity index 100% rename from examples/simplecoapclient/mainwindow.ui rename to examples/coap/simplecoapclient/mainwindow.ui diff --git a/examples/simplecoapclient/optiondialog.cpp b/examples/coap/simplecoapclient/optiondialog.cpp similarity index 100% rename from examples/simplecoapclient/optiondialog.cpp rename to examples/coap/simplecoapclient/optiondialog.cpp diff --git a/examples/simplecoapclient/optiondialog.h b/examples/coap/simplecoapclient/optiondialog.h similarity index 100% rename from examples/simplecoapclient/optiondialog.h rename to examples/coap/simplecoapclient/optiondialog.h diff --git a/examples/simplecoapclient/optiondialog.ui b/examples/coap/simplecoapclient/optiondialog.ui similarity index 100% rename from examples/simplecoapclient/optiondialog.ui rename to examples/coap/simplecoapclient/optiondialog.ui diff --git a/examples/simplecoapclient/simplecoapclient.pro b/examples/coap/simplecoapclient/simplecoapclient.pro similarity index 94% rename from examples/simplecoapclient/simplecoapclient.pro rename to examples/coap/simplecoapclient/simplecoapclient.pro index 16fa118..d83d7b3 100644 --- a/examples/simplecoapclient/simplecoapclient.pro +++ b/examples/coap/simplecoapclient/simplecoapclient.pro @@ -29,5 +29,5 @@ FORMS += \ mainwindow.ui \ optiondialog.ui -target.path = $$[QT_INSTALL_EXAMPLES]/simplecoapclient +target.path = $$[QT_INSTALL_EXAMPLES]/coap/simplecoapclient INSTALLS += target diff --git a/examples/examples.pro b/examples/examples.pro index 5c76612..30a3c0f 100644 --- a/examples/examples.pro +++ b/examples/examples.pro @@ -1,6 +1,2 @@ TEMPLATE = subdirs -CONFIG += no_docs_target - -SUBDIRS += \ - simplecoapclient \ - consolecoapclient +SUBDIRS += coap diff --git a/src/coap/doc/qtcoap.qdocconf b/src/coap/doc/qtcoap.qdocconf index d805d62..1ef01b8 100644 --- a/src/coap/doc/qtcoap.qdocconf +++ b/src/coap/doc/qtcoap.qdocconf @@ -31,7 +31,7 @@ qhp.QtCoap.subprojects.examples.sortPages = true headerdirs += .. sourcedirs += .. -exampledirs = ../../../examples +exampledirs = ../../../examples/coap excludedirs += ../qt4support Cpp.ignoretokens += Q_COAP_EXPORT