summaryrefslogtreecommitdiffstats
path: root/examples
Commit message (Expand)AuthorAgeFilesLines
* Merge commit 'qt/master'Jason Barron2009-08-214-16/+21
|\
| * Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into qtscript-jsc-b...Kent Hansen2009-08-201-13/+13
| |\
| * | only create and attach the script debugger if it's actually requestedKent Hansen2009-08-201-11/+16
| * | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into qtscript-jsc-b...Kent Hansen2009-08-207-80/+76
| |\ \
| * \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into qtscript-jsc-b...Kent Hansen2009-08-192-69/+38
| |\ \ \
| * \ \ \ 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/qt into qtscript-jsc-b...Kent Hansen2009-08-121078-1132/+1132
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into qtscript-jsc-b...Kent Hansen2009-08-106-0/+465
| |\ \ \ \ \ \
| * | | | | | | 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
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into qtscript-jsc-b...Kent Hansen2009-08-0530-38/+2032
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into qtscript-jsc-b...Kent Hansen2009-07-3078-6527/+11
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'qtwebkit-4.6-staging' into qtscript-jsc-backendKent Hansen2009-07-2879-2715/+809
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | implement name() function of custom property iteratorKent Hansen2009-07-151-1/+1
| * | | | | | | | | | | Merge branch 'qtwebkit-4.6-staging' into qtscript-jsc-backendKent Hansen2009-07-1439-35/+2191
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | don't assert in QScriptEngine::setGlobalObject()Kent Hansen2009-07-132-4/+4
| * | | | | | | | | | | | make the qtscript calculator and tetrix examples runKent Hansen2009-07-022-4/+4
| * | | | | | | | | | | | make the calculator example use only standard JSKent Hansen2009-06-301-45/+62
* | | | | | | | | | | | | Fix opengl examples after bad merge.Jason Barron2009-08-204-28/+79
* | | | | | | | | | | | | Merge commit 'qt/master'Jason Barron2009-08-208-92/+100
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |
| * | | | | | | | | | | | Improved support for SVG animation.Kim Motoyoshi Kalland2009-08-201-13/+13
| | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |
| * | | | | | | | | | | Changed the streambookmarks example to use aggregationThorbjørn Lindeijer2009-08-195-50/+62
| * | | | | | | | | | | Make the license test pass.Frans Englich2009-08-192-25/+19
| * | | | | | | | | | | Revert re-adding of readUnknownElementThorbjørn Lindeijer2009-08-192-10/+0
* | | | | | | | | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-08-192-69/+38
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Fixed compile errorThorbjørn Lindeijer2009-08-191-1/+1
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
| * | | | | | | | | | Fixes compileBill King2009-08-192-0/+10
| * | | | | | | | | | Added two convenience functions to QXmlStreamReaderThorbjørn Lindeijer2009-08-183-78/+37
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
* | | | | | | | | | Changed names and URLs to reflect name change.axis2009-08-197-9/+9
* | | | | | | | | | Merge commit 'qt/master'Jason Barron2009-08-181-1/+1
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtWarwick Allison2009-08-141078-1136/+1134
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ 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 commit 'qt/master'Jason Barron2009-08-131078-1132/+1139
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Get the pinchzoom working againBradley T. Hughes2009-08-132-4/+4
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | 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 commit 'qt/master-stable'Jason Barron2009-08-1015-58/+841
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | Doc: Integrated the Rogue (state machine) example.Geir Vattekar2009-08-076-0/+465