summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
Diffstat (limited to 'doc')
-rw-r--r--doc/global/manifest-meta.qdocconf35
-rw-r--r--doc/global/qt-cpp-defines.qdocconf6
-rw-r--r--doc/src/examples/imagegestures.qdoc100
3 files changed, 7 insertions, 134 deletions
diff --git a/doc/global/manifest-meta.qdocconf b/doc/global/manifest-meta.qdocconf
index fb0f5c200b..516e810c21 100644
--- a/doc/global/manifest-meta.qdocconf
+++ b/doc/global/manifest-meta.qdocconf
@@ -77,12 +77,9 @@ manifestmeta.android.names = "QtQuick/Qt Quick Demo - Maroon*" \
"QtWidgets/Stickman Example" \
"QtWidgets/Move Blocks Example" \
"QtWidgets/Border Layout Example" \
- "QtWidgets/Dynamic Layouts Example" \
"QtWidgets/Flow Layout Example" \
- "QtWidgets/MDI Example" \
"QtWidgets/Dock Widgets Example" \
"QtWidgets/Recent Files Example" \
- "QtWidgets/Menus Example" \
"QtWidgets/Concentric Circles Example" \
"QtWidgets/Gradients" \
"QtWidgets/Font Sampler Example" \
@@ -90,38 +87,23 @@ manifestmeta.android.names = "QtQuick/Qt Quick Demo - Maroon*" \
"QtWidgets/Transformations Example" \
"QtWidgets/Syntax Highlighter Example" \
"QtWidgets/Calendar Example" \
- "QtWidgets/Movie Example" \
- "QtWidgets/Validators Example" \
"QtWidgets/Analog Clock Example" \
"QtWidgets/Calculator Example" \
"QtWidgets/Mouse Button Tester" \
"QtWidgets/Character Map Example" \
- "QtWidgets/Wiggly Example" \
"QtWidgets/Digital Clock Example" \
"QtWidgets/Elided Label Example" \
- "QtWidgets/Image Viewer Example" \
"QtWidgets/Sliders Example" \
"QtWidgets/Tetrix Example" \
"QtWidgets/Group Box Example" \
- "QtWidgets/Spin Boxes Example" \
"QtWidgets/Undo Framework" \
- "QtWidgets/Regular Expressions Example" \
"QtWidgets/Colliding Mice Example" \
- "QtWidgets/Basic Graphics Layouts Example" \
- "QtWidgets/40000 Chips" \
"QtWidgets/Diagram Scene Example" \
- "QtWidgets/Drag and Drop Robot Example" \
"QtWidgets/Elastic Nodes Example" \
- "QtWidgets/Pad Navigator Example" \
- "QtWidgets/Anchor Layout Example" \
"QtWidgets/Weather Anchor Layout Example" \
- "QtConcurrent/Image Scaling Example" \
- "QtConcurrent/QtConcurrent Progress Dialog Example" \
"QtNetwork/Torrent Example" \
"QtNetwork/Network Chat Example" \
"QtSQL/Master Detail Example" \
- "QtOpenGL/Cube OpenGL ES 2.0 example" \
- "QtOpenGL/Textures Example" \
"QtLinguist/Arrow Pad Example" \
"QtGui/Raster Window Example" \
"QtGui/Analog Clock Window Example" \
@@ -129,12 +111,16 @@ manifestmeta.android.names = "QtQuick/Qt Quick Demo - Maroon*" \
"QtMultimedia/QML Video Shader Effects Example" \
"QtMultimedia/QML Video Example" \
"QtMultimedia/QML Camera Example" \
- "QtMultimedia/Audio Output Example" \
"QtSVG/Text Object Example" \
"QtQML/Qt Quick Examples - XMLHttpRequest" \
"QtQuick/Qt Quick Particles Examples - *" \
"QtQuick/Qt Quick Examples - Touch Interaction" \
- "QtQuick/Scene Graph - *" \
+ "QtQuick/Scene Graph - Custom Geometry" \
+ "QtQuick/Scene Graph - Graph" \
+ "QtQuick/Scene Graph - OpenGL Under QML" \
+ "QtQuick/Scene Graph - Painted Item" \
+ "QtQuick/Scene Graph - Rendering FBOs" \
+ "QtQuick/Scene Graph - Simple Material" \
"QtQuick/Qt Quick Examples - Image Elements" \
"QtQuick/Qt Quick Examples - Key Interaction" \
"QtQuick/Qt Quick Examples - Text" \
@@ -147,21 +133,15 @@ manifestmeta.android.names = "QtQuick/Qt Quick Demo - Maroon*" \
"QtWidgets/Interview" \
"QtWidgets/Spreadsheet" \
"QtWidgets/Pixelator Example" \
- "QtWidgets/Class Wizard Example" \
"QtWidgets/Animated Tiles Example" \
- "QtWidgets/Basic Layouts Example" \
- "QtWidgets/Application Example" \
"QtWidgets/Affine Transformations" \
"QtWidgets/Image Composition Example" \
"QtWidgets/Basic Drawing Example" \
"QtWidgets/Vector Deformation" \
"QtWidgets/Painter Paths Example" \
- "QtWidgets/Text Edit" \
"QtWidgets/Style Sheet Example" \
"QtWidgets/Code Editor Example" \
- "QtWidgets/Window Flags Example" \
"QtWidgets/Scribble Example" \
- "QtWidgets/Shaped Clock Example" \
"QtWidgets/Line Edits Example" \
"QtWidgets/Calendar Widget Example" \
"QtWidgets/Completer Example" \
@@ -169,8 +149,7 @@ manifestmeta.android.names = "QtQuick/Qt Quick Demo - Maroon*" \
"QtQML/Extending QML - Grouped Properties Example" \
"QtQML/Extending QML - Methods Example" \
"QtQML/Extending QML - Signal Support Example" \
- "QtQML/Extending QML - Attached Properties Example" \
- "QtWidgets/Address Book Example"
+ "QtQML/Extending QML - Attached Properties Example"
manifestmeta.android.tags = android
diff --git a/doc/global/qt-cpp-defines.qdocconf b/doc/global/qt-cpp-defines.qdocconf
index 37fa5dbdcf..bbf1dda2e6 100644
--- a/doc/global/qt-cpp-defines.qdocconf
+++ b/doc/global/qt-cpp-defines.qdocconf
@@ -111,12 +111,6 @@ Cpp.ignoretokens += \
QT_FASTCALL \
QT_MUTEX_LOCK_NOEXCEPT \
QT_WIDGET_PLUGIN_EXPORT \
- QT_BEGIN_NAMESPACE_NFC \
- QT_END_NAMESPACE_NFC \
- QT_USE_NAMESPACE_NFC \
- QT_BEGIN_NAMESPACE_BLUETOOTH \
- QT_END_NAMESPACE_BLUETOOTH \
- QT_USE_NAMESPACE_BLUETOOTH \
QWEBKIT_EXPORT
Cpp.ignoredirectives += \
diff --git a/doc/src/examples/imagegestures.qdoc b/doc/src/examples/imagegestures.qdoc
deleted file mode 100644
index cb76ee83b1..0000000000
--- a/doc/src/examples/imagegestures.qdoc
+++ /dev/null
@@ -1,100 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** 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 Digia. For licensing terms and
-** conditions see http://qt.digia.com/licensing. For further information
-** use the contact form at http://qt.digia.com/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: http://www.gnu.org/copyleft/fdl.html.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-/*!
- \example gestures/imagegestures
- \title Image Gestures Example
-
- This example shows how to enable gestures for a widget and use gesture input
- to perform actions.
-
- We use two classes to create the user interface for the application: \c MainWidget
- and \c ImageWidget. The \c MainWidget class is simply used as a container for the
- \c ImageWidget class, which we will configure to accept gesture input. Since we
- are interested in the way gestures are used, we will concentrate on the
- implementation of the \c ImageWidget class.
-
- \section1 ImageWidget Class Definition
-
- The \c ImageWidget class is a simple QWidget subclass that reimplements the general
- QWidget::event() handler function in addition to several more specific event handlers:
-
- \snippet examples/gestures/imagegestures/imagewidget.h class definition begin
- \dots
- \snippet examples/gestures/imagegestures/imagewidget.h class definition end
-
- We also implement a private helper function, \c gestureEvent(), to help manage
- gesture events delivered to the widget, and three functions to perform actions
- based on gestures: \c panTriggered(), \c pinchTriggered() and \c swipeTriggered().
-
- \section1 ImageWidget Class Implementation
-
- In the widget's constructor, we begin by setting up various parameters that will
- be used to control the way images are displayed.
-
- \snippet examples/gestures/imagegestures/imagewidget.cpp constructor
-
- We enable three of the standard gestures for the widget by calling QWidget::grabGesture()
- with the types of gesture we need. These will be recognized by the application's
- default gesture recognizer, and events will be delivered to our widget.
-
- Since QWidget does not define a specific event handler for gestures, the widget
- needs to reimplement the general QWidget::event() to receive gesture events.
-
- \snippet examples/gestures/imagegestures/imagewidget.cpp event handler
-
- We implement the event handler to delegate gesture events to a private function
- specifically written for the task, and pass all other events to QWidget's
- implementation.
-
- The \c gestureHandler() function examines the gestures supplied by the
- newly-delivered QGestureEvent. Since only one gesture of a given type can be
- used on a widget at any particular time, we can check for each gesture type
- using the QGestureEvent::gesture() function:
-
- \snippet examples/gestures/imagegestures/imagewidget.cpp gesture event handler
-
- If a QGesture object is supplied for a certain type of gesture, we call a special
- purpose function to deal with it, casting the gesture object to the appropriate
- QGesture subclass.
-
- To illustrate how a standard gesture can be interpreted by an application, we
- show the implementation of the \c swipeTriggered() function, which handles the
- gesture associated with a brushing or swiping motion on the user's display or
- input device:
-
- \snippet examples/gestures/imagegestures/imagewidget.cpp swipe function
-
- The QSwipeGesture class provides specialized functions and defines a enum
- to make it more convenient for developers to discover which direction, if
- any, the user swiped the display. Here, we simply navigate to the previous
- image in the collection if the user swiped upwards or to the left; otherwise
- we navigate to the next image in the collection.
-
- The other gestures are also handled by special purpose functions, but use
- the values of properties held by the QGesture object passed to them.
-*/
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-21 17:23:30 +0000