diff options
author | Paul Wicking <paul.wicking@qt.io> | 2018-09-12 12:57:33 +0200 |
---|---|---|
committer | Paul Wicking <paul.wicking@qt.io> | 2018-09-14 03:56:22 +0000 |
commit | a62bab95d3adfcd6aab1f32d41750f0c1a5adfe3 (patch) | |
tree | 30a0f95d210d1d7369a3ee73c2785fd1c30f7e80 /examples | |
parent | 74700493c33bf8acc2973a6d151be209fd606655 (diff) |
Doc: Move touch examples around so they get included in docs
Task-number: QTBUG-59249
Change-Id: I71f1d2e28f0cadbad1d6bcf117198018eaf8e012
Reviewed-by: Topi Reiniƶ <topi.reinio@qt.io>
Diffstat (limited to 'examples')
-rw-r--r-- | examples/examples.pro | 3 | ||||
-rw-r--r-- | examples/widgets/touch/dials/dials.pro (renamed from examples/touch/dials/dials.pro) | 2 | ||||
-rw-r--r-- | examples/widgets/touch/dials/dials.ui (renamed from examples/touch/dials/dials.ui) | 0 | ||||
-rw-r--r-- | examples/widgets/touch/dials/doc/images/touch-dials-example.png (renamed from examples/touch/dials/doc/images/touch-dials-example.png) | bin | 17676 -> 17676 bytes | |||
-rw-r--r-- | examples/widgets/touch/dials/doc/src/touch-dials.qdoc (renamed from examples/touch/dials/doc/src/touch-dials.qdoc) | 2 | ||||
-rw-r--r-- | examples/widgets/touch/dials/main.cpp (renamed from examples/touch/dials/main.cpp) | 0 | ||||
-rw-r--r-- | examples/widgets/touch/fingerpaint/doc/src/fingerpaint.qdoc | 42 | ||||
-rw-r--r-- | examples/widgets/touch/fingerpaint/fingerpaint.pro (renamed from examples/touch/fingerpaint/fingerpaint.pro) | 2 | ||||
-rw-r--r-- | examples/widgets/touch/fingerpaint/main.cpp (renamed from examples/touch/fingerpaint/main.cpp) | 0 | ||||
-rw-r--r-- | examples/widgets/touch/fingerpaint/mainwindow.cpp (renamed from examples/touch/fingerpaint/mainwindow.cpp) | 0 | ||||
-rw-r--r-- | examples/widgets/touch/fingerpaint/mainwindow.h (renamed from examples/touch/fingerpaint/mainwindow.h) | 0 | ||||
-rw-r--r-- | examples/widgets/touch/fingerpaint/scribblearea.cpp (renamed from examples/touch/fingerpaint/scribblearea.cpp) | 0 | ||||
-rw-r--r-- | examples/widgets/touch/fingerpaint/scribblearea.h (renamed from examples/touch/fingerpaint/scribblearea.h) | 0 | ||||
-rw-r--r-- | examples/widgets/touch/knobs/doc/images/touch-knobs-example.png (renamed from examples/touch/knobs/doc/images/touch-knobs-example.png) | bin | 1290 -> 1290 bytes | |||
-rw-r--r-- | examples/widgets/touch/knobs/doc/src/touch-knobs.qdoc (renamed from examples/touch/knobs/doc/src/touch-knobs.qdoc) | 2 | ||||
-rw-r--r-- | examples/widgets/touch/knobs/knob.cpp (renamed from examples/touch/knobs/knob.cpp) | 0 | ||||
-rw-r--r-- | examples/widgets/touch/knobs/knob.h (renamed from examples/touch/knobs/knob.h) | 0 | ||||
-rw-r--r-- | examples/widgets/touch/knobs/knobs.pro (renamed from examples/touch/knobs/knobs.pro) | 2 | ||||
-rw-r--r-- | examples/widgets/touch/knobs/main.cpp (renamed from examples/touch/knobs/main.cpp) | 0 | ||||
-rw-r--r-- | examples/widgets/touch/pinchzoom/doc/images/pinch-zoom-example.png | bin | 0 -> 42493 bytes | |||
-rw-r--r-- | examples/widgets/touch/pinchzoom/doc/src/pinchzoom.qdoc | 38 | ||||
-rw-r--r-- | examples/widgets/touch/pinchzoom/graphicsview.cpp (renamed from examples/touch/pinchzoom/graphicsview.cpp) | 0 | ||||
-rw-r--r-- | examples/widgets/touch/pinchzoom/graphicsview.h (renamed from examples/touch/pinchzoom/graphicsview.h) | 0 | ||||
-rw-r--r-- | examples/widgets/touch/pinchzoom/images/cheese.jpg (renamed from examples/touch/pinchzoom/images/cheese.jpg) | bin | 3029 -> 3029 bytes | |||
-rw-r--r-- | examples/widgets/touch/pinchzoom/main.cpp (renamed from examples/touch/pinchzoom/main.cpp) | 0 | ||||
-rw-r--r-- | examples/widgets/touch/pinchzoom/mice.qrc (renamed from examples/touch/pinchzoom/mice.qrc) | 0 | ||||
-rw-r--r-- | examples/widgets/touch/pinchzoom/mouse.cpp (renamed from examples/touch/pinchzoom/mouse.cpp) | 0 | ||||
-rw-r--r-- | examples/widgets/touch/pinchzoom/mouse.h (renamed from examples/touch/pinchzoom/mouse.h) | 0 | ||||
-rw-r--r-- | examples/widgets/touch/pinchzoom/pinchzoom.pro (renamed from examples/touch/pinchzoom/pinchzoom.pro) | 2 | ||||
-rw-r--r-- | examples/widgets/touch/touch.pro (renamed from examples/touch/touch.pro) | 0 | ||||
-rw-r--r-- | examples/widgets/widgets.pro | 1 |
31 files changed, 88 insertions, 8 deletions
diff --git a/examples/examples.pro b/examples/examples.pro index 4ec5ca60e2..077e5828a9 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 index 2c522a46f0..0e823551cc 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 index 8ca7ae9475..8ca7ae9475 100644 --- a/examples/touch/dials/dials.ui +++ b/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 Binary files differindex 60e1776fc3..60e1776fc3 100644 --- a/examples/touch/dials/doc/images/touch-dials-example.png +++ b/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 index 10784c8c0d..dec8248efb 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 index 071f485de3..071f485de3 100644 --- a/examples/touch/dials/main.cpp +++ b/examples/widgets/touch/dials/main.cpp diff --git a/examples/widgets/touch/fingerpaint/doc/src/fingerpaint.qdoc b/examples/widgets/touch/fingerpaint/doc/src/fingerpaint.qdoc new file mode 100644 index 0000000000..6f8f636f86 --- /dev/null +++ b/examples/widgets/touch/fingerpaint/doc/src/fingerpaint.qdoc @@ -0,0 +1,42 @@ +/**************************************************************************** +** +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the documentation of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:FDL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU Free Documentation License Usage +** Alternatively, this file may be used under the terms of the GNU Free +** Documentation License version 1.3 as published by the Free Software +** Foundation and appearing in the file included in the packaging of +** this file. Please review the following information to ensure +** the GNU Free Documentation License version 1.3 requirements +** will be met: https://www.gnu.org/licenses/fdl-1.3.html. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +/*! + \example touch/fingerpaint + \title Finger Paint Example + \ingroup touchinputexamples + \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. + + \image touch-fingerpaint-example.png + + This example was specifically designed to work with a touchscreen, using + QTouchEvent instead of QMouseEvent to handle user input over the custom + widget. As a result, it is not possible to draw with the mouse cursor. +*/ diff --git a/examples/touch/fingerpaint/fingerpaint.pro b/examples/widgets/touch/fingerpaint/fingerpaint.pro index f196f7eed4..6370da6607 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 index e7ab8856b7..e7ab8856b7 100644 --- a/examples/touch/fingerpaint/main.cpp +++ b/examples/widgets/touch/fingerpaint/main.cpp diff --git a/examples/touch/fingerpaint/mainwindow.cpp b/examples/widgets/touch/fingerpaint/mainwindow.cpp index 0e45eea240..0e45eea240 100644 --- a/examples/touch/fingerpaint/mainwindow.cpp +++ b/examples/widgets/touch/fingerpaint/mainwindow.cpp diff --git a/examples/touch/fingerpaint/mainwindow.h b/examples/widgets/touch/fingerpaint/mainwindow.h index 47c339050e..47c339050e 100644 --- a/examples/touch/fingerpaint/mainwindow.h +++ b/examples/widgets/touch/fingerpaint/mainwindow.h diff --git a/examples/touch/fingerpaint/scribblearea.cpp b/examples/widgets/touch/fingerpaint/scribblearea.cpp index aa4e60c934..aa4e60c934 100644 --- a/examples/touch/fingerpaint/scribblearea.cpp +++ b/examples/widgets/touch/fingerpaint/scribblearea.cpp diff --git a/examples/touch/fingerpaint/scribblearea.h b/examples/widgets/touch/fingerpaint/scribblearea.h index 5138e3a1ab..5138e3a1ab 100644 --- a/examples/touch/fingerpaint/scribblearea.h +++ b/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 Binary files differindex 1cbd90d101..1cbd90d101 100644 --- a/examples/touch/knobs/doc/images/touch-knobs-example.png +++ b/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 index d39dd564b2..6da5992195 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 index 12aaa1e948..12aaa1e948 100644 --- a/examples/touch/knobs/knob.cpp +++ b/examples/widgets/touch/knobs/knob.cpp diff --git a/examples/touch/knobs/knob.h b/examples/widgets/touch/knobs/knob.h index c16b61d6f1..c16b61d6f1 100644 --- a/examples/touch/knobs/knob.h +++ b/examples/widgets/touch/knobs/knob.h diff --git a/examples/touch/knobs/knobs.pro b/examples/widgets/touch/knobs/knobs.pro index 267ba26167..0915b0665a 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 index ea0e857e7b..ea0e857e7b 100644 --- a/examples/touch/knobs/main.cpp +++ b/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 Binary files differnew file mode 100644 index 0000000000..7db51fbf55 --- /dev/null +++ b/examples/widgets/touch/pinchzoom/doc/images/pinch-zoom-example.png diff --git a/examples/widgets/touch/pinchzoom/doc/src/pinchzoom.qdoc b/examples/widgets/touch/pinchzoom/doc/src/pinchzoom.qdoc new file mode 100644 index 0000000000..61db2f96c5 --- /dev/null +++ b/examples/widgets/touch/pinchzoom/doc/src/pinchzoom.qdoc @@ -0,0 +1,38 @@ +/**************************************************************************** +** +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the documentation of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:FDL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU Free Documentation License Usage +** Alternatively, this file may be used under the terms of the GNU Free +** Documentation License version 1.3 as published by the Free Software +** Foundation and appearing in the file included in the packaging of +** this file. Please review the following information to ensure +** the GNU Free Documentation License version 1.3 requirements +** will be met: https://www.gnu.org/licenses/fdl-1.3.html. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +/*! + \example touch/pinchzoom + \title Pinch Zoom Example + \ingroup touchinputexamples + \brief Shows how to recognize a gesture. + + The Pinch Zoom example shows how to use low-level touch information + to recognize a gesture. + + \image touch-pinchzoom-example.png +*/ diff --git a/examples/touch/pinchzoom/graphicsview.cpp b/examples/widgets/touch/pinchzoom/graphicsview.cpp index 54e134aea2..54e134aea2 100644 --- a/examples/touch/pinchzoom/graphicsview.cpp +++ b/examples/widgets/touch/pinchzoom/graphicsview.cpp diff --git a/examples/touch/pinchzoom/graphicsview.h b/examples/widgets/touch/pinchzoom/graphicsview.h index d4e2e32d36..d4e2e32d36 100644 --- a/examples/touch/pinchzoom/graphicsview.h +++ b/examples/widgets/touch/pinchzoom/graphicsview.h diff --git a/examples/touch/pinchzoom/images/cheese.jpg b/examples/widgets/touch/pinchzoom/images/cheese.jpg Binary files differindex dea5795fd0..dea5795fd0 100644 --- a/examples/touch/pinchzoom/images/cheese.jpg +++ b/examples/widgets/touch/pinchzoom/images/cheese.jpg diff --git a/examples/touch/pinchzoom/main.cpp b/examples/widgets/touch/pinchzoom/main.cpp index 938432600f..938432600f 100644 --- a/examples/touch/pinchzoom/main.cpp +++ b/examples/widgets/touch/pinchzoom/main.cpp diff --git a/examples/touch/pinchzoom/mice.qrc b/examples/widgets/touch/pinchzoom/mice.qrc index accdb4d0a6..accdb4d0a6 100644 --- a/examples/touch/pinchzoom/mice.qrc +++ b/examples/widgets/touch/pinchzoom/mice.qrc diff --git a/examples/touch/pinchzoom/mouse.cpp b/examples/widgets/touch/pinchzoom/mouse.cpp index 1e6814be13..1e6814be13 100644 --- a/examples/touch/pinchzoom/mouse.cpp +++ b/examples/widgets/touch/pinchzoom/mouse.cpp diff --git a/examples/touch/pinchzoom/mouse.h b/examples/widgets/touch/pinchzoom/mouse.h index 870bfcd6c0..870bfcd6c0 100644 --- a/examples/touch/pinchzoom/mouse.h +++ b/examples/widgets/touch/pinchzoom/mouse.h diff --git a/examples/touch/pinchzoom/pinchzoom.pro b/examples/widgets/touch/pinchzoom/pinchzoom.pro index 9441cc1d92..ebbc7ddf1f 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 index 018ec134eb..018ec134eb 100644 --- a/examples/touch/touch.pro +++ b/examples/widgets/touch/touch.pro diff --git a/examples/widgets/widgets.pro b/examples/widgets/widgets.pro index f9d863b69e..8bd85bfe6b 100644 --- a/examples/widgets/widgets.pro +++ b/examples/widgets/widgets.pro @@ -19,6 +19,7 @@ SUBDIRS = \ scroller \ statemachine \ tools \ + touch \ tutorials \ widgets |