diff --git a/examples/examples.pro b/examples/examples.pro index 4ec5ca60e2a..077e5828a93 100644 --- a/examples/examples.pro +++ b/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 diff --git a/examples/touch/dials/dials.pro b/examples/widgets/touch/dials/dials.pro similarity index 58% rename from examples/touch/dials/dials.pro rename to examples/widgets/touch/dials/dials.pro index 2c522a46f03..0e823551cc9 100644 --- a/examples/touch/dials/dials.pro +++ b/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 diff --git a/examples/touch/dials/dials.ui b/examples/widgets/touch/dials/dials.ui similarity index 100% rename from examples/touch/dials/dials.ui rename to examples/widgets/touch/dials/dials.ui diff --git a/examples/touch/dials/doc/images/touch-dials-example.png b/examples/widgets/touch/dials/doc/images/touch-dials-example.png similarity index 100% rename from examples/touch/dials/doc/images/touch-dials-example.png rename to examples/widgets/touch/dials/doc/images/touch-dials-example.png diff --git a/examples/touch/dials/doc/src/touch-dials.qdoc b/examples/widgets/touch/dials/doc/src/touch-dials.qdoc similarity index 99% rename from examples/touch/dials/doc/src/touch-dials.qdoc rename to examples/widgets/touch/dials/doc/src/touch-dials.qdoc index 10784c8c0dc..dec8248efb2 100644 --- a/examples/touch/dials/doc/src/touch-dials.qdoc +++ b/examples/widgets/touch/dials/doc/src/touch-dials.qdoc @@ -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. diff --git a/examples/touch/dials/main.cpp b/examples/widgets/touch/dials/main.cpp similarity index 100% rename from examples/touch/dials/main.cpp rename to examples/widgets/touch/dials/main.cpp diff --git a/doc/src/examples/fingerpaint.qdoc b/examples/widgets/touch/fingerpaint/doc/src/fingerpaint.qdoc similarity index 99% rename from doc/src/examples/fingerpaint.qdoc rename to examples/widgets/touch/fingerpaint/doc/src/fingerpaint.qdoc index 79001ddc7db..6f8f636f86d 100644 --- a/doc/src/examples/fingerpaint.qdoc +++ b/examples/widgets/touch/fingerpaint/doc/src/fingerpaint.qdoc @@ -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. diff --git a/examples/touch/fingerpaint/fingerpaint.pro b/examples/widgets/touch/fingerpaint/fingerpaint.pro similarity index 81% rename from examples/touch/fingerpaint/fingerpaint.pro rename to examples/widgets/touch/fingerpaint/fingerpaint.pro index f196f7eed44..6370da6607f 100644 --- a/examples/touch/fingerpaint/fingerpaint.pro +++ b/examples/widgets/touch/fingerpaint/fingerpaint.pro @@ -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 diff --git a/examples/touch/fingerpaint/main.cpp b/examples/widgets/touch/fingerpaint/main.cpp similarity index 100% rename from examples/touch/fingerpaint/main.cpp rename to examples/widgets/touch/fingerpaint/main.cpp diff --git a/examples/touch/fingerpaint/mainwindow.cpp b/examples/widgets/touch/fingerpaint/mainwindow.cpp similarity index 100% rename from examples/touch/fingerpaint/mainwindow.cpp rename to examples/widgets/touch/fingerpaint/mainwindow.cpp diff --git a/examples/touch/fingerpaint/mainwindow.h b/examples/widgets/touch/fingerpaint/mainwindow.h similarity index 100% rename from examples/touch/fingerpaint/mainwindow.h rename to examples/widgets/touch/fingerpaint/mainwindow.h diff --git a/examples/touch/fingerpaint/scribblearea.cpp b/examples/widgets/touch/fingerpaint/scribblearea.cpp similarity index 100% rename from examples/touch/fingerpaint/scribblearea.cpp rename to examples/widgets/touch/fingerpaint/scribblearea.cpp diff --git a/examples/touch/fingerpaint/scribblearea.h b/examples/widgets/touch/fingerpaint/scribblearea.h similarity index 100% rename from examples/touch/fingerpaint/scribblearea.h rename to examples/widgets/touch/fingerpaint/scribblearea.h diff --git a/examples/touch/knobs/doc/images/touch-knobs-example.png b/examples/widgets/touch/knobs/doc/images/touch-knobs-example.png similarity index 100% rename from examples/touch/knobs/doc/images/touch-knobs-example.png rename to examples/widgets/touch/knobs/doc/images/touch-knobs-example.png diff --git a/examples/touch/knobs/doc/src/touch-knobs.qdoc b/examples/widgets/touch/knobs/doc/src/touch-knobs.qdoc similarity index 99% rename from examples/touch/knobs/doc/src/touch-knobs.qdoc rename to examples/widgets/touch/knobs/doc/src/touch-knobs.qdoc index d39dd564b21..6da5992195d 100644 --- a/examples/touch/knobs/doc/src/touch-knobs.qdoc +++ b/examples/widgets/touch/knobs/doc/src/touch-knobs.qdoc @@ -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. diff --git a/examples/touch/knobs/knob.cpp b/examples/widgets/touch/knobs/knob.cpp similarity index 100% rename from examples/touch/knobs/knob.cpp rename to examples/widgets/touch/knobs/knob.cpp diff --git a/examples/touch/knobs/knob.h b/examples/widgets/touch/knobs/knob.h similarity index 100% rename from examples/touch/knobs/knob.h rename to examples/widgets/touch/knobs/knob.h diff --git a/examples/touch/knobs/knobs.pro b/examples/widgets/touch/knobs/knobs.pro similarity index 60% rename from examples/touch/knobs/knobs.pro rename to examples/widgets/touch/knobs/knobs.pro index 267ba26167e..0915b0665ad 100644 --- a/examples/touch/knobs/knobs.pro +++ b/examples/widgets/touch/knobs/knobs.pro @@ -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 diff --git a/examples/touch/knobs/main.cpp b/examples/widgets/touch/knobs/main.cpp similarity index 100% rename from examples/touch/knobs/main.cpp rename to examples/widgets/touch/knobs/main.cpp diff --git a/examples/widgets/touch/pinchzoom/doc/images/pinch-zoom-example.png b/examples/widgets/touch/pinchzoom/doc/images/pinch-zoom-example.png new file mode 100644 index 00000000000..7db51fbf55d Binary files /dev/null and b/examples/widgets/touch/pinchzoom/doc/images/pinch-zoom-example.png differ diff --git a/doc/src/examples/pinchzoom.qdoc b/examples/widgets/touch/pinchzoom/doc/src/pinchzoom.qdoc similarity index 97% rename from doc/src/examples/pinchzoom.qdoc rename to examples/widgets/touch/pinchzoom/doc/src/pinchzoom.qdoc index 077e9c5ee37..61db2f96c5c 100644 --- a/doc/src/examples/pinchzoom.qdoc +++ b/examples/widgets/touch/pinchzoom/doc/src/pinchzoom.qdoc @@ -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. diff --git a/examples/touch/pinchzoom/graphicsview.cpp b/examples/widgets/touch/pinchzoom/graphicsview.cpp similarity index 100% rename from examples/touch/pinchzoom/graphicsview.cpp rename to examples/widgets/touch/pinchzoom/graphicsview.cpp diff --git a/examples/touch/pinchzoom/graphicsview.h b/examples/widgets/touch/pinchzoom/graphicsview.h similarity index 100% rename from examples/touch/pinchzoom/graphicsview.h rename to examples/widgets/touch/pinchzoom/graphicsview.h diff --git a/examples/touch/pinchzoom/images/cheese.jpg b/examples/widgets/touch/pinchzoom/images/cheese.jpg similarity index 100% rename from examples/touch/pinchzoom/images/cheese.jpg rename to examples/widgets/touch/pinchzoom/images/cheese.jpg diff --git a/examples/touch/pinchzoom/main.cpp b/examples/widgets/touch/pinchzoom/main.cpp similarity index 100% rename from examples/touch/pinchzoom/main.cpp rename to examples/widgets/touch/pinchzoom/main.cpp diff --git a/examples/touch/pinchzoom/mice.qrc b/examples/widgets/touch/pinchzoom/mice.qrc similarity index 100% rename from examples/touch/pinchzoom/mice.qrc rename to examples/widgets/touch/pinchzoom/mice.qrc diff --git a/examples/touch/pinchzoom/mouse.cpp b/examples/widgets/touch/pinchzoom/mouse.cpp similarity index 100% rename from examples/touch/pinchzoom/mouse.cpp rename to examples/widgets/touch/pinchzoom/mouse.cpp diff --git a/examples/touch/pinchzoom/mouse.h b/examples/widgets/touch/pinchzoom/mouse.h similarity index 100% rename from examples/touch/pinchzoom/mouse.h rename to examples/widgets/touch/pinchzoom/mouse.h diff --git a/examples/touch/pinchzoom/pinchzoom.pro b/examples/widgets/touch/pinchzoom/pinchzoom.pro similarity index 75% rename from examples/touch/pinchzoom/pinchzoom.pro rename to examples/widgets/touch/pinchzoom/pinchzoom.pro index 9441cc1d92e..ebbc7ddf1f2 100644 --- a/examples/touch/pinchzoom/pinchzoom.pro +++ b/examples/widgets/touch/pinchzoom/pinchzoom.pro @@ -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 diff --git a/examples/touch/touch.pro b/examples/widgets/touch/touch.pro similarity index 100% rename from examples/touch/touch.pro rename to examples/widgets/touch/touch.pro diff --git a/examples/widgets/widgets.pro b/examples/widgets/widgets.pro index f9d863b69ef..8bd85bfe6b5 100644 --- a/examples/widgets/widgets.pro +++ b/examples/widgets/widgets.pro @@ -19,6 +19,7 @@ SUBDIRS = \ scroller \ statemachine \ tools \ + touch \ tutorials \ widgets