summaryrefslogtreecommitdiffstats
path: root/examples
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'custom_shaders' of ../qt-graphics-team into custom-shadersRhys Weatherley2009-07-2319-474/+34
|\
| * Make QStateMachine inherit QStateKent Hansen2009-07-2212-37/+34
| * Remove Stickman editorEskil Abrahamsen Blomfeldt2009-07-217-437/+0
* | Merge commit 'qt/master' into graphicseffectsBjørn Erik Nilsen2009-07-21122-14524/+869
|\ \ | |/
| * Merge commit 'origin/4.5'Oswald Buddenhagen2009-07-201-1/+3
| |\
| | * Update the example TrafficInfo for GCC 3.3Benjamin Poulain2009-07-171-1/+3
| * | Add the "star" example, which demonstrates how to mix OpenVG and QPainterRhys Weatherley2009-07-207-0/+290
| * | Update the documentation after the change in the completer exempleOlivier Goffart2009-07-171-2/+2
| * | Lets the size of the completer be configurable in a way similar to QComboBox.Frédéric Mercille2009-07-172-4/+23
| * | Doc: show warnings about unrecognized or unsupported devices in the statusVolker Hilsheimer2009-07-161-8/+25
| * | And again in the examplesThiago Macieira2009-07-163-3/+3
| * | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtPeter Hartmann2009-07-1510-22/+19
| |\ \
| | * | Make the mainwindow examples use setWindowFilePathNorwegian Rock Cat2009-07-146-18/+15
| | * | make examples/activeqt/webbrowser work on Windows CEJoerg Bornemann2009-07-133-3/+3
| | * | general wording change for some file type namesFrederik Schwarzer2009-07-061-1/+1
| * | | Merge branch 'master' of git://gitorious.org/qt/qtTobias Koenig2009-07-051113-2201/+4732
| |\ \ \ | | |/ /
| | * | Refactored gesture apiDenis Dzyubenko2009-07-0282-14645/+59
| | * | These files don't have to have CRLF line-termination.Thiago Macieira2009-07-023-16/+14
| | * | Animation: fixed a NOTIFY signal name that was wrongThierry Bastian2009-07-011-6/+6
| | * | Made QPainter / OpenGL intermixing in hellogl_es2 work properly again.Samuel Rødal2009-07-011-0/+3
| | * | examples: QString::fromUtf16() -> QString::fromWCharArray()Marius Storm-Olsen2009-07-011-1/+1
| * | | Merge branch 'master' of git://gitorious.org/qt/qtTobias Koenig2009-06-1611-53/+32
| |\ \ \
| * \ \ \ Merge branch 'master' of git://gitorious.org/qt/qtTobias Koenig2009-06-1015-59/+37
| |\ \ \ \
| * \ \ \ \ Merge commit 'qt-mainline/master'Tobias Koenig2009-06-04220-359/+14115
| |\ \ \ \ \
| * | | | | | Complete documentation of schema example and reference it from api docsTobias Koenig2009-05-201-0/+10
| * | | | | | First version of documentation for schema exampleTobias Koenig2009-05-192-9/+12
| * | | | | | Add missing example filesTobias Koenig2009-05-199-0/+168
| * | | | | | Adapt license headers to LGPLTobias Koenig2009-05-163-6/+96
| * | | | | | Add W3C XML Schema validation supportTobias Koenig2009-05-168-1/+335
* | | | | | | Merge commit 'master/master' into kinetic-graphicseffectAriya Hidayat2009-06-301-4/+32
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| * | | | | | Doc: Documented the Move Blocks example.Geir Vattekar2009-06-291-4/+32
* | | | | | | Merge commit 'master/master' into kinetic-graphicseffectAriya Hidayat2009-06-291190-2258/+19324
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Fix license headers after multitouch+gestures merge.Jason McDonald2009-06-2961-305/+305
| * | | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtJason McDonald2009-06-291-2/+1
| |\ \ \ \ \ \
| | * | | | | | Make compile when -no-webkit is passed to configureBill King2009-06-291-2/+1
| * | | | | | | Fix old/missing license headers from multitouch+gestures merge.Jason McDonald2009-06-2969-193/+398
| |/ / / / / /
| * | | | | | Cleanup includes in public headers.Bradley T. Hughes2009-06-261-0/+1
| * | | | | | Don't build the pannablewebview example if webkit is disabledBradley T. Hughes2009-06-261-1/+4
| * | | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtBradley T. Hughes2009-06-247-0/+372
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge commit 'origin/4.5'Oswald Buddenhagen2009-06-237-0/+372
| | |\ \ \ \ \ \ | | | | |_|_|_|/ | | | |/| | | |
| | | * | | | | Doc - Adding the new Frozen Column Example by Pierre Rossi into our list ofKavindra Devi Palaraja2009-06-231-0/+1
| | | * | | | | Doc - Adding Pierre Rossi's frozen column exampleKavindra Devi Palaraja2009-06-236-0/+371
| * | | | | | | Don't build the gesture browser "example" if webkit or svg are disabledBradley T. Hughes2009-06-231-1/+2
| * | | | | | | Don't crash in the fingerpaint example if the touch id gets too largeBradley T. Hughes2009-06-221-1/+1
| * | | | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtBradley T. Hughes2009-06-221-14/+14
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Demo: fixed colors in the calendar when May 1st is a FridayThierry Bastian2009-06-181-14/+14
| * | | | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtBradley T. Hughes2009-06-183-0/+3
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Use the unified toolbar on Mac.Morten Sørvig2009-06-183-0/+3
| * | | | | | | update examples now that we get both touch and mouse events at the same timeBradley T. Hughes2009-06-185-7/+100
| * | | | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtBradley T. Hughes2009-06-171075-2159/+2159
| |\ \ \ \ \ \ \ | | |/ / / / / /