Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into qtscript-jsc-b... | Kent Hansen | 2009-08-19 | 2 | -69/+38 |
|\ | |||||
| * | Fixes compile | Bill King | 2009-08-19 | 2 | -0/+10 |
| * | Added two convenience functions to QXmlStreamReader | Thorbjørn Lindeijer | 2009-08-18 | 3 | -78/+37 |
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into qtscript-jsc-b... | Kent Hansen | 2009-08-14 | 3 | -5/+5 |
|\ \ | |/ | |||||
| * | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt | Warwick Allison | 2009-08-14 | 1078 | -1136/+1134 |
| |\ | |||||
| | * | Get the pinchzoom working again | Bradley T. Hughes | 2009-08-13 | 2 | -4/+4 |
| * | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt | Warwick Allison | 2009-08-10 | 34 | -60/+2615 |
| |\ \ | |||||
| * \ \ | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt | Warwick Allison | 2009-08-04 | 5 | -28/+237 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt | Warwick Allison | 2009-08-03 | 2 | -3/+8 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt | Warwick Allison | 2009-08-02 | 2 | -2/+5 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt | Warwick Allison | 2009-07-31 | 128 | -9285/+251 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt | Warwick Allison | 2009-07-17 | 18 | -9/+631 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | unwarn | Warwick Allison | 2009-07-17 | 1 | -1/+1 |
* | | | | | | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into qtscript-jsc-b... | Kent Hansen | 2009-08-12 | 1078 | -1132/+1132 |
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | | | |||||
| * | | | | | | | | Update obsolete email addresses. | Jason McDonald | 2009-08-12 | 1 | -1/+1 |
| * | | | | | | | | Replace some mentions of Trolltech with more appropriate terms. | Jason McDonald | 2009-08-12 | 9 | -23/+21 |
| * | | | | | | | | Update obsolete URL's in code and docs. | Jason McDonald | 2009-08-12 | 3 | -3/+3 |
| * | | | | | | | | Update references to online documentation. | Jason McDonald | 2009-08-12 | 9 | -18/+18 |
| * | | | | | | | | Eliminate last mentions of "Qt Software". | Jason McDonald | 2009-08-12 | 3 | -3/+3 |
| * | | | | | | | | Update URL's to use new domain. | Jason McDonald | 2009-08-12 | 6 | -16/+16 |
| * | | | | | | | | Update contact URL in license headers. | Jason McDonald | 2009-08-12 | 1068 | -1068/+1068 |
| | |_|_|_|_|_|/ | |/| | | | | | | |||||
| * | | | | | | | Compile fix with namespaces | hjk | 2009-08-10 | 1 | -0/+2 |
* | | | | | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into qtscript-jsc-b... | Kent Hansen | 2009-08-10 | 6 | -0/+465 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | Doc: Integrated the Rogue (state machine) example. | Geir Vattekar | 2009-08-07 | 6 | -0/+465 |
| * | | | | | | | implement name() function of custom property iterator | Kent Hansen | 2009-08-06 | 1 | -1/+1 |
| * | | | | | | | make the calculator example use only standard JS | Kent Hansen | 2009-08-06 | 1 | -45/+62 |
* | | | | | | | | add configure options for (not) building the QtScript module | Kent Hansen | 2009-08-07 | 1 | -1/+1 |
* | | | | | | | | merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into qtscript-jsc-b... | Kent Hansen | 2009-08-06 | 7 | -12/+313 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | Fixed compilation of the gestures/imagewidget example. | Denis Dzyubenko | 2009-08-06 | 3 | -12/+35 |
| * | | | | | | | Added example that uses WebKit to capture Web page frames. | Andre Pedralho | 2009-08-06 | 4 | -0/+278 |
* | | | | | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into qtscript-jsc-b... | Kent Hansen | 2009-08-05 | 30 | -38/+2032 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | Merge AudioServices into mainline. | Justin McPherson | 2009-08-05 | 17 | -0/+1772 |
| * | | | | | | | Merge branch '4.5' | Bill King | 2009-08-05 | 2 | -2/+0 |
| |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | | |||||
| | * | | | | | | Fix obsolete license headers | Jason McDonald | 2009-08-04 | 3 | -8/+6 |
| * | | | | | | | Added the license header to the example. | Denis Dzyubenko | 2009-08-04 | 2 | -0/+82 |
| * | | | | | | | Removed the QTapAndHoldGesture | Denis Dzyubenko | 2009-08-04 | 5 | -8/+151 |
| * | | | | | | | Modify imagewidget example so it works with new API | Richard Moe Gustavsen | 2009-08-04 | 1 | -31/+15 |
| | |_|_|_|_|/ | |/| | | | | | |||||
| * | | | | | | Merge branch '4.5' | Thiago Macieira | 2009-08-03 | 1 | -1/+4 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
| | * | | | | | Musicplayer example crashes when trying to open unvalid file | Richard Moe Gustavsen | 2009-07-24 | 1 | -1/+4 |
| * | | | | | | remove constructors that are not useful | Kent Hansen | 2009-08-03 | 1 | -2/+4 |
| | |_|_|_|/ | |/| | | | | |||||
| * | | | | | Doc: Use new APIs in example and correct documentation regarding replacement. | Volker Hilsheimer | 2009-07-31 | 1 | -2/+2 |
| * | | | | | Show open directory dialog for new gesture example | Richard Moe Gustavsen | 2009-07-31 | 1 | -0/+3 |
| | |_|_|/ | |/| | | | |||||
| * | | | | fix two bugs in the custom script class example | Kent Hansen | 2009-07-30 | 2 | -3/+10 |
* | | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into qtscript-jsc-b... | Kent Hansen | 2009-07-30 | 78 | -6527/+11 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Fix compilation errors in examples and demos on VxWorks and QNX. | Robert Griebl | 2009-07-29 | 6 | -6/+11 |
| * | | | | Move sub-attaq from examples to demos because sub-attaq is a bit | Alexis Menard | 2009-07-28 | 72 | -6521/+0 |
* | | | | | Merge branch 'qtwebkit-4.6-staging' into qtscript-jsc-backend | Kent Hansen | 2009-07-28 | 79 | -2715/+809 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Remove tank game example | Eskil Abrahamsen Blomfeldt | 2009-07-28 | 27 | -2396/+1 |
| * | | | | Remove the close shortcut from the example since QMdiArea provides this | Andy Shaw | 2009-07-23 | 1 | -1/+0 |
| * | | | | Make QStateMachine inherit QState | Kent Hansen | 2009-07-22 | 12 | -37/+34 |