diff options
Diffstat (limited to 'src/corelib/animation')
| -rw-r--r-- | src/corelib/animation/qvariantanimation.cpp | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/src/corelib/animation/qvariantanimation.cpp b/src/corelib/animation/qvariantanimation.cpp index dd32424..73ed0df 100644 --- a/src/corelib/animation/qvariantanimation.cpp +++ b/src/corelib/animation/qvariantanimation.cpp @@ -313,13 +313,6 @@ QVariantAnimation::~QVariantAnimation() The easing curve is used with the interpolator, the interpolated() virtual function, the animation's duration, and iterationCount, to control how the current value changes as the animation progresses. - -<<<<<<< Updated upstream:src/corelib/animation/qvariantanimation.cpp - The easing curve is used with the interpolator, the interpolated() virtual - function, the animation's duration, and loopCount, to control how the - current value changes as the animation progresses. -======= ->>>>>>> Stashed changes:src/corelib/animation/qvariantanimation.cpp */ QEasingCurve QVariantAnimation::easingCurve() const { |