diff options
author | Martin Smith <martin.smith@digia.com> | 2013-10-01 13:03:28 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-10-02 14:40:01 +0200 |
commit | 4706b1ceff9af9141044ed3cf020ce5624bfa40f (patch) | |
tree | 43672217a945512ddd1704468d1fd4b6e9c153c7 /src/quick/items/qquickflickable.cpp | |
parent | 4f50ab594aa2fb1d38981127beca634ad3396489 (diff) |
qdoc: no longer recognizes the version nr in QML refs
All QML references of the form
<QML-module-name><QML-module-version>::<QML-type>::<member-name> have
had the <QML-module-version> removed i.
Task-number: QTBUG-33776
Change-Id: Idde279e0f254cd24ea44f9841662dd81a2c5bbc6
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Diffstat (limited to 'src/quick/items/qquickflickable.cpp')
-rw-r--r-- | src/quick/items/qquickflickable.cpp | 96 |
1 files changed, 48 insertions, 48 deletions
diff --git a/src/quick/items/qquickflickable.cpp b/src/quick/items/qquickflickable.cpp index 037e4786c2..d1caa824e7 100644 --- a/src/quick/items/qquickflickable.cpp +++ b/src/quick/items/qquickflickable.cpp @@ -581,14 +581,14 @@ is finished. */ /*! - \qmlsignal QtQuick2::Flickable::onDragStarted() + \qmlsignal QtQuick::Flickable::onDragStarted() This handler is called when the view starts to be dragged due to user interaction. */ /*! - \qmlsignal QtQuick2::Flickable::onDragEnded() + \qmlsignal QtQuick::Flickable::onDragEnded() This handler is called when the user stops dragging the view. @@ -648,14 +648,14 @@ is finished. */ /*! - \qmlsignal QtQuick2::Flickable::onMovementStarted() + \qmlsignal QtQuick::Flickable::onMovementStarted() This handler is called when the view begins moving due to user interaction. */ /*! - \qmlsignal QtQuick2::Flickable::onMovementEnded() + \qmlsignal QtQuick::Flickable::onMovementEnded() This handler is called when the view stops moving due to user interaction. If a flick was generated, this handler will @@ -665,7 +665,7 @@ is finished. */ /*! - \qmlsignal QtQuick2::Flickable::onFlickStarted() + \qmlsignal QtQuick::Flickable::onFlickStarted() This handler is called when the view is flicked. A flick starts from the point that the mouse or touch is released, @@ -673,16 +673,16 @@ is finished. */ /*! - \qmlsignal QtQuick2::Flickable::onFlickEnded() + \qmlsignal QtQuick::Flickable::onFlickEnded() This handler is called when the view stops moving due to a flick. */ /*! - \qmlproperty real QtQuick2::Flickable::visibleArea.xPosition - \qmlproperty real QtQuick2::Flickable::visibleArea.widthRatio - \qmlproperty real QtQuick2::Flickable::visibleArea.yPosition - \qmlproperty real QtQuick2::Flickable::visibleArea.heightRatio + \qmlproperty real QtQuick::Flickable::visibleArea.xPosition + \qmlproperty real QtQuick::Flickable::visibleArea.widthRatio + \qmlproperty real QtQuick::Flickable::visibleArea.yPosition + \qmlproperty real QtQuick::Flickable::visibleArea.heightRatio These properties describe the position and size of the currently viewed area. The size is defined as the percentage of the full view currently visible, @@ -718,8 +718,8 @@ QQuickFlickable::~QQuickFlickable() } /*! - \qmlproperty real QtQuick2::Flickable::contentX - \qmlproperty real QtQuick2::Flickable::contentY + \qmlproperty real QtQuick::Flickable::contentX + \qmlproperty real QtQuick::Flickable::contentY These properties hold the surface coordinate currently at the top-left corner of the Flickable. For example, if you flick an image up 100 pixels, @@ -760,7 +760,7 @@ void QQuickFlickable::setContentY(qreal pos) } /*! - \qmlproperty bool QtQuick2::Flickable::interactive + \qmlproperty bool QtQuick::Flickable::interactive This property describes whether the user can interact with the Flickable. A user cannot drag or flick a Flickable that is not interactive. @@ -798,8 +798,8 @@ void QQuickFlickable::setInteractive(bool interactive) } /*! - \qmlproperty real QtQuick2::Flickable::horizontalVelocity - \qmlproperty real QtQuick2::Flickable::verticalVelocity + \qmlproperty real QtQuick::Flickable::horizontalVelocity + \qmlproperty real QtQuick::Flickable::verticalVelocity The instantaneous velocity of movement along the x and y axes, in pixels/sec. @@ -823,10 +823,10 @@ qreal QQuickFlickable::verticalVelocity() const } /*! - \qmlproperty bool QtQuick2::Flickable::atXBeginning - \qmlproperty bool QtQuick2::Flickable::atXEnd - \qmlproperty bool QtQuick2::Flickable::atYBeginning - \qmlproperty bool QtQuick2::Flickable::atYEnd + \qmlproperty bool QtQuick::Flickable::atXBeginning + \qmlproperty bool QtQuick::Flickable::atXEnd + \qmlproperty bool QtQuick::Flickable::atYBeginning + \qmlproperty bool QtQuick::Flickable::atYEnd These properties are true if the flickable view is positioned at the beginning, or end respectively. @@ -856,7 +856,7 @@ bool QQuickFlickable::isAtYBeginning() const } /*! - \qmlproperty Item QtQuick2::Flickable::contentItem + \qmlproperty Item QtQuick::Flickable::contentItem The internal item that contains the Items to be moved in the Flickable. @@ -890,7 +890,7 @@ QQuickFlickableVisibleArea *QQuickFlickable::visibleArea() } /*! - \qmlproperty enumeration QtQuick2::Flickable::flickableDirection + \qmlproperty enumeration QtQuick::Flickable::flickableDirection This property determines which directions the view can be flicked. @@ -920,7 +920,7 @@ void QQuickFlickable::setFlickableDirection(FlickableDirection direction) } /*! - \qmlproperty bool QtQuick2::Flickable::pixelAligned + \qmlproperty bool QtQuick::Flickable::pixelAligned This property sets the alignment of \l contentX and \l contentY to pixels (\c true) or subpixels (\c false). @@ -1551,7 +1551,7 @@ void QQuickFlickable::geometryChanged(const QRectF &newGeometry, } /*! - \qmlmethod QtQuick2::Flickable::flick(qreal xVelocity, qreal yVelocity) + \qmlmethod QtQuick::Flickable::flick(qreal xVelocity, qreal yVelocity) Flicks the content with \a xVelocity horizontally and \a yVelocity vertically in pixels/sec. */ @@ -1586,7 +1586,7 @@ void QQuickFlickablePrivate::flickingStarted(bool flickingH, bool flickingV) } /*! - \qmlmethod QtQuick2::Flickable::cancelFlick() + \qmlmethod QtQuick::Flickable::cancelFlick() Cancels the current flick animation. */ @@ -1641,7 +1641,7 @@ QQmlListProperty<QQuickItem> QQuickFlickable::flickableChildren() } /*! - \qmlproperty enumeration QtQuick2::Flickable::boundsBehavior + \qmlproperty enumeration QtQuick::Flickable::boundsBehavior This property holds whether the surface may be dragged beyond the Flickable's boundaries, or overshoot the Flickable's boundaries when flicked. @@ -1677,7 +1677,7 @@ void QQuickFlickable::setBoundsBehavior(BoundsBehavior b) } /*! - \qmlproperty Transition QtQuick2::Flickable::rebound + \qmlproperty Transition QtQuick::Flickable::rebound This holds the transition to be applied to the content view when it snaps back to the bounds of the flickable. The transition is @@ -1738,8 +1738,8 @@ void QQuickFlickable::setRebound(QQuickTransition *transition) } /*! - \qmlproperty real QtQuick2::Flickable::contentWidth - \qmlproperty real QtQuick2::Flickable::contentHeight + \qmlproperty real QtQuick::Flickable::contentWidth + \qmlproperty real QtQuick::Flickable::contentHeight The dimensions of the content (the surface controlled by Flickable). This should typically be set to the combined size of the items placed in the @@ -1820,10 +1820,10 @@ void QQuickFlickable::setContentHeight(qreal h) } /*! - \qmlproperty real QtQuick2::Flickable::topMargin - \qmlproperty real QtQuick2::Flickable::leftMargin - \qmlproperty real QtQuick2::Flickable::bottomMargin - \qmlproperty real QtQuick2::Flickable::rightMargin + \qmlproperty real QtQuick::Flickable::topMargin + \qmlproperty real QtQuick::Flickable::leftMargin + \qmlproperty real QtQuick::Flickable::bottomMargin + \qmlproperty real QtQuick::Flickable::rightMargin These properties hold the margins around the content. This space is reserved in addition to the contentWidth and contentHeight. @@ -1915,8 +1915,8 @@ void QQuickFlickable::setRightMargin(qreal m) } /*! - \qmlproperty real QtQuick2::Flickable::originX - \qmlproperty real QtQuick2::Flickable::originY + \qmlproperty real QtQuick::Flickable::originX + \qmlproperty real QtQuick::Flickable::originY These properties hold the origin of the content. This value always refers to the top-left position of the content regardless of layout direction. @@ -1940,7 +1940,7 @@ qreal QQuickFlickable::originX() const /*! - \qmlmethod QtQuick2::Flickable::resizeContent(real width, real height, QPointF center) + \qmlmethod QtQuick::Flickable::resizeContent(real width, real height, QPointF center) Resizes the content to \a width x \a height about \a center. @@ -1978,7 +1978,7 @@ void QQuickFlickable::resizeContent(qreal w, qreal h, QPointF center) } /*! - \qmlmethod QtQuick2::Flickable::returnToBounds() + \qmlmethod QtQuick::Flickable::returnToBounds() Ensures the content is within legal bounds. @@ -2132,7 +2132,7 @@ bool QQuickFlickable::childMouseEventFilter(QQuickItem *i, QEvent *e) } /*! - \qmlproperty real QtQuick2::Flickable::maximumFlickVelocity + \qmlproperty real QtQuick::Flickable::maximumFlickVelocity This property holds the maximum velocity that the user can flick the view in pixels/second. The default value is platform dependent. @@ -2153,7 +2153,7 @@ void QQuickFlickable::setMaximumFlickVelocity(qreal v) } /*! - \qmlproperty real QtQuick2::Flickable::flickDeceleration + \qmlproperty real QtQuick::Flickable::flickDeceleration This property holds the rate at which a flick will decelerate. The default value is platform dependent. @@ -2180,9 +2180,9 @@ bool QQuickFlickable::isFlicking() const } /*! - \qmlproperty bool QtQuick2::Flickable::flicking - \qmlproperty bool QtQuick2::Flickable::flickingHorizontally - \qmlproperty bool QtQuick2::Flickable::flickingVertically + \qmlproperty bool QtQuick::Flickable::flicking + \qmlproperty bool QtQuick::Flickable::flickingHorizontally + \qmlproperty bool QtQuick::Flickable::flickingVertically These properties describe whether the view is currently moving horizontally, vertically or in either direction, due to the user flicking the view. @@ -2200,9 +2200,9 @@ bool QQuickFlickable::isFlickingVertically() const } /*! - \qmlproperty bool QtQuick2::Flickable::dragging - \qmlproperty bool QtQuick2::Flickable::draggingHorizontally - \qmlproperty bool QtQuick2::Flickable::draggingVertically + \qmlproperty bool QtQuick::Flickable::dragging + \qmlproperty bool QtQuick::Flickable::draggingHorizontally + \qmlproperty bool QtQuick::Flickable::draggingVertically These properties describe whether the view is currently moving horizontally, vertically or in either direction, due to the user dragging the view. @@ -2272,7 +2272,7 @@ bool QQuickFlickablePrivate::isViewMoving() const } /*! - \qmlproperty int QtQuick2::Flickable::pressDelay + \qmlproperty int QtQuick::Flickable::pressDelay This property holds the time to delay (ms) delivering a press to children of the Flickable. This can be useful where reacting @@ -2305,9 +2305,9 @@ void QQuickFlickable::setPressDelay(int delay) } /*! - \qmlproperty bool QtQuick2::Flickable::moving - \qmlproperty bool QtQuick2::Flickable::movingHorizontally - \qmlproperty bool QtQuick2::Flickable::movingVertically + \qmlproperty bool QtQuick::Flickable::moving + \qmlproperty bool QtQuick::Flickable::movingHorizontally + \qmlproperty bool QtQuick::Flickable::movingVertically These properties describe whether the view is currently moving horizontally, vertically or in either direction, due to the user either dragging or |