summaryrefslogtreecommitdiffstats
path: root/examples/statemachine/errorstate/tankitem.h
Commit message (Expand)AuthorAgeFilesLines
6:39:05 (GMT)'>2009-05-075-3/+205 * Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Aaron Kennedy2009-05-075-20/+20 |\ | * Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Ian Walters2009-05-0714-77/+368 | |\ | * | Use focus property, not active focus for control focusIan Walters2009-05-072-18/+9 | * | KeyProxy to send to focused child of focus realms.Ian Walters2009-05-073-2/+11 * | | Add a QmlDebuggerStatus interface elements can use to interact with the debuggerAaron Kennedy2009-05-0710-10/+193 | |/ |/| * | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Aaron Kennedy2009-05-076-34/+168 |\ \ | * \ Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Martin Jones2009-05-072-3/+14 | |\ \ | * | | Don't crashMartin Jones2009-05-072-14/+15 | * | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Martin Jones2009-05-074-12/+41 | |\ \ \ | | | |/ | | |/| | * | | Viewing the same image twice showed no image the second time.Martin Jones2009-05-071-0/+11 | * | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Martin Jones2009-05-0718-234/+501 | |\ \ \ | * | | | Add progress reporting to Image and use it in the flickr demo.Martin Jones2009-05-075-10/+86 | * | | | Doc.Martin Jones2009-05-061-11/+57 * | | | | Disable watcher table selectionAaron Kennedy2009-05-071-0/+1 * | | | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Aaron Kennedy2009-05-072-3/+14 |\ \ \ \ \ | | |_|_|/ | |/| | | | * | | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Michael Brasser2009-05-074-12/+41 | |\ \ \ \ | | | |_|/ | | |/| | | * | | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Michael Brasser2009-05-0717-233/+500 | |\ \ \ \ | | | |_|/ | | |/| | | * | | | Use correct 'from' value for repeating animations.Michael Brasser2009-05-072-3/+14 * | | | | Add "watchers" to debuggerAaron Kennedy2009-05-076-40/+185 | |_|/ / |/| | | * | | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Aaron Kennedy2009-05-073-11/+35 |\ \ \ \ | * \ \ \ Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Warwick Allison2009-05-0717-233/+500 | |\ \ \ \ | | | |/ / | | |/| | | * | | | Fix QmlXmlListModel on property changes, on empty results.Warwick Allison2009-05-072-10/+34 | * | | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Warwick Allison2009-05-0610-884/+906 | |\ \ \ \ | | | |/ / | | |/| | | * | | | default QGVWarwick Allison2009-05-061-1/+1 * | | | | Layouts should only modify items in their direction of operationAaron Kennedy2009-05-071-1/+6 | |_|/ / |/| | | * | | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Aaron Kennedy2009-05-0711-898/+920 |\ \ \ \ | | |/ / | |/| | | * | | Fix typo.Michael Brasser2009-05-061-1/+1 | | |/ | |/| | * | Use source locations in the diagnostic messages.Roberto Raggi2009-05-064-54/+34 | * | Add some support for QWidget (again)Thomas Hartmann2009-05-061-1/+6 | * | Reject multiple top-level object members.Roberto Raggi2009-05-065-825/+851 | * | Enable updating of XmlListModel from Qml.Michael Brasser2009-05-063-4/+15 | |/ | * Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Martin Jones2009-05-0615-3/+368 | |\ | * \ Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Martin Jones2009-05-064-46/+48 | |\ \ | * | | Docs.Martin Jones2009-05-061-14/+14 * | | | Shift QmlBindableValue data into d-ptrAaron Kennedy2009-05-06