summaryrefslogtreecommitdiffstats
path: root/src/declarative/graphicsitems/qdeclarativeeffects.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Remove (undocumented) QML bindings for effects.Michael Brasser2010-04-221-174/+0
| | | | | Support for effects will be introduced in a future release, when we can make better guarantees about performance.
* Merge remote branch 'origin/master' into 4.7Thiago Macieira2010-02-271-0/+4
| | | | | | | | | | | | | | | | | | | | | 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
* Change class prefix to from QmlXXX to QDeclarativeXXX, QmlGraphicsXXX to ↵Warwick Allison2010-02-241-0/+170
QDeclarativeXXX.