summaryrefslogtreecommitdiffstats
path: root/examples/phonon
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.5' into 4.6Thiago Macieira2009-08-316-78/+78
|\
| * Update tech preview license header.Jason McDonald2009-08-316-78/+78
| * Update license headers.Jason McDonald2009-08-116-6/+6
* | renamed examplebase.pri to symbianpkgrules.priEspen Riskedal2009-08-211-1/+1
* | Fixes: Missing deployment of backends for phonon examplesaxis2009-08-212-2/+6
* | Merge commit 'qt/master'Jason Barron2009-08-181-1/+1
|\ \
| * \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtWarwick Allison2009-08-146-6/+6
| |\ \
| * \ \ 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-136-6/+6
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Update contact URL in license headers.Jason McDonald2009-08-126-6/+6
| | |/ / | |/| |
* | | | 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
| * | | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-06-296-12/+12
| |\ \ \ \ | | |/ / / | |/| | / | | | |/ | | |/|
* | | | Merge commit 'qt/master-stable' into 4.6-mergedJason Barron2009-06-306-12/+12
|\ \ \ \ | | |_|/ | |/| |
| * | | 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
* | | | Merge commit 'qt/master-stable' into 4.6-stableJason Barron2009-06-251-1/+1
|\ \ \ \ | |/ / / | | | / | |_|/ |/| |
| * | Replace all instances of "Ctrl+Q" with QKeySequence::Quit.Norwegian Rock Cat2009-05-121-1/+1
| |/
* | Added proper UID3 for some demos and examples.Miikka Heikkinen2009-06-102-0/+3
* | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-05-111-1/+1
|\ \ | |/
| * Fixed typo in README fileNils Christian Roscher-Nielsen2009-05-061-1/+1
| * Long live Qt 4.5!Lars Knoll2009-03-2310-0/+923
* Long live Qt for S60!axis2009-04-2410-0/+920