Move example folders to the 'coap' subdirectory

Change-Id: Iebded58e8cfd307cd54fc3bdcca3a1002aa21bd4 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
2019-04-15 10:29:08 +02:00 · 2019-04-15 10:29:08 +02:00 · 8b9b59f09f
parent 551e79f4be
commit 8b9b59f09f
20 changed files with 9 additions and 8 deletions
--- a/examples/coap/coap.pro
+++ b/examples/coap/coap.pro
@ -0,0 +1,5 @@
+TEMPLATE = subdirs
+
+SUBDIRS += \
+    simplecoapclient \
+    consolecoapclient
--- a/examples/coap/consolecoapclient/coaphandler.cpp
+++ b/examples/coap/consolecoapclient/coaphandler.cpp
--- a/examples/coap/consolecoapclient/coaphandler.h
+++ b/examples/coap/consolecoapclient/coaphandler.h
--- a/examples/coap/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
--- a/examples/coap/consolecoapclient/main.cpp
+++ b/examples/coap/consolecoapclient/main.cpp
--- a/examples/coap/doc/consolecoapclient.qdoc
+++ b/examples/coap/doc/consolecoapclient.qdoc
--- a/examples/coap/doc/examples.qdoc
+++ b/examples/coap/doc/examples.qdoc
--- a/examples/coap/doc/quickmulticastclient.qdoc
+++ b/examples/coap/doc/quickmulticastclient.qdoc
--- a/examples/coap/doc/quicksecureclient.qdoc
+++ b/examples/coap/doc/quicksecureclient.qdoc
--- a/examples/coap/doc/simplecoapclient.qdoc
+++ b/examples/coap/doc/simplecoapclient.qdoc
--- a/examples/coap/simplecoapclient/main.cpp
+++ b/examples/coap/simplecoapclient/main.cpp
--- a/examples/coap/simplecoapclient/mainwindow.cpp
+++ b/examples/coap/simplecoapclient/mainwindow.cpp
--- a/examples/coap/simplecoapclient/mainwindow.h
+++ b/examples/coap/simplecoapclient/mainwindow.h
--- a/examples/coap/simplecoapclient/mainwindow.ui
+++ b/examples/coap/simplecoapclient/mainwindow.ui
--- a/examples/coap/simplecoapclient/optiondialog.cpp
+++ b/examples/coap/simplecoapclient/optiondialog.cpp
--- a/examples/coap/simplecoapclient/optiondialog.h
+++ b/examples/coap/simplecoapclient/optiondialog.h
--- a/examples/coap/simplecoapclient/optiondialog.ui
+++ b/examples/coap/simplecoapclient/optiondialog.ui
--- a/examples/coap/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
--- a/examples/examples.pro
+++ b/examples/examples.pro
@ -1,6 +1,2 @@
 TEMPLATE = subdirs
-CONFIG += no_docs_target
-
-SUBDIRS += \
-    simplecoapclient \
-    consolecoapclient
+SUBDIRS += coap
--- 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