Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Docs and minor fixes for the Rotation element. | Michael Brasser | 2009-05-19 | 1 | -0/+1 |
| | |||||
* | Merge branch 'kinetic-animations' of git@scm.dev.nokia.troll.no:qt/kinetic ↵ | Michael Brasser | 2009-05-18 | 26 | -56/+1334 |
|\ | | | | | | | | | | | | | | | | | into kinetic-declarativeui Conflicts: src/corelib/animation/qanimationgroup.cpp src/corelib/animation/qvariantanimation.cpp src/gui/graphicsview/qgraphicsitem.cpp | ||||
| * | Doc: Added architecture image to animation overview. | Geir Vattekar | 2009-05-15 | 2 | -1/+4 |
| | | | | | | | | Reviewed-by: David Boddie | ||||
| * | Merge branch 'kinetic-animations' of git@scm.dev.nokia.troll.no:qt/kinetic ↵ | David Boddie | 2009-05-15 | 1 | -0/+2 |
| |\ | | | | | | | | | | into kinetic-animations | ||||
| | * | Merge branch 'kinetic-animations' into kinetic-statemachine | Kent Hansen | 2009-05-14 | 2 | -9/+9 |
| | |\ | |||||
| | * | | Pop up message when a tank wins the game | Eskil Abrahamsen Blomfeldt | 2009-05-14 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | | | | Also fixed: Added some docs and moved the tanks a little so they don't start partly outside the scene rect. | ||||
| * | | | Doc: Added a work in progress class hierarchy overview. | David Boddie | 2009-05-15 | 1 | -0/+351 |
| | |/ | |/| | | | | | | | Reviewed-by: Geir Vattekar | ||||
| * | | Doc: Marked up a link correctly. | David Boddie | 2009-05-14 | 1 | -1/+1 |
| | | | | | | | | | | | | Reviewed-by: David Boddie <dboddie@trolltech.com> | ||||
| * | | Merge branch 'kinetic-animations' of git@scm.dev.nokia.troll.no:qt/kinetic ↵ | David Boddie | 2009-05-13 | 7 | -5/+259 |
| |\ \ | | |/ | | | | | | | into kinetic-animations | ||||
| | * | more statemachine docs | Kent Hansen | 2009-05-13 | 2 | -5/+40 |
| | | | |||||
| | * | doc: Add screenshot for Tank Game Example | Eskil Abrahamsen Blomfeldt | 2009-05-13 | 1 | -0/+0 |
| | | | |||||
| | * | document statemachine/factorial example | Kent Hansen | 2009-05-13 | 3 | -0/+103 |
| | | | |||||
| | * | doc: Correct names of snippets in docs for Tank Game example | Eskil Abrahamsen Blomfeldt | 2009-05-13 | 1 | -1/+1 |
| | | | |||||
| | * | doc: Add documentation for Tank Game example | Eskil Abrahamsen Blomfeldt | 2009-05-13 | 2 | -0/+116 |
| | | | |||||
| * | | Merge branch 'kinetic-animations' of git@scm.dev.nokia.troll.no:qt/kinetic ↵ | David Boddie | 2009-05-12 | 48 | -388/+1003 |
| |\ \ | | |/ | | | | | | | into kinetic-animations | ||||
| | * | document the statemachine/eventtransitions example | Kent Hansen | 2009-05-12 | 2 | -2/+89 |
| | | | |||||
| | * | add State Machine to examples overview | Kent Hansen | 2009-05-12 | 1 | -0/+8 |
| | | | |||||
| | * | Fixes: document statemachine/twowaybutton example | Kent Hansen | 2009-05-12 | 2 | -0/+83 |
| | | | |||||
| | * | document the statemachine/pingpong example | Kent Hansen | 2009-05-12 | 3 | -0/+108 |
| | | | |||||
| | * | Merge branch 'kinetic-statemachine' of git@scm.dev.nokia.troll.no:qt/kinetic ↵ | Alexis Menard | 2009-05-12 | 11 | -56/+435 |
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | into kinetic-statemachine Conflicts: src/gui/graphicsview/qgraphicsitem.cpp | ||||
| | | * | doc: Add documentation for animations, restore policy and polished signal | Eskil Abrahamsen Blomfeldt | 2009-05-12 | 1 | -0/+182 |
| | | | | |||||
| | | * | update license headers | Kent Hansen | 2009-05-12 | 2 | -6/+66 |
| | | | | |||||
| | | * | improve the docs for the trafficlight example | Kent Hansen | 2009-05-12 | 3 | -16/+27 |
| | | | | |||||
| | | * | Merge branch 'kinetic-animations' into kinetic-statemachine | Kent Hansen | 2009-05-12 | 1 | -0/+1 |
| | | |\ | |||||
| | | | * | Doc: Assign state machine overview to architecture group (get it in | Geir Vattekar | 2009-05-11 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | the overview list) | ||||
| | | * | | redo statecharts in proper UML notation, expand documentation | Kent Hansen | 2009-05-12 | 8 | -22/+150 |
| | | |/ | |||||
| | * | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-statemachine | Alexis Menard | 2009-05-12 | 79 | -821/+1608 |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/graphicsview/qgraphicsitem.cpp | ||||
| | * | | | Initial import of statemachine branch from the old kinetic repository | Alexis Menard | 2009-04-17 | 3292 | -0/+227236 |
| | / / | |||||
| * | | | Merged local changes. | David Boddie | 2009-04-29 | 2 | -8/+8 |
| | |/ | |/| | |||||
* | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵ | Warwick Allison | 2009-05-15 | 6 | -29/+232 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: configure.exe src/gui/graphicsview/qgraphicsscene.cpp | ||||
| * \ \ | Merge branch '4.5' | Thiago Macieira | 2009-05-14 | 2 | -24/+33 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: tools/macdeployqt/shared/shared.cpp | ||||
| | * | | | Correcting bug in cardLayout example | Morten Engvoldsen | 2009-05-13 | 2 | -24/+33 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding the count() function to the example. Task-number: 220766 Rev-by: Geir Vattekar | ||||
| * | | | | Merge branch 'master' of ../master into contiguouscache | Ian Walters | 2009-05-14 | 3 | -5/+102 |
| |\ \ \ \ | |||||
| | * \ \ \ | Merge branch '4.5' | Thiago Macieira | 2009-05-13 | 2 | -8/+8 |
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | | Conflicts: tests/auto/qgraphicsview/tst_qgraphicsview.cpp | ||||
| | | * | | | Clearifying docs QSet::insert | Morten Engvoldsen | 2009-05-13 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Chaning the sentence to clearify where the iterator points to. Task-number: 202656 Rev-by: Geir Vattekar | ||||
| | | * | | | qdoc: Fixed some qdoc errors. | Martin Smith | 2009-05-13 | 1 | -7/+7 |
| | | | | | | |||||
| | * | | | | Merge commit 'origin/4.5' | Olivier Goffart | 2009-05-13 | 2 | -4/+101 |
| | |\ \ \ \ | | | |/ / / | |||||
| | | * | | | Reviewed-by: TrustMe | Volker Hilsheimer | 2009-05-12 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | Small polishing. | ||||
| | | * | | | Adding documentation to the fancy browser example | Morten Engvoldsen | 2009-05-12 | 1 | -3/+100 |
| | | | |/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added documentation to the fancy browser example. Task-number:252097 Rev-by: Geir Vattekar Rev-by: Ariya Hidayat | ||||
| | | * | | Correcting bug in custom Database Driver code snipptet | Morten Engvoldsen | 2009-05-11 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding const to call. Changing QSqlRecord record() { return QSqlRecord(); } to QSqlRecord record() const { return QSqlRecord(); } This is needed since record() is a virtual function. Task-number:204557 Rev-by: Geir Vattekar | ||||
| * | | | | Merge branch 'master' into contiguouscache | Ian Walters | 2009-05-12 | 40 | -562/+360 |
| |\ \ \ \ | | |/ / / | |||||
| * | | | | Various fixes resulting from QA code review. | Ian Walters | 2009-05-12 | 1 | -4/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some documentation fixes. More clear handling of what is and isn't a valid indexes. Added functions for the 'really long lived circular buffer use case' Improved unit tests. | ||||
| * | | | | Documentation patch from Jason | Ian Walters | 2009-05-11 | 1 | -18/+16 |
| | | | | | | | | | | | | | | | | | | | | A bunch of minor doc fixes. | ||||
| * | | | | Update licensing headers. | Ian Walters | 2009-04-07 | 1 | -2/+32 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Update files to have consistent licencesing with the rest of Qt. | ||||
| * | | | | Merge branch 'master' into contiguouscache | Ian Walters | 2009-04-06 | 28 | -304/+588 |
| |\ \ \ \ | |||||
| * | | | | | Rename OffsetVector to ContiguousCache | Ian Walters | 2009-04-03 | 1 | -20/+19 |
| | | | | | | |||||
| * | | | | | Squashed commit of the following: | Rhys Weatherley | 2009-03-24 | 1 | -0/+70 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 39de3862f5678b3226b4932eeb342c4a023d2f2b Author: Ian Walters <ian.walters@nokia.com> Date: Thu Feb 19 14:16:05 2009 +1000 Fixes: Test runs (and passes), doc links. Task: QT-308 Details: Minor changes related to the code having moved. commit 5a8910dd1018fb228d0e2e2819ea429577bfa834 Author: Ian Walters <ian.walters@nokia.com> Date: Thu Feb 19 09:47:20 2009 +1000 Fixes: Checkin of QOffsetVector stuff for branch Task: QT-308 Details: Files originally from research/qcircularbuffer This checkin likely won't compile. Just a copy for now. | ||||
* | | | | | | qdoc: Fixed some qdoc errors. | Martin Smith | 2009-05-13 | 1 | -3/+3 |
| | | | | | | |||||
* | | | | | | qdoc: Fixed some qdoc errors. | Martin Smith | 2009-05-13 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | qdoc: Fixed some qdoc errors. | Martin Smith | 2009-05-13 | 2 | -2/+2 |
| | | | | | |