summaryrefslogtreecommitdiffstats
path: root/demos
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into graphics-masterTom Cooksey2009-05-251-0/+15
|\
| * Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-animat...Thierry Bastian2009-05-228-72/+80
| |\
| * | add animation and state machine examples to qtdemoKent Hansen2009-05-201-0/+15
* | | Merge commit 'qt/master'Samuel Rødal2009-05-203-11/+15
|\ \ \ | | |/ | |/|
| * | Merge commit 'origin/4.5'Samuel Rødal2009-05-201-2/+5
| |\ \
| | * | Compile on Solaris with broken GL headers.Trond Kjernåsen2009-05-201-2/+5
| * | | Merge commit 'origin/4.5'Olivier Goffart2009-05-181-1/+1
| |\ \ \ | | |/ /
| | * | Fix syntax error in demos.pro.Jason McDonald2009-05-151-1/+1
| | |/
| * | Graphics View Optimization: Use a simple style option by default.Bjoern Erik Nilsen2009-05-151-8/+9
* | | Merge commit 'qt/master'Samuel Rødal2009-05-131-1/+1
|\ \ \ | |/ /
| * | Fix typo in spreadsheet exampleThomas Zander2009-05-121-1/+1
* | | Mac OSX compile errors in shader usageRhys Weatherley2009-05-101-9/+9
* | | Port boxes demo to use math3d throughoutRhys Weatherley2009-05-0112-732/+131
* | | Rename QGLShader(Program)::errors() to log()Rhys Weatherley2009-05-011-3/+3
* | | Merge branch 'shaderprograms' of git@scm.dev.nokia.troll.no:qt/rweathers-shad...Rhys Weatherley2009-05-017-550/+61
|\ \ \ | |/ / |/| |
| * | Import shader implementation from before the history cut.Rhys Weatherley2009-03-237-550/+61
* | | Fixed Compile after removal of D3D.Friedemann Kleint2009-04-283-8/+8
* | | Remove the Direct3D engine.Gunnar Sletta2009-04-243-32/+2
* | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-231-0/+1
|\ \ \ | | |/ | |/|
| * | Add Google Suggest as a new network exampleAriya Hidayat2009-04-231-0/+1
* | | Merge branch '4.5'Thiago Macieira2009-04-231-0/+1
|\ \ \ | |/ /
| * | Added Google Chat client as a new WebKit exampleAriya Hidayat2009-04-231-0/+1
* | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-231-0/+5
|\ \ \ | |/ /
| * | Add the fancybrowser to the examples in qtdemoSimon Hausmann2009-04-231-0/+1
| * | Add WebKit examples to the Qt DemoSimon Hausmann2009-04-231-0/+4
* | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-172-3/+3
|\ \ \ | |/ /
| * | BT: Mac: QtDemo is really sluggish when opening menusRichard Moe Gustavsen2009-04-162-3/+3
* | | Merge commit 'origin/4.5'Olivier Goffart2009-04-153-4/+15
|\ \ \ | |/ /
| * | BT: Fix the embedded dialogs demo on Mac OS X and Motif styleAndreas Aardal Hanssen2009-04-082-3/+15
| * | Revert "Bt: Fix regression in the Embedded dialogs example"Andreas Aardal Hanssen2009-04-081-9/+2
| * | BT: Revert "Fixes: Remove warnings in the embeddeddialogs demo."Andreas Aardal Hanssen2009-04-081-1/+0
| * | Bt: Fix regression in the Embedded dialogs exampleJens Bache-Wiig2009-04-071-2/+9
* | | Merge branch '4.5' of git@scm.dev.troll.no:qt/qtSimon Hausmann2009-03-261-0/+1
|\ \ \ | |/ /
| * | Squashed commit of the following:David Boddie2009-03-261-0/+1
| |/
| * Long live Qt 4.5!Lars Knoll2009-03-23459-0/+49291
* Long live Qt!Lars Knoll2009-03-23459-0/+49325