Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'kinetic-declarativeui' of ↵ | Warwick Allison | 2009-04-29 | 47 | -682/+2801 |
|\ | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵ | Michael Brasser | 2009-04-28 | 21 | -5/+1347 |
| |\ | | | | | | | | | | kinetic-declarativeui | ||||
| | * | fixed minor issue with the piechart demo | Pierre Rossi | 2009-04-24 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | The rubberband was not set on the viewport, leading to an offset when adding margins. Task-number: 251892 Reviewed-by: Alexis | ||||
| | * | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt | Simon Hausmann | 2009-04-23 | 7 | -0/+498 |
| | |\ | |||||
| | | * | Add Google Suggest as a new network example | Ariya Hidayat | 2009-04-23 | 7 | -0/+498 |
| | | | | | | | | | | | | | | | | Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> | ||||
| | * | | Merge branch '4.5' | Thiago Macieira | 2009-04-23 | 6 | -1/+512 |
| | |\ \ | | | |/ | | | | | | | | | | | | | Conflicts: tests/auto/qaction/tst_qaction.cpp | ||||
| | | * | Added Google Chat client as a new WebKit example | Ariya Hidayat | 2009-04-23 | 6 | -1/+512 |
| | | | | | | | | | | | | | | | | Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> | ||||
| | * | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt | Simon Hausmann | 2009-04-23 | 7 | -1/+331 |
| | |\ \ | | | |/ | |||||
| | | * | Add fancy browser as the new example | Ariya Hidayat | 2009-04-23 | 7 | -1/+331 |
| | | | | | | | | | | | | | | | | Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> | ||||
| | * | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt | Simon Hausmann | 2009-04-23 | 1 | -3/+6 |
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/global/qfeatures.h src/gui/painting/qtransform.cpp util/scripts/make_qfeatures_dot_h | ||||
| | | * | Fix more NaNs in Elastic Nodes example | João Abecasis | 2009-04-22 | 1 | -3/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't try to draw zero-length lines. Don't draw lines if nodes are superimposed. Reviewed-by: Andreas | ||||
| * | | | Merge branch 'kinetic-declarativeui' of ../kinetic into ↵ | Aaron Kennedy | 2009-04-28 | 1 | -185/+72 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kinetic-declarativeui-qfx Conflicts: examples/declarative/minehunt/minehunt.qml | ||||
| | * \ \ | Merge branch 'kinetic-declarativeui' of ↵ | Michael Brasser | 2009-04-28 | 3 | -10/+10 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * | | | | API and documentation work on the transform elements. | Michael Brasser | 2009-04-28 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Axis has been split into Axis, AxisRotation, and AxisTranslation. Basic docs (in some cases just a stub) have been added for these, Perspective, and Squish. Flipable has moved to its own file. | ||||
| * | | | | | Merge branch 'kinetic-declarativeui' of ../kinetic into ↵ | Aaron Kennedy | 2009-04-28 | 1 | -48/+24 |
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | kinetic-declarativeui-qfx Conflicts: examples/declarative/mouseregion/mouse.qml | ||||
| | * | | | | More mouse and key event handling and related documentation | Martin Jones | 2009-04-28 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Converted connections, listview and mouse. | Roberto Raggi | 2009-04-27 | 3 | -114/+180 |
| | | | | | | |||||
| * | | | | | Merge branch 'kinetic-declarativeui' of ↵ | Roberto Raggi | 2009-04-27 | 3 | -10/+10 |
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | git://scm.dev.nokia.troll.no/qt/kinetic into kinetic-declarativeui-qfx | ||||
| * | | | | | Converted the examples. | Roberto Raggi | 2009-04-27 | 23 | -655/+1503 |
| | |/ / / | |/| | | | |||||
* | | | | | Enable plugins | Warwick Allison | 2009-04-29 | 1 | -1/+1 |
| |/ / / |/| | | | | | | | | | | | They're no longer on by default, as per QWebPage. | ||||
* | | | | Merge branch 'kinetic-declarativeui' of ↵ | Martin Jones | 2009-04-27 | 9 | -16/+6 |
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui Conflicts: src/declarative/fx/qfxitem.cpp | ||||
| * | | | Update tile images for minehunt example. | Michael Brasser | 2009-04-27 | 7 | -12/+2 |
| | | | | |||||
| * | | | Tweak the Dial example. | Michael Brasser | 2009-04-26 | 2 | -4/+4 |
| | | | | |||||
* | | | | Make MouseRegion signals pass a mouse event as their parameter. | Martin Jones | 2009-04-27 | 2 | -9/+9 |
| | | | | |||||
* | | | | Fix the highlight positioning. | Martin Jones | 2009-04-27 | 1 | -1/+1 |
|/ / / | |||||
* | | | Merge branch 'kinetic-animations' of git@scm.dev.nokia.troll.no:qt/kinetic ↵ | Michael Brasser | 2009-04-23 | 64 | -429/+2256 |
|\ \ \ | | | | | | | | | | | | | into kinetic-declarativeui | ||||
| * | | | Moved the animation examples piemenu and photobrowser to examples/research | Leonardo Sobral Cunha | 2009-04-23 | 16 | -0/+0 |
| | | | | |||||
| * | | | Update copyright headers of animation examples | Leonardo Sobral Cunha | 2009-04-23 | 54 | -110/+1937 |
| | | | | |||||
* | | | | Merge branch 'kinetic-declarativeui' of ↵ | Ian Walters | 2009-04-23 | 1 | -3/+2 |
|\ \ \ \ | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | | | Simplify dial example. | Aaron Kennedy | 2009-04-23 | 1 | -3/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | As Item::rotation is a subscribable property, the second (identical) Follow is unnecessary. | ||||
* | | | | | Adding 'presentation' qml to tutorial steps. | Ian Walters | 2009-04-23 | 18 | -109/+181 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Also changed background from black to white so to better match screenshots within documentation. | ||||
* | | | | | First draft chapter 1 of tutorial: complete. | Ian Walters | 2009-04-23 | 1 | -21/+13 |
| | | | | | |||||
* | | | | | Merge branch 'kinetic-declarativeui' of ↵ | Ian Walters | 2009-04-23 | 8 | -22/+28 |
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | | | Allow method text of recipe example to scroll | Martin Jones | 2009-04-23 | 3 | -16/+18 |
| | | | | | |||||
| * | | | | Merge branch 'kinetic-animations' of git@scm.dev.nokia.troll.no:qt/kinetic ↵ | Michael Brasser | 2009-04-22 | 5 | -6/+10 |
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | into kinetic-declarativeui Conflicts: src/gui/animation/qguivariantanimation.cpp | ||||
| | * | | | Fixes for solution package. | Jan-Arve Sæther | 2009-04-22 | 5 | -6/+10 |
| | | | | | |||||
* | | | | | Continuing tutorial | Ian Walters | 2009-04-23 | 15 | -432/+507 |
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Start of qdoc componenet relating to example files. Also removed t8 and replaced with Final, which will represent the final 'application', and not necissarily in terms of minor stages. However difference that will be useful or confusing to the user will still be highlighted, just not in the progressive manor of the rest of the tutorial Scheduled for review when complete. | ||||
* | | | | Merge branch 'kinetic-animations' of ../../qt/kinetic into kinetic-declarativeui | Michael Brasser | 2009-04-22 | 52 | -326/+1151 |
|\ \ \ \ | |/ / / | | | | | | | | | | | | | Conflicts: src/gui/graphicsview/qgraphicsitem.cpp | ||||
| * | | | include the right header | Kent Hansen | 2009-04-21 | 2 | -2/+2 |
| | | | | |||||
| * | | | compile fix | Thierry Bastian | 2009-04-20 | 1 | -1/+1 |
| | | | | |||||
| * | | | cleanup in demo | Thierry Bastian | 2009-04-20 | 4 | -95/+30 |
| | | | | | | | | | | | | | | | | sub-attaq doesn't use anymore animation private headers | ||||
| * | | | iterationCount becomes loopCount again | Thierry Bastian | 2009-04-20 | 3 | -6/+5 |
| | | | | |||||
| * | | | Merge branch 'kinetic-animations' into kinetic-statemachine | Kent Hansen | 2009-04-17 | 40 | -38/+2096 |
| |\ \ \ | |||||
| | * \ \ | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-animations | Alexis Menard | 2009-04-17 | 40 | -38/+2096 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/graphicsview/qgraphicsitem.cpp | ||||
| | * | | | | Initial import of kinetic-animations branch from the old kinetic | Alexis Menard | 2009-04-17 | 2095 | -0/+154496 |
| | / / / | | | | | | | | | | | | | | | | repository to the new repository | ||||
| * | | | | Initial import of statemachine branch from the old kinetic repository | Alexis Menard | 2009-04-17 | 2102 | -0/+155387 |
| / / / | |||||
* | | | | Merge branch 'master' of ../../qt/qt into kinetic-declarativeui | Michael Brasser | 2009-04-22 | 2 | -4/+9 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | Merge branch '4.5' | Rhys Weatherley | 2009-04-21 | 1 | -3/+8 |
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/graphicsview/qgraphicsitem.cpp tools/qdoc3/test/assistant.qdocconf tools/qdoc3/test/designer.qdocconf tools/qdoc3/test/linguist.qdocconf tools/qdoc3/test/qmake.qdocconf tools/qdoc3/test/qt-build-docs.qdocconf tools/qdoc3/test/qt.qdocconf | ||||
| | * | | BT: Fix lock-up & crash in the Elastic Nodes example | Andreas Aardal Hanssen | 2009-04-21 | 1 | -3/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure that we don't divide by 0 when two nodes are exactly on top of each other. Reviewed-by: Alexis Reviewed-by: Joao | ||||
| * | | | Merge branch '4.5' | Thiago Macieira | 2009-04-20 | 1 | -1/+1 |
| |\ \ \ | | |/ / | | | | | | | | | | | | | Conflicts: tests/auto/qaction/tst_qaction.cpp |