summaryrefslogtreecommitdiff
path: root/src/quick/items/qquickanimation.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into animation-refactorwip/animation-refactoranimation-refactorMichael Brasser2012-01-251-2/+2
|\ | | | | | | | | | | | | Conflicts: tests/auto/declarative/declarative.pro Change-Id: Ie339be2989fac553d351f3077869f1847367b504
| * Update obsolete contact address.Jason McDonald2012-01-231-1/+1
| | | | | | | | | | | | | | | | Replace Nokia contact email address with Qt Project website. Change-Id: I6a730abc0c396fb545a48b2d6938abedac2e3f1c Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com> Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
| * Update copyright year in Nokia copyright headers.Jason McDonald2012-01-171-1/+1
| | | | | | | | | | | | | | | | Update copyright headers from before 2011, and a couple of new ones that were merged after the previous change to copyright headers. Change-Id: Ia76e08e2734afa4ef3f1207dbcda5ff3bc81b366 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* | Fix crash when exiting with running animation.Michael Brasser2012-01-241-1/+4
| | | | | | | | | | Change-Id: I3940b3d9f20ca948e435d583366544eecb895fb2 Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
* | Update PathAnimation API and document.Michael Brasser2012-01-241-15/+125
| | | | | | | | | | | | | | | | Update the API according to the last API review. Document it and add a basic example as well. Change-Id: I2d06a0772a9fb2101844446e68799620c275db97 Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
* | Re-add documentation for AnchorAnimation and ParentAnimation.Michael Brasser2012-01-241-0/+123
| | | | | | | | | | Change-Id: I2dfec71ef24d83492b8ade5849392e4b056ba5f6 Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
* | Fix potential crash.Michael Brasser2012-01-191-0/+5
| | | | | | | | | | Change-Id: I374d13a80d8778ddad081b29a0cbd63a9bf44f35 Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
* | Rename animation backend classes.Michael Brasser2012-01-191-9/+9
| | | | | | | | | | Change-Id: I8796086097b5464dbe16a92df055e5a153971f21 Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
* | Correctly clear activeAnimations for smoothed, spring, and path animation.Michael Brasser2012-01-171-2/+17
| | | | | | | | | | | | | | Remove animations from the hash when they are deleted. Change-Id: I17dd8f577a6d3cb0282b24d6d52f963caecfcd33 Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
* | Prevent PathAnimation from hanging when jumping backwards to beginning.Michael Brasser2012-01-131-0/+1
| | | | | | | | | | | | Task-number: QTBUG-23076 Change-Id: I2aecdfd28f0c3d45b3b805640edaecbd5be2e6fd Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
* | Fix animation looping.Michael Brasser2012-01-131-3/+3
| | | | | | | | | | | | Task-number: QTBUG-23092 Change-Id: I67b4e9565228d4cdf7aa4a8fe1c490a5e471ee47 Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
* | Further optimization and cleanup.Michael Brasser2012-01-131-20/+16
| | | | | | | | | | | | | | | | | | | | | | | | Note that this removes the reference counting, as in practice we seem to always have a single clear owner for each animation. This isn't completely the case for Smoothed, Spring, and Path animations, which also keep previous animations cached, so we will need to specially handle that case. Change-Id: Ie7eb6642ae1ecdee31602cd8d49d1ad703ac102a Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
* | Merge branch 'master' into animation-refactorCharles Yin2011-12-051-108/+98
|/ | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/declarative/declarative.pro src/declarative/items/qquickanimation_p.h src/declarative/items/qquickcanvas.cpp src/declarative/items/qquickcanvas_p.h src/declarative/particles/qquickparticlesystem.cpp src/declarative/particles/qquickparticlesystem_p.h src/declarative/scenegraph/qsgcontext.cpp src/declarative/scenegraph/qsgcontext_p.h src/declarative/util/qdeclarativeanimation_p.h src/declarative/util/qdeclarativebehavior_p.h src/declarative/util/qdeclarativesmoothedanimation_p.h src/declarative/util/qdeclarativespringanimation_p.h src/declarative/util/qdeclarativetimer_p.h src/declarative/util/util.pri tests/auto/declarative/nodes/nodes.pro tests/auto/declarative/qdeclarativeanimations/tst_qdeclarativeanimations.cpp tests/auto/declarative/qdeclarativebehaviors/tst_qdeclarativebehaviors.cpp tests/auto/declarative/qdeclarativetimer/qdeclarativetimer.pro Change-Id: Ia406128ed943866fc296c7810c3aab94f00e906d
* Say hello to QtQuick moduleKent Hansen2011-12-021-0/+792
This change moves the QtQuick 2 types and C++ API (including SceneGraph) to a new module (AKA library), QtQuick. 99% of this change is moving files from src/declarative to src/quick, and from tests/auto/declarative to tests/auto/qtquick2. The loading of QtQuick 2 ("import QtQuick 2.0") is now delegated to a plugin, src/imports/qtquick2, just like it's done for QtQuick 1. All tools, examples, and tests that use QtQuick C++ API have gotten "QT += quick" or "QT += quick-private" added to their .pro file. A few additional internal QtDeclarative classes had to be exported (via Q_DECLARATIVE_PRIVATE_EXPORT) since they're needed by the QtQuick 2 implementation. The old header locations (e.g. QtDeclarative/qquickitem.h) will still be supported for some time, but will produce compile-time warnings. (To avoid the QtQuick implementation using the compatibility headers (since QtDeclarative's includepath comes first), a few include statements were modified, e.g. from "#include <qsgnode.h>" to "#include <QtQuick/qsgnode.h>".) There's a change in qtbase that automatically adds QtQuick to the module list if QtDeclarative is used. Together with the compatibility headers, this should help reduce the migration pain for existing projects. In theory, simply getting an existing QtDeclarative-based project to compile and link shouldn't require any changes for now -- but porting to the new scheme is of course recommended, and will eventually become mandatory. Task-number: QTBUG-22889 Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Change-Id: Ia52be9373172ba2f37e7623231ecb060316c96a7 Reviewed-by: Kent Hansen <kent.hansen@nokia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
View Lorry Controller Status