aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/animations
Commit message (Collapse)AuthorAgeFilesLines
* Animations: Avoid accessing invalid memory if stop() triggers deletionKai Koehne2013-05-291-2/+2
| | | | | | | | | Return immediately if calling stop() results in the current object being deleted. Task-number: QTBUG-31247 Change-Id: I684a858bfb4cc53f415daa8cc1c4df96067daa1c Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* Remove QT_{BEGIN,END}_HEADER macro usageSergio Ahumada2013-01-285-20/+0
| | | | | | | | | | | The macro was made empty in qtbase/ba3dc5f3b56d1fab6fe37fe7ae08096d7dc68bcb and is no longer necessary or used. Discussed-on: http://lists.qt-project.org/pipermail/development/2013-January/009284.html Change-Id: Ia07e99676e0134fde5e32880edb95e57c779a7ff Reviewed-by: Laszlo Papp <lpapp@kde.org> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com> Reviewed-by: Alan Alpert <aalpert@rim.com>
* Update copyright year in Digia's license headersSergio Ahumada2013-01-1011-11/+11
| | | | | | Change-Id: I6c3bd7bebe3d62d1cfd0fa6334544c9db8398c76 Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Do not crash on some animation changesAlbert Astals Cid2012-12-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stop() might end up deleting the animationjob object so wrap the call with a RETURN_IF_DELETED Fixes valgrind complaining ==18380== Invalid read of size 1 ==18380== at 0x5530B24: QAbstractAnimationJob::setCurrentTime(int) (in /home/tsdgeos/qt5/qtdeclarative/lib/libQt5Qml.so.5.0.0) ==18380== by 0x5530BDE: QQmlAnimationTimer::updateAnimationsTime(long long) (in /home/tsdgeos/qt5/qtdeclarative/lib/libQt5Qml.so.5.0.0) ==18380== by 0x65C05DC: QUnifiedTimer::updateAnimationTimers(long long) (in /home/tsdgeos/qt5/qtbase/lib/libQt5Core.so.5.0.0) ==18380== by 0x65C10E3: QAnimationDriver::advanceAnimation(long long) (in /home/tsdgeos/qt5/qtbase/lib/libQt5Core.so.5.0.0) ==18380== by 0x5047DB9: QQuickRenderThreadSingleContextWindowManager::event(QEvent*) (qquickthreadedwindowmanager.cpp:588) ==18380== by 0x58D7F9B: QApplicationPrivate::notify_helper(QObject*, QEvent*) (in /home/tsdgeos/qt5/qtbase/lib/libQt5Widgets.so.5.0.0) ==18380== by 0x58DB364: QApplication::notify(QObject*, QEvent*) (in /home/tsdgeos/qt5/qtbase/lib/libQt5Widgets.so.5.0.0) ==18380== by 0x6756B9D: QCoreApplication::notifyInternal(QObject*, QEvent*) (in /home/tsdgeos/qt5/qtbase/lib/libQt5Core.so.5.0.0) ==18380== by 0x6758855: QCoreApplicationPrivate::sendPostedEvents(QObject*, int, QThreadData*) (in /home/tsdgeos/qt5/qtbase/lib/libQt5Core.so.5.0.0) ==18380== by 0x679E7C2: postEventSourceDispatch(_GSource*, int (*)(void*), void*) (in /home/tsdgeos/qt5/qtbase/lib/libQt5Core.so.5.0.0) ==18380== by 0x85B7AB4: g_main_context_dispatch (gmain.c:2715) ==18380== by 0x85B7DE7: g_main_context_iterate.isra.24 (gmain.c:3290) ==18380== Address 0x1642bd48 is 88 bytes inside a block of size 128 free'd ==18380== at 0x4C2A44B: operator delete(void*) (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so) ==18380== by 0x4F0728B: QQuickBehavior::write(QVariant const&) (qquickbehavior.cpp:210) ==18380== by 0x53EB0FE: QQmlVMEMetaObject::metaCall(QMetaObject::Call, int, void**) (in /home/tsdgeos/qt5/qtdeclarative/lib/libQt5Qml.so.5.0.0) ==18380== by 0x54FEA08: StoreProperty(QV8Engine*, QObject*, QQmlPropertyData*, v8::Handle<v8::Value>) (in /home/tsdgeos/qt5/qtdeclarative/lib/libQt5Qml.so.5.0.0) ==18380== by 0x79ED2CE: v8::internal::JSObject::SetPropertyWithCallback(v8::internal::Object*, v8::internal::String*, v8::internal::Object*, v8::internal::JSObject*, v8::internal::StrictModeFlag) (in /home/tsdgeos/qt5/qtjsbackend/lib/libQt5V8.so.5.0.0) ==18380== by 0x7A0AE71: v8::internal::JSObject::SetPropertyForResult(v8::internal::LookupResult*, v8::internal::String*, v8::internal::Object*, PropertyAttributes, v8::internal::StrictModeFlag) (in /home/tsdgeos/qt5/qtjsbackend/lib/libQt5V8.so.5.0.0) ==18380== by 0x7A0B2D8: v8::internal::JSReceiver::SetProperty(v8::internal::String*, v8::internal::Object*, PropertyAttributes, v8::internal::StrictModeFlag, bool) (in /home/tsdgeos/qt5/qtjsbackend/lib/libQt5V8.so.5.0.0) ==18380== by 0x79A8861: v8::internal::StoreIC::Store(v8::internal::InlineCacheState, v8::internal::StrictModeFlag, v8::internal::Handle<v8::internal::Object>, v8::internal::Handle<v8::internal::String>, v8::internal::Handle<v8::internal::Object>) (in /home/tsdgeos/qt5/qtjsbackend/lib/libQt5V8.so.5.0.0) ==18380== by 0x79A8DF0: v8::internal::StoreIC_Miss(v8::internal::Arguments, v8::internal::Isolate*) (in /home/tsdgeos/qt5/qtjsbackend/lib/libQt5V8.so.5.0.0) ==18380== by 0x24E8BD20618D: ??? ==18380== by 0x24E8BD237AC9: ??? ==18380== by 0x24E8BD2249E6: ??? Change-Id: Idcb195206d344bb526ee37f9172a6b3c029540db Reviewed-by: Michael Brasser <michael.brasser@live.com>
* Add designer support for animations and componentCompleteMarco Bubke2012-11-221-1/+12
| | | | | | | | | In the designer animations confuse users, if you change a state or move a item around. Also component complete is called later by the designer. The call in the VME is to early. Change-Id: I49aa04edbc49fb44ddb7b52062307982865efd7e Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* Remove stale QT_MODULE() usage casesSergio Ahumada2012-10-295-10/+0
| | | | | | | | As of Qt5, this macro is defined to be empty; simply get rid of these leftovers. Change-Id: Ib3a8e8eae98e2839c3db4bf34be8dcf43f49af11 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
* Fixed missing virtual destructors in qtdeclarative.Samuel Rødal2012-09-242-1/+6
| | | | | | Change-Id: I0b0e63b572617a56874e27361479de2690644aa3 Reviewed-by: Marc Mutz <marc.mutz@kdab.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Change copyrights from Nokia to DigiaIikka Eklund2012-09-2311-265/+265
| | | | | | | 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-3/+3
| | | | | Change-Id: Ia4ba88bef012cee7329244adf10c219bd763a936 Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
* Avoid using previously declared variablesCharles Yin2012-05-291-2/+2
| | | | | Change-Id: Ie2f003cacc99fda00b666ed194cb044a7ee3faf1 Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
* Add more RETURN_IF_DELETED checking in animation codeCharles Yin2012-05-251-1/+1
| | | | | Change-Id: I5f77cdc7a6bede547119b2a0b59b41d27cfc401a Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Only preallocate 1 change listener per animation instanceCharles Yin2012-05-231-1/+1
| | | | | | | | In most cases, only one animation change listener is added to animation instance, so change QPODVector's Increment parameter from 4 to 1 can save 24 bytes (8 bytes for each listener) per animation instance. Change-Id: Iaf50016899963689f2bf84c3dd14fcd05c306d21 Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
* Add completeToBeginning()/completeToEnd() to animation controllerCharles Yin2012-05-232-5/+38
| | | | | Change-Id: I1abac96754cc82c8e0e00c58a27c09b68c5075c1 Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
* Remove unnecessary exportsMatthew Vogt2012-05-185-7/+7
| | | | | | | | | Reduce library load time by removing any exports which are not required by existing clients. Task-number: QTBUG-24768 Change-Id: Ia5754d6f97bb2ed46e290820a5b092f85a4bc5b0 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* More defense programming in animation codeCharles Yin2012-05-171-2/+5
| | | | | | | | 1. Add more deletion checkings in animation job code 2. Add some more asserts Change-Id: I34772792ea4638b61eb2c3d65da5d35ce75183d7 Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
* Add a new running property to QQuickTransitionCharles Yin2012-04-162-2/+0
| | | | | | | | | | | This read only property can be used to track the transition running state. As all animation items inside a Transition item are just animation defination templetes, so their running properties won't be updated during the transition animations running, which makes it hard to know the current running state of a transition animation. Change-Id: If7fc0616ba384abc6bf2da67c7c639430c3d8fb9 Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
* Rewrite QAnimationGroupJob::clear() methodCharles Yin2012-04-051-5/+11
| | | | | | | | Before removing and deleting children, set the m_group to 0 to avoid potential cycling deletions when this method is called from QAnimationGroupJob::~QAnimationGroupJob(). Change-Id: Idb6920be71fc9e033e5a76b724c9550018995035 Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
* More refactoring on animation controllerCharles Yin2012-03-132-9/+40
| | | | | | | | | Add a flag and helper functions for disabling user control in QAbstractAnimationJob class and make it synchronized with QDeclarativeAnimation class's disableUserControl flag. Change-Id: Ifa84ab0c78291941469c33f2cafe5f61ee718b2c Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
* Return early if animationjob was deleted in all callback methods.Charles Yin2012-03-121-6/+9
| | | | | Change-Id: I703c8a8904ffd760683de4ee74544dff9eb53144 Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
* Rename QDeclarative symbols to QQuick and QQmlMatthew Vogt2012-02-2412-0/+2059
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>