summaryrefslogtreecommitdiffstats
path: root/examples
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into gl2engine-new-shadersSamuel Rødal2009-04-2212-32/+285
|\
| * Merge branch 'qt/main'Gunnar Sletta2009-04-1712-32/+285
| |\
| | * Fixed and improved the example codeJan-Arve Sæther2009-04-152-14/+58
| | * Changed codeeditor include to use double quotes, was failing to compile uncer...Kurt Korbatits2009-04-151-1/+1
| | * Merge commit 'origin/4.5'Bjoern Erik Nilsen2009-04-074-8/+10
| | |\
| | | * BT: Adjust the colliding mice example to work with coalesced updates.Norwegian Rock Cat2009-04-063-7/+9
| | | * Install the animation.mng file.Thiago Macieira2009-04-061-1/+1
| | * | Fix a small bugs in the example. +two small cleanups.Jan-Arve Sæther2009-04-063-5/+7
| | * | Add missing license headers.Jan-Arve Sæther2009-04-065-4/+209
* | | | Import shader implementation from before the history cut.Rhys Weatherley2009-04-032-303/+119
|/ / /
* | | Merge branch 'graphics-main'Gunnar Sletta2009-04-032-5/+26
|\ \ \ | |/ / |/| |
| * | Fixes: Use the blit/multisample FBO API in the framebuffer object example.Samuel Rødal2009-04-012-5/+26
* | | Improve example so that we can demonstrate custom layout items.Jan-Arve Sæther2009-03-312-13/+49
* | | Add an example of how to write a custom layout for QGraphicsLayouts.Jan-Arve Sæther2009-03-316-0/+258
|/ /
* | Merge branch '4.5' of git@scm.dev.troll.no:qt/qtSimon Hausmann2009-03-2610-1/+718
|\ \ | |/
| * Squashed commit of the following:David Boddie2009-03-261-0/+5
| * Squashed commit of the following:David Boddie2009-03-261-1/+1
| * Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5David Boddie2009-03-261-1/+1
| |\
| * | Squashed commit of the following:David Boddie2009-03-268-0/+712
* | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-03-261-1/+1
|\ \ \ | | |/ | |/|
| * | Make the traffic info example not hit the server every minute.Thiago Macieira2009-03-261-1/+1
| |/
| * Long live Qt 4.5!Lars Knoll2009-03-231907-0/+142207
* Long live Qt!Lars Knoll2009-03-231907-0/+142213