summaryrefslogtreecommitdiffstats
path: root/src/corelib/animation/qvariantanimation.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/corelib/animation/qvariantanimation.cpp')
-rw-r--r--src/corelib/animation/qvariantanimation.cpp18
1 files changed, 2 insertions, 16 deletions
diff --git a/src/corelib/animation/qvariantanimation.cpp b/src/corelib/animation/qvariantanimation.cpp
index 3c90d71c7d..e935ac711e 100644
--- a/src/corelib/animation/qvariantanimation.cpp
+++ b/src/corelib/animation/qvariantanimation.cpp
@@ -46,8 +46,6 @@
#include <algorithm>
-#ifndef QT_NO_ANIMATION
-
QT_BEGIN_NAMESPACE
/*!
@@ -118,15 +116,7 @@ QT_BEGIN_NAMESPACE
and the current progress.
Example:
- \code
- QVariant myColorInterpolator(const QColor &start, const QColor &end, qreal progress)
- {
- ...
- return QColor(...);
- }
- ...
- qRegisterAnimationInterpolator<QColor>(myColorInterpolator);
- \endcode
+ \snippet code/src_corelib_animation_qvariantanimation.cpp 0
Another option is to reimplement interpolated(), which returns
interpolation values for the value being interpolated.
@@ -418,9 +408,7 @@ static QBasicMutex registeredInterpolatorsMutex;
This is a typedef for a pointer to a function with the following
signature:
- \code
- QVariant myInterpolator(const QVariant &from, const QVariant &to, qreal progress);
- \endcode
+ \snippet code/src_corelib_animation_qvariantanimation.cpp 1
*/
@@ -700,5 +688,3 @@ void QVariantAnimation::updateCurrentTime(int)
QT_END_NAMESPACE
#include "moc_qvariantanimation.cpp"
-
-#endif //QT_NO_ANIMATION