summaryrefslogtreecommitdiffstats
path: root/src/corelib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'kinetic-animations' of git@scm.dev.nokia.troll.no:qt/kinetic in...Michael Brasser2009-05-1826-395/+388
|\
| * Avoid resetting the QVariantAnimation::currentValue when changing stateLeonardo Sobral Cunha2009-05-151-2/+0
| * General refactors in QVariantAnimationLeonardo Sobral Cunha2009-05-152-27/+35
| * Update current value on QVariantAnimation::setKeyValuesLeonardo Sobral Cunha2009-05-151-0/+1
| * Avoid interpolating if we have less than 2 key values in QVariantAnimationLeonardo Sobral Cunha2009-05-151-4/+10
| * Indentation and whitespace fixes in animation apiLeonardo Sobral Cunha2009-05-155-13/+10
| * Merge branch 'kinetic-animations' into kinetic-statemachineKent Hansen2009-05-141-1/+1
| |\
| | * Merge branch 'kinetic-animations' of git@scm.dev.nokia.troll.no:qt/kinetic in...David Boddie2009-05-1318-290/+115
| | |\
| | | * correctly handle multiple event transitions for same (object,event)Kent Hansen2009-05-132-7/+14
| | * | Merge branch 'kinetic-animations' of git@scm.dev.nokia.troll.no:qt/kinetic in...David Boddie2009-05-1252-720/+1100
| | |\ \
| | * \ \ Merge branch 'kinetic-animations' of git@scm.dev.nokia.troll.no:qt/kinetic in...David Boddie2009-04-296-131/+171
| | |\ \ \
| | * | | | Merged local changes.David Boddie2009-04-291-1/+1
| * | | | | Make QAbstractTransition::eventTest() non-constEskil Abrahamsen Blomfeldt2009-05-149-10/+10
| * | | | | correctly handle multiple event transitions for same (object,event)Kent Hansen2009-05-132-7/+14
| | |_|_|/ | |/| | |
| * | | | Merge branch 'kinetic-animations' into kinetic-statemachineKent Hansen2009-05-131-55/+85
| |\ \ \ \
| | * \ \ \ Merge branch 'kinetic-animations' of git@scm.dev.nokia.troll.no:qt/kinetic in...Geir Vattekar2009-05-133-15/+23
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | * | | | Doc: Work on QStateMachine class descriptionGeir Vattekar2009-05-131-55/+85
| | * | | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-animationsAlexis Menard2009-05-1225-438/+451
| | |\ \ \ \
| * | | | | | kill the QT_STATEMACHINE_SOLUTION defineKent Hansen2009-05-1318-228/+16
| | |_|/ / / | |/| | | |
| * | | | | correctly handle multiple signal transitions for same (object,signal)Kent Hansen2009-05-123-15/+23
| * | | | | Merge branch 'kinetic-statemachine' of git@scm.dev.nokia.troll.no:qt/kinetic ...Alexis Menard2009-05-1254-2748/+1524
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge branch 'kinetic-animations' into kinetic-statemachineKent Hansen2009-05-123-7/+65
| | |\ \ \ \
| | | * | | | Doc: Work on QPauseAnimationGeir Vattekar2009-05-111-0/+16
| | | * | | | Merge branch 'kinetic-animations' of git@scm.dev.nokia.troll.no:qt/kinetic in...Geir Vattekar2009-05-115-12/+74
| | | |\ \ \ \
| | | * | | | | Doc: Work on QParallelAnimationGroup and QSequentialAnimationGroupGeir Vattekar2009-05-112-7/+49
| | * | | | | | Fixes crash when calling QState::setErrorState() with null pointerEskil Abrahamsen Blomfeldt2009-05-121-1/+1
| | | |/ / / / | | |/| | | |
| | * | | | | Merge branch 'kinetic-animations' into kinetic-statemachineKent Hansen2009-05-084-44/+114
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Doc: Work on QAnimationGroup class description.Geir Vattekar2009-05-081-12/+40
| | | * | | | Correct spelling. setConsitentTiming -> setConsistentTimingMichael Brasser2009-05-082-2/+2
| | * | | | | gracefully handle deletion of transition's target stateKent Hansen2009-05-083-4/+17
| | * | | | | get rid of warningsKent Hansen2009-05-081-2/+0
| | * | | | | make sure connections and event filters are removed when state machine haltsKent Hansen2009-05-082-0/+17
| | * | | | | don't create transition to null stateKent Hansen2009-05-081-2/+5
| | * | | | | don't add signal transition if target is null or signal doesn't existKent Hansen2009-05-071-0/+9
| | * | | | | Make it impossible to have root state as source or target of transition or as...Eskil Abrahamsen Blomfeldt2009-05-073-4/+26
| * | | | | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-statemachineAlexis Menard2009-05-1253-652/+1068
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
* | | | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declar...Warwick Allison2009-05-1517-291/+1861
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch '4.5'Thiago Macieira2009-05-144-6/+9
| |\ \ \ \ \ \ \
| | * | | | | | | Use isNull() for strings instead of comparing against QString().Jesper Thomschütz2009-05-142-3/+3
| | * | | | | | | Cleaning docsMorten Engvoldsen2009-05-131-1/+3
| | * | | | | | | Adding details to QVariant docsMorten Engvoldsen2009-05-131-2/+3
| * | | | | | | | Merge branch 'master' of ../master into contiguouscacheIan Walters2009-05-149-285/+972
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch '4.5'Thiago Macieira2009-05-131-3/+4
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / /
| | | * | | | | | | qdoc: Fixed some qdoc errors.Martin Smith2009-05-131-2/+3
| | | * | | | | | | qdoc: Fixed some qdoc errors.Martin Smith2009-05-131-3/+3
| | | | |/ / / / / | | | |/| | | | |
| | * | | | | | | QNonContiguousByteDevice: An wrapper around QByteArray, QIODevice, ...Markus Goetz2009-05-133-0/+733
| | * | | | | | | QRingBuffer: Enanced with readPointerAtPositionMarkus Goetz2009-05-131-0/+46
| | * | | | | | | Remove unused file qfileinfo_p.hMarius Storm-Olsen2009-05-132-146/+0
| | * | | | | | | Merge commit 'origin/4.5'Olivier Goffart2009-05-134-139/+192
| | |\ \ \ \ \ \ \ | | | |/ / / / / /
| | | * | | | | | Correcting bug in QString::fromWCharArray documentationMorten Engvoldsen2009-05-121-1/+3