diff options
| -rw-r--r-- | doc/src/qnamespace.qdoc | 3 | ||||
| -rw-r--r-- | src/gui/graphicsview/qgraphicsitem.cpp | 8 | ||||
| -rw-r--r-- | src/gui/graphicsview/qgraphicssceneevent.cpp | 5 | ||||
| -rw-r--r-- | src/gui/kernel/qapplication.cpp | 5 | ||||
| -rw-r--r-- | src/gui/kernel/qevent.cpp | 1 | ||||
| -rw-r--r-- | src/gui/kernel/qgesture.cpp | 2 | ||||
| -rw-r--r-- | src/gui/kernel/qgesturerecognizer.cpp | 2 | ||||
| -rw-r--r-- | src/gui/kernel/qwidget.cpp | 8 |
8 files changed, 33 insertions, 1 deletions
diff --git a/doc/src/qnamespace.qdoc b/doc/src/qnamespace.qdoc index ae0be1a..21aae2d 100644 --- a/doc/src/qnamespace.qdoc +++ b/doc/src/qnamespace.qdoc @@ -2677,6 +2677,7 @@ */ /*! \enum Qt::GestureType + \since 4.6 This enum lists standard gestures. @@ -2691,6 +2692,7 @@ /*! \enum Qt::GestureState + \since 4.6 This enum type describes the state of a gesture. @@ -2704,6 +2706,7 @@ /*! \enum Qt::DirectionType + \since 4.6 This enum type describes directions. This could be used by the gesture recognizers. diff --git a/src/gui/graphicsview/qgraphicsitem.cpp b/src/gui/graphicsview/qgraphicsitem.cpp index 3d2d1b6..e2b8115 100644 --- a/src/gui/graphicsview/qgraphicsitem.cpp +++ b/src/gui/graphicsview/qgraphicsitem.cpp @@ -5792,6 +5792,8 @@ QVariant QGraphicsItem::inputMethodQuery(Qt::InputMethodQuery query) const } /*! + \since 4.6 + Subscribes the graphics item to the specified \a gesture type. Returns the id of the gesture. @@ -5804,6 +5806,8 @@ int QGraphicsItem::grabGesture(Qt::GestureType gesture) } /*! + \since 4.6 + Subscribes the graphics item to the specified \a gesture type. Returns the id of the gesture. @@ -5820,6 +5824,8 @@ int QGraphicsItem::grabGesture(const QString &gesture) } /*! + \since 4.6 + Unsubscribes the graphics item from a gesture, which is specified by the \a gestureId. @@ -5834,6 +5840,8 @@ void QGraphicsItem::releaseGesture(int gestureId) } /*! + \since 4.6 + If \a enable is true, the gesture with the given \a gestureId is enabled; otherwise the gesture is disabled. diff --git a/src/gui/graphicsview/qgraphicssceneevent.cpp b/src/gui/graphicsview/qgraphicssceneevent.cpp index 9795fda..b599632 100644 --- a/src/gui/graphicsview/qgraphicssceneevent.cpp +++ b/src/gui/graphicsview/qgraphicssceneevent.cpp @@ -1711,8 +1711,9 @@ void QGraphicsSceneMoveEvent::setNewPos(const QPointF &pos) /*! \class QGraphicsSceneGestureEvent \brief The QGraphicsSceneGestureEvent class provides gesture events for - the graphics view framework. + the graphics view framework. \since 4.6 + \ingroup multimedia \ingroup graphicsview-api QGraphicsSceneGestureEvent extends information provided by @@ -1725,6 +1726,8 @@ void QGraphicsSceneMoveEvent::setNewPos(const QPointF &pos) The scene sends the event to the first QGraphicsItem under the mouse cursor that accepts gestures; a graphics item is set to accept gestures with \l{QGraphicsItem::}{grabGesture()}. + + \sa QGestureEvent */ /*! diff --git a/src/gui/kernel/qapplication.cpp b/src/gui/kernel/qapplication.cpp index ba105e0..e9a113e 100644 --- a/src/gui/kernel/qapplication.cpp +++ b/src/gui/kernel/qapplication.cpp @@ -5058,6 +5058,8 @@ bool QApplicationPrivate::shouldSetFocus(QWidget *w, Qt::FocusPolicy policy) } /*! + \since 4.6 + Adds custom gesture \a recognizer object. Qt takes ownership of the provided \a recognizer. @@ -5070,6 +5072,8 @@ void QApplication::addGestureRecognizer(QGestureRecognizer *recognizer) } /*! + \since 4.6 + Removes custom gesture \a recognizer object. \sa Qt::AA_EnableGestures, QGestureEvent @@ -5084,6 +5088,7 @@ void QApplication::removeGestureRecognizer(QGestureRecognizer *recognizer) /*! \property QApplication::eventDeliveryDelayForGestures + \since 4.6 Specifies the \a delay before input events are delivered to the gesture enabled widgets. diff --git a/src/gui/kernel/qevent.cpp b/src/gui/kernel/qevent.cpp index fa85bf2..4c31d33 100644 --- a/src/gui/kernel/qevent.cpp +++ b/src/gui/kernel/qevent.cpp @@ -3513,6 +3513,7 @@ QMenubarUpdatedEvent::QMenubarUpdatedEvent(QMenuBar * const menuBar) /*! \class QGestureEvent + \since 4.6 \ingroup events \brief The QGestureEvent class provides the parameters used for diff --git a/src/gui/kernel/qgesture.cpp b/src/gui/kernel/qgesture.cpp index 7437ed3..ac55521 100644 --- a/src/gui/kernel/qgesture.cpp +++ b/src/gui/kernel/qgesture.cpp @@ -48,6 +48,7 @@ QString qt_getStandardGestureTypeName(Qt::GestureType type); /*! \class QGesture + \since 4.6 \brief The QGesture class represents a gesture, containing all properties that describe a gesture. @@ -242,6 +243,7 @@ QPoint QGesture::pos() const /*! \class QPanningGesture + \since 4.6 \brief The QPanningGesture class represents a Pan gesture, providing additional information related to panning. diff --git a/src/gui/kernel/qgesturerecognizer.cpp b/src/gui/kernel/qgesturerecognizer.cpp index 6600bb0..41160cd 100644 --- a/src/gui/kernel/qgesturerecognizer.cpp +++ b/src/gui/kernel/qgesturerecognizer.cpp @@ -51,6 +51,7 @@ QString qt_getStandardGestureTypeName(Qt::GestureType gestureType); /*! \class QGestureRecognizer + \since 4.6 \brief The QGestureRecognizer class is the base class for implementing custom gestures. @@ -68,6 +69,7 @@ QString qt_getStandardGestureTypeName(Qt::GestureType gestureType); /*! \enum QGestureRecognizer::Result + \since 4.6 This enum type defines the state of the gesture recognizer. diff --git a/src/gui/kernel/qwidget.cpp b/src/gui/kernel/qwidget.cpp index 22c2ea7..1be4573 100644 --- a/src/gui/kernel/qwidget.cpp +++ b/src/gui/kernel/qwidget.cpp @@ -11024,6 +11024,8 @@ QWindowSurface *QWidget::windowSurface() const } /*! + \since 4.6 + Subscribes the widget to the specified \a gesture type. Returns the id of the gesture. @@ -11057,6 +11059,8 @@ bool QWidgetPrivate::releaseGesture(int gestureId) } /*! + \since 4.6 + Subscribes the widget to the specified \a gesture type. Returns the id of the gesture. @@ -11069,6 +11073,8 @@ int QWidget::grabGesture(Qt::GestureType gesture) } /*! + \since 4.6 + Unsubscribes the widget from a gesture, which is specified by the \a gestureId. @@ -11082,6 +11088,8 @@ void QWidget::releaseGesture(int gestureId) } /*! + \since 4.6 + If \a enable is true, the gesture with the given \a gestureId is enabled; otherwise the gesture is disabled. |