diff options
author | Liang Qi <liang.qi@theqtcompany.com> | 2015-10-23 14:01:35 +0200 |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-10-23 14:45:03 +0200 |
commit | 790aef362fd195adf97d8c780a7cbbbade27d51f (patch) | |
tree | 8be464687ab21806cfe9f7ada27098b563aa41b2 /src/corelib/tools/qeasingcurve.cpp | |
parent | 9720efbd1035c2e939b0581163e6d804c713dd96 (diff) | |
parent | 07475c662eb73c833da2d461b8ef2702ca1e2cfb (diff) |
Merge remote-tracking branch 'origin/5.6' into dev
Conflicts:
.qmake.conf
configure
src/corelib/global/qglobal.h
src/tools/qdoc/node.cpp
src/tools/qdoc/qdocdatabase.cpp
tests/auto/corelib/io/qsettings/tst_qsettings.cpp
tools/configure/configureapp.cpp
Change-Id: I66028ae5e441a06b73ee85ba72a03a3af3e8593f
Diffstat (limited to 'src/corelib/tools/qeasingcurve.cpp')
-rw-r--r-- | src/corelib/tools/qeasingcurve.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/corelib/tools/qeasingcurve.cpp b/src/corelib/tools/qeasingcurve.cpp index 22f5c65a40..012e6a95e8 100644 --- a/src/corelib/tools/qeasingcurve.cpp +++ b/src/corelib/tools/qeasingcurve.cpp @@ -170,7 +170,7 @@ \value OutSine \image qeasingcurve-outsine.png \caption Easing curve for a sinusoidal (sin(t)) function: - decelerating from zero velocity. + decelerating to zero velocity. \value InOutSine \image qeasingcurve-inoutsine.png \caption Easing curve for a sinusoidal (sin(t)) function: @@ -186,7 +186,7 @@ \value OutExpo \image qeasingcurve-outexpo.png \caption Easing curve for an exponential (2^t) function: - decelerating from zero velocity. + decelerating to zero velocity. \value InOutExpo \image qeasingcurve-inoutexpo.png \caption Easing curve for an exponential (2^t) function: @@ -202,7 +202,7 @@ \value OutCirc \image qeasingcurve-outcirc.png \caption Easing curve for a circular (sqrt(1-t^2)) function: - decelerating from zero velocity. + decelerating to zero velocity. \value InOutCirc \image qeasingcurve-inoutcirc.png \caption Easing curve for a circular (sqrt(1-t^2)) function: @@ -222,7 +222,7 @@ \caption Easing curve for an elastic (exponentially decaying sine wave) function: - decelerating from zero velocity. The peak amplitude + decelerating to zero velocity. The peak amplitude can be set with the \e amplitude parameter, and the period of decay by the \e period parameter. \value InOutElastic \image qeasingcurve-inoutelastic.png |