diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-17 16:08:46 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-17 16:08:46 (GMT) |
| commit | e66fcc2b1897883d8ec0780c731c5989cb657cdf (patch) | |
| tree | 8cac984418b97886793d973f0ee138f1412fbc14 /src/declarative/util/qdeclarativesmoothedfollow.cpp | |
| parent | fd36b47e8758562fc9ff350f292fc9ae9ed91d4e (diff) | |
| parent | e23a519366587cfc27ad3be88180692cb49e206f (diff) | |
| download | Qt-e66fcc2b1897883d8ec0780c731c5989cb657cdf.zip Qt-e66fcc2b1897883d8ec0780c731c5989cb657cdf.tar.gz Qt-e66fcc2b1897883d8ec0780c731c5989cb657cdf.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (29 commits)
Recognize identifiers containing unicode escape sequences.
Fix README
Fix doc: QML_DECLARE_TYPE is no longer necessary
Fix doc: remote contents requires qmldir
Fixed parsing of inner labelled statements.
Doc
Remove unsupported plugin version flags in .pro files of declarative examples
Documentation typo.
More QML doc consistency.
Ensure existing image is gone before next photo selection.
Don't use zoomfactor.
Doc: in QML use "real" and "enumeration", not "qreal" and "enum"
Doc: Put "default" property label on same line as property name
Wait for debug clients asynchronously instead of blocking creation of
Test not reliable
ResizeMode support for QGraphicsWidgets created with QDeclarativeView
More class documentation fixes for declarative.
Simplify QML import plugin deployment lines
Add QML imports to s60installs.pro
Cleanup photoviewer demo.
...
Diffstat (limited to 'src/declarative/util/qdeclarativesmoothedfollow.cpp')
| -rw-r--r-- | src/declarative/util/qdeclarativesmoothedfollow.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/declarative/util/qdeclarativesmoothedfollow.cpp b/src/declarative/util/qdeclarativesmoothedfollow.cpp index 9f155fc..3ed9257 100644 --- a/src/declarative/util/qdeclarativesmoothedfollow.cpp +++ b/src/declarative/util/qdeclarativesmoothedfollow.cpp @@ -195,7 +195,7 @@ qreal QDeclarativeSmoothedFollow::velocity() const } /*! - \qmlproperty qreal SmoothedFollow::velocity + \qmlproperty real SmoothedFollow::velocity This property holds the average velocity allowed when tracking the 'to' value. @@ -214,7 +214,7 @@ void QDeclarativeSmoothedFollow::setVelocity(qreal v) } /*! - \qmlproperty qreal SmoothedFollow::maximumEasingTime + \qmlproperty int SmoothedFollow::maximumEasingTime This property specifies the maximum time, in msecs, an "eases" during the follow should take. Setting this property causes the velocity to "level out" after at a time. Setting |