Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.... | Qt Continuous Integration System | 2010-04-10 | 1 | -1/+5 |
|\ | |||||
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.... | Qt Continuous Integration System | 2010-04-07 | 1 | -1/+5 |
| |\ | |||||
| | * | Fix Phonon build with mingw. | Andrew den Exter | 2010-04-07 | 1 | -1/+5 |
* | | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6 | Thiago Macieira | 2010-04-09 | 3 | -6/+11 |
|\ \ \ | |/ / |/| | | |||||
| * | | Ensure Phonon MMF backend emits aboutToFinish | Gareth Stockwell | 2010-03-31 | 2 | -5/+10 |
| * | | Remove compiler warning | Gareth Stockwell | 2010-03-31 | 1 | -1/+1 |
* | | | Revert "Attempt at fixing Phonon build issue on Symbian." | Thiago Macieira | 2010-04-04 | 1 | -18/+20 |
* | | | Attempt at fixing Phonon build issue on Symbian. | Thiago Macieira | 2010-04-04 | 1 | -3/+5 |
* | | | Merge remote branch 'origin/4.7' into HEAD | Thiago Macieira | 2010-04-01 | 1 | -7/+0 |
|\ \ \ | |||||
| * \ \ | Merge remote branch 'integration/qt-4.7-from-4.6' into 4.7 | Olivier Goffart | 2010-03-31 | 4 | -3/+44 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7 | David Boddie | 2010-03-30 | 92 | -1289/+3493 |
| |\ \ \ \ | |||||
| | * \ \ \ | Merge remote branch 'origin/4.7' into 4.7 | Olivier Goffart | 2010-03-30 | 96 | -1915/+3611 |
| | |\ \ \ \ | |||||
| | * \ \ \ \ | Merge remote branch 'origin/4.7' into 4.7 | Olivier Goffart | 2010-03-25 | 1 | -1/+1 |
| | |\ \ \ \ \ | |||||
| | * | | | | | | Fixes a deadlock with streaming in Phonon. | unknown | 2010-03-25 | 1 | -6/+0 |
* | | | | | | | | Fix Phonon compilation with a namespaced Qt. | Thiago Macieira | 2010-04-01 | 6 | -0/+36 |
| |_|_|_|/ / / |/| | | | | | | |||||
* | | | | | | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6 | Thiago Macieira | 2010-03-31 | 4 | -3/+44 |
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | / | |_|_|_|_|/ |/| | | | | | |||||
| * | | | | | Added additional logging to Phonon MMF backend | Gareth Stockwell | 2010-03-30 | 4 | -3/+44 |
| |/ / / / | |||||
* | | | | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6 | Thiago Macieira | 2010-03-30 | 1 | -1/+7 |
|\ \ \ \ \ | |/ / / / | | | | / | |_|_|/ |/| | | | |||||
| * | | | Fixed crash in Phonon MMF backend during application shutdown | Gareth Stockwell | 2010-03-29 | 1 | -1/+7 |
* | | | | Fix typo in phonon/symbian. | Justin McPherson | 2010-03-30 | 1 | -1/+1 |
* | | | | Merge branch 'phonon-update' into 4.7 | Justin McPherson | 2010-03-29 | 96 | -1915/+3612 |
|\ \ \ \ | |_|_|/ |/| | | | |||||
| * | | | Phonon core; compile fixes after merge. | Justin McPherson | 2010-03-26 | 2 | -2/+1 |
| * | | | Phonon qt7; Compile fixes after merge. | Justin McPherson | 2010-03-26 | 5 | -12/+21 |
| * | | | Phonon; complete integration. | Justin McPherson | 2010-03-25 | 12 | -22/+1678 |
| * | | | Update Phonon CMakeLists.txt. | Justin McPherson | 2010-03-25 | 1 | -1/+1 |
| * | | | Update Phonon qt7 backend to 4.4.0. | Justin McPherson | 2010-03-25 | 10 | -574/+137 |
| * | | | Update Phonon ds9 backend to 4.4.0. | Justin McPherson | 2010-03-25 | 33 | -996/+621 |
| * | | | Update Phonon GStreamer backend to 4.4.0. | Justin McPherson | 2010-03-25 | 19 | -132/+639 |
| * | | | Update Phonon core to 4.4.0 | Justin McPherson | 2010-03-25 | 22 | -193/+531 |
| | |/ | |/| | |||||
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2010-03-22 | 1 | -1/+1 |
|\ \ \ | |/ / |/| | | |||||
| * | | Compile Phonon in C++0x mode. | Thiago Macieira | 2010-03-20 | 1 | -1/+1 |
* | | | Merge branch '4.6-s60' into 4.7-s60 | axis | 2010-03-22 | 28 | -1163/+1982 |
|\ \ \ | |/ / |/| / | |/ | |||||
| * | Added support for video surfaces to Phonon MMF backend | Gareth Stockwell | 2010-03-18 | 28 | -1163/+1982 |
* | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6 | Thiago Macieira | 2010-03-15 | 1 | -10/+12 |
|\ \ | |/ | |||||
| * | Merge branch 'mmfphonon' into 4.6 | Frans Englich | 2010-03-10 | 1 | -10/+12 |
| |\ | |||||
| | * | Fix SDP files are not supported. | Frans Englich | 2010-03-10 | 1 | -10/+12 |
* | | | make it possible to use sse2 with mingw | Thierry Bastian | 2010-03-11 | 2 | -2/+2 |
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2010-03-05 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | fixed case of GL include directory | Mark Brand | 2010-03-05 | 1 | -1/+1 |
* | | | | Fixa few warnings on mingw | Thierry Bastian | 2010-03-05 | 1 | -1/+1 |
|/ / / | |||||
* | | | optimization: get rid of QString::fromUtf16() usage, part 2 | Oswald Buddenhagen | 2010-02-16 | 2 | -7/+7 |
* | | | Merge remote branch 'qt/4.6' into qt-master-from-4.6 | Qt Continuous Integration System | 2010-02-09 | 2 | -31/+25 |
|\ \ \ | |/ / | |||||
| * | | Merge remote branch 'origin/4.6' into 4.6 | Paul Olav Tvete | 2010-02-05 | 1 | -31/+22 |
| |\ \ | |||||
| | * | | I10n: Use 'real' Linguist comments in Phonon::EnvironmentalReverb | Friedemann Kleint | 2010-02-04 | 1 | -31/+22 |
| * | | | Merge remote branch 'staging/4.6' into 4.6 | Samuel Rødal | 2010-02-04 | 1 | -0/+3 |
| |\ \ \ | | |/ / | |/| | | |||||
| | * | | fix crash in Phonon::DS9 backend | Joerg Bornemann | 2010-02-01 | 1 | -0/+3 |
* | | | | Merge remote branch 'origin/4.6' into qt-master-from-4.6 | Olivier Goffart | 2010-02-04 | 2 | -2/+22 |
|\ \ \ \ | |/ / / | |||||
| * | | | Added descriptions of translatable strings for Phonon MMF reverb effect | Gareth Stockwell | 2010-02-03 | 1 | -1/+21 |
| * | | | Corrected namespace for Phonon::MMF translatable error strings | Gareth Stockwell | 2010-02-03 | 1 | -1/+1 |
| |/ / | |||||
* | | | build fix for phonon on wince | Thierry Bastian | 2010-01-25 | 2 | -2/+2 |