summaryrefslogtreecommitdiffstats
path: root/examples
Commit message (Expand)AuthorAgeFilesLines
* Merge commit 'qt/master'Samuel Rødal2009-05-1339-82/+107
|\
| * Merge commit 'origin/4.5'Olivier Goffart2009-05-132-2/+22
| |\
| | * Adding documentation to the fancy browser exampleMorten Engvoldsen2009-05-122-2/+22
| * | Replace all instances of "Ctrl+Q" with QKeySequence::Quit.Norwegian Rock Cat2009-05-1234-74/+71
| * | Merge branch '4.5'Thiago Macieira2009-05-112-5/+13
| |\ \ | | |/
| | * Only link against opengles .LIB files if on WinCETom Cooksey2009-05-111-5/+7
| | * Fixing hellogl_es2 for Windows CEThomas Hartmann2009-05-081-0/+6
| * | Merge branch '4.5' of git@scm.dev.troll.no:qt/qtSimon Hausmann2009-05-061-1/+1
| |\ \ | | |/
| | * Fixed typo in README fileNils Christian Roscher-Nielsen2009-05-061-1/+1
* | | Merge branch 'shader-api' into gl2engine-new-shadersRhys Weatherley2009-05-0128-20/+1391
|\ \ \
| * \ \ Merge branch 'shaderprograms' of git@scm.dev.nokia.troll.no:qt/rweathers-shad...Rhys Weatherley2009-05-012-303/+119
| |\ \ \ | | |/ / | |/| |
| | * | Import shader implementation from before the history cut.Rhys Weatherley2009-03-232-303/+119
| * | | Merge commit 'origin/4.5'Bjoern Erik Nilsen2009-04-294-6/+30
| |\ \ \ | | | |/ | | |/|
| | * | Corrected bugs in the flow layout exampleMorten Engvoldsen2009-04-294-6/+30
| | * | fixed minor issue with the piechart demoPierre Rossi2009-04-241-1/+1
| * | | fixed minor issue with the piechart demoPierre Rossi2009-04-241-1/+1
| * | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-237-0/+498
| |\ \ \ | | |/ /
| | * | Add Google Suggest as a new network exampleAriya Hidayat2009-04-237-0/+498
| * | | Merge branch '4.5'Thiago Macieira2009-04-236-1/+512
| |\ \ \ | | |/ /
| | * | Added Google Chat client as a new WebKit exampleAriya Hidayat2009-04-236-1/+512
| * | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-237-1/+331
| |\ \ \ | | |/ /
| | * | Add fancy browser as the new exampleAriya Hidayat2009-04-237-1/+331
| * | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-231-3/+6
| |\ \ \ | | |/ /
| | * | Fix more NaNs in Elastic Nodes exampleJoão Abecasis2009-04-221-3/+6
| * | | Merge branch '4.5'Rhys Weatherley2009-04-211-3/+8
| |\ \ \ | | |/ /
| | * | BT: Fix lock-up & crash in the Elastic Nodes exampleAndreas Aardal Hanssen2009-04-211-3/+8
| * | | Merge branch '4.5'Thiago Macieira2009-04-201-1/+1
| |\ \ \ | | |/ /
| | * | Unable to build ActiveQt with Opensource edition.Prasanth Ullattil2009-04-201-1/+1
| * | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-173-6/+6
| |\ \ \ | | |/ /
| | * | Use setContentsMargins() instead of setMargin().Jan-Arve Sæther2009-04-161-2/+2
| | * | Doc - Changed the link provided in the README file to one that does notKavindra Devi Palaraja2009-04-161-1/+1
| | * | Doc - Some minor cleanups in the documentation of QInputDialog. AlsoKavindra Devi Palaraja2009-04-161-3/+3
| | * | Fixed and improved the example codeJan-Arve Sæther2009-04-152-14/+58
* | | | 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