diff options
| author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2011-08-31 16:43:22 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2011-08-31 17:02:05 +0200 |
| commit | 01335edc94d2961bd4061ed2cb81ebd1151797bf (patch) | |
| tree | 54df7d2d0857278198258e4d8a65bf63cb35d91a /src/declarative/util | |
| parent | 20c3575fc39004d6a556820543982f4a6ebef0be (diff) | |
Fix export symbols for QtDeclarative and QtQuick1.
Fix build on Windows and compiler warnings.
Requires 090ee21eac7257644422e35395194e5fd7fb8efa in qtbase.
Change-Id: Ief8da504ccd3e2c2e78644cc9943d685c4302019
Reviewed-on: http://codereview.qt.nokia.com/3988
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Diffstat (limited to 'src/declarative/util')
| -rw-r--r-- | src/declarative/util/qdeclarativesmoothedanimation.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/declarative/util/qdeclarativesmoothedanimation.cpp b/src/declarative/util/qdeclarativesmoothedanimation.cpp index f76531a5f7..d306f8ab2b 100644 --- a/src/declarative/util/qdeclarativesmoothedanimation.cpp +++ b/src/declarative/util/qdeclarativesmoothedanimation.cpp @@ -123,14 +123,14 @@ bool QSmoothedAnimation::recalc() sd = s; } else if (maximumEasingTime != -1 && tf > (maximumEasingTime / 1000.)) { qreal met = maximumEasingTime / 1000.; - // tp| |td - // vp_ _______ - // / \ - // vi_ / \ - // \ - // \ _ 0 - // |ta| |ta| - // + /* tp| |td + * vp_ _______ + * / \ + * vi_ / \ + * \ + * \ _ 0 + * |ta| |ta| + */ qreal ta = met / 2.; a = (s - (vi * tf - 0.5 * vi * ta)) / (tf * ta - ta * ta); |