Merge remote-tracking branch 'origin/5.12' into dev

Change-Id: Ic3ffc44d61448a44353c004b9f6703786cc1b213

2 files changed, 0 insertions, 80 deletions

diff --git a/doc/src/examples/fingerpaint.qdoc b/doc/src/examples/fingerpaint.qdoc
deleted file mode 100644
index 79001ddc7d..0000000000
--- a/doc/src/examples/fingerpaint.qdoc
+++ /dev/null
@@ -1,42 +0,0 @@
-/****************************************************************************
-**
-** 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/doc/src/examples/pinchzoom.qdoc b/doc/src/examples/pinchzoom.qdoc
deleted file mode 100644
index 077e9c5ee3..0000000000
--- a/doc/src/examples/pinchzoom.qdoc
+++ /dev/null
@@ -1,38 +0,0 @@
-/****************************************************************************
-**
-** 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
-*/