summaryrefslogtreecommitdiffstats
path: root/examples/phonon
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtWarwick Allison2009-08-031-1/+4
|\
| * Merge branch '4.5'Thiago Macieira2009-08-031-1/+4
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/tools/qsharedpointer.cpp src/corelib/tools/qsharedpointer_impl.h src/gui/dialogs/qcolordialog.cpp src/gui/painting/qwindowsurface_raster.cpp src/network/access/qnetworkaccessmanager.cpp tests/auto/qsharedpointer/externaltests.cpp
| | * Musicplayer example crashes when trying to open unvalid fileRichard Moe Gustavsen2009-07-241-1/+4
| | | | | | | | | | | | | | | | | | | | | Reason: Example tries to get media from QList with an index out of bounds. Nothing to do with Phonon. Task-number: 253307
* | | unwarnWarwick Allison2009-07-171-1/+1
|/ /
* | Merge license header changes from 4.5Volker Hilsheimer2009-06-166-12/+12
|\ \ | |/
| * Update license headers as requested by the marketing department.Jason McDonald2009-06-166-12/+12
| | | | | | | | Reviewed-by: Trust Me
* | Replace all instances of "Ctrl+Q" with QKeySequence::Quit.Norwegian Rock Cat2009-05-121-1/+1
|/ | | | We introduce this new enum, we should be using it.
* Fixed typo in README fileNils Christian Roscher-Nielsen2009-05-061-1/+1
| | | | Reviewed-by: David Boddie <dboddie@trolltech.com>
* Long live Qt 4.5!Lars Knoll2009-03-2310-0/+923