Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'shader-api' into gl2engine-new-shaders | Rhys Weatherley | 2009-05-01 | 28 | -20/+1391 |
|\ | |||||
| * | Merge branch 'shaderprograms' of git@scm.dev.nokia.troll.no:qt/rweathers-shad... | Rhys Weatherley | 2009-05-01 | 2 | -303/+119 |
| |\ | |||||
| | * | Import shader implementation from before the history cut. | Rhys Weatherley | 2009-03-23 | 2 | -303/+119 |
| * | | Merge commit 'origin/4.5' | Bjoern Erik Nilsen | 2009-04-29 | 4 | -6/+30 |
| |\ \ | |||||
| | * | | Corrected bugs in the flow layout example | Morten Engvoldsen | 2009-04-29 | 4 | -6/+30 |
| | * | | fixed minor issue with the piechart demo | Pierre Rossi | 2009-04-24 | 1 | -1/+1 |
| * | | | fixed minor issue with the piechart demo | Pierre Rossi | 2009-04-24 | 1 | -1/+1 |
| * | | | 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 |
| * | | | Merge branch '4.5' | Thiago Macieira | 2009-04-23 | 6 | -1/+512 |
| |\ \ \ | | |/ / | |||||
| | * | | Added Google Chat client as a new WebKit example | Ariya Hidayat | 2009-04-23 | 6 | -1/+512 |
| * | | | 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 |
| * | | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt | Simon Hausmann | 2009-04-23 | 1 | -3/+6 |
| |\ \ \ | | |/ / | |||||
| | * | | Fix more NaNs in Elastic Nodes example | João Abecasis | 2009-04-22 | 1 | -3/+6 |
| * | | | Merge branch '4.5' | Rhys Weatherley | 2009-04-21 | 1 | -3/+8 |
| |\ \ \ | | |/ / | |||||
| | * | | BT: Fix lock-up & crash in the Elastic Nodes example | Andreas Aardal Hanssen | 2009-04-21 | 1 | -3/+8 |
| * | | | Merge branch '4.5' | Thiago Macieira | 2009-04-20 | 1 | -1/+1 |
| |\ \ \ | | |/ / | |||||
| | * | | Unable to build ActiveQt with Opensource edition. | Prasanth Ullattil | 2009-04-20 | 1 | -1/+1 |
| * | | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt | Simon Hausmann | 2009-04-17 | 3 | -6/+6 |
| |\ \ \ | | |/ / | |||||
| | * | | Use setContentsMargins() instead of setMargin(). | Jan-Arve Sæther | 2009-04-16 | 1 | -2/+2 |
| | * | | Doc - Changed the link provided in the README file to one that does not | Kavindra Devi Palaraja | 2009-04-16 | 1 | -1/+1 |
| | * | | Doc - Some minor cleanups in the documentation of QInputDialog. Also | Kavindra Devi Palaraja | 2009-04-16 | 1 | -3/+3 |
| | * | | Fixed and improved the example code | Jan-Arve Sæther | 2009-04-15 | 2 | -14/+58 |
* | | | | Merge branch 'master' into gl2engine-new-shaders | Samuel Rødal | 2009-04-22 | 12 | -32/+285 |
|\ \ \ \ | |||||
| * \ \ \ | Merge branch 'qt/main' | Gunnar Sletta | 2009-04-17 | 12 | -32/+285 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Fixed and improved the example code | Jan-Arve Sæther | 2009-04-15 | 2 | -14/+58 |
| | * | | | Changed codeeditor include to use double quotes, was failing to compile uncer... | Kurt Korbatits | 2009-04-15 | 1 | -1/+1 |
| | * | | | Merge commit 'origin/4.5' | Bjoern Erik Nilsen | 2009-04-07 | 4 | -8/+10 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | BT: Adjust the colliding mice example to work with coalesced updates. | Norwegian Rock Cat | 2009-04-06 | 3 | -7/+9 |
| | | * | | Install the animation.mng file. | Thiago Macieira | 2009-04-06 | 1 | -1/+1 |
| | * | | | Fix a small bugs in the example. +two small cleanups. | Jan-Arve Sæther | 2009-04-06 | 3 | -5/+7 |
| | * | | | Add missing license headers. | Jan-Arve Sæther | 2009-04-06 | 5 | -4/+209 |
* | | | | | Import shader implementation from before the history cut. | Rhys Weatherley | 2009-04-03 | 2 | -303/+119 |
|/ / / / | |||||
* | | | | Merge branch 'graphics-main' | Gunnar Sletta | 2009-04-03 | 2 | -5/+26 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Fixes: Use the blit/multisample FBO API in the framebuffer object example. | Samuel Rødal | 2009-04-01 | 2 | -5/+26 |
* | | | | Improve example so that we can demonstrate custom layout items. | Jan-Arve Sæther | 2009-03-31 | 2 | -13/+49 |
* | | | | Add an example of how to write a custom layout for QGraphicsLayouts. | Jan-Arve Sæther | 2009-03-31 | 6 | -0/+258 |
|/ / / | |||||
* | | | Merge branch '4.5' of git@scm.dev.troll.no:qt/qt | Simon Hausmann | 2009-03-26 | 10 | -1/+718 |
|\ \ \ | |/ / | |||||
| * | | Squashed commit of the following: | David Boddie | 2009-03-26 | 1 | -0/+5 |
| * | | Squashed commit of the following: | David Boddie | 2009-03-26 | 1 | -1/+1 |
| * | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5 | David Boddie | 2009-03-26 | 1 | -1/+1 |
| |\ \ | |||||
| * | | | Squashed commit of the following: | David Boddie | 2009-03-26 | 8 | -0/+712 |
| | |/ | |/| | |||||
* | | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt | Simon Hausmann | 2009-03-26 | 1 | -1/+1 |
|\ \ \ | | |/ | |/| | |||||
| * | | Make the traffic info example not hit the server every minute. | Thiago Macieira | 2009-03-26 | 1 | -1/+1 |
| |/ | |||||
| * | Long live Qt 4.5! | Lars Knoll | 2009-03-23 | 1907 | -0/+142207 |
* | Long live Qt! | Lars Knoll | 2009-03-23 | 1907 | -0/+142213 |