Doc: Move touch examples around so they get included in docs

Task-number: QTBUG-59249
Change-Id: I71f1d2e28f0cadbad1d6bcf117198018eaf8e012
Reviewed-by: Topi Reiniö <[email protected]>

Author: paulwicking

examples/examples.pro

@@ -4,8 +4,7 @@ CONFIG += no_docs_target
 SUBDIRS = \
     corelib \
     embedded \
-    qpa \
-    touch
+    qpa
 
 qtHaveModule(dbus): SUBDIRS += dbus
 qtHaveModule(network): SUBDIRS += network

examples/touch/dials/dials.pro examples/widgets/touch/dials/dials.pro

@@ -4,5 +4,5 @@ SOURCES += main.cpp
 FORMS += dials.ui
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/touch/dials
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/touch/dials
 INSTALLS += target

examples/touch/dials/dials.ui examples/widgets/touch/dials/dials.ui

@@ -29,7 +29,7 @@
     \example touch/dials
     \title Touch Dials Example
     \ingroup touchinputexamples
-    \brief Shows how to apply touch to a set of standard Qt widgets
+    \brief Shows how to apply touch to a set of standard Qt widgets.
 
     The Touch Dials example shows how to apply touch to a set of
     standard Qt widgets.

examples/touch/dials/doc/images/touch-dials-example.png examples/widgets/touch/dials/doc/images/touch-dials-example.png

@@ -29,7 +29,7 @@
     \example touch/fingerpaint
     \title Finger Paint Example
     \ingroup touchinputexamples
-    \brief Shows the use of a touchscreen to make a simple painting application
+    \brief Shows the use of a touchscreen to make a simple painting application.
 
     The Finger Paint example shows the use of a touchscreen with a custom widget
     to create a simple painting application.

examples/touch/dials/doc/src/touch-dials.qdoc examples/widgets/touch/dials/doc/src/touch-dials.qdoc

@@ -9,5 +9,5 @@ SOURCES       = main.cpp \
                 scribblearea.cpp
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/touch/fingerpaint
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/touch/fingerpaint
 INSTALLS += target

examples/touch/dials/main.cpp examples/widgets/touch/dials/main.cpp

@@ -29,7 +29,7 @@
     \example touch/knobs
     \title Touch Knobs Example
     \ingroup touchinputexamples
-    \brief Shows how to create custom controls that accept touch input
+    \brief Shows how to create custom controls that accept touch input.
 
     The Touch Knobs example shows how to create custom controls that
     accept touch input.

doc/src/examples/fingerpaint.qdoc examples/widgets/touch/fingerpaint/doc/src/fingerpaint.qdoc

@@ -4,5 +4,5 @@ HEADERS = knob.h
 SOURCES = main.cpp knob.cpp
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/touch/knobs
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/touch/knobs
 INSTALLS += target

examples/touch/fingerpaint/fingerpaint.pro examples/widgets/touch/fingerpaint/fingerpaint.pro

@@ -29,7 +29,7 @@
     \example touch/pinchzoom
     \title Pinch Zoom Example
     \ingroup touchinputexamples
-    \brief Shows how to recognize a gesture
+    \brief Shows how to recognize a gesture.
 
     The Pinch Zoom example shows how to use low-level touch information
     to recognize a gesture.

examples/touch/fingerpaint/main.cpp examples/widgets/touch/fingerpaint/main.cpp

@@ -12,5 +12,5 @@ RESOURCES += \
 	mice.qrc
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/touch/pinchzoom
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/touch/pinchzoom
 INSTALLS += target

examples/touch/fingerpaint/mainwindow.cpp examples/widgets/touch/fingerpaint/mainwindow.cpp

@@ -19,6 +19,7 @@ SUBDIRS       = \
                 scroller \
                 statemachine \
                 tools \
+                touch \
                 tutorials \
                 widgets