summaryrefslogtreecommitdiffstats
path: root/src/corelib/animation
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Aaron Kennedy2009-07-232-5/+6
|\ | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: configure configure.exe src/gui/kernel/qaction.h
| * Doc: A few cleanups, fixes and improvements.Volker Hilsheimer2009-07-192-4/+5
| |
| * Animations: animations with 0 duration would never be auto-deletedThierry Bastian2009-07-171-1/+1
| |
* | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-07-107-12/+34
|\ \ | |/ | | | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: configure.exe src/corelib/kernel/qmetaobject.cpp tools/qdoc3/generator.cpp tools/qdoc3/test/qt-cpp-ignore.qdocconf tools/qdoc3/test/qt-inc.qdocconf
| * QPropertyAnimation: save a Q_GLOBAL_STATICThierry Bastian2009-07-081-10/+8
| | | | | | | | | | This is possible because we anyway use a Mutex to access the static hash
| * Animations: fix compilation with QT_NO_ANIMATIONThierry Bastian2009-07-086-2/+26
| |
* | extend the QObjectPrivate::connectedSignals bitfield to make spacemae2009-07-061-1/+1
| | | | | | | | | | | | | | for all the required NOTIFY signals we need for QML bindings. An additional internal function QMetaObject::isConnected() allows to query the bits, or you use connectedSignals[0] if you know that the signal in question has a QMetaObject::indexOfSignal() < 32.
* | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-07-022-27/+22
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: configure.exe src/gui/kernel/qevent.cpp src/gui/kernel/qevent_p.h tools/qdoc3/codemarker.cpp tools/qdoc3/cppcodemarker.cpp tools/qdoc3/generator.cpp
| * QAnimation: fix a jump in values when restarting an animationThierry Bastian2009-07-011-26/+21
| |
| * Animation: fixed a NOTIFY signal name that was wrongThierry Bastian2009-07-011-1/+1
| | | | | | | | Also slightly updated a demo
* | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Aaron Kennedy2009-06-1920-40/+41
|\ \ | |/ | | | | | | | | | | | | kinetic-declarativeui Conflicts: configure.exe tools/qdoc3/htmlgenerator.cpp
| * Doc: Removed mention of QItemAnimation from animation docs and setGeir Vattekar2009-06-181-0/+1
| | | | | | | | | | | | QPropertyAnimation as a main class. Reviewed-by: Trust Me
| * Update license headers in files that are new in 4.6.Jason McDonald2009-06-1720-40/+40
| | | | | | | | Reviewed-by: Trust Me
* | Merge commit 'qt/master' into kinetic-declarativeuiBjørn Erik Nilsen2009-06-101-14/+19
|\ \ | |/ | | | | | | | | | | Conflicts: src/corelib/kernel/qabstractitemmodel.cpp src/corelib/kernel/qobject.cpp tools/qdoc3/htmlgenerator.cpp
| * removed foreach usage from animation APIThierry Bastian2009-06-091-14/+19
| |
* | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-06-097-15/+15
|\ \ | |/ | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: configure.exe tools/qdoc3/htmlgenerator.cpp tools/qdoc3/tree.cpp
| * move the QT_NO_ANIMATION macro to the right place (ie after otherThierry Bastian2009-06-047-15/+15
| | | | | | | | includes)
* | Merge commit 'mainline/master' into kinetic-declarativeuiBjørn Erik Nilsen2009-06-049-44/+48
|\ \ | |/ | | | | | | | | | | | | Conflicts: configure.exe src/gui/math3d/qmatrix4x4.cpp src/gui/math3d/qmatrix4x4.h tools/qdoc3/htmlgenerator.cpp
| * use of QMutexPool to reduce the number of Q_GLOBAL_STATIC in theThierry Bastian2009-06-032-36/+40
| | | | | | | | animation framework
| * prepend private/ for included private headersMartin Jones2009-06-015-5/+5
| |
| * Fix compilation with -pedanticDavid Faure2009-05-293-3/+3
| |
| * Export symbol needed by the declarative module.Michael Brasser2009-05-281-1/+2
| | | | | | | | Reviewed-by: Leo
* | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-05-2717-182/+148
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: mkspecs/features/qt.prf src/corelib/animation/qanimationgroup.cpp src/corelib/animation/qparallelanimationgroup.cpp src/corelib/animation/qpauseanimation.cpp src/corelib/animation/qpropertyanimation.cpp src/corelib/animation/qsequentialanimationgroup.cpp src/corelib/kernel/kernel.pri src/corelib/kernel/qvariant_p.h src/corelib/tools/qeasingcurve.cpp src/gui/graphicsview/qgraphicsitem.cpp src/opengl/opengl.pro src/opengl/qgl_x11egl.cpp tests/auto/auto.pro
| * small refactor to change the interpolator at the same time as theThierry Bastian2009-05-274-34/+40
| | | | | | | | current interval in the variant animations
| * Fixed a bug in animation when you set a start value that doesn't haveThierry Bastian2009-05-261-3/+7
| | | | | | | | | | | | | | | | | | the same type as the property For example, if you set a start value of 0 (integer) for a qreal animation, it would not work. Reviewed-by: janarve
| * Fixed docs warnings for Animation APIThierry Bastian2009-05-263-6/+15
| |
| * Some refactoring of windows specific code + a private class of animationsThierry Bastian2009-05-252-31/+19
| |
| * Fix compilation on Solaris for animation API.Alexis Menard2009-05-221-1/+1
| | | | | | | | Reviewed-by: thierry
| * update the qdoc tags (\since 4.6, remove \preliminary)Kent Hansen2009-05-207-13/+7
| |
| * Fix an issue that made appear warnings when the target of a propertyThierry Bastian2009-05-203-2/+31
| | | | | | | | | | | | | | | | | | | | animation was destroyed The problem was that we were not really detecting when the target was destroyed. So we weren't able to unregister it from the global internal hash we have in QPropertyAnimation. This happens if an animation is running and the target object is destroyed.
| * No need to export QVariantAnimationPrivateThierry Bastian2009-05-201-1/+1
| |
| * Removing QT_EXPERIMENTAL_SOLUTION from the animation apiLeonardo Sobral Cunha2009-05-1911-74/+9
| |
| * Removed unused method from QVariantAnimationPrivateLeonardo Sobral Cunha2009-05-192-7/+0
| |
| * Doc: Added information about ownership of animations.David Boddie2009-05-191-7/+14
| | | | | | | | Reviewed-by: Thierry Bastian
* | Merge branch 'kinetic-animations' of git@scm.dev.nokia.troll.no:qt/kinetic ↵Michael Brasser2009-05-188-68/+166
|\ \ | |/ | | | | | | | | | | | | | | into kinetic-declarativeui Conflicts: src/corelib/animation/qanimationgroup.cpp src/corelib/animation/qvariantanimation.cpp src/gui/graphicsview/qgraphicsitem.cpp
| * Avoid resetting the QVariantAnimation::currentValue when changing stateLeonardo Sobral Cunha2009-05-151-2/+0
| | | | | | | | Reviewed-by: janarve
| * General refactors in QVariantAnimationLeonardo Sobral Cunha2009-05-152-27/+35
| | | | | | | | Reviewed-by: janarve
| * Update current value on QVariantAnimation::setKeyValuesLeonardo Sobral Cunha2009-05-151-0/+1
| | | | | | | | | | | | | | The current value was udpated on setKeyValueAt, but not on setKeyValues and this was leading to a semantic inconsistency. Reviewed-by: janarve
| * Avoid interpolating if we have less than 2 key values in QVariantAnimationLeonardo Sobral Cunha2009-05-151-4/+10
| | | | | | | | | | | | | | If we have less than 2 key values, we should neither try to interpolate nor set the current value. Reviewed-by: janarve
| * Indentation and whitespace fixes in animation apiLeonardo Sobral Cunha2009-05-155-13/+10
| |
| * Merge branch 'kinetic-animations' of git@scm.dev.nokia.troll.no:qt/kinetic ↵David Boddie2009-05-128-128/+334
| |\ | | | | | | | | | into kinetic-animations
| | * Doc: Work on QPauseAnimationGeir Vattekar2009-05-111-0/+16
| | |
| | * Doc: Work on QParallelAnimationGroup and QSequentialAnimationGroupGeir Vattekar2009-05-112-7/+49
| | |
| | * Doc: Work on QAnimationGroup class description.Geir Vattekar2009-05-081-12/+40
| | |
| | * Correct spelling. setConsitentTiming -> setConsistentTimingMichael Brasser2009-05-082-2/+2
| | |
| * | Merge branch 'kinetic-animations' of git@scm.dev.nokia.troll.no:qt/kinetic ↵David Boddie2009-04-291-17/+7
| |\ \ | | | | | | | | | | | | into kinetic-animations
| * | | Merged local changes.David Boddie2009-04-291-1/+1
| | | |
* | | | qdoc: Fixed some qdoc errors.Martin Smith2009-05-131-9/+7
| | | |
* | | | qdoc: Fixed some qdoc errors.Martin Smith2009-05-121-1/+1
| | | |
* | | | qdoc: Fixed some qdoc errors.Martin Smith2009-05-121-1/+1
| | | |