summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/phonon
Commit message (Expand)AuthorAgeFilesLines
* Fix a possible crash with the EVR video renderer in windowsThierry Bastian2010-06-181-7/+9
* Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Olivier Goffart2010-06-086-2/+14
|\
| * Removed compiler warningsGareth Stockwell2010-06-026-2/+14
* | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Olivier Goffart2010-05-171-1/+0
|\ \ | |/
| * Phonon QT7 backend; Don't release string after unsuccessful AudioDeviceGetPro...Justin McPherson2010-05-121-1/+0
* | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-05-011-1/+1
|\ \ | |/
| * Fixed incorrect runtime platform version check in Phonon MMF backendGareth Stockwell2010-04-301-1/+1
* | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Olivier Goffart2010-04-1610-97/+169
|\ \ | |/
| * Phonon MMF: fixed crash during opening of video clipGareth Stockwell2010-04-152-57/+58
| * Phonon MMF: ensure initial volume is appliedGareth Stockwell2010-04-151-3/+2
| * Phonon MMF: fix state changes emitted during playlist handlingGareth Stockwell2010-04-151-0/+5
| * Phonon MMF: calling pause() when in StoppedState triggers stateChanged()Gareth Stockwell2010-04-156-29/+71
| * Phonon MMF: change to PausedState, not StoppedState when finishedGareth Stockwell2010-04-151-1/+1
| * Phonon MMF: Suppress intermediate stateChanged() signalGareth Stockwell2010-04-152-8/+16
| * Phonon MMF: Emit tick() signalGareth Stockwell2010-04-151-0/+1
| * Phonon MMF: Emit prefinishMarkReached(), finished() signalsGareth Stockwell2010-04-153-2/+18
| * Phonon MMF: Removed compiler warningGareth Stockwell2010-04-151-1/+1
| * Phonon MMF: fixed typo in trace statementGareth Stockwell2010-04-141-1/+1
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-04-141-1/+1
|\ \
| * | Phonon MMF: fixed typo in trace statementGareth Stockwell2010-04-141-1/+1
* | | Build fixThierry Bastian2010-04-121-10/+0
* | | Merge commit 'internal-qt-repo/4.7' into oslo-staging-2/4.7Tom Cooksey2010-04-121-0/+13
|\ \ \ | |/ /
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-04-101-1/+5
| |\ \
| | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-04-071-1/+5
| | |\ \
| | | * | Fix Phonon build with mingw.Andrew den Exter2010-04-071-1/+5
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-04-1033-620/+999
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Revert "Update Phonon ds9 backend to 4.4.0."Thierry Bastian2010-04-0733-620/+999
| |/ / /
* | | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-04-093-6/+11
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | Ensure Phonon MMF backend emits aboutToFinishGareth Stockwell2010-03-312-5/+10
| * | Remove compiler warningGareth Stockwell2010-03-311-1/+1
* | | Revert "Attempt at fixing Phonon build issue on Symbian."Thiago Macieira2010-04-041-18/+20
* | | Attempt at fixing Phonon build issue on Symbian.Thiago Macieira2010-04-041-3/+5
* | | Merge remote branch 'origin/4.7' into HEADThiago Macieira2010-04-011-7/+0
|\ \ \
| * \ \ Merge remote branch 'integration/qt-4.7-from-4.6' into 4.7Olivier Goffart2010-03-314-3/+44
| |\ \ \
| * \ \ \ Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-03-3092-1289/+3493
| |\ \ \ \
| | * \ \ \ Merge remote branch 'origin/4.7' into 4.7Olivier Goffart2010-03-3096-1915/+3611
| | |\ \ \ \
| | * \ \ \ \ Merge remote branch 'origin/4.7' into 4.7Olivier Goffart2010-03-251-1/+1
| | |\ \ \ \ \
| | * | | | | | Fixes a deadlock with streaming in Phonon.unknown2010-03-251-6/+0
* | | | | | | | Fix Phonon compilation with a namespaced Qt.Thiago Macieira2010-04-016-0/+36
| |_|_|_|/ / / |/| | | | | |
* | | | | | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-03-314-3/+44
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | / | |_|_|_|_|/ |/| | | | |
| * | | | | Added additional logging to Phonon MMF backendGareth Stockwell2010-03-304-3/+44
| |/ / / /
* | | | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-03-301-1/+7
|\ \ \ \ \ | |/ / / / | | | | / | |_|_|/ |/| | |
| * | | Fixed crash in Phonon MMF backend during application shutdownGareth Stockwell2010-03-291-1/+7
* | | | Fix typo in phonon/symbian.Justin McPherson2010-03-301-1/+1
* | | | Merge branch 'phonon-update' into 4.7Justin McPherson2010-03-2996-1915/+3612
|\ \ \ \ | |_|_|/ |/| | |
| * | | Phonon core; compile fixes after merge.Justin McPherson2010-03-262-2/+1
| * | | Phonon qt7; Compile fixes after merge.Justin McPherson2010-03-265-12/+21
| * | | Phonon; complete integration.Justin McPherson2010-03-2512-22/+1678
| * | | Update Phonon CMakeLists.txt.Justin McPherson2010-03-251-1/+1
| * | | Update Phonon qt7 backend to 4.4.0.Justin McPherson2010-03-2510-574/+137