diff options
| author | Janne Koskinen <janne.p.koskinen@digia.com> | 2010-01-29 13:38:09 (GMT) |
|---|---|---|
| committer | Janne Koskinen <janne.p.koskinen@digia.com> | 2010-01-29 13:38:09 (GMT) |
| commit | f4784025082b84a02e51dcde89bf32ad77cb4ccd (patch) | |
| tree | e9c63d745d4b96a9e276c23d92d940017811dbb3 /src/corelib/tools | |
| parent | 2812fb6ee0357e4da4d9a776638914416274a2f1 (diff) | |
| parent | 4f584d5d4c53d8510a34a698fac0f78c17f6cb93 (diff) | |
| download | Qt-f4784025082b84a02e51dcde89bf32ad77cb4ccd.zip Qt-f4784025082b84a02e51dcde89bf32ad77cb4ccd.tar.gz Qt-f4784025082b84a02e51dcde89bf32ad77cb4ccd.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6
Diffstat (limited to 'src/corelib/tools')
| -rw-r--r-- | src/corelib/tools/qeasingcurve.cpp | 6 | ||||
| -rw-r--r-- | src/corelib/tools/qsharedpointer.cpp | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/corelib/tools/qeasingcurve.cpp b/src/corelib/tools/qeasingcurve.cpp index 0ef92d9..b6a2df4 100644 --- a/src/corelib/tools/qeasingcurve.cpp +++ b/src/corelib/tools/qeasingcurve.cpp @@ -125,7 +125,7 @@ \value OutCubic \inlineimage qeasingcurve-outcubic.png \br Easing curve for a cubic (t^3) function: - decelerating from zero velocity. + decelerating to zero velocity. \value InOutCubic \inlineimage qeasingcurve-inoutcubic.png \br Easing curve for a cubic (t^3) function: @@ -141,7 +141,7 @@ \value OutQuart \inlineimage qeasingcurve-outquart.png \br Easing curve for a cubic (t^4) function: - decelerating from zero velocity. + decelerating to zero velocity. \value InOutQuart \inlineimage qeasingcurve-inoutquart.png \br Easing curve for a cubic (t^4) function: @@ -157,7 +157,7 @@ \value OutQuint \inlineimage qeasingcurve-outquint.png \br Easing curve for a cubic (t^5) function: - decelerating from zero velocity. + decelerating to zero velocity. \value InOutQuint \inlineimage qeasingcurve-inoutquint.png \br Easing curve for a cubic (t^5) function: diff --git a/src/corelib/tools/qsharedpointer.cpp b/src/corelib/tools/qsharedpointer.cpp index 21816b9..1b4b356 100644 --- a/src/corelib/tools/qsharedpointer.cpp +++ b/src/corelib/tools/qsharedpointer.cpp @@ -130,7 +130,7 @@ multiple- or virtual-inheritance (that is, in cases where two different pointer addresses can refer to the same object). In that case, if a pointer is cast to a different type and its value changes, - QSharedPointer's pointer tracking mechanism mail fail to detect that the + QSharedPointer's pointer tracking mechanism may fail to detect that the object being tracked is the same. \omit |