summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/phonon
Commit message (Expand)AuthorAgeFilesLines
* 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 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
| * | | Update Phonon ds9 backend to 4.4.0.Justin McPherson2010-03-2533-996/+621
| * | | Update Phonon GStreamer backend to 4.4.0.Justin McPherson2010-03-2519-132/+639
| * | | Update Phonon core to 4.4.0Justin McPherson2010-03-2522-193/+531
| | |/ | |/|
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-03-221-1/+1
|\ \ \ | |/ / |/| |
| * | Compile Phonon in C++0x mode.Thiago Macieira2010-03-201-1/+1
* | | Merge branch '4.6-s60' into 4.7-s60axis2010-03-2228-1163/+1982
|\ \ \ | |/ / |/| / | |/
| * Added support for video surfaces to Phonon MMF backendGareth Stockwell2010-03-1828-1163/+1982
* | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-03-151-10/+12
|\ \ | |/
| * Merge branch 'mmfphonon' into 4.6Frans Englich2010-03-101-10/+12
| |\
| | * Fix SDP files are not supported.Frans Englich2010-03-101-10/+12
* | | make it possible to use sse2 with mingwThierry Bastian2010-03-112-2/+2
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-03-051-1/+1
|\ \ \
| * | | fixed case of GL include directoryMark Brand2010-03-051-1/+1
* | | | Fixa few warnings on mingwThierry Bastian2010-03-051-1/+1
|/ / /
* | | optimization: get rid of QString::fromUtf16() usage, part 2Oswald Buddenhagen2010-02-162-7/+7
* | | Merge remote branch 'qt/4.6' into qt-master-from-4.6Qt Continuous Integration System2010-02-092-31/+25
|\ \ \ | |/ /
| * | Merge remote branch 'origin/4.6' into 4.6Paul Olav Tvete2010-02-051-31/+22
| |\ \
| | * | I10n: Use 'real' Linguist comments in Phonon::EnvironmentalReverbFriedemann Kleint2010-02-041-31/+22
| * | | Merge remote branch 'staging/4.6' into 4.6Samuel Rødal2010-02-041-0/+3
| |\ \ \ | | |/ / | |/| |
| | * | fix crash in Phonon::DS9 backendJoerg Bornemann2010-02-011-0/+3
* | | | Merge remote branch 'origin/4.6' into qt-master-from-4.6Olivier Goffart2010-02-042-2/+22
|\ \ \ \ | |/ / /
| * | | Added descriptions of translatable strings for Phonon MMF reverb effectGareth Stockwell2010-02-031-1/+21
| * | | Corrected namespace for Phonon::MMF translatable error stringsGareth Stockwell2010-02-031-1/+1
| |/ /
* | | build fix for phonon on winceThierry Bastian2010-01-252-2/+2