summaryrefslogtreecommitdiffstats
path: root/demos
Commit message (Expand)AuthorAgeFilesLines
* Change namespace; QtMedia -> QtMultimediaJustin McPherson2010-02-191-4/+4
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-team into ma...Qt Continuous Integration System2010-02-1812-0/+1221
|\
| * Merge branch 'master' of ../../qt/masterJustin McPherson2010-02-14151-6/+4900
| |\
| * \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtJustin McPherson2010-02-053-2/+13
| |\ \
| * \ \ Merge ../../qt/masterJustin McPherson2010-01-295-5/+156
| |\ \ \
| * | | | Multimedia; Add player demo.Justin McPherson2010-01-1810-0/+1215
| * | | | Move QtMobility multimedia framework into Qt.Justin McPherson2010-01-152-0/+6
* | | | | Fix copyright year.Jason McDonald2010-02-161-1/+1
| |_|_|/ |/| | |
* | | | Merge remote branch 'origin/master' into qt-master-from-4.6Thiago Macieira2010-02-13147-0/+4885
|\ \ \ \
| * \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integra...Qt Continuous Integration System2010-02-10147-0/+4885
| |\ \ \ \
| | * \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integra...Qt Continuous Integration System2010-02-05147-0/+4885
| | |\ \ \ \ | | | |_|_|/ | | |/| | |
| | | * | | Merge branch 'kinetic-declarativeui' of git://git-nokia.trolltech.com.au/qtso...Warwick Allison2010-02-04147-0/+4885
| | | |\ \ \
| | | | * | | Disallow ids that start with uppercase letters and update docs andBea Lam2010-02-033-8/+8
| | | | * | | Merge commit 'qt/4.6' into kinetic-declarativeuiBjørn Erik Nilsen2010-01-272-1/+12
| | | | |\ \ \
| | | | * | | | Remove samegame README (mentioned images have been replaced)Kai Koehne2010-01-221-10/+0
| | | | * | | | Tweak marble graphics in SamegameNigel Hietala2010-01-224-0/+0
| | | | * | | | Updated graphics for SamegameNigel Hietala2010-01-216-0/+1
| | | | * | | | Merge branch '4.6' of ../qt into kinetic-declarativeuiAaron Kennedy2010-01-195-5/+156
| | | | |\ \ \ \
| | | | * \ \ \ \ Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into kinetic-declara...Warwick Allison2010-01-14267-283/+292
| | | | |\ \ \ \ \
| | | | * | | | | | Follow naming conventions (pass examples test)Warwick Allison2010-01-1123-5/+6
| | | | * | | | | | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic int...Alan Alpert2010-01-076-202/+258
| | | | |\ \ \ \ \ \
| | | | | * | | | | | Avoid spurious error messagesWarwick Allison2010-01-061-2/+4
| | | | | * | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeuiAaron Kennedy2010-01-055-200/+254
| | | | | |\ \ \ \ \ \
| | | | * | | | | | | | Make minehunt more responsiveAlan Alpert2010-01-071-1/+1
| | | | |/ / / / / / /
| | | | * | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeuiMichael Brasser2009-12-171-2/+19
| | | | |\ \ \ \ \ \ \
| | | | * | | | | | | | Add a quit button to the toolbarHarald Fernengel2009-12-161-0/+6
| | | | * | | | | | | | Set score text color (so that it will be visible)Alan Alpert2009-12-162-1/+2
| | | | * | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeuiMichael Brasser2009-12-073-261/+345
| | | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | | Fix initial scaling. QWebPage::setPreferredSize doesn't really work.Warwick Allison2009-12-021-3/+3
| | | | * | | | | | | | | Restructure for easier re-use.Warwick Allison2009-12-027-278/+276
| | | | * | | | | | | | | Change from scaling/zooming by zoomFactor to instead use painter scaling.Warwick Allison2009-12-021-10/+22
| | | | * | | | | | | | | Fix use of XmlHttpRequest in examplesAlan Alpert2009-11-272-0/+2
| | | | * | | | | | | | | Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into kinetic-declara...Warwick Allison2009-11-2729-186/+260
| | | | |\ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | binary?Warwick Allison2009-11-261-0/+0
| | | | * | | | | | | | | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Alan Alpert2009-11-262-1/+1
| | | | |\ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | reenable particles effect for the cookiemae2009-11-262-1/+1
| | | | * | | | | | | | | | | Fix minor clipping issue in twitter appAlan Alpert2009-11-262-3/+2
| | | | |/ / / / / / / / / /
| | | | * | | | | | | | | | Twitter demo touchupsAlan Alpert2009-11-267-29/+61
| | | | * | | | | | | | | | added a snake demomae2009-11-2522-0/+1019
| | | | * | | | | | | | | | If zooming on nothing, zoom 2x rather than doing nothing.Warwick Allison2009-11-251-0/+2
| | | | * | | | | | | | | | Use console.log, not printWarwick Allison2009-11-232-2/+2
| | | | * | | | | | | | | | Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into kinetic-declara...Warwick Allison2009-11-1911-49/+40
| | | | |\ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | Removed Browser demo from Symbian buildsMiikka Heikkinen2009-11-181-1/+1
| | | | * | | | | | | | | | | Pass error messages through to WebView users.Warwick Allison2009-11-181-0/+2
| | | | * | | | | | | | | | | Fix URL update in demoWarwick Allison2009-11-181-1/+1
| | | | * | | | | | | | | | | Update examples for new SQL API.Warwick Allison2009-11-181-22/+10
| | | | * | | | | | | | | | | Partial fix for QTBUGT-5845Warwick Allison2009-11-171-7/+8
| | | | * | | | | | | | | | | Merge remote branch 'qt/4.6' into kinetic-declarativeuiAndreas Aardal Hanssen2009-11-111-1/+1
| | | | |\ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | Fix minehunt demoAlan Alpert2009-11-114-2/+17
| | | | * | | | | | | | | | | | Remove WebView::pagewidth and tidy up - it's not needed and interferedWarwick Allison2009-11-101-17/+26