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/util | |
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/util')
-rw-r--r-- | src/quick/util/qquickanimation.cpp | 86 | ||||
-rw-r--r-- | src/quick/util/qquickanimationcontroller.cpp | 10 | ||||
-rw-r--r-- | src/quick/util/qquickanimator.cpp | 24 | ||||
-rw-r--r-- | src/quick/util/qquickbehavior.cpp | 4 | ||||
-rw-r--r-- | src/quick/util/qquickfontloader.cpp | 6 | ||||
-rw-r--r-- | src/quick/util/qquickpath.cpp | 88 | ||||
-rw-r--r-- | src/quick/util/qquickpathinterpolator.cpp | 10 | ||||
-rw-r--r-- | src/quick/util/qquickpropertychanges.cpp | 6 | ||||
-rw-r--r-- | src/quick/util/qquicksmoothedanimation.cpp | 8 | ||||
-rw-r--r-- | src/quick/util/qquickspringanimation.cpp | 12 | ||||
-rw-r--r-- | src/quick/util/qquickstate.cpp | 8 | ||||
-rw-r--r-- | src/quick/util/qquickstatechangescript.cpp | 4 | ||||
-rw-r--r-- | src/quick/util/qquickstategroup.cpp | 6 | ||||
-rw-r--r-- | src/quick/util/qquicksystempalette.cpp | 30 | ||||
-rw-r--r-- | src/quick/util/qquicktransition.cpp | 12 |
15 files changed, 157 insertions, 157 deletions
diff --git a/src/quick/util/qquickanimation.cpp b/src/quick/util/qquickanimation.cpp index 16b2af9ca8..a3578020ae 100644 --- a/src/quick/util/qquickanimation.cpp +++ b/src/quick/util/qquickanimation.cpp @@ -109,7 +109,7 @@ QAbstractAnimationJob* QQuickAbstractAnimation::qtAnimation() } /*! - \qmlproperty bool QtQuick2::Animation::running + \qmlproperty bool QtQuick::Animation::running This property holds whether the animation is currently running. The \c running property can be set to declaratively control whether or not @@ -200,7 +200,7 @@ QQmlProperty QQuickAbstractAnimationPrivate::createProperty(QObject *obj, const } /*! - \qmlsignal QtQuick2::Animation::onStarted() + \qmlsignal QtQuick::Animation::onStarted() This signal handler is called when the animation begins. @@ -210,7 +210,7 @@ QQmlProperty QQuickAbstractAnimationPrivate::createProperty(QObject *obj, const */ /*! - \qmlsignal QtQuick2::Animation::onStopped() + \qmlsignal QtQuick::Animation::onStopped() This signal handler is called when the animation ends. @@ -287,7 +287,7 @@ void QQuickAbstractAnimation::setRunning(bool r) } /*! - \qmlproperty bool QtQuick2::Animation::paused + \qmlproperty bool QtQuick::Animation::paused This property holds whether the animation is currently paused. The \c paused property can be set to declaratively control whether or not @@ -360,7 +360,7 @@ void QQuickAbstractAnimation::componentFinalized() } /*! - \qmlproperty bool QtQuick2::Animation::alwaysRunToEnd + \qmlproperty bool QtQuick::Animation::alwaysRunToEnd This property holds whether the animation should run to completion when it is stopped. If this true the animation will complete its current iteration when it @@ -392,7 +392,7 @@ void QQuickAbstractAnimation::setAlwaysRunToEnd(bool f) } /*! - \qmlproperty int QtQuick2::Animation::loops + \qmlproperty int QtQuick::Animation::loops This property holds the number of times the animation should play. By default, \c loops is 1: the animation will play through once and then stop. @@ -474,7 +474,7 @@ void QQuickAbstractAnimation::setGroup(QQuickAnimationGroup *g) } /*! - \qmlmethod QtQuick2::Animation::start() + \qmlmethod QtQuick::Animation::start() \brief Starts the animation If the animation is already running, calling this method has no effect. The @@ -486,7 +486,7 @@ void QQuickAbstractAnimation::start() } /*! - \qmlmethod QtQuick2::Animation::pause() + \qmlmethod QtQuick::Animation::pause() \brief Pauses the animation If the animation is already paused or not \c running, calling this method has no effect. @@ -498,7 +498,7 @@ void QQuickAbstractAnimation::pause() } /*! - \qmlmethod QtQuick2::Animation::resume() + \qmlmethod QtQuick::Animation::resume() \brief Resumes a paused animation If the animation is not paused or not \c running, calling this method has no effect. @@ -510,7 +510,7 @@ void QQuickAbstractAnimation::resume() } /*! - \qmlmethod QtQuick2::Animation::stop() + \qmlmethod QtQuick::Animation::stop() \brief Stops the animation If the animation is not running, calling this method has no effect. Both the @@ -535,7 +535,7 @@ void QQuickAbstractAnimation::stop() } /*! - \qmlmethod QtQuick2::Animation::restart() + \qmlmethod QtQuick::Animation::restart() \brief Restarts the animation This is a convenience method, and is equivalent to calling \c stop() and @@ -548,7 +548,7 @@ void QQuickAbstractAnimation::restart() } /*! - \qmlmethod QtQuick2::Animation::complete() + \qmlmethod QtQuick::Animation::complete() \brief Stops the animation, jumping to the final property values If the animation is not running, calling this method has no effect. The @@ -685,7 +685,7 @@ QQuickPauseAnimation::~QQuickPauseAnimation() } /*! - \qmlproperty int QtQuick2::PauseAnimation::duration + \qmlproperty int QtQuick::PauseAnimation::duration This property holds the duration of the pause in milliseconds The default value is 250. @@ -768,7 +768,7 @@ QQuickColorAnimation::~QQuickColorAnimation() } /*! - \qmlproperty color QtQuick2::ColorAnimation::from + \qmlproperty color QtQuick::ColorAnimation::from This property holds the color value at which the animation should begin. For example, the following animation is not applied until a color value @@ -805,7 +805,7 @@ void QQuickColorAnimation::setFrom(const QColor &f) } /*! - \qmlproperty color QtQuick2::ColorAnimation::to + \qmlproperty color QtQuick::ColorAnimation::to This property holds the color value at which the animation should end. @@ -911,7 +911,7 @@ QQuickScriptActionPrivate::QQuickScriptActionPrivate() : QQuickAbstractAnimationPrivate(), hasRunScriptScript(false), reversing(false){} /*! - \qmlproperty script QtQuick2::ScriptAction::script + \qmlproperty script QtQuick::ScriptAction::script This property holds the script to run. */ QQmlScriptString QQuickScriptAction::script() const @@ -927,7 +927,7 @@ void QQuickScriptAction::setScript(const QQmlScriptString &script) } /*! - \qmlproperty string QtQuick2::ScriptAction::scriptName + \qmlproperty string QtQuick::ScriptAction::scriptName This property holds the name of the StateChangeScript to run. This property is only valid when ScriptAction is used as part of a transition. @@ -1077,10 +1077,10 @@ void QQuickPropertyAction::setProperty(const QString &n) } /*! - \qmlproperty Object QtQuick2::PropertyAction::target - \qmlproperty list<Object> QtQuick2::PropertyAction::targets - \qmlproperty string QtQuick2::PropertyAction::property - \qmlproperty string QtQuick2::PropertyAction::properties + \qmlproperty Object QtQuick::PropertyAction::target + \qmlproperty list<Object> QtQuick::PropertyAction::targets + \qmlproperty string QtQuick::PropertyAction::property + \qmlproperty string QtQuick::PropertyAction::properties These properties determine the items and their properties that are affected by this action. @@ -1113,7 +1113,7 @@ QQmlListProperty<QObject> QQuickPropertyAction::targets() } /*! - \qmlproperty list<Object> QtQuick2::PropertyAction::exclude + \qmlproperty list<Object> QtQuick::PropertyAction::exclude This property holds the objects that should not be affected by this action. \sa targets @@ -1125,7 +1125,7 @@ QQmlListProperty<QObject> QQuickPropertyAction::exclude() } /*! - \qmlproperty any QtQuick2::PropertyAction::value + \qmlproperty any QtQuick::PropertyAction::value This property holds the value to be set on the property. If the PropertyAction is defined within a \l Transition or \l Behavior, @@ -1301,7 +1301,7 @@ void QQuickNumberAnimation::init() } /*! - \qmlproperty real QtQuick2::NumberAnimation::from + \qmlproperty real QtQuick::NumberAnimation::from This property holds the starting value for the animation. For example, the following animation is not applied until the \c x value @@ -1339,7 +1339,7 @@ void QQuickNumberAnimation::setFrom(qreal f) } /*! - \qmlproperty real QtQuick2::NumberAnimation::to + \qmlproperty real QtQuick::NumberAnimation::to This property holds the end value for the animation. If the NumberAnimation is defined within a \l Transition or \l Behavior, @@ -1394,7 +1394,7 @@ QQuickVector3dAnimation::~QQuickVector3dAnimation() } /*! - \qmlproperty real QtQuick2::Vector3dAnimation::from + \qmlproperty real QtQuick::Vector3dAnimation::from This property holds the starting value for the animation. If the Vector3dAnimation is defined within a \l Transition or \l Behavior, @@ -1416,7 +1416,7 @@ void QQuickVector3dAnimation::setFrom(QVector3D f) } /*! - \qmlproperty real QtQuick2::Vector3dAnimation::to + \qmlproperty real QtQuick::Vector3dAnimation::to This property holds the end value for the animation. If the Vector3dAnimation is defined within a \l Transition or \l Behavior, @@ -1531,7 +1531,7 @@ QQuickRotationAnimation::~QQuickRotationAnimation() } /*! - \qmlproperty real QtQuick2::RotationAnimation::from + \qmlproperty real QtQuick::RotationAnimation::from This property holds the starting value for the animation. For example, the following animation is not applied until the \c angle value @@ -1568,7 +1568,7 @@ void QQuickRotationAnimation::setFrom(qreal f) } /*! - \qmlproperty real QtQuick2::RotationAnimation::to + \qmlproperty real QtQuick::RotationAnimation::to This property holds the end value for the animation.. If the RotationAnimation is defined within a \l Transition or \l Behavior, @@ -1590,7 +1590,7 @@ void QQuickRotationAnimation::setTo(qreal t) } /*! - \qmlproperty enumeration QtQuick2::RotationAnimation::direction + \qmlproperty enumeration QtQuick::RotationAnimation::direction This property holds the direction of the rotation. Possible values are: @@ -2002,7 +2002,7 @@ QQuickPropertyAnimation::~QQuickPropertyAnimation() } /*! - \qmlproperty int QtQuick2::PropertyAnimation::duration + \qmlproperty int QtQuick::PropertyAnimation::duration This property holds the duration of the animation, in milliseconds. The default value is 250. @@ -2028,7 +2028,7 @@ void QQuickPropertyAnimation::setDuration(int duration) } /*! - \qmlproperty variant QtQuick2::PropertyAnimation::from + \qmlproperty variant QtQuick::PropertyAnimation::from This property holds the starting value for the animation. If the PropertyAnimation is defined within a \l Transition or \l Behavior, @@ -2055,7 +2055,7 @@ void QQuickPropertyAnimation::setFrom(const QVariant &f) } /*! - \qmlproperty variant QtQuick2::PropertyAnimation::to + \qmlproperty variant QtQuick::PropertyAnimation::to This property holds the end value for the animation. If the PropertyAnimation is defined within a \l Transition or \l Behavior, @@ -2082,11 +2082,11 @@ void QQuickPropertyAnimation::setTo(const QVariant &t) } /*! - \qmlproperty enumeration QtQuick2::PropertyAnimation::easing.type - \qmlproperty real QtQuick2::PropertyAnimation::easing.amplitude - \qmlproperty real QtQuick2::PropertyAnimation::easing.overshoot - \qmlproperty real QtQuick2::PropertyAnimation::easing.period - \qmlproperty list<real> QtQuick2::PropertyAnimation::easing.bezierCurve + \qmlproperty enumeration QtQuick::PropertyAnimation::easing.type + \qmlproperty real QtQuick::PropertyAnimation::easing.amplitude + \qmlproperty real QtQuick::PropertyAnimation::easing.overshoot + \qmlproperty real QtQuick::PropertyAnimation::easing.period + \qmlproperty list<real> QtQuick::PropertyAnimation::easing.bezierCurve //! propertyanimation.easing \brief Specifies the easing curve used for the animation @@ -2355,10 +2355,10 @@ void QQuickPropertyAnimation::setProperties(const QString &prop) } /*! - \qmlproperty string QtQuick2::PropertyAnimation::properties - \qmlproperty list<Object> QtQuick2::PropertyAnimation::targets - \qmlproperty string QtQuick2::PropertyAnimation::property - \qmlproperty Object QtQuick2::PropertyAnimation::target + \qmlproperty string QtQuick::PropertyAnimation::properties + \qmlproperty list<Object> QtQuick::PropertyAnimation::targets + \qmlproperty string QtQuick::PropertyAnimation::property + \qmlproperty Object QtQuick::PropertyAnimation::target These properties are used as a set to determine which properties should be animated. The singular and plural forms are functionally identical, e.g. @@ -2451,7 +2451,7 @@ QQmlListProperty<QObject> QQuickPropertyAnimation::targets() } /*! - \qmlproperty list<Object> QtQuick2::PropertyAnimation::exclude + \qmlproperty list<Object> QtQuick::PropertyAnimation::exclude This property holds the items not to be affected by this animation. \sa PropertyAnimation::targets */ diff --git a/src/quick/util/qquickanimationcontroller.cpp b/src/quick/util/qquickanimationcontroller.cpp index ac2075df44..0214dde597 100644 --- a/src/quick/util/qquickanimationcontroller.cpp +++ b/src/quick/util/qquickanimationcontroller.cpp @@ -117,7 +117,7 @@ QQuickAnimationController::~QQuickAnimationController() } /*! - \qmlproperty real QtQuick2::AnimationController::progress + \qmlproperty real QtQuick::AnimationController::progress This property holds the animation progress value. The valid \c progress value is 0.0 to 1.0, setting values less than 0 will be converted to 0, @@ -142,7 +142,7 @@ void QQuickAnimationController::setProgress(qreal progress) } /*! - \qmlproperty real QtQuick2::AnimationController::animation + \qmlproperty real QtQuick::AnimationController::animation \default This property holds the animation to be controlled by the AnimationController. @@ -187,7 +187,7 @@ void QQuickAnimationController::setAnimation(QQuickAbstractAnimation *animation) } /*! - \qmlmethod QtQuick2::AnimationController::reload() + \qmlmethod QtQuick::AnimationController::reload() \brief Reloads the animation properties If the animation properties changed, calling this method to reload the animation definations. @@ -237,7 +237,7 @@ void QQuickAnimationController::componentFinalized() } /*! - \qmlmethod QtQuick2::AnimationController::completeToBeginning() + \qmlmethod QtQuick::AnimationController::completeToBeginning() \brief Finishes running the controlled animation in a backwards direction. After calling this method, the animation runs normally from the current progress point @@ -266,7 +266,7 @@ void QQuickAnimationController::completeToBeginning() } /*! - \qmlmethod QtQuick2::AnimationController::completeToEnd() + \qmlmethod QtQuick::AnimationController::completeToEnd() \brief Finishes running the controlled animation in a forwards direction. After calling this method, the animation runs normally from the current progress point diff --git a/src/quick/util/qquickanimator.cpp b/src/quick/util/qquickanimator.cpp index 59e2d8c39a..592b6a0138 100644 --- a/src/quick/util/qquickanimator.cpp +++ b/src/quick/util/qquickanimator.cpp @@ -90,7 +90,7 @@ QQuickAnimator::QQuickAnimator(QObject *parent) } /*! - \qmlproperty QtQuick2::Item QtQuick2::Animator::target + \qmlproperty QtQuick::Item QtQuick::Animator::target This property holds the target item of the animator. @@ -113,7 +113,7 @@ QQuickItem *QQuickAnimator::targetItem() const } /*! - \qmlproperty int QtQuick2::Animator::duration + \qmlproperty int QtQuick::Animator::duration This property holds the duration of the animation in milliseconds. The default value is 250. @@ -134,12 +134,12 @@ int QQuickAnimator::duration() const } /*! - \qmlpropertygroup QtQuick2::Animator::easing - \qmlproperty enumeration QtQuick2::Animator::easing.type - \qmlproperty real QtQuick2::Animator::easing.amplitude - \qmlproperty real QtQuick2::Animator::easing.overshoot - \qmlproperty real QtQuick2::Animator::easing.period - \qmlproperty list<real> QtQuick2::Animator::easing.bezierCurve + \qmlpropertygroup QtQuick::Animator::easing + \qmlproperty enumeration QtQuick::Animator::easing.type + \qmlproperty real QtQuick::Animator::easing.amplitude + \qmlproperty real QtQuick::Animator::easing.overshoot + \qmlproperty real QtQuick::Animator::easing.period + \qmlproperty list<real> QtQuick::Animator::easing.bezierCurve \include qquickanimation.cpp propertyanimation.easing */ @@ -159,7 +159,7 @@ QEasingCurve QQuickAnimator::easing() const } /*! - \qmlproperty real QtQuick2::Animator::to + \qmlproperty real QtQuick::Animator::to This property holds the end value for the animation. If the Animator is defined within a \l Transition or \l Behavior, @@ -185,7 +185,7 @@ qreal QQuickAnimator::to() const } /*! - \qmlproperty real QtQuick2::Animator::from + \qmlproperty real QtQuick::Animator::from This property holds the starting value for the animation. If the Animator is defined within a \l Transition or \l Behavior, @@ -456,7 +456,7 @@ QQuickAnimatorJob *QQuickRotationAnimator::createJob() const { } /*! - \qmlproperty enumeration QtQuick2::RotationAnimator::direction + \qmlproperty enumeration QtQuick::RotationAnimator::direction This property holds the direction of the rotation. Possible values are: @@ -521,7 +521,7 @@ QQuickUniformAnimator::QQuickUniformAnimator(QObject *parent) } /*! - \qmlproperty string QtQuick2::UniformAnimator::uniform + \qmlproperty string QtQuick::UniformAnimator::uniform This property holds the name of the uniform to animate. The value of the uniform must correspond to both a property diff --git a/src/quick/util/qquickbehavior.cpp b/src/quick/util/qquickbehavior.cpp index 571f8b88c5..69ebb22f0d 100644 --- a/src/quick/util/qquickbehavior.cpp +++ b/src/quick/util/qquickbehavior.cpp @@ -115,7 +115,7 @@ QQuickBehavior::~QQuickBehavior() } /*! - \qmlproperty Animation QtQuick2::Behavior::animation + \qmlproperty Animation QtQuick::Behavior::animation \default This property holds the animation to run when the behavior is triggered. @@ -150,7 +150,7 @@ void QQuickBehaviorPrivate::animationStateChanged(QAbstractAnimationJob *, QAbst } /*! - \qmlproperty bool QtQuick2::Behavior::enabled + \qmlproperty bool QtQuick::Behavior::enabled This property holds whether the behavior will be triggered when the tracked property changes value. diff --git a/src/quick/util/qquickfontloader.cpp b/src/quick/util/qquickfontloader.cpp index b3f5615864..c0672359ef 100644 --- a/src/quick/util/qquickfontloader.cpp +++ b/src/quick/util/qquickfontloader.cpp @@ -182,7 +182,7 @@ QQuickFontLoader::~QQuickFontLoader() } /*! - \qmlproperty url QtQuick2::FontLoader::source + \qmlproperty url QtQuick::FontLoader::source The url of the font to load. */ QUrl QQuickFontLoader::source() const @@ -253,7 +253,7 @@ void QQuickFontLoader::updateFontInfo(const QString& name, QQuickFontLoader::Sta } /*! - \qmlproperty string QtQuick2::FontLoader::name + \qmlproperty string QtQuick::FontLoader::name This property holds the name of the font family. It is set automatically when a font is loaded using the \c url property. @@ -294,7 +294,7 @@ void QQuickFontLoader::setName(const QString &name) } /*! - \qmlproperty enumeration QtQuick2::FontLoader::status + \qmlproperty enumeration QtQuick::FontLoader::status This property holds the status of font loading. It can be one of: \list diff --git a/src/quick/util/qquickpath.cpp b/src/quick/util/qquickpath.cpp index cf95364f55..25e40d8eb6 100644 --- a/src/quick/util/qquickpath.cpp +++ b/src/quick/util/qquickpath.cpp @@ -93,8 +93,8 @@ QQuickPath::~QQuickPath() } /*! - \qmlproperty real QtQuick2::Path::startX - \qmlproperty real QtQuick2::Path::startY + \qmlproperty real QtQuick::Path::startX + \qmlproperty real QtQuick::Path::startY These properties hold the starting position of the path. */ qreal QQuickPath::startX() const @@ -142,7 +142,7 @@ bool QQuickPath::hasStartY() const } /*! - \qmlproperty bool QtQuick2::Path::closed + \qmlproperty bool QtQuick::Path::closed This property holds whether the start and end of the path are identical. */ bool QQuickPath::isClosed() const @@ -166,7 +166,7 @@ bool QQuickPath::hasEnd() const } /*! - \qmlproperty list<PathElement> QtQuick2::Path::pathElements + \qmlproperty list<PathElement> QtQuick::Path::pathElements This property holds the objects composing the path. \default @@ -919,7 +919,7 @@ bool QQuickCurve::hasRelativeY() */ /*! - \qmlproperty string QtQuick2::PathAttribute::name + \qmlproperty string QtQuick::PathAttribute::name This property holds the name of the attribute to change. This attribute will be available to the delegate as PathView.<name> @@ -948,7 +948,7 @@ void QQuickPathAttribute::setName(const QString &name) } /*! - \qmlproperty real QtQuick2::PathAttribute::value + \qmlproperty real QtQuick::PathAttribute::value This property holds the value for the attribute. The value specified can be used to influence the visual appearance @@ -1023,8 +1023,8 @@ void QQuickPathAttribute::setValue(qreal value) */ /*! - \qmlproperty real QtQuick2::PathLine::x - \qmlproperty real QtQuick2::PathLine::y + \qmlproperty real QtQuick::PathLine::x + \qmlproperty real QtQuick::PathLine::y Defines the end point of the line. @@ -1032,8 +1032,8 @@ void QQuickPathAttribute::setValue(qreal value) */ /*! - \qmlproperty real QtQuick2::PathLine::relativeX - \qmlproperty real QtQuick2::PathLine::relativeY + \qmlproperty real QtQuick::PathLine::relativeX + \qmlproperty real QtQuick::PathLine::relativeY Defines the end point of the line relative to its start. @@ -1085,8 +1085,8 @@ void QQuickPathLine::addToPath(QPainterPath &path, const QQuickPathData &data) */ /*! - \qmlproperty real QtQuick2::PathQuad::x - \qmlproperty real QtQuick2::PathQuad::y + \qmlproperty real QtQuick::PathQuad::x + \qmlproperty real QtQuick::PathQuad::y Defines the end point of the curve. @@ -1094,8 +1094,8 @@ void QQuickPathLine::addToPath(QPainterPath &path, const QQuickPathData &data) */ /*! - \qmlproperty real QtQuick2::PathQuad::relativeX - \qmlproperty real QtQuick2::PathQuad::relativeY + \qmlproperty real QtQuick::PathQuad::relativeX + \qmlproperty real QtQuick::PathQuad::relativeY Defines the end point of the curve relative to its start. @@ -1109,8 +1109,8 @@ void QQuickPathLine::addToPath(QPainterPath &path, const QQuickPathData &data) */ /*! - \qmlproperty real QtQuick2::PathQuad::controlX - \qmlproperty real QtQuick2::PathQuad::controlY + \qmlproperty real QtQuick::PathQuad::controlX + \qmlproperty real QtQuick::PathQuad::controlY Defines the position of the control point. */ @@ -1151,8 +1151,8 @@ void QQuickPathQuad::setControlY(qreal y) } /*! - \qmlproperty real QtQuick2::PathQuad::relativeControlX - \qmlproperty real QtQuick2::PathQuad::relativeControlY + \qmlproperty real QtQuick::PathQuad::relativeControlX + \qmlproperty real QtQuick::PathQuad::relativeControlY Defines the position of the control point relative to the curve's start. @@ -1241,8 +1241,8 @@ void QQuickPathQuad::addToPath(QPainterPath &path, const QQuickPathData &data) */ /*! - \qmlproperty real QtQuick2::PathCubic::x - \qmlproperty real QtQuick2::PathCubic::y + \qmlproperty real QtQuick::PathCubic::x + \qmlproperty real QtQuick::PathCubic::y Defines the end point of the curve. @@ -1250,8 +1250,8 @@ void QQuickPathQuad::addToPath(QPainterPath &path, const QQuickPathData &data) */ /*! - \qmlproperty real QtQuick2::PathCubic::relativeX - \qmlproperty real QtQuick2::PathCubic::relativeY + \qmlproperty real QtQuick::PathCubic::relativeX + \qmlproperty real QtQuick::PathCubic::relativeY Defines the end point of the curve relative to its start. @@ -1265,8 +1265,8 @@ void QQuickPathQuad::addToPath(QPainterPath &path, const QQuickPathData &data) */ /*! - \qmlproperty real QtQuick2::PathCubic::control1X - \qmlproperty real QtQuick2::PathCubic::control1Y + \qmlproperty real QtQuick::PathCubic::control1X + \qmlproperty real QtQuick::PathCubic::control1Y Defines the position of the first control point. */ @@ -1299,8 +1299,8 @@ void QQuickPathCubic::setControl1Y(qreal y) } /*! - \qmlproperty real QtQuick2::PathCubic::control2X - \qmlproperty real QtQuick2::PathCubic::control2Y + \qmlproperty real QtQuick::PathCubic::control2X + \qmlproperty real QtQuick::PathCubic::control2Y Defines the position of the second control point. */ @@ -1333,10 +1333,10 @@ void QQuickPathCubic::setControl2Y(qreal y) } /*! - \qmlproperty real QtQuick2::PathCubic::relativeControl1X - \qmlproperty real QtQuick2::PathCubic::relativeControl1Y - \qmlproperty real QtQuick2::PathCubic::relativeControl2X - \qmlproperty real QtQuick2::PathCubic::relativeControl2Y + \qmlproperty real QtQuick::PathCubic::relativeControl1X + \qmlproperty real QtQuick::PathCubic::relativeControl1Y + \qmlproperty real QtQuick::PathCubic::relativeControl2X + \qmlproperty real QtQuick::PathCubic::relativeControl2Y Defines the positions of the control points relative to the curve's start. @@ -1458,8 +1458,8 @@ void QQuickPathCubic::addToPath(QPainterPath &path, const QQuickPathData &data) */ /*! - \qmlproperty real QtQuick2::PathCurve::x - \qmlproperty real QtQuick2::PathCurve::y + \qmlproperty real QtQuick::PathCurve::x + \qmlproperty real QtQuick::PathCurve::y Defines the end point of the curve. @@ -1467,8 +1467,8 @@ void QQuickPathCubic::addToPath(QPainterPath &path, const QQuickPathData &data) */ /*! - \qmlproperty real QtQuick2::PathCurve::relativeX - \qmlproperty real QtQuick2::PathCurve::relativeY + \qmlproperty real QtQuick::PathCurve::relativeX + \qmlproperty real QtQuick::PathCurve::relativeY Defines the end point of the curve relative to its start. @@ -1607,8 +1607,8 @@ void QQuickPathCatmullRomCurve::addToPath(QPainterPath &path, const QQuickPathDa */ /*! - \qmlproperty real QtQuick2::PathArc::x - \qmlproperty real QtQuick2::PathArc::y + \qmlproperty real QtQuick::PathArc::x + \qmlproperty real QtQuick::PathArc::y Defines the end point of the arc. @@ -1616,8 +1616,8 @@ void QQuickPathCatmullRomCurve::addToPath(QPainterPath &path, const QQuickPathDa */ /*! - \qmlproperty real QtQuick2::PathArc::relativeX - \qmlproperty real QtQuick2::PathArc::relativeY + \qmlproperty real QtQuick::PathArc::relativeX + \qmlproperty real QtQuick::PathArc::relativeY Defines the end point of the arc relative to its start. @@ -1631,8 +1631,8 @@ void QQuickPathCatmullRomCurve::addToPath(QPainterPath &path, const QQuickPathDa */ /*! - \qmlproperty real QtQuick2::PathArc::radiusX - \qmlproperty real QtQuick2::PathArc::radiusY + \qmlproperty real QtQuick::PathArc::radiusX + \qmlproperty real QtQuick::PathArc::radiusY Defines the radius of the arc. @@ -1674,7 +1674,7 @@ void QQuickPathArc::setRadiusY(qreal radius) } /*! - \qmlproperty bool QtQuick2::PathArc::useLargeArc + \qmlproperty bool QtQuick::PathArc::useLargeArc Whether to use a large arc as defined by the arc points. Given fixed start and end positions, radius, and direction, @@ -1707,7 +1707,7 @@ void QQuickPathArc::setUseLargeArc(bool largeArc) } /*! - \qmlproperty enumeration QtQuick2::PathArc::direction + \qmlproperty enumeration QtQuick::PathArc::direction Defines the direction of the arc. Possible values are PathArc.Clockwise (default) and PathArc.Counterclockwise. @@ -1778,7 +1778,7 @@ void QQuickPathArc::addToPath(QPainterPath &path, const QQuickPathData &data) */ /*! - \qmlproperty string QtQuick2::PathSvg::path + \qmlproperty string QtQuick::PathSvg::path The SVG path data string specifying the path. @@ -1859,7 +1859,7 @@ void QQuickPathSvg::addToPath(QPainterPath &path, const QQuickPathData &) */ /*! - \qmlproperty real QtQuick2::PathPercent::value + \qmlproperty real QtQuick::PathPercent::value The proportion of items that should be laid out up to this point. This value should always be higher than the last value specified diff --git a/src/quick/util/qquickpathinterpolator.cpp b/src/quick/util/qquickpathinterpolator.cpp index 78a22ec111..09bebebf05 100644 --- a/src/quick/util/qquickpathinterpolator.cpp +++ b/src/quick/util/qquickpathinterpolator.cpp @@ -66,7 +66,7 @@ QQuickPathInterpolator::QQuickPathInterpolator(QObject *parent) : } /*! - \qmlproperty Path QtQuick2::PathInterpolator::path + \qmlproperty Path QtQuick::PathInterpolator::path This property holds the path to interpolate. For more information on defining a path see the \l Path documentation. @@ -88,7 +88,7 @@ void QQuickPathInterpolator::setPath(QQuickPath *path) } /*! - \qmlproperty real QtQuick2::PathInterpolator::progress + \qmlproperty real QtQuick::PathInterpolator::progress This property holds the current progress along the path. Typical usage of PathInterpolator is to set the progress @@ -114,8 +114,8 @@ void QQuickPathInterpolator::setProgress(qreal progress) } /*! - \qmlproperty real QtQuick2::PathInterpolator::x - \qmlproperty real QtQuick2::PathInterpolator::y + \qmlproperty real QtQuick::PathInterpolator::x + \qmlproperty real QtQuick::PathInterpolator::y These properties hold the position of the path at \l progress. */ @@ -130,7 +130,7 @@ qreal QQuickPathInterpolator::y() const } /*! - \qmlproperty real QtQuick2::PathInterpolator::angle + \qmlproperty real QtQuick::PathInterpolator::angle This property holds the angle of the path tangent at \l progress. diff --git a/src/quick/util/qquickpropertychanges.cpp b/src/quick/util/qquickpropertychanges.cpp index 04547b1ac9..cada612248 100644 --- a/src/quick/util/qquickpropertychanges.cpp +++ b/src/quick/util/qquickpropertychanges.cpp @@ -131,7 +131,7 @@ QT_BEGIN_NAMESPACE */ /*! - \qmlproperty Object QtQuick2::PropertyChanges::target + \qmlproperty Object QtQuick::PropertyChanges::target This property holds the object which contains the properties to be changed. */ @@ -400,7 +400,7 @@ void QQuickPropertyChanges::setObject(QObject *o) } /*! - \qmlproperty bool QtQuick2::PropertyChanges::restoreEntryValues + \qmlproperty bool QtQuick::PropertyChanges::restoreEntryValues This property holds whether the previous values should be restored when leaving the state. @@ -504,7 +504,7 @@ QQuickPropertyChanges::ActionList QQuickPropertyChanges::actions() } /*! - \qmlproperty bool QtQuick2::PropertyChanges::explicit + \qmlproperty bool QtQuick::PropertyChanges::explicit If explicit is set to true, any potential bindings will be interpreted as once-off assignments that occur when the state is entered. diff --git a/src/quick/util/qquicksmoothedanimation.cpp b/src/quick/util/qquicksmoothedanimation.cpp index 4819bf6469..53e3520bde 100644 --- a/src/quick/util/qquicksmoothedanimation.cpp +++ b/src/quick/util/qquicksmoothedanimation.cpp @@ -444,7 +444,7 @@ QAbstractAnimationJob* QQuickSmoothedAnimation::transition(QQuickStateActions &a } /*! - \qmlproperty enumeration QtQuick2::SmoothedAnimation::reversingMode + \qmlproperty enumeration QtQuick::SmoothedAnimation::reversingMode Sets how the SmoothedAnimation behaves if an animation direction is reversed. @@ -474,7 +474,7 @@ void QQuickSmoothedAnimation::setReversingMode(ReversingMode m) } /*! - \qmlproperty int QtQuick2::SmoothedAnimation::duration + \qmlproperty int QtQuick::SmoothedAnimation::duration This property holds the animation duration, in msecs, used when tracking the source. @@ -507,7 +507,7 @@ qreal QQuickSmoothedAnimation::velocity() const } /*! - \qmlproperty real QtQuick2::SmoothedAnimation::velocity + \qmlproperty real QtQuick::SmoothedAnimation::velocity This property holds the average velocity allowed when tracking the 'to' value. @@ -530,7 +530,7 @@ void QQuickSmoothedAnimation::setVelocity(qreal v) } /*! - \qmlproperty int QtQuick2::SmoothedAnimation::maximumEasingTime + \qmlproperty int QtQuick::SmoothedAnimation::maximumEasingTime This property specifies the maximum time, in msecs, any "eases" during the follow should take. Setting this property causes the velocity to "level out" after at a time. Setting diff --git a/src/quick/util/qquickspringanimation.cpp b/src/quick/util/qquickspringanimation.cpp index 0568879382..f663491a58 100644 --- a/src/quick/util/qquickspringanimation.cpp +++ b/src/quick/util/qquickspringanimation.cpp @@ -383,7 +383,7 @@ QQuickSpringAnimation::~QQuickSpringAnimation() } /*! - \qmlproperty real QtQuick2::SpringAnimation::velocity + \qmlproperty real QtQuick::SpringAnimation::velocity This property holds the maximum velocity allowed when tracking the source. @@ -405,7 +405,7 @@ void QQuickSpringAnimation::setVelocity(qreal velocity) } /*! - \qmlproperty real QtQuick2::SpringAnimation::spring + \qmlproperty real QtQuick::SpringAnimation::spring This property describes how strongly the target is pulled towards the source. The default value is 0 (that is, the spring-like motion is disabled). @@ -429,7 +429,7 @@ void QQuickSpringAnimation::setSpring(qreal spring) } /*! - \qmlproperty real QtQuick2::SpringAnimation::damping + \qmlproperty real QtQuick::SpringAnimation::damping This property holds the spring damping value. This value describes how quickly the spring-like motion comes to rest. @@ -455,7 +455,7 @@ void QQuickSpringAnimation::setDamping(qreal damping) /*! - \qmlproperty real QtQuick2::SpringAnimation::epsilon + \qmlproperty real QtQuick::SpringAnimation::epsilon This property holds the spring epsilon. The epsilon is the rate and amount of change in the value which is close enough @@ -477,7 +477,7 @@ void QQuickSpringAnimation::setEpsilon(qreal epsilon) } /*! - \qmlproperty real QtQuick2::SpringAnimation::modulus + \qmlproperty real QtQuick::SpringAnimation::modulus This property holds the modulus value. The default value is 0. Setting a \a modulus forces the target value to "wrap around" at the modulus. @@ -501,7 +501,7 @@ void QQuickSpringAnimation::setModulus(qreal modulus) } /*! - \qmlproperty real QtQuick2::SpringAnimation::mass + \qmlproperty real QtQuick::SpringAnimation::mass This property holds the "mass" of the property being moved. The value is 1.0 by default. diff --git a/src/quick/util/qquickstate.cpp b/src/quick/util/qquickstate.cpp index 1b8f0c0b65..504b5981c4 100644 --- a/src/quick/util/qquickstate.cpp +++ b/src/quick/util/qquickstate.cpp @@ -168,7 +168,7 @@ QQuickState::~QQuickState() } /*! - \qmlproperty string QtQuick2::State::name + \qmlproperty string QtQuick::State::name This property holds the name of the state. Each state should have a unique name within its item. @@ -199,7 +199,7 @@ bool QQuickState::isWhenKnown() const } /*! - \qmlproperty bool QtQuick2::State::when + \qmlproperty bool QtQuick::State::when This property holds when the state should be applied. This should be set to an expression that evaluates to \c true when you want the state to @@ -237,7 +237,7 @@ void QQuickState::setWhen(QQmlBinding *when) } /*! - \qmlproperty string QtQuick2::State::extend + \qmlproperty string QtQuick::State::extend This property holds the state that this state extends. When a state extends another state, it inherits all the changes of that state. @@ -258,7 +258,7 @@ void QQuickState::setExtends(const QString &extends) } /*! - \qmlproperty list<Change> QtQuick2::State::changes + \qmlproperty list<Change> QtQuick::State::changes This property holds the changes to apply for this state \default diff --git a/src/quick/util/qquickstatechangescript.cpp b/src/quick/util/qquickstatechangescript.cpp index c52cd95ac1..51b379195d 100644 --- a/src/quick/util/qquickstatechangescript.cpp +++ b/src/quick/util/qquickstatechangescript.cpp @@ -92,7 +92,7 @@ QQuickStateChangeScript::~QQuickStateChangeScript() } /*! - \qmlproperty script QtQuick2::StateChangeScript::script + \qmlproperty script QtQuick::StateChangeScript::script This property holds the script to run when the state is current. */ QQmlScriptString QQuickStateChangeScript::script() const @@ -108,7 +108,7 @@ void QQuickStateChangeScript::setScript(const QQmlScriptString &s) } /*! - \qmlproperty string QtQuick2::StateChangeScript::name + \qmlproperty string QtQuick::StateChangeScript::name This property holds the name of the script. This name can be used by a ScriptAction to target a specific script. diff --git a/src/quick/util/qquickstategroup.cpp b/src/quick/util/qquickstategroup.cpp index 20937f1bbc..779b08ef3e 100644 --- a/src/quick/util/qquickstategroup.cpp +++ b/src/quick/util/qquickstategroup.cpp @@ -141,7 +141,7 @@ QList<QQuickState *> QQuickStateGroup::states() const } /*! - \qmlproperty list<State> QtQuick2::StateGroup::states + \qmlproperty list<State> QtQuick::StateGroup::states This property holds a list of states defined by the state group. \qml @@ -202,7 +202,7 @@ void QQuickStateGroupPrivate::clear_states(QQmlListProperty<QQuickState> *list) } /*! - \qmlproperty list<Transition> QtQuick2::StateGroup::transitions + \qmlproperty list<Transition> QtQuick::StateGroup::transitions This property holds a list of transitions defined by the state group. \qml @@ -256,7 +256,7 @@ void QQuickStateGroupPrivate::clear_transitions(QQmlListProperty<QQuickTransitio } /*! - \qmlproperty string QtQuick2::StateGroup::state + \qmlproperty string QtQuick::StateGroup::state This property holds the name of the current state of the state group. diff --git a/src/quick/util/qquicksystempalette.cpp b/src/quick/util/qquicksystempalette.cpp index bd651e1a73..515bf28c2f 100644 --- a/src/quick/util/qquicksystempalette.cpp +++ b/src/quick/util/qquicksystempalette.cpp @@ -95,7 +95,7 @@ QQuickSystemPalette::~QQuickSystemPalette() } /*! - \qmlproperty color QtQuick2::SystemPalette::window + \qmlproperty color QtQuick::SystemPalette::window The window (general background) color of the current color group. \sa QPalette::ColorRole @@ -107,7 +107,7 @@ QColor QQuickSystemPalette::window() const } /*! - \qmlproperty color QtQuick2::SystemPalette::windowText + \qmlproperty color QtQuick::SystemPalette::windowText The window text (general foreground) color of the current color group. \sa QPalette::ColorRole @@ -119,7 +119,7 @@ QColor QQuickSystemPalette::windowText() const } /*! - \qmlproperty color QtQuick2::SystemPalette::base + \qmlproperty color QtQuick::SystemPalette::base The base color of the current color group. \sa QPalette::ColorRole @@ -131,7 +131,7 @@ QColor QQuickSystemPalette::base() const } /*! - \qmlproperty color QtQuick2::SystemPalette::text + \qmlproperty color QtQuick::SystemPalette::text The text color of the current color group. \sa QPalette::ColorRole @@ -143,7 +143,7 @@ QColor QQuickSystemPalette::text() const } /*! - \qmlproperty color QtQuick2::SystemPalette::alternateBase + \qmlproperty color QtQuick::SystemPalette::alternateBase The alternate base color of the current color group. \sa QPalette::ColorRole @@ -155,7 +155,7 @@ QColor QQuickSystemPalette::alternateBase() const } /*! - \qmlproperty color QtQuick2::SystemPalette::button + \qmlproperty color QtQuick::SystemPalette::button The button color of the current color group. \sa QPalette::ColorRole @@ -167,7 +167,7 @@ QColor QQuickSystemPalette::button() const } /*! - \qmlproperty color QtQuick2::SystemPalette::buttonText + \qmlproperty color QtQuick::SystemPalette::buttonText The button text foreground color of the current color group. \sa QPalette::ColorRole @@ -179,7 +179,7 @@ QColor QQuickSystemPalette::buttonText() const } /*! - \qmlproperty color QtQuick2::SystemPalette::light + \qmlproperty color QtQuick::SystemPalette::light The light color of the current color group. \sa QPalette::ColorRole @@ -191,7 +191,7 @@ QColor QQuickSystemPalette::light() const } /*! - \qmlproperty color QtQuick2::SystemPalette::midlight + \qmlproperty color QtQuick::SystemPalette::midlight The midlight color of the current color group. \sa QPalette::ColorRole @@ -203,7 +203,7 @@ QColor QQuickSystemPalette::midlight() const } /*! - \qmlproperty color QtQuick2::SystemPalette::dark + \qmlproperty color QtQuick::SystemPalette::dark The dark color of the current color group. \sa QPalette::ColorRole @@ -215,7 +215,7 @@ QColor QQuickSystemPalette::dark() const } /*! - \qmlproperty color QtQuick2::SystemPalette::mid + \qmlproperty color QtQuick::SystemPalette::mid The mid color of the current color group. \sa QPalette::ColorRole @@ -227,7 +227,7 @@ QColor QQuickSystemPalette::mid() const } /*! - \qmlproperty color QtQuick2::SystemPalette::shadow + \qmlproperty color QtQuick::SystemPalette::shadow The shadow color of the current color group. \sa QPalette::ColorRole @@ -239,7 +239,7 @@ QColor QQuickSystemPalette::shadow() const } /*! - \qmlproperty color QtQuick2::SystemPalette::highlight + \qmlproperty color QtQuick::SystemPalette::highlight The highlight color of the current color group. \sa QPalette::ColorRole @@ -251,7 +251,7 @@ QColor QQuickSystemPalette::highlight() const } /*! - \qmlproperty color QtQuick2::SystemPalette::highlightedText + \qmlproperty color QtQuick::SystemPalette::highlightedText The highlighted text color of the current color group. \sa QPalette::ColorRole @@ -263,7 +263,7 @@ QColor QQuickSystemPalette::highlightedText() const } /*! - \qmlproperty enumeration QtQuick2::SystemPalette::colorGroup + \qmlproperty enumeration QtQuick::SystemPalette::colorGroup The color group of the palette. This can be one of: diff --git a/src/quick/util/qquicktransition.cpp b/src/quick/util/qquicktransition.cpp index 75524c190f..dcfc4549c2 100644 --- a/src/quick/util/qquicktransition.cpp +++ b/src/quick/util/qquicktransition.cpp @@ -278,8 +278,8 @@ QQuickTransitionInstance *QQuickTransition::prepare(QQuickStateOperation::Action } /*! - \qmlproperty string QtQuick2::Transition::from - \qmlproperty string QtQuick2::Transition::to + \qmlproperty string QtQuick::Transition::from + \qmlproperty string QtQuick::Transition::to These properties indicate the state changes that trigger the transition. @@ -319,7 +319,7 @@ void QQuickTransition::setFromState(const QString &f) } /*! - \qmlproperty bool QtQuick2::Transition::reversible + \qmlproperty bool QtQuick::Transition::reversible This property holds whether the transition should be automatically reversed when the conditions that triggered this transition are reversed. The default value is false. @@ -375,7 +375,7 @@ void QQuickTransition::setToState(const QString &t) } /*! - \qmlproperty bool QtQuick2::Transition::enabled + \qmlproperty bool QtQuick::Transition::enabled This property holds whether the Transition will be run when moving from the \c from state to the \c to state. @@ -421,7 +421,7 @@ void QQuickTransition::setEnabled(bool enabled) } /*! - \qmlproperty bool QtQuick2::Transition::running + \qmlproperty bool QtQuick::Transition::running This property holds whether the transition is currently running. @@ -435,7 +435,7 @@ bool QQuickTransition::running() const /*! - \qmlproperty list<Animation> QtQuick2::Transition::animations + \qmlproperty list<Animation> QtQuick::Transition::animations \default This property holds a list of the animations to be run for this transition. |