Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵ | Aaron Kennedy | 2009-07-23 | 2 | -5/+6 |
|\ | | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: configure configure.exe src/gui/kernel/qaction.h | ||||
| * | Doc: A few cleanups, fixes and improvements. | Volker Hilsheimer | 2009-07-19 | 2 | -4/+5 |
| | | |||||
| * | Animations: animations with 0 duration would never be auto-deleted | Thierry Bastian | 2009-07-17 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵ | Michael Brasser | 2009-07-10 | 7 | -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_STATIC | Thierry Bastian | 2009-07-08 | 1 | -10/+8 |
| | | | | | | | | | | This is possible because we anyway use a Mutex to access the static hash | ||||
| * | Animations: fix compilation with QT_NO_ANIMATION | Thierry Bastian | 2009-07-08 | 6 | -2/+26 |
| | | |||||
* | | extend the QObjectPrivate::connectedSignals bitfield to make space | mae | 2009-07-06 | 1 | -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 Brasser | 2009-07-02 | 2 | -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 animation | Thierry Bastian | 2009-07-01 | 1 | -26/+21 |
| | | |||||
| * | Animation: fixed a NOTIFY signal name that was wrong | Thierry Bastian | 2009-07-01 | 1 | -1/+1 |
| | | | | | | | | Also slightly updated a demo | ||||
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵ | Aaron Kennedy | 2009-06-19 | 20 | -40/+41 |
|\ \ | |/ | | | | | | | | | | | | | kinetic-declarativeui Conflicts: configure.exe tools/qdoc3/htmlgenerator.cpp | ||||
| * | Doc: Removed mention of QItemAnimation from animation docs and set | Geir Vattekar | 2009-06-18 | 1 | -0/+1 |
| | | | | | | | | | | | | QPropertyAnimation as a main class. Reviewed-by: Trust Me | ||||
| * | Update license headers in files that are new in 4.6. | Jason McDonald | 2009-06-17 | 20 | -40/+40 |
| | | | | | | | | Reviewed-by: Trust Me | ||||
* | | Merge commit 'qt/master' into kinetic-declarativeui | Bjørn Erik Nilsen | 2009-06-10 | 1 | -14/+19 |
|\ \ | |/ | | | | | | | | | | | Conflicts: src/corelib/kernel/qabstractitemmodel.cpp src/corelib/kernel/qobject.cpp tools/qdoc3/htmlgenerator.cpp | ||||
| * | removed foreach usage from animation API | Thierry Bastian | 2009-06-09 | 1 | -14/+19 |
| | | |||||
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵ | Michael Brasser | 2009-06-09 | 7 | -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 other | Thierry Bastian | 2009-06-04 | 7 | -15/+15 |
| | | | | | | | | includes) | ||||
* | | Merge commit 'mainline/master' into kinetic-declarativeui | Bjørn Erik Nilsen | 2009-06-04 | 9 | -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 the | Thierry Bastian | 2009-06-03 | 2 | -36/+40 |
| | | | | | | | | animation framework | ||||
| * | prepend private/ for included private headers | Martin Jones | 2009-06-01 | 5 | -5/+5 |
| | | |||||
| * | Fix compilation with -pedantic | David Faure | 2009-05-29 | 3 | -3/+3 |
| | | |||||
| * | Export symbol needed by the declarative module. | Michael Brasser | 2009-05-28 | 1 | -1/+2 |
| | | | | | | | | Reviewed-by: Leo | ||||
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵ | Michael Brasser | 2009-05-27 | 17 | -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 the | Thierry Bastian | 2009-05-27 | 4 | -34/+40 |
| | | | | | | | | current interval in the variant animations | ||||
| * | Fixed a bug in animation when you set a start value that doesn't have | Thierry Bastian | 2009-05-26 | 1 | -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 API | Thierry Bastian | 2009-05-26 | 3 | -6/+15 |
| | | |||||
| * | Some refactoring of windows specific code + a private class of animations | Thierry Bastian | 2009-05-25 | 2 | -31/+19 |
| | | |||||
| * | Fix compilation on Solaris for animation API. | Alexis Menard | 2009-05-22 | 1 | -1/+1 |
| | | | | | | | | Reviewed-by: thierry | ||||
| * | update the qdoc tags (\since 4.6, remove \preliminary) | Kent Hansen | 2009-05-20 | 7 | -13/+7 |
| | | |||||
| * | Fix an issue that made appear warnings when the target of a property | Thierry Bastian | 2009-05-20 | 3 | -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 QVariantAnimationPrivate | Thierry Bastian | 2009-05-20 | 1 | -1/+1 |
| | | |||||
| * | Removing QT_EXPERIMENTAL_SOLUTION from the animation api | Leonardo Sobral Cunha | 2009-05-19 | 11 | -74/+9 |
| | | |||||
| * | Removed unused method from QVariantAnimationPrivate | Leonardo Sobral Cunha | 2009-05-19 | 2 | -7/+0 |
| | | |||||
| * | Doc: Added information about ownership of animations. | David Boddie | 2009-05-19 | 1 | -7/+14 |
| | | | | | | | | Reviewed-by: Thierry Bastian | ||||
* | | Merge branch 'kinetic-animations' of git@scm.dev.nokia.troll.no:qt/kinetic ↵ | Michael Brasser | 2009-05-18 | 8 | -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 state | Leonardo Sobral Cunha | 2009-05-15 | 1 | -2/+0 |
| | | | | | | | | Reviewed-by: janarve | ||||
| * | General refactors in QVariantAnimation | Leonardo Sobral Cunha | 2009-05-15 | 2 | -27/+35 |
| | | | | | | | | Reviewed-by: janarve | ||||
| * | Update current value on QVariantAnimation::setKeyValues | Leonardo Sobral Cunha | 2009-05-15 | 1 | -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 QVariantAnimation | Leonardo Sobral Cunha | 2009-05-15 | 1 | -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 api | Leonardo Sobral Cunha | 2009-05-15 | 5 | -13/+10 |
| | | |||||
| * | Merge branch 'kinetic-animations' of git@scm.dev.nokia.troll.no:qt/kinetic ↵ | David Boddie | 2009-05-12 | 8 | -128/+334 |
| |\ | | | | | | | | | | into kinetic-animations | ||||
| | * | Doc: Work on QPauseAnimation | Geir Vattekar | 2009-05-11 | 1 | -0/+16 |
| | | | |||||
| | * | Doc: Work on QParallelAnimationGroup and QSequentialAnimationGroup | Geir Vattekar | 2009-05-11 | 2 | -7/+49 |
| | | | |||||
| | * | Doc: Work on QAnimationGroup class description. | Geir Vattekar | 2009-05-08 | 1 | -12/+40 |
| | | | |||||
| | * | Correct spelling. setConsitentTiming -> setConsistentTiming | Michael Brasser | 2009-05-08 | 2 | -2/+2 |
| | | | |||||
| * | | Merge branch 'kinetic-animations' of git@scm.dev.nokia.troll.no:qt/kinetic ↵ | David Boddie | 2009-04-29 | 1 | -17/+7 |
| |\ \ | | | | | | | | | | | | | into kinetic-animations | ||||
| * | | | Merged local changes. | David Boddie | 2009-04-29 | 1 | -1/+1 |
| | | | | |||||
* | | | | qdoc: Fixed some qdoc errors. | Martin Smith | 2009-05-13 | 1 | -9/+7 |
| | | | | |||||
* | | | | qdoc: Fixed some qdoc errors. | Martin Smith | 2009-05-12 | 1 | -1/+1 |
| | | | | |||||
* | | | | qdoc: Fixed some qdoc errors. | Martin Smith | 2009-05-12 | 1 | -1/+1 |
| | | | |