Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt | Bradley T. Hughes | 2009-05-29 | 23 | -100/+125 |
|\ | |||||
| * | Merge branch '4.5' | Tom Cooksey | 2009-05-28 | 2 | -11/+8 |
| |\ | | | | | | | | | | | | | Conflicts: src/gui/embedded/qkbdtty_qws.cpp | ||||
| | * | Doc - final screenshot and changes | Kavindra Devi Palaraja | 2009-05-28 | 2 | -11/+8 |
| | | | |||||
| * | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt | Simon Hausmann | 2009-05-27 | 20 | -83/+75 |
| |\ \ | | |/ | | | | | | | | | | Conflicts: tests/auto/qtreeview/tst_qtreeview.cpp | ||||
| | * | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5 | David Boddie | 2009-05-26 | 9 | -56/+47 |
| | |\ | |||||
| | | * | Doc - more images and additional description | Kavindra Devi Palaraja | 2009-05-26 | 6 | -11/+13 |
| | | | | |||||
| | | * | Doc - whitespace cleaning | Kavindra Devi Palaraja | 2009-05-26 | 1 | -24/+24 |
| | | | | |||||
| | | * | Doc - more screenshots and better description | Kavindra Devi Palaraja | 2009-05-26 | 4 | -23/+12 |
| | | | | |||||
| | * | | Doc: Updated the list of tools to include makeqpf and qvfb. | David Boddie | 2009-05-26 | 3 | -8/+9 |
| | |/ | | | | | | | | | | Reviewed-by: Marcel Schuette | ||||
| | * | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5 | David Boddie | 2009-05-26 | 5 | -17/+21 |
| | |\ | |||||
| | | * | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5 | Martin Smith | 2009-05-26 | 3 | -13/+15 |
| | | |\ | |||||
| | | | * | Doc - more screenshots and adding better description | Kavindra Devi Palaraja | 2009-05-26 | 3 | -13/+15 |
| | | | | | | | | | | | | | | | | | | | | Details: Work in progress | ||||
| | | * | | qdoc: Indicate what iterator_categor means for container classes. | Martin Smith | 2009-05-26 | 1 | -4/+5 |
| | | |/ | | | | | | | | | | | | | Task-number: 245501 | ||||
| | | * | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5 | Martin Smith | 2009-05-26 | 5 | -61/+87 |
| | | |\ | |||||
| | | * | | qdoc: Indicate that qAbs(T& v) compares v to a 0 of type T. | Martin Smith | 2009-05-26 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | Task-number: 246789 | ||||
| | * | | | Doc: Removed irrelevant links from the Qt for Windows CE documentation. | David Boddie | 2009-05-26 | 1 | -2/+0 |
| | | |/ | | |/| | | | | | | | | | Reviewed-by: Maurice Kalinowski | ||||
| | * | | Doc: Removed the incorrect figures for Thumb builds of libraries. | David Boddie | 2009-05-25 | 1 | -2/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need to resolve the issues around the use of Thumb code in Qt and automate the building and comparison of libraries. Reviewed-by: Trust Me | ||||
| | * | | Doc: Fixed custom graphics item snippet. | David Boddie | 2009-05-25 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | As reported on qt-interest: http://lists.trolltech.com/pipermail/qt-interest/2009-May/007036.html Reviewed-by: Trust Me | ||||
| | * | | Doc: Miscellaneous documentation fixes for Qt 4.5.x and later. | David Boddie | 2009-05-25 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | Reviewed-by: Trust Me | ||||
| | * | | Doc: Fixed links to resources on the qtsoftware.com Web site. | David Boddie | 2009-05-25 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | Task-number: 254463 Reviewed-by: Denis Dzyubenko | ||||
| | * | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5 | David Boddie | 2009-05-25 | 1 | -0/+0 |
| | |\ \ | | | |/ | |||||
| * | | | Add a flag that ensure that a connection is made only one | Olivier Goffart | 2009-05-27 | 2 | -5/+13 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is often desirable, when doing connection, to ensure that the same connection is only made once. This can be done with the Qt::UniqueConnection 'flag' Also documented the order the slot are called Reviewed-by: Brad | ||||
| * | | | Fix doc warnings for Phonon | Thierry Bastian | 2009-05-26 | 1 | -2/+30 |
| | | | | |||||
* | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt | Bradley T. Hughes | 2009-05-26 | 89 | -0/+2345 |
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | Conflicts: src/corelib/kernel/qcoreevent.h src/gui/graphicsview/qgraphicsitem_p.h | ||||
| * | | | Merge branch '4.5' | Thiago Macieira | 2009-05-22 | 1 | -0/+0 |
| |\ \ \ | | | |/ | | |/| | | | | | | | | | Conflicts: src/corelib/kernel/qsharedmemory_unix.cpp | ||||
| | * | | Doc - updating the screenshot | Kavindra Devi Palaraja | 2009-05-22 | 1 | -0/+0 |
| | | | | | | | | | | | | | | | | Reviewed-By: TrustMe | ||||
| * | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵ | Thierry Bastian | 2009-05-22 | 47 | -173/+977 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kinetic-animations Conflicts: src/corelib/kernel/kernel.pri src/corelib/kernel/qvariant_p.h src/corelib/tools/tools.pri src/gui/graphicsview/qgraphicsitem.cpp src/gui/graphicsview/qgraphicsitem.h src/gui/graphicsview/qgraphicswidget.h src/gui/gui.pro | ||||
| * | | | | Doc: Added a small example/test case for sequential animations. | David Boddie | 2009-05-20 | 7 | -0/+108 |
| | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me | ||||
| * | | | | Merge branch 'kinetic-animations' into kinetic-statemachine | Kent Hansen | 2009-05-19 | 3 | -3/+357 |
| |\ \ \ \ | |||||
| | * | | | | Fixed access to members of an object. | David Boddie | 2009-05-18 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: David Boddie | ||||
| | * | | | | 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 | ||||
| | * | | | | | Doc: Added a work in progress class hierarchy overview. | David Boddie | 2009-05-15 | 1 | -0/+351 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Geir Vattekar | ||||
| * | | | | | | doc: Minor fixes + update UML diagrams for stick man example | Eskil Abrahamsen Blomfeldt | 2009-05-18 | 5 | -4/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using StarUML this time, since there were "unregistered version" watermarks on the Enterprise Architect ones. Not as nice, but it's impossible to find a free UML tool which produces nice diagrams. | ||||
| * | | | | | | doc: New state chart diagrams for Stickman example | Eskil Abrahamsen Blomfeldt | 2009-05-15 | 3 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These obviously cannot be used, since they have the "unregistered version" watermark on them. Didn't notice before now, so I might as well commit them for the time being. | ||||
| * | | | | | | Remove the connectByAnimation() function and add some documentation for the ↵ | Eskil Abrahamsen Blomfeldt | 2009-05-14 | 3 | -0/+115 |
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Stickman example The connectByAnimation() function is no longer needed since we have default animations. The docs are unfinished. | ||||
| * | | | | | Merge branch 'kinetic-animations' into kinetic-statemachine | Kent Hansen | 2009-05-14 | 2 | -9/+9 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | 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 | ||||
| | * \ \ \ \ | Merge branch 'kinetic-animations' of git@scm.dev.nokia.troll.no:qt/kinetic ↵ | David Boddie | 2009-05-12 | 48 | -388/+1003 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | into kinetic-animations | ||||
| | * | | | | | | Merged local changes. | David Boddie | 2009-04-29 | 2 | -8/+8 |
| | | | | | | | | |||||
| * | | | | | | | 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. | ||||
| * | | | | | | 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 |
| | |/ / / / | |/| | | | | |||||
| * | | | | | 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 |
| | | | | | |