diff options
author | J-P Nurmi <jpnurmi@digia.com> | 2012-10-16 16:35:34 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-10-17 20:47:08 +0200 |
commit | a98b9435579f5abef82036e81af4488d8a464b66 (patch) | |
tree | d647030face0d45f51c39f9c56ad77574871f4fe /src/widgets/styles/qcommonstyle.cpp | |
parent | 037d1e18e39f24b8ebb2772c20444d4b44cfb12b (diff) |
Styles: revise indeterminate progress bar animations
Remove dependencies to QProgressBar where possible. This makes
it possible to animate for example QQuickItem based progress
bars (read: the desktop components).
Change-Id: If208506702365895576238c24191b8d70b90841c
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
Diffstat (limited to 'src/widgets/styles/qcommonstyle.cpp')
-rw-r--r-- | src/widgets/styles/qcommonstyle.cpp | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/src/widgets/styles/qcommonstyle.cpp b/src/widgets/styles/qcommonstyle.cpp index d4e4ea22d0..dd75870437 100644 --- a/src/widgets/styles/qcommonstyle.cpp +++ b/src/widgets/styles/qcommonstyle.cpp @@ -1062,22 +1062,19 @@ QStyleAnimation * QCommonStylePrivate::animation(const QObject *target) const } /*! \internal */ -void QCommonStylePrivate::startAnimation(QStyleAnimation *animation) +void QCommonStylePrivate::startAnimation(QStyleAnimation *animation) const { -#ifndef QT_NO_ANIMATION - Q_Q(QCommonStyle); + Q_Q(const QCommonStyle); stopAnimation(animation->target()); q->connect(animation, SIGNAL(finished()), SLOT(_q_removeAnimation()), Qt::UniqueConnection); q->connect(animation, SIGNAL(destroyed()), SLOT(_q_removeAnimation()), Qt::UniqueConnection); animations.insert(animation->target(), animation); animation->start(); -#endif // QT_NO_ANIMATION } /*! \internal */ -void QCommonStylePrivate::stopAnimation(const QObject *target) +void QCommonStylePrivate::stopAnimation(const QObject *target) const { -#ifndef QT_NO_ANIMATION QStyleAnimation *animation = animations.value(target); if (animation) { if (animation->state() == QAbstractAnimation::Stopped) @@ -1085,20 +1082,17 @@ void QCommonStylePrivate::stopAnimation(const QObject *target) else animation->stop(); } -#endif // QT_NO_ANIMATION } /*! \internal */ void QCommonStylePrivate::_q_removeAnimation() { -#ifndef QT_NO_ANIMATION Q_Q(QCommonStyle); QObject *animation = q->sender(); if (animation) { animations.remove(animation->parent()); animation->deleteLater(); } -#endif // QT_NO_ANIMATION } /*! |