Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'kinetic-animations' of git@scm.dev.nokia.troll.no:qt/kinetic in... | Michael Brasser | 2009-05-18 | 26 | -395/+388 |
|\ | |||||
| * | Avoid resetting the QVariantAnimation::currentValue when changing state | Leonardo Sobral Cunha | 2009-05-15 | 1 | -2/+0 |
| * | General refactors in QVariantAnimation | Leonardo Sobral Cunha | 2009-05-15 | 2 | -27/+35 |
| * | Update current value on QVariantAnimation::setKeyValues | Leonardo Sobral Cunha | 2009-05-15 | 1 | -0/+1 |
| * | Avoid interpolating if we have less than 2 key values in QVariantAnimation | Leonardo Sobral Cunha | 2009-05-15 | 1 | -4/+10 |
| * | Indentation and whitespace fixes in animation api | Leonardo Sobral Cunha | 2009-05-15 | 5 | -13/+10 |
| * | Merge branch 'kinetic-animations' into kinetic-statemachine | Kent Hansen | 2009-05-14 | 1 | -1/+1 |
| |\ | |||||
| | * | Merge branch 'kinetic-animations' of git@scm.dev.nokia.troll.no:qt/kinetic in... | David Boddie | 2009-05-13 | 18 | -290/+115 |
| | |\ | |||||
| | | * | correctly handle multiple event transitions for same (object,event) | Kent Hansen | 2009-05-13 | 2 | -7/+14 |
| | * | | Merge branch 'kinetic-animations' of git@scm.dev.nokia.troll.no:qt/kinetic in... | David Boddie | 2009-05-12 | 52 | -720/+1100 |
| | |\ \ | |||||
| | * \ \ | Merge branch 'kinetic-animations' of git@scm.dev.nokia.troll.no:qt/kinetic in... | David Boddie | 2009-04-29 | 6 | -131/+171 |
| | |\ \ \ | |||||
| | * | | | | Merged local changes. | David Boddie | 2009-04-29 | 1 | -1/+1 |
| * | | | | | Make QAbstractTransition::eventTest() non-const | Eskil Abrahamsen Blomfeldt | 2009-05-14 | 9 | -10/+10 |
| * | | | | | correctly handle multiple event transitions for same (object,event) | Kent Hansen | 2009-05-13 | 2 | -7/+14 |
| | |_|_|/ | |/| | | | |||||
| * | | | | Merge branch 'kinetic-animations' into kinetic-statemachine | Kent Hansen | 2009-05-13 | 1 | -55/+85 |
| |\ \ \ \ | |||||
| | * \ \ \ | Merge branch 'kinetic-animations' of git@scm.dev.nokia.troll.no:qt/kinetic in... | Geir Vattekar | 2009-05-13 | 3 | -15/+23 |
| | |\ \ \ \ | | | | |_|/ | | | |/| | | |||||
| | * | | | | Doc: Work on QStateMachine class description | Geir Vattekar | 2009-05-13 | 1 | -55/+85 |
| | * | | | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-animations | Alexis Menard | 2009-05-12 | 25 | -438/+451 |
| | |\ \ \ \ | |||||
| * | | | | | | kill the QT_STATEMACHINE_SOLUTION define | Kent Hansen | 2009-05-13 | 18 | -228/+16 |
| | |_|/ / / | |/| | | | | |||||
| * | | | | | correctly handle multiple signal transitions for same (object,signal) | Kent Hansen | 2009-05-12 | 3 | -15/+23 |
| * | | | | | Merge branch 'kinetic-statemachine' of git@scm.dev.nokia.troll.no:qt/kinetic ... | Alexis Menard | 2009-05-12 | 54 | -2748/+1524 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | Merge branch 'kinetic-animations' into kinetic-statemachine | Kent Hansen | 2009-05-12 | 3 | -7/+65 |
| | |\ \ \ \ | |||||
| | | * | | | | Doc: Work on QPauseAnimation | Geir Vattekar | 2009-05-11 | 1 | -0/+16 |
| | | * | | | | Merge branch 'kinetic-animations' of git@scm.dev.nokia.troll.no:qt/kinetic in... | Geir Vattekar | 2009-05-11 | 5 | -12/+74 |
| | | |\ \ \ \ | |||||
| | | * | | | | | Doc: Work on QParallelAnimationGroup and QSequentialAnimationGroup | Geir Vattekar | 2009-05-11 | 2 | -7/+49 |
| | * | | | | | | Fixes crash when calling QState::setErrorState() with null pointer | Eskil Abrahamsen Blomfeldt | 2009-05-12 | 1 | -1/+1 |
| | | |/ / / / | | |/| | | | | |||||
| | * | | | | | Merge branch 'kinetic-animations' into kinetic-statemachine | Kent Hansen | 2009-05-08 | 4 | -44/+114 |
| | |\ \ \ \ \ | | | |/ / / / | |||||
| | | * | | | | 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 |
| | * | | | | | gracefully handle deletion of transition's target state | Kent Hansen | 2009-05-08 | 3 | -4/+17 |
| | * | | | | | get rid of warnings | Kent Hansen | 2009-05-08 | 1 | -2/+0 |
| | * | | | | | make sure connections and event filters are removed when state machine halts | Kent Hansen | 2009-05-08 | 2 | -0/+17 |
| | * | | | | | don't create transition to null state | Kent Hansen | 2009-05-08 | 1 | -2/+5 |
| | * | | | | | don't add signal transition if target is null or signal doesn't exist | Kent Hansen | 2009-05-07 | 1 | -0/+9 |
| | * | | | | | Make it impossible to have root state as source or target of transition or as... | Eskil Abrahamsen Blomfeldt | 2009-05-07 | 3 | -4/+26 |
| * | | | | | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-statemachine | Alexis Menard | 2009-05-12 | 53 | -652/+1068 |
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | |||||
* | | | | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declar... | Warwick Allison | 2009-05-15 | 17 | -291/+1861 |
|\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch '4.5' | Thiago Macieira | 2009-05-14 | 4 | -6/+9 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Use isNull() for strings instead of comparing against QString(). | Jesper Thomschütz | 2009-05-14 | 2 | -3/+3 |
| | * | | | | | | | Cleaning docs | Morten Engvoldsen | 2009-05-13 | 1 | -1/+3 |
| | * | | | | | | | Adding details to QVariant docs | Morten Engvoldsen | 2009-05-13 | 1 | -2/+3 |
| * | | | | | | | | Merge branch 'master' of ../master into contiguouscache | Ian Walters | 2009-05-14 | 9 | -285/+972 |
| |\ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ | Merge branch '4.5' | Thiago Macieira | 2009-05-13 | 1 | -3/+4 |
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | |||||
| | | * | | | | | | | qdoc: Fixed some qdoc errors. | Martin Smith | 2009-05-13 | 1 | -2/+3 |
| | | * | | | | | | | qdoc: Fixed some qdoc errors. | Martin Smith | 2009-05-13 | 1 | -3/+3 |
| | | | |/ / / / / | | | |/| | | | | | |||||
| | * | | | | | | | QNonContiguousByteDevice: An wrapper around QByteArray, QIODevice, ... | Markus Goetz | 2009-05-13 | 3 | -0/+733 |
| | * | | | | | | | QRingBuffer: Enanced with readPointerAtPosition | Markus Goetz | 2009-05-13 | 1 | -0/+46 |
| | * | | | | | | | Remove unused file qfileinfo_p.h | Marius Storm-Olsen | 2009-05-13 | 2 | -146/+0 |
| | * | | | | | | | Merge commit 'origin/4.5' | Olivier Goffart | 2009-05-13 | 4 | -139/+192 |
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | |||||
| | | * | | | | | | Correcting bug in QString::fromWCharArray documentation | Morten Engvoldsen | 2009-05-12 | 1 | -1/+3 |