diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-01-22 05:13:52 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-01-22 05:13:52 (GMT) |
| commit | 747cca678faedac763fa9206d6ec55e028d24452 (patch) | |
| tree | d48e6b641be8c282193075d1320e76ab2c0056f1 /src/corelib | |
| parent | d1f77a5e47d79b9fb688046a7357bc0c8b21c875 (diff) | |
| parent | a3744b9394824cb50573215338e8ce54bc339adb (diff) | |
| download | Qt-747cca678faedac763fa9206d6ec55e028d24452.zip Qt-747cca678faedac763fa9206d6ec55e028d24452.tar.gz Qt-747cca678faedac763fa9206d6ec55e028d24452.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Only send QGraphicsItem::ParentChange(d) notifications from setParentItem.
Pass value as const void *const to QGraphicsSceneIndex::itemChange.
Optimize QGraphicsItem::setFlags.
Optimize QGraphicsScenePrivate::itemAcceptsHoverEvents_helper
Improve performance of QGraphicsItem::setParentItem.
Make sure cursor is painted at the correct position when we are using IM.
Purely cosmetic (formatting) changes to GL2 engine's GLSL
Use an attribute value for the PMV matrix rather than a uniform
Remove unnecessary depth uniform from GL2 engine's GLSL
Doc fixes: Remove some lies from QEasingCurve.
Fix how we select antialiasing method for text under Mac OS X
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/tools/qeasingcurve.cpp | 6 |
1 files changed, 3 insertions, 3 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: |