aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/animations/qparallelanimationgroupjob.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Updated license headersJani Heikkinen2016-01-191-14/+20
| | | | | | | | | | | From Qt 5.7 -> LGPL v2.1 isn't an option anymore, see http://blog.qt.io/blog/2016/01/13/new-agreement-with-the-kde-free-qt-foundation/ Updated license headers to use new LGPL header instead of LGPL21 one (in those files which will be under LGPL v3) Change-Id: Ic36f1a0a1436fe6ac6eeca8c2375a79857e9cb12 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* QtQml: Fix const correctness in old style castsThiago Macieira2015-07-091-1/+1
| | | | | | | Found with GCC's -Wcast-qual. Change-Id: Ia0aac2f09e9245339951ffff13c958364a2e9859 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* Update copyright headersJani Heikkinen2015-02-121-7/+7
| | | | | | | | | Qt copyrights are now in The Qt Company, so we could update the source code headers accordingly. In the same go we should also fix the links to point to qt.io. Change-Id: I61120571787870c0ed17066afb31779b1e6e30e9 Reviewed-by: Iikka Eklund <iikka.eklund@theqtcompany.com>
* Update license headers and add new licensesJani Heikkinen2014-08-251-19/+11
| | | | | | | | | - Renamed LICENSE.LGPL to LICENSE.LGPLv21 - Added LICENSE.LGPLv3 & LICENSE.GPLv2 - Removed LICENSE.GPL Change-Id: I84a565e2e0caa3b76bf291a7d188a57a4b00e1b0 Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
* Append the start time of the current loop to the animation time.Gunnar Sletta2014-04-241-1/+1
| | | | | | | | | currentTime() uses the total time, so when we use only the loop-local time for the child animations, normal animations will seem to have terminated long ago (on the previous loop). Change-Id: I80a229f40a99569014d8082d153ad579c09fb9db Reviewed-by: Michael Brasser <michael.brasser@live.com>
* Reset loop counters when animations are started.Gunnar Sletta2014-04-241-1/+3
| | | | | | | | | | Where normal animations would derive the current loop from the current time, uncontrolled animations use an iterative approach and which was not reset when an animation was restarted or a parent had a loop around it. Change-Id: Ia7a1880c8b7578463dff4c5ddeab48324bcb32ee Reviewed-by: Michael Brasser <michael.brasser@live.com>
* Fix nested parallel/sequential animations combined with animators.Gunnar Sletta2014-04-241-5/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | The logic for looping uncontrolled animations in QAbstractAnimationJob::setCurrentTime assumes that uncontrolled animations return duration == -1, always. The logic falls apart when a duration gets set while the animation is running. To rememdy this, update QParallelAnimation's duration to return -1 for this case. This is also how the sequential group's duration is implemented so these are now using the same pattern. Update the logic in parallel animations to flush previous loops in updateAnimationsTime to handle the case where duration is -1. This solves the case where we have for instance: ParallelAnimation Sequential YAnimator: duration: 1000 ScriptAction ... Sequential Pause duration: 5000 <--- longer than yanimator ScriptAction ... Task-number: QTBUG-37246 Change-Id: I7a1ea547b2f3090feb8b1e87aa7ca746151736fa Reviewed-by: Michael Brasser <michael.brasser@live.com>
* Support dumping of animation jobs via QML_ANIMATION_TICK_DUMP.Michael Brasser2014-04-081-0/+7
| | | | | Change-Id: I0b444321667691be3e1037164d02f29ed4dfc13e Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
* Fix various compiler warnings in order to remove warn_off in the near futureErik Verbruggen2013-11-041-1/+1
| | | | | Change-Id: Ic0492fbe31a1e134674bc6c20381f735dd6d5b7a Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Support looping for "uncontrolled animations".Gunnar Sletta2013-09-261-2/+11
| | | | | | | | | | The render thread animations rely heavily on uncontrolled animations, meaning animations with duration=-1. We support this by adding a m_currentLoopStartTime and incrementally counting the finish time of each uncontrolled animation. Change-Id: I1f2ccea09aff4c51b1a7f98a2ddb58636af50557 Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
* Update copyright year in Digia's license headersSergio Ahumada2013-01-101-1/+1
| | | | | | Change-Id: I6c3bd7bebe3d62d1cfd0fa6334544c9db8398c76 Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Change copyrights from Nokia to DigiaIikka Eklund2012-09-231-24/+24
| | | | | | | Change copyrights and license headers from Nokia to Digia Change-Id: Ie7f5d49ed8235d7a7845ab68f99ad1c220e64d5c Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Avoid using previously declared variablesCharles Yin2012-05-291-2/+2
| | | | | Change-Id: Ie2f003cacc99fda00b666ed194cb044a7ee3faf1 Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
* Rename QDeclarative symbols to QQuick and QQmlMatthew Vogt2012-02-241-0/+227
Symbols beginning with QDeclarative are already exported by the quick1 module. Users can apply the bin/rename-qtdeclarative-symbols.sh script to modify client code using the previous names of the renamed symbols. Task-number: QTBUG-23737 Change-Id: Ifaa482663767634931e8711a8e9bf6e404859e66 Reviewed-by: Martin Jones <martin.jones@nokia.com>