summaryrefslogtreecommitdiffstats
path: root/src/3rdparty
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'mainline/4.6' into 4.6Oswald Buddenhagen2009-11-1829-418/+439
|\
| * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Justin McPherson2009-11-1793-1893/+4184
| |\
| | * Merge oslo-staging-2/4.6 into upstream/4.6Olivier Goffart2009-11-1725-411/+414
| | |\
| | | * Merge commit 's60/4.6' into mmfphononFrans Englich2009-11-16123-448/+979
| | | |\
| | | * \ Merge branch '4.6' into mmfphononFrans Englich2009-11-1648-340/+921
| | | |\ \
| | | * | | Implemented aspect ratio and scale mode handling in Phonon MMF backendGareth Stockwell2009-11-1317-337/+380
| | | * | | Allowed execution of pause command when backend is in error stateGareth Stockwell2009-11-091-1/+1
| | | * | | Removed infinite recursion from Phonon::MMF::MediaObject::errorTypeGareth Stockwell2009-11-091-1/+1
| | | * | | Merge branch 'mmfphonon' of scm.dev.nokia.troll.no:qt/qt-s60-public into mmfp...Gareth Stockwell2009-11-098-42/+9
| | | |\ \ \
| | | | * | | Replace mmfphonondebug.lib with #ifndef QT_NO_DEBUG.Frans Englich2009-11-098-42/+9
| | | * | | | Fixed compiler warning for RVCT 2.2Gareth Stockwell2009-11-091-23/+24
| | | |/ / /
| | | * | | Removed logging from Phonon MMF backendGareth Stockwell2009-11-051-8/+0
| * | | | | Fix compilation of Phonon DS9 backend when Qt is built statically.Andrew den Exter2009-11-123-6/+7
| * | | | | Fix assert on windows when deleting phonon nodes from a running graph.Andrew den Exter2009-11-121-1/+18
| * | | | | Phonon; Integrate changes to .desktop fileJustin McPherson2009-11-111-0/+42
| * | | | | Phonon; Integrate changes to cmake files.Justin McPherson2009-11-114-20/+38
| * | | | | Gstreamer: Do not assume that the list index is the same as the deviceJustin McPherson2009-11-111-2/+10
| * | | | | Gstreamer: Added DVD supportJustin McPherson2009-11-111-15/+19
| * | | | | Gstreamer: Do not assume that the list index is the same as the device id.Justin McPherson2009-11-111-4/+7
| * | | | | gstreamer: Set the glib app name only once and do it in the backend.Justin McPherson2009-11-112-1/+7
| * | | | | Gstreamer: Detect more mimetypesJustin McPherson2009-11-111-2/+9
| * | | | | reduce the speed of CD drive to 2X while playing CD audio to limit CDJustin McPherson2009-11-111-3/+15
| * | | | | gstreamer: Do not call gst_deinit() but do free the device and effect manager...Justin McPherson2009-11-111-1/+0
| * | | | | Remove rogue \refs from documentation.Justin McPherson2009-11-112-2/+2
| * | | | | Import change 924855 from phonon-svn.Justin McPherson2009-11-111-2/+6
| * | | | | Import change 932546 from phonon-svn.Justin McPherson2009-11-1191-91/+91
| * | | | | Import change 950964 from phonon-svn.Justin McPherson2009-11-111-2/+2
| * | | | | Import change 953828 from phonon-svnJustin McPherson2009-11-111-1/+1
* | | | | | Merge remote branch 'mainline/4.6' into 4.6Oswald Buddenhagen2009-11-1767-1480/+3767
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge remote branch 'staging/4.6' into 4.6Simon Hausmann2009-11-1760-1470/+3721
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | Fix inputMethods QWebPage autotest failure.Simon Hausmann2009-11-161-3/+3
| | * | | | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2009-11-1656-1446/+3491
| | * | | | Merge commit 'upstream/4.6' into 4.6Bradley T. Hughes2009-11-131-2/+3
| | |\ \ \ \
| | * | | | | Re-apply change 945e079e60506e88435802d0a764c8b4121ad16f by Richard Moe Gusta...Richard Moe Gustavsen2009-11-121-1/+1
| | * | | | | Re-apply change f80c224ddd3c3c4a408c8f88e6cf5114ee107c89 by Joerg BornemannJoerg Bornemann2009-11-122-1/+6
| | * | | | | Re-apply change a6123418522a3865d462cb64022f567462603af1 by Thiago MacieiraThiago Macieira2009-11-121-0/+37
| | * | | | | Re-apply change d09f0e3949d4e705ef60516a9ccfacad736dff43 by Thiago MacieiraThiago Macieira2009-11-121-1/+2
| | * | | | | Re-apply change d0c5bcf3b5793e73a059dea083b0f9ea0b16bfb3 by David BoddieDavid Boddie2009-11-122-7/+91
| | * | | | | Updated WebKit from /home/jturcott/dev/webkit/ to qtwebkit/qtwebkit-4.6 ( 361...Jocelyn Turcotte2009-11-1217-159/+238
| * | | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6Gunnar Sletta2009-11-138-12/+43
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge commit upstream/4.6 into oslo-staging-2/4.6Olivier Goffart2009-11-1399-146/+249
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | |
| | * | | | | | Make the render() test pass when pixmaps aren't 32 bit.Paul Olav Tvete2009-11-121-1/+4
| | * | | | | | Fix QT_NO_PHONON_SETTINGSGROUPJørgen Lind2009-11-123-4/+14
| | * | | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-st...axis2009-11-123-5/+22
| | |\ \ \ \ \ \
| | | * | | | | | Revert "Using qreal more consistently in code (prevent misuse of double)"Aleksandar Sasha Babic2009-11-111-88/+92
| | | * | | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Shane Kearns2009-11-102-2/+2
| | | |\ \ \ \ \ \ | | | | | |_|/ / / | | | | |/| | | |
| | | * | | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6-s60axis2009-11-1023-205/+609
| | | |\ \ \ \ \ \ | | | | |_|_|_|_|/ | | | |/| | | | |
| | | * | | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6-s60axis2009-11-096-9/+127
| | | |\ \ \ \ \ \
| | | * | | | | | | Using qreal more consistently in code (prevent misuse of double)Aleksandar Sasha Babic2009-11-061-92/+88
| | | * | | | | | | Fix qdoc errors in the MMF Phonon backend.Frans Englich2009-11-063-5/+22
generated by cgit v0.12 at 2024-10-21 12:43:03 (GMT)