Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'custom_shaders' of ../qt-graphics-team into custom-shaders | Rhys Weatherley | 2009-07-23 | 19 | -474/+34 |
|\ | |||||
| * | Make QStateMachine inherit QState | Kent Hansen | 2009-07-22 | 12 | -37/+34 |
| * | Remove Stickman editor | Eskil Abrahamsen Blomfeldt | 2009-07-21 | 7 | -437/+0 |
* | | Merge commit 'qt/master' into graphicseffects | Bjørn Erik Nilsen | 2009-07-21 | 122 | -14524/+869 |
|\ \ | |/ | |||||
| * | Merge commit 'origin/4.5' | Oswald Buddenhagen | 2009-07-20 | 1 | -1/+3 |
| |\ | |||||
| | * | Update the example TrafficInfo for GCC 3.3 | Benjamin Poulain | 2009-07-17 | 1 | -1/+3 |
| * | | Add the "star" example, which demonstrates how to mix OpenVG and QPainter | Rhys Weatherley | 2009-07-20 | 7 | -0/+290 |
| * | | Update the documentation after the change in the completer exemple | Olivier Goffart | 2009-07-17 | 1 | -2/+2 |
| * | | Lets the size of the completer be configurable in a way similar to QComboBox. | Frédéric Mercille | 2009-07-17 | 2 | -4/+23 |
| * | | Doc: show warnings about unrecognized or unsupported devices in the status | Volker Hilsheimer | 2009-07-16 | 1 | -8/+25 |
| * | | And again in the examples | Thiago Macieira | 2009-07-16 | 3 | -3/+3 |
| * | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt | Peter Hartmann | 2009-07-15 | 10 | -22/+19 |
| |\ \ | |||||
| | * | | Make the mainwindow examples use setWindowFilePath | Norwegian Rock Cat | 2009-07-14 | 6 | -18/+15 |
| | * | | make examples/activeqt/webbrowser work on Windows CE | Joerg Bornemann | 2009-07-13 | 3 | -3/+3 |
| | * | | general wording change for some file type names | Frederik Schwarzer | 2009-07-06 | 1 | -1/+1 |
| * | | | Merge branch 'master' of git://gitorious.org/qt/qt | Tobias Koenig | 2009-07-05 | 1113 | -2201/+4732 |
| |\ \ \ | | |/ / | |||||
| | * | | Refactored gesture api | Denis Dzyubenko | 2009-07-02 | 82 | -14645/+59 |
| | * | | These files don't have to have CRLF line-termination. | Thiago Macieira | 2009-07-02 | 3 | -16/+14 |
| | * | | Animation: fixed a NOTIFY signal name that was wrong | Thierry Bastian | 2009-07-01 | 1 | -6/+6 |
| | * | | Made QPainter / OpenGL intermixing in hellogl_es2 work properly again. | Samuel Rødal | 2009-07-01 | 1 | -0/+3 |
| | * | | examples: QString::fromUtf16() -> QString::fromWCharArray() | Marius Storm-Olsen | 2009-07-01 | 1 | -1/+1 |
| * | | | Merge branch 'master' of git://gitorious.org/qt/qt | Tobias Koenig | 2009-06-16 | 11 | -53/+32 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'master' of git://gitorious.org/qt/qt | Tobias Koenig | 2009-06-10 | 15 | -59/+37 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge commit 'qt-mainline/master' | Tobias Koenig | 2009-06-04 | 220 | -359/+14115 |
| |\ \ \ \ \ | |||||
| * | | | | | | Complete documentation of schema example and reference it from api docs | Tobias Koenig | 2009-05-20 | 1 | -0/+10 |
| * | | | | | | First version of documentation for schema example | Tobias Koenig | 2009-05-19 | 2 | -9/+12 |
| * | | | | | | Add missing example files | Tobias Koenig | 2009-05-19 | 9 | -0/+168 |
| * | | | | | | Adapt license headers to LGPL | Tobias Koenig | 2009-05-16 | 3 | -6/+96 |
| * | | | | | | Add W3C XML Schema validation support | Tobias Koenig | 2009-05-16 | 8 | -1/+335 |
* | | | | | | | Merge commit 'master/master' into kinetic-graphicseffect | Ariya Hidayat | 2009-06-30 | 1 | -4/+32 |
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | |||||
| * | | | | | | Doc: Documented the Move Blocks example. | Geir Vattekar | 2009-06-29 | 1 | -4/+32 |
* | | | | | | | Merge commit 'master/master' into kinetic-graphicseffect | Ariya Hidayat | 2009-06-29 | 1190 | -2258/+19324 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Fix license headers after multitouch+gestures merge. | Jason McDonald | 2009-06-29 | 61 | -305/+305 |
| * | | | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt | Jason McDonald | 2009-06-29 | 1 | -2/+1 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Make compile when -no-webkit is passed to configure | Bill King | 2009-06-29 | 1 | -2/+1 |
| * | | | | | | | Fix old/missing license headers from multitouch+gestures merge. | Jason McDonald | 2009-06-29 | 69 | -193/+398 |
| |/ / / / / / | |||||
| * | | | | | | Cleanup includes in public headers. | Bradley T. Hughes | 2009-06-26 | 1 | -0/+1 |
| * | | | | | | Don't build the pannablewebview example if webkit is disabled | Bradley T. Hughes | 2009-06-26 | 1 | -1/+4 |
| * | | | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt | Bradley T. Hughes | 2009-06-24 | 7 | -0/+372 |
| |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ | Merge commit 'origin/4.5' | Oswald Buddenhagen | 2009-06-23 | 7 | -0/+372 |
| | |\ \ \ \ \ \ | | | | |_|_|_|/ | | | |/| | | | | |||||
| | | * | | | | | Doc - Adding the new Frozen Column Example by Pierre Rossi into our list of | Kavindra Devi Palaraja | 2009-06-23 | 1 | -0/+1 |
| | | * | | | | | Doc - Adding Pierre Rossi's frozen column example | Kavindra Devi Palaraja | 2009-06-23 | 6 | -0/+371 |
| * | | | | | | | Don't build the gesture browser "example" if webkit or svg are disabled | Bradley T. Hughes | 2009-06-23 | 1 | -1/+2 |
| * | | | | | | | Don't crash in the fingerpaint example if the touch id gets too large | Bradley T. Hughes | 2009-06-22 | 1 | -1/+1 |
| * | | | | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt | Bradley T. Hughes | 2009-06-22 | 1 | -14/+14 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |||||
| | * | | | | | | Demo: fixed colors in the calendar when May 1st is a Friday | Thierry Bastian | 2009-06-18 | 1 | -14/+14 |
| * | | | | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt | Bradley T. Hughes | 2009-06-18 | 3 | -0/+3 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |||||
| | * | | | | | | Use the unified toolbar on Mac. | Morten Sørvig | 2009-06-18 | 3 | -0/+3 |
| * | | | | | | | update examples now that we get both touch and mouse events at the same time | Bradley T. Hughes | 2009-06-18 | 5 | -7/+100 |
| * | | | | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt | Bradley T. Hughes | 2009-06-17 | 1075 | -2159/+2159 |
| |\ \ \ \ \ \ \ | | |/ / / / / / |