summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/corelib/doc/snippets/code/src_corelib_tools_qeasingcurve.cpp15
-rw-r--r--src/corelib/tools/qeasingcurve.cpp17
2 files changed, 17 insertions, 15 deletions
diff --git a/src/corelib/doc/snippets/code/src_corelib_tools_qeasingcurve.cpp b/src/corelib/doc/snippets/code/src_corelib_tools_qeasingcurve.cpp
index 0485bd290a..97453e2b06 100644
--- a/src/corelib/doc/snippets/code/src_corelib_tools_qeasingcurve.cpp
+++ b/src/corelib/doc/snippets/code/src_corelib_tools_qeasingcurve.cpp
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2018 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the documentation of the Qt Toolkit.
@@ -49,6 +49,17 @@
****************************************************************************/
//! [0]
-qreal myEasingFunction(qreal progress);
+ QEasingCurve easing(QEasingCurve::InOutQuad);
+
+ for (qreal t = 0.0; t < 1.0; t+=0.1)
+ qWarning() << "Effective progress" << t << " is
+ << easing.valueForProgress(t);
//! [0]
+//! [1]
+ QPropertyAnimation animation;
+ animation.setStartValue(0);
+ animation.setEndValue(1000);
+ animation.setDuration(1000);
+ animation.setEasingCurve(QEasingCurve::InOutQuad);
+//! [1]
diff --git a/src/corelib/tools/qeasingcurve.cpp b/src/corelib/tools/qeasingcurve.cpp
index e66db58ed7..235ca625c1 100644
--- a/src/corelib/tools/qeasingcurve.cpp
+++ b/src/corelib/tools/qeasingcurve.cpp
@@ -72,24 +72,15 @@
curve is a linear curve. This is the default behaviour.
For example,
- \code
- QEasingCurve easing(QEasingCurve::InOutQuad);
- for(qreal t = 0.0; t < 1.0; t+=0.1)
- qWarning() << "Effective progress" << t << " is
- << easing.valueForProgress(t);
- \endcode
+ \snippet code/src_corelib_tools_qeasingcurve.cpp 0
+
will print the effective progress of the interpolation between 0 and 1.
When using a QPropertyAnimation, the associated easing curve will be used to control the
progress of the interpolation between startValue and endValue:
- \code
- QPropertyAnimation animation;
- animation.setStartValue(0);
- animation.setEndValue(1000);
- animation.setDuration(1000);
- animation.setEasingCurve(QEasingCurve::InOutQuad);
- \endcode
+
+ \snippet code/src_corelib_tools_qeasingcurve.cpp 1
The ability to set an amplitude, overshoot, or period depends on
the QEasingCurve type. Amplitude access is available to curves