Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Remove changes from bad merge. | Jason Barron | 2009-08-21 | 1 | -3/+4 |
* | Remove commented-out code from examples. | axis | 2009-08-21 | 1 | -4/+0 |
* | Removed an example that was listed twice. | axis | 2009-08-21 | 1 | -1/+0 |
* | Fixes: Missing deployment of backends for phonon examples | axis | 2009-08-21 | 2 | -2/+6 |
* | Merge commit 'qt/master' | Jason Barron | 2009-08-21 | 3 | -1/+124 |
|\ | |||||
| * | Merge branch 'anchorlayout' of git@gitorious.org:+openbossa-developers/qt/ope... | Jan-Arve Sæther | 2009-08-21 | 3 | -1/+124 |
| |\ | |||||
| | * | Remove the anchorlayoyt example that can load layouts. | Jan-Arve Sæther | 2009-08-20 | 14 | -1759/+0 |
| | * | update API to what was agreed on the API review meeting yesterday: | Jan-Arve Sæther | 2009-08-19 | 3 | -49/+71 |
| | * | Clean up example | Jan-Arve Sæther | 2009-08-17 | 2 | -151/+6 |
| | * | Clean up public API: move dumpGraph() to private API. | Jan-Arve Sæther | 2009-08-17 | 1 | -2/+0 |
| | * | Make sure that internal center anchors are not simplified. | Jan-Arve Sæther | 2009-07-22 | 1 | -0/+57 |
| | * | Can now specify which layout to load on the command line. | Jan-Arve Sæther | 2009-07-22 | 3 | -4/+10 |
| | * | Explicitly use a spacing of 0 in order to keep old behaviour. | Jan-Arve Sæther | 2009-07-22 | 1 | -23/+23 |
| | * | Use whitespaces and newlines when saving the xml file. | Jan-Arve Sæther | 2009-07-22 | 1 | -15/+16 |
| | * | Added the possibility to save a layout. | Jan-Arve Sæther | 2009-07-22 | 3 | -34/+85 |
| | * | Add an example | Jan-Arve Sæther | 2009-07-22 | 13 | -0/+1645 |
| | * | QGraphicsAnchorLayoutExample: Delete objects to avoid memory leaks | Eduardo M. Fleury | 2009-07-22 | 1 | -1/+6 |
| | * | QGraphicsAnchorLayout: Adding an usage example | Jesus Sanchez-Palencia | 2009-07-22 | 4 | -1/+243 |
* | | | Merge commit 'qt/master' | Jason Barron | 2009-08-21 | 4 | -16/+21 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into qtscript-jsc-b... | Kent Hansen | 2009-08-20 | 1 | -13/+13 |
| |\ \ | |||||
| * | | | only create and attach the script debugger if it's actually requested | Kent Hansen | 2009-08-20 | 1 | -11/+16 |
| * | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into qtscript-jsc-b... | Kent Hansen | 2009-08-20 | 7 | -80/+76 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into qtscript-jsc-b... | Kent Hansen | 2009-08-19 | 2 | -69/+38 |
| |\ \ \ \ | |||||
| * \ \ \ \ | 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 into qtscript-jsc-b... | Kent Hansen | 2009-08-12 | 1078 | -1132/+1132 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into qtscript-jsc-b... | Kent Hansen | 2009-08-10 | 6 | -0/+465 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | 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 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | 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 branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into qtscript-jsc-b... | Kent Hansen | 2009-07-30 | 78 | -6527/+11 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'qtwebkit-4.6-staging' into qtscript-jsc-backend | Kent Hansen | 2009-07-28 | 79 | -2715/+809 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | implement name() function of custom property iterator | Kent Hansen | 2009-07-15 | 1 | -1/+1 |
| * | | | | | | | | | | | | Merge branch 'qtwebkit-4.6-staging' into qtscript-jsc-backend | Kent Hansen | 2009-07-14 | 39 | -35/+2191 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | don't assert in QScriptEngine::setGlobalObject() | Kent Hansen | 2009-07-13 | 2 | -4/+4 |
| * | | | | | | | | | | | | | make the qtscript calculator and tetrix examples run | Kent Hansen | 2009-07-02 | 2 | -4/+4 |
| * | | | | | | | | | | | | | make the calculator example use only standard JS | Kent Hansen | 2009-06-30 | 1 | -45/+62 |
* | | | | | | | | | | | | | | Fix opengl examples after bad merge. | Jason Barron | 2009-08-20 | 4 | -28/+79 |
* | | | | | | | | | | | | | | Merge commit 'qt/master' | Jason Barron | 2009-08-20 | 8 | -92/+100 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Improved support for SVG animation. | Kim Motoyoshi Kalland | 2009-08-20 | 1 | -13/+13 |
| | |_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Changed the streambookmarks example to use aggregation | Thorbjørn Lindeijer | 2009-08-19 | 5 | -50/+62 |
| * | | | | | | | | | | | | Make the license test pass. | Frans Englich | 2009-08-19 | 2 | -25/+19 |
| * | | | | | | | | | | | | Revert re-adding of readUnknownElement | Thorbjørn Lindeijer | 2009-08-19 | 2 | -10/+0 |
* | | | | | | | | | | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt | axis | 2009-08-19 | 2 | -69/+38 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | Fixed compile error | Thorbjørn Lindeijer | 2009-08-19 | 1 | -1/+1 |
| | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | |||||
| * | | | | | | | | | | | 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 |
| | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Changed names and URLs to reflect name change. | axis | 2009-08-19 | 7 | -9/+9 |
* | | | | | | | | | | | Merge commit 'qt/master' | Jason Barron | 2009-08-18 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | |||||
| * | | | | | | | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt | Warwick Allison | 2009-08-14 | 1078 | -1136/+1134 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt | Warwick Allison | 2009-08-10 | 34 | -60/+2615 |
| |\ \ \ \ \ \ \ \ \ \ \ |