summaryrefslogtreecommitdiffstats
path: root/examples
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into qtscript-jsc-b...Kent Hansen2009-08-143-5/+5
|\
| * Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtWarwick Allison2009-08-141078-1136/+1134
| |\
| | * Get the pinchzoom working againBradley T. Hughes2009-08-132-4/+4
| * | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtWarwick Allison2009-08-1034-60/+2615
| |\ \
| * \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtWarwick Allison2009-08-045-28/+237
| |\ \ \
| * \ \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtWarwick Allison2009-08-032-3/+8
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtWarwick Allison2009-08-022-2/+5
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtWarwick Allison2009-07-31128-9285/+251
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtWarwick Allison2009-07-1718-9/+631
| |\ \ \ \ \ \ \
| * | | | | | | | unwarnWarwick Allison2009-07-171-1/+1
* | | | | | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into qtscript-jsc-b...Kent Hansen2009-08-121078-1132/+1132
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | |
| * | | | | | | | Update obsolete email addresses.Jason McDonald2009-08-121-1/+1
| * | | | | | | | Replace some mentions of Trolltech with more appropriate terms.Jason McDonald2009-08-129-23/+21
| * | | | | | | | Update obsolete URL's in code and docs.Jason McDonald2009-08-123-3/+3
| * | | | | | | | Update references to online documentation.Jason McDonald2009-08-129-18/+18
| * | | | | | | | Eliminate last mentions of "Qt Software".Jason McDonald2009-08-123-3/+3
| * | | | | | | | Update URL's to use new domain.Jason McDonald2009-08-126-16/+16
| * | | | | | | | Update contact URL in license headers.Jason McDonald2009-08-121068-1068/+1068
| | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | Compile fix with namespaceshjk2009-08-101-0/+2
* | | | | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into qtscript-jsc-b...Kent Hansen2009-08-106-0/+465
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Doc: Integrated the Rogue (state machine) example.Geir Vattekar2009-08-076-0/+465
| * | | | | | | implement name() function of custom property iteratorKent Hansen2009-08-061-1/+1
| * | | | | | | make the calculator example use only standard JSKent Hansen2009-08-061-45/+62
* | | | | | | | add configure options for (not) building the QtScript moduleKent Hansen2009-08-071-1/+1
* | | | | | | | merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into qtscript-jsc-b...Kent Hansen2009-08-067-12/+313
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Fixed compilation of the gestures/imagewidget example.Denis Dzyubenko2009-08-063-12/+35
| * | | | | | | Added example that uses WebKit to capture Web page frames.Andre Pedralho2009-08-064-0/+278
* | | | | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into qtscript-jsc-b...Kent Hansen2009-08-0530-38/+2032
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge AudioServices into mainline.Justin McPherson2009-08-0517-0/+1772
| * | | | | | | Merge branch '4.5'Bill King2009-08-052-2/+0
| |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| | * | | | | | Fix obsolete license headersJason McDonald2009-08-043-8/+6
| * | | | | | | Added the license header to the example.Denis Dzyubenko2009-08-042-0/+82
| * | | | | | | Removed the QTapAndHoldGestureDenis Dzyubenko2009-08-045-8/+151
| * | | | | | | Modify imagewidget example so it works with new APIRichard Moe Gustavsen2009-08-041-31/+15
| | |_|_|_|_|/ | |/| | | | |
| * | | | | | Merge branch '4.5'Thiago Macieira2009-08-031-1/+4
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Musicplayer example crashes when trying to open unvalid fileRichard Moe Gustavsen2009-07-241-1/+4
| * | | | | | remove constructors that are not usefulKent Hansen2009-08-031-2/+4
| | |_|_|_|/ | |/| | | |
| * | | | | Doc: Use new APIs in example and correct documentation regarding replacement.Volker Hilsheimer2009-07-311-2/+2
| * | | | | Show open directory dialog for new gesture exampleRichard Moe Gustavsen2009-07-311-0/+3
| | |_|_|/ | |/| | |
| * | | | fix two bugs in the custom script class exampleKent Hansen2009-07-302-3/+10
* | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into qtscript-jsc-b...Kent Hansen2009-07-3078-6527/+11
|\ \ \ \ \ | |/ / / /
| * | | | Fix compilation errors in examples and demos on VxWorks and QNX.Robert Griebl2009-07-296-6/+11
| * | | | Move sub-attaq from examples to demos because sub-attaq is a bitAlexis Menard2009-07-2872-6521/+0
* | | | | Merge branch 'qtwebkit-4.6-staging' into qtscript-jsc-backendKent Hansen2009-07-2879-2715/+809
|\ \ \ \ \ | |/ / / /
| * | | | Remove tank game exampleEskil Abrahamsen Blomfeldt2009-07-2827-2396/+1
| * | | | Remove the close shortcut from the example since QMdiArea provides thisAndy Shaw2009-07-231-1/+0
| * | | | Make QStateMachine inherit QStateKent Hansen2009-07-2212-37/+34
| * | | | Remove Stickman editorEskil Abrahamsen Blomfeldt2009-07-217-437/+0
| * | | | Merge commit 'origin/4.5'Oswald Buddenhagen2009-07-201-1/+3
| |\ \ \ \ | | |/ / /
| | * | | Update the example TrafficInfo for GCC 3.3Benjamin Poulain2009-07-171-1/+3