| Commit message (Expand) | Author | Age | Files | Lines |
* | Update translation sources. | Casper van Donderen | 2011-09-29 | 2 | -5/+5 |
|
|
* | Merge branch '4.8-upstream' | Thierry Bastian | 2011-05-19 | 2 | -0/+50 |
|\ |
|
| * | Merge branch 4.7 into qt-4.8-from-4.7 | Qt Continuous Integration System | 2011-04-28 | 2 | -0/+50 |
| |\ |
|
| | * | Legal: add the license header to the hand-edits | Thiago Macieira | 2011-04-27 | 2 | -0/+50 |
|
|
* | | | Fix a problem where the video would'nt show on some containers | Thierry Bastian | 2011-05-16 | 1 | -8/+22 |
|/ / |
|
* | | Unbreak build on Mac OS X 10.5 after b0b80d9e8d11c38d | Tor Arne Vestbø | 2011-03-04 | 1 | -1/+1 |
|
|
* | | Don't treat Objective-C property references as l-values | Tor Arne Vestbø | 2011-03-02 | 1 | -4/+6 |
|
|
* | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2011-02-10 | 1 | -1/+1 |
|\ \
| |/ |
|
| * | Fixed "not a valid preprocessing token" on GCCE. | axis | 2011-02-04 | 1 | -1/+1 |
|
|
* | | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2011-01-25 | 1 | -12/+6 |
|\ \
| |/ |
|
| * | Switch default Phonon backend on Symbian from Helix to MMF | Gareth Stockwell | 2011-01-19 | 1 | -12/+6 |
|
|
* | | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2011-01-17 | 10 | -14/+88 |
|\ \
| |/ |
|
| * | Fixed resource leak in Phonon MMF backend | Ruth Sadler | 2011-01-11 | 1 | -0/+2 |
|
|
| * | Allow IAP to be selected in Phonon MMF backend | Ruth Sadler | 2011-01-11 | 10 | -14/+86 |
|
|
* | | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2010-12-20 | 6 | -6/+6 |
|\ \
| |/ |
|
| * | Fixed several compile and deployment issues in the mmf phonon plugin. | axis | 2010-12-14 | 6 | -6/+6 |
|
|
* | | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2010-12-06 | 5 | -83/+83 |
|\ \
| |/ |
|
| * | Phonon: Fix use of ASCII casting in the PulseAudio support. | Thiago Macieira | 2010-11-26 | 1 | -74/+72 |
|
|
| * | Phonon: Fix unused parameter warning | Thiago Macieira | 2010-11-26 | 1 | -1/+1 |
|
|
| * | Phonon: Fix warning on casting from "false" to QFlags. | Thiago Macieira | 2010-11-26 | 1 | -2/+2 |
|
|
| * | Phonon: Fix "value not in enum" warning with GCC 4.5. | Thiago Macieira | 2010-11-26 | 1 | -1/+1 |
|
|
| * | Ensure that if this is does not have a valid filter when on XP or less | Andy Shaw | 2010-11-24 | 1 | -5/+7 |
|
|
* | | Merge branch 'staging-master' of scm.dev.nokia.troll.no:qt/qt-lighthouse into... | Qt Continuous Integration System | 2010-10-29 | 3 | -5/+7 |
|\ \ |
|
| * \ | Merge remote branch 'qt/master' into lighthouse-master | Paul Olav Tvete | 2010-10-26 | 1 | -14/+0 |
| |\ \ |
|
| * \ \ | Merge remote branch 'qt/master' into lighthouse-master | Paul Olav Tvete | 2010-10-22 | 11 | -45/+542 |
| |\ \ \ |
|
| * \ \ \ | Merge remote branch 'lighthouse/4.7' into lighthouse-master | Paul Olav Tvete | 2010-09-13 | 3 | -5/+7 |
| |\ \ \ \ |
|
| | * \ \ \ | Merge branch 'qt-4.7' into lighthouse-4.7 | Paul Olav Tvete | 2010-09-13 | 1 | -3/+3 |
| | |\ \ \ \ |
|
| | * | | | | | Make phonon gst backend build properly | Jørgen Lind | 2010-09-07 | 3 | -5/+7 |
|
|
* | | | | | | | Merge branch 4.7 into qt-master-from-4.7 | Qt Continuous Integration System | 2010-10-27 | 1 | -0/+2 |
|\ \ \ \ \ \ \
| |_|_|_|_|/ /
|/| | | | | /
| | |_|_|_|/
| |/| | | | |
|
| * | | | | | Phonon MMF backend: set _q_DummyWindowSurface property on VideoWidget | Gareth Stockwell | 2010-10-26 | 1 | -0/+2 |
|
|
* | | | | | | Merge branch 4.7 into qt-master-from-4.7 | Qt Continuous Integration System | 2010-10-26 | 1 | -14/+0 |
|\ \ \ \ \ \
| |/ / / / /
| | | | | /
| |_|_|_|/
|/| | | | |
|
| * | | | | Phonon MMF backend: removed redundant trace output | Gareth Stockwell | 2010-10-25 | 1 | -14/+0 |
|
|
* | | | | | Phonon: Export ObjectDescriptionModel to prevent link errors with Clang | Tor Arne Vestbø | 2010-10-15 | 1 | -1/+2 |
|
|
* | | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2010-10-07 | 10 | -44/+540 |
|\ \ \ \ \
| |/ / / /
| | / / /
| |/ / /
|/| | | |
|
| * | | | Added qmake check for presence of RHttpDownloadMgr header | Gareth Stockwell | 2010-10-03 | 3 | -7/+30 |
|
|
| * | | | Progressive download in Phonon MMF backend: integrated with player | Gareth Stockwell | 2010-10-01 | 8 | -43/+211 |
|
|
| * | | | Progressive download in Phonon MMF backend: added download managers | Gareth Stockwell | 2010-10-01 | 2 | -0/+305 |
| | |/
| |/| |
|
* | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2010-09-10 | 1 | -3/+3 |
|\ \ \
| |/ / |
|
| * | | QString usage cleanups | Oswald Buddenhagen | 2010-09-01 | 1 | -3/+3 |
| |/ |
|
* | | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2010-08-13 | 14 | -25/+128 |
|\ \
| |/ |
|
| * | Phonon; Update CMakeLists.txt | Justin McPherson | 2010-08-04 | 1 | -1/+1 |
|
|
| * | Phonon; Use correct Phonon version numbers. | Justin McPherson | 2010-08-04 | 2 | -4/+4 |
|
|
| * | Fixed build break on Symbian versions earlier than S^3 | Gareth Stockwell | 2010-08-02 | 1 | -1/+1 |
|
|
| * | Added support to Phonon MMF backend for playback of Qt resource files | Gareth Stockwell | 2010-08-02 | 12 | -20/+123 |
|
|
* | | Replace gluOrtho2d with glOrtho. | Bjørn Erik Nilsen | 2010-08-10 | 1 | -1/+1 |
|
|
* | | Remove the use of deprecated qVariant* | Olivier Goffart | 2010-08-06 | 2 | -4/+4 |
|/ |
|
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2010-07-08 | 1 | -1/+1 |
|\ |
|
| * | Phonon MediaSource fails to load when passed as a resource file | Jens Bache-Wiig | 2010-07-07 | 1 | -1/+1 |
|
|
* | | Use lower case for including system header files | Gareth Stockwell | 2010-07-07 | 6 | -6/+6 |
|
|
* | | Added trace statements to Phonon MMF backend | Gareth Stockwell | 2010-07-07 | 1 | -0/+17 |
|
|