summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/phonon
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.8-upstream'Thierry Bastian2011-05-192-0/+50
|\
| * Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-04-282-0/+50
| |\
| | * Legal: add the license header to the hand-editsThiago Macieira2011-04-272-0/+50
* | | Fix a problem where the video would'nt show on some containersThierry Bastian2011-05-161-8/+22
|/ /
* | Unbreak build on Mac OS X 10.5 after b0b80d9e8d11c38dTor Arne Vestbø2011-03-041-1/+1
* | Don't treat Objective-C property references as l-valuesTor Arne Vestbø2011-03-021-4/+6
* | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-101-1/+1
|\ \ | |/
| * Fixed "not a valid preprocessing token" on GCCE.axis2011-02-041-1/+1
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-251-12/+6
|\ \ | |/
| * Switch default Phonon backend on Symbian from Helix to MMFGareth Stockwell2011-01-191-12/+6
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-1710-14/+88
|\ \ | |/
| * Fixed resource leak in Phonon MMF backendRuth Sadler2011-01-111-0/+2
| * Allow IAP to be selected in Phonon MMF backendRuth Sadler2011-01-1110-14/+86
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-12-206-6/+6
|\ \ | |/
| * Fixed several compile and deployment issues in the mmf phonon plugin.axis2010-12-146-6/+6
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-12-065-83/+83
|\ \ | |/
| * Phonon: Fix use of ASCII casting in the PulseAudio support.Thiago Macieira2010-11-261-74/+72
| * Phonon: Fix unused parameter warningThiago Macieira2010-11-261-1/+1
| * Phonon: Fix warning on casting from "false" to QFlags.Thiago Macieira2010-11-261-2/+2
| * Phonon: Fix "value not in enum" warning with GCC 4.5.Thiago Macieira2010-11-261-1/+1
| * Ensure that if this is does not have a valid filter when on XP or lessAndy Shaw2010-11-241-5/+7
* | Merge branch 'staging-master' of scm.dev.nokia.troll.no:qt/qt-lighthouse into...Qt Continuous Integration System2010-10-293-5/+7
|\ \
| * \ Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-10-261-14/+0
| |\ \
| * \ \ Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-10-2211-45/+542
| |\ \ \
| * \ \ \ Merge remote branch 'lighthouse/4.7' into lighthouse-masterPaul Olav Tvete2010-09-133-5/+7
| |\ \ \ \
| | * \ \ \ Merge branch 'qt-4.7' into lighthouse-4.7Paul Olav Tvete2010-09-131-3/+3
| | |\ \ \ \
| | * | | | | Make phonon gst backend build properlyJørgen Lind2010-09-073-5/+7
* | | | | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-271-0/+2
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | / | | |_|_|_|/ | |/| | | |
| * | | | | Phonon MMF backend: set _q_DummyWindowSurface property on VideoWidgetGareth Stockwell2010-10-261-0/+2
* | | | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-261-14/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | / | |_|_|_|/ |/| | | |
| * | | | Phonon MMF backend: removed redundant trace outputGareth Stockwell2010-10-251-14/+0
* | | | | Phonon: Export ObjectDescriptionModel to prevent link errors with ClangTor Arne Vestbø2010-10-151-1/+2
* | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-10-0710-44/+540
|\ \ \ \ \ | |/ / / / | | / / / | |/ / / |/| | |
| * | | Added qmake check for presence of RHttpDownloadMgr headerGareth Stockwell2010-10-033-7/+30
| * | | Progressive download in Phonon MMF backend: integrated with playerGareth Stockwell2010-10-018-43/+211
| * | | Progressive download in Phonon MMF backend: added download managersGareth Stockwell2010-10-012-0/+305
| | |/ | |/|
* | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-09-101-3/+3
|\ \ \ | |/ /
| * | QString usage cleanupsOswald Buddenhagen2010-09-011-3/+3
| |/
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-08-1314-25/+128
|\ \ | |/
| * Phonon; Update CMakeLists.txtJustin McPherson2010-08-041-1/+1
| * Phonon; Use correct Phonon version numbers.Justin McPherson2010-08-042-4/+4
| * Fixed build break on Symbian versions earlier than S^3Gareth Stockwell2010-08-021-1/+1
| * Added support to Phonon MMF backend for playback of Qt resource filesGareth Stockwell2010-08-0212-20/+123
* | Replace gluOrtho2d with glOrtho.Bjørn Erik Nilsen2010-08-101-1/+1
* | Remove the use of deprecated qVariant*Olivier Goffart2010-08-062-4/+4
|/
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-07-081-1/+1
|\
| * Phonon MediaSource fails to load when passed as a resource fileJens Bache-Wiig2010-07-071-1/+1
* | Use lower case for including system header filesGareth Stockwell2010-07-076-6/+6
* | Added trace statements to Phonon MMF backendGareth Stockwell2010-07-071-0/+17
* | MMF Phonon backend: call winId() from VideoWidget constructorGareth Stockwell2010-07-072-4/+2