summaryrefslogtreecommitdiffstats
path: root/src/declarative/util/qdeclarativespringfollow.cpp
Commit message (Collapse)AuthorAgeFilesLines
* 'on' syntax fixesYann Bodson2010-03-031-3/+3
|
* Merge remote branch 'origin/master' into 4.7Thiago Macieira2010-02-271-0/+1
| | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/kernel/qmetatype.cpp src/declarative/graphicsitems/qdeclarativeevents.cpp src/declarative/graphicsitems/qdeclarativeflickable.cpp src/declarative/graphicsitems/qdeclarativegridview.cpp src/declarative/qml/qdeclarativescript.cpp src/declarative/util/qdeclarativeanimation.cpp src/declarative/util/qdeclarativebehavior.cpp src/declarative/util/qdeclarativeeasefollow.cpp src/declarative/util/qdeclarativefontloader.cpp src/declarative/util/qdeclarativelistmodel.cpp src/declarative/util/qdeclarativespringfollow.cpp src/declarative/util/qdeclarativestategroup.cpp src/declarative/util/qdeclarativesystempalette.cpp src/declarative/util/qdeclarativetimer.cpp src/declarative/util/qmlstateoperations.cpp src/multimedia/qml/qdeclarativeaudio.cpp src/multimedia/qml/qdeclarativevideo.cpp
* Rename QDeclarativeMetaProperty -> QDeclarativePropertyAaron Kennedy2010-02-251-2/+2
| | | | There's nothing meta about our properties.
* Change class prefix to from QmlXXX to QDeclarativeXXX, QmlGraphicsXXX to ↵Warwick Allison2010-02-241-0/+464
QDeclarativeXXX.