diff options
Diffstat (limited to 'src/quick/util/qquickanimator.cpp')
| -rw-r--r-- | src/quick/util/qquickanimator.cpp | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/src/quick/util/qquickanimator.cpp b/src/quick/util/qquickanimator.cpp index 7b73e9e59b..986f695fef 100644 --- a/src/quick/util/qquickanimator.cpp +++ b/src/quick/util/qquickanimator.cpp @@ -247,7 +247,8 @@ QAbstractAnimationJob *QQuickAnimator::transition(QQuickStateActions &actions, Q_D(QQuickAnimator); if (d->defaultProperty.isValid() && propertyName() != d->defaultProperty.name()) { - qDebug() << Q_FUNC_INFO << "property name conflict..."; + qmlWarning(this) << "property name conflict: \"" + << propertyName() << "\" != \"" << d->defaultProperty.name() << "\""; return nullptr; } @@ -448,14 +449,16 @@ QQuickAnimatorJob *QQuickRotationAnimator::createJob() const { Possible values are: - \list - \li RotationAnimator.Numerical (default) - Rotate by linearly interpolating between the two numbers. - A rotation from 10 to 350 will rotate 340 degrees clockwise. - \li RotationAnimator.Clockwise - Rotate clockwise between the two values - \li RotationAnimator.Counterclockwise - Rotate counterclockwise between the two values - \li RotationAnimator.Shortest - Rotate in the direction that produces the shortest animation path. - A rotation from 10 to 350 will rotate 20 degrees counterclockwise. - \endlist + \value RotationAnimator.Numerical + (default) Rotate by linearly interpolating between the two numbers. + A rotation from 10 to 350 will rotate 340 degrees clockwise. + \value RotationAnimator.Clockwise + Rotate clockwise between the two values + \value RotationAnimator.Counterclockwise + Rotate counterclockwise between the two values + \value RotationAnimator.Shortest + Rotate in the direction that produces the shortest animation path. + A rotation from 10 to 350 will rotate 20 degrees counterclockwise. */ void QQuickRotationAnimator::setDirection(RotationDirection dir) { |