Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Change namespace; QtMedia -> QtMultimedia | Justin McPherson | 2010-02-19 | 1 | -4/+4 |
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-team into ma... | Qt Continuous Integration System | 2010-02-18 | 12 | -0/+1221 |
|\ | |||||
| * | Merge branch 'master' of ../../qt/master | Justin McPherson | 2010-02-14 | 151 | -6/+4900 |
| |\ | |||||
| * \ | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt | Justin McPherson | 2010-02-05 | 3 | -2/+13 |
| |\ \ | |||||
| * \ \ | Merge ../../qt/master | Justin McPherson | 2010-01-29 | 5 | -5/+156 |
| |\ \ \ | |||||
| * | | | | Multimedia; Add player demo. | Justin McPherson | 2010-01-18 | 10 | -0/+1215 |
| * | | | | Move QtMobility multimedia framework into Qt. | Justin McPherson | 2010-01-15 | 2 | -0/+6 |
* | | | | | Fix copyright year. | Jason McDonald | 2010-02-16 | 1 | -1/+1 |
| |_|_|/ |/| | | | |||||
* | | | | Merge remote branch 'origin/master' into qt-master-from-4.6 | Thiago Macieira | 2010-02-13 | 147 | -0/+4885 |
|\ \ \ \ | |||||
| * \ \ \ | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integra... | Qt Continuous Integration System | 2010-02-10 | 147 | -0/+4885 |
| |\ \ \ \ | |||||
| | * \ \ \ | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integra... | Qt Continuous Integration System | 2010-02-05 | 147 | -0/+4885 |
| | |\ \ \ \ | | | |_|_|/ | | |/| | | | |||||
| | | * | | | Merge branch 'kinetic-declarativeui' of git://git-nokia.trolltech.com.au/qtso... | Warwick Allison | 2010-02-04 | 147 | -0/+4885 |
| | | |\ \ \ | |||||
| | | | * | | | Disallow ids that start with uppercase letters and update docs and | Bea Lam | 2010-02-03 | 3 | -8/+8 |
| | | | * | | | Merge commit 'qt/4.6' into kinetic-declarativeui | Bjørn Erik Nilsen | 2010-01-27 | 2 | -1/+12 |
| | | | |\ \ \ | |||||
| | | | * | | | | Remove samegame README (mentioned images have been replaced) | Kai Koehne | 2010-01-22 | 1 | -10/+0 |
| | | | * | | | | Tweak marble graphics in Samegame | Nigel Hietala | 2010-01-22 | 4 | -0/+0 |
| | | | * | | | | Updated graphics for Samegame | Nigel Hietala | 2010-01-21 | 6 | -0/+1 |
| | | | * | | | | Merge branch '4.6' of ../qt into kinetic-declarativeui | Aaron Kennedy | 2010-01-19 | 5 | -5/+156 |
| | | | |\ \ \ \ | |||||
| | | | * \ \ \ \ | Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into kinetic-declara... | Warwick Allison | 2010-01-14 | 267 | -283/+292 |
| | | | |\ \ \ \ \ | |||||
| | | | * | | | | | | Follow naming conventions (pass examples test) | Warwick Allison | 2010-01-11 | 23 | -5/+6 |
| | | | * | | | | | | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic int... | Alan Alpert | 2010-01-07 | 6 | -202/+258 |
| | | | |\ \ \ \ \ \ | |||||
| | | | | * | | | | | | Avoid spurious error messages | Warwick Allison | 2010-01-06 | 1 | -2/+4 |
| | | | | * | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui | Aaron Kennedy | 2010-01-05 | 5 | -200/+254 |
| | | | | |\ \ \ \ \ \ | |||||
| | | | * | | | | | | | | Make minehunt more responsive | Alan Alpert | 2010-01-07 | 1 | -1/+1 |
| | | | |/ / / / / / / | |||||
| | | | * | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui | Michael Brasser | 2009-12-17 | 1 | -2/+19 |
| | | | |\ \ \ \ \ \ \ | |||||
| | | | * | | | | | | | | Add a quit button to the toolbar | Harald Fernengel | 2009-12-16 | 1 | -0/+6 |
| | | | * | | | | | | | | Set score text color (so that it will be visible) | Alan Alpert | 2009-12-16 | 2 | -1/+2 |
| | | | * | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui | Michael Brasser | 2009-12-07 | 3 | -261/+345 |
| | | | |\ \ \ \ \ \ \ \ | |||||
| | | | * | | | | | | | | | Fix initial scaling. QWebPage::setPreferredSize doesn't really work. | Warwick Allison | 2009-12-02 | 1 | -3/+3 |
| | | | * | | | | | | | | | Restructure for easier re-use. | Warwick Allison | 2009-12-02 | 7 | -278/+276 |
| | | | * | | | | | | | | | Change from scaling/zooming by zoomFactor to instead use painter scaling. | Warwick Allison | 2009-12-02 | 1 | -10/+22 |
| | | | * | | | | | | | | | Fix use of XmlHttpRequest in examples | Alan Alpert | 2009-11-27 | 2 | -0/+2 |
| | | | * | | | | | | | | | Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into kinetic-declara... | Warwick Allison | 2009-11-27 | 29 | -186/+260 |
| | | | |\ \ \ \ \ \ \ \ \ | |||||
| | | | * | | | | | | | | | | binary? | Warwick Allison | 2009-11-26 | 1 | -0/+0 |
| | | | * | | | | | | | | | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic... | Alan Alpert | 2009-11-26 | 2 | -1/+1 |
| | | | |\ \ \ \ \ \ \ \ \ \ | |||||
| | | | | * | | | | | | | | | | reenable particles effect for the cookie | mae | 2009-11-26 | 2 | -1/+1 |
| | | | * | | | | | | | | | | | Fix minor clipping issue in twitter app | Alan Alpert | 2009-11-26 | 2 | -3/+2 |
| | | | |/ / / / / / / / / / | |||||
| | | | * | | | | | | | | | | Twitter demo touchups | Alan Alpert | 2009-11-26 | 7 | -29/+61 |
| | | | * | | | | | | | | | | added a snake demo | mae | 2009-11-25 | 22 | -0/+1019 |
| | | | * | | | | | | | | | | If zooming on nothing, zoom 2x rather than doing nothing. | Warwick Allison | 2009-11-25 | 1 | -0/+2 |
| | | | * | | | | | | | | | | Use console.log, not print | Warwick Allison | 2009-11-23 | 2 | -2/+2 |
| | | | * | | | | | | | | | | Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into kinetic-declara... | Warwick Allison | 2009-11-19 | 11 | -49/+40 |
| | | | |\ \ \ \ \ \ \ \ \ \ | |||||
| | | | | * | | | | | | | | | | Removed Browser demo from Symbian builds | Miikka Heikkinen | 2009-11-18 | 1 | -1/+1 |
| | | | * | | | | | | | | | | | Pass error messages through to WebView users. | Warwick Allison | 2009-11-18 | 1 | -0/+2 |
| | | | * | | | | | | | | | | | Fix URL update in demo | Warwick Allison | 2009-11-18 | 1 | -1/+1 |
| | | | * | | | | | | | | | | | Update examples for new SQL API. | Warwick Allison | 2009-11-18 | 1 | -22/+10 |
| | | | * | | | | | | | | | | | Partial fix for QTBUGT-5845 | Warwick Allison | 2009-11-17 | 1 | -7/+8 |
| | | | * | | | | | | | | | | | Merge remote branch 'qt/4.6' into kinetic-declarativeui | Andreas Aardal Hanssen | 2009-11-11 | 1 | -1/+1 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * | | | | | | | | | | | | Fix minehunt demo | Alan Alpert | 2009-11-11 | 4 | -2/+17 |
| | | | * | | | | | | | | | | | | Remove WebView::pagewidth and tidy up - it's not needed and interfered | Warwick Allison | 2009-11-10 | 1 | -17/+26 |