summaryrefslogtreecommitdiffstats
path: root/examples/phonon/musicplayer/mainwindow.cpp
Commit message (Expand)AuthorAgeFilesLines
* Merge commit 'qt/master'Jason Barron2009-08-181-1/+1
|\
| * Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtWarwick Allison2009-08-141-1/+1
| |\
| * \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtWarwick Allison2009-08-031-1/+4
| |\ \
| * | | unwarnWarwick Allison2009-07-171-1/+1
* | | | Merge commit 'qt/master'Jason Barron2009-08-131-1/+1
|\ \ \ \ | | |_|/ | |/| |
| * | | Update contact URL in license headers.Jason McDonald2009-08-121-1/+1
| | |/ | |/|
* | | Merge commit 'qt/master-stable'Jason Barron2009-08-041-1/+4
|\ \ \ | |/ /
| * | Merge branch '4.5'Thiago Macieira2009-08-031-1/+4
| |\ \ | | |/ | |/|
| | * Musicplayer example crashes when trying to open unvalid fileRichard Moe Gustavsen2009-07-241-1/+4
* | | Merge commit 'origin/master' into 4.6-mergedJason Barron2009-07-091-1/+1
|\ \ \ | |/ / |/| |
| * | Merge branch 'warningRemovals'axis2009-06-301-1/+1
| |\ \ | | |/ | |/|
| | * Removed warnings because of extra semicolons.axis2009-06-301-1/+1
| | * Long live Qt for S60!axis2009-04-241-0/+352
* | Merge license header changes from 4.5Volker Hilsheimer2009-06-161-2/+2
|\ \ | |/
| * Update license headers as requested by the marketing department.Jason McDonald2009-06-161-2/+2
| * Long live Qt 4.5!Lars Knoll2009-03-231-0/+352
* Replace all instances of "Ctrl+Q" with QKeySequence::Quit.Norwegian Rock Cat2009-05-121-1/+1
* Long live Qt!Lars Knoll2009-03-231-0/+352