summaryrefslogtreecommitdiffstats
path: root/src/3rdparty
Commit message (Expand)AuthorAgeFilesLines
* Merge commit upstream/4.6 into oslo-staging-2/4.6Olivier Goffart2009-11-1399-146/+249
|\
| * Merge oslo-staging-2/4.6 into upstream/4.6Olivier Goffart2009-11-131-2/+3
| |\
| * | Phonon; Integrate changes to .desktop fileJustin McPherson2009-11-121-0/+42
| * | Phonon; Integrate changes to cmake files.Justin McPherson2009-11-124-20/+38
| * | Gstreamer: Do not assume that the list index is the same as the deviceJustin McPherson2009-11-121-2/+10
| * | Gstreamer: Added DVD supportJustin McPherson2009-11-121-15/+19
| * | Gstreamer: Do not assume that the list index is the same as the device id.Justin McPherson2009-11-121-4/+7
| * | gstreamer: Set the glib app name only once and do it in the backend.Justin McPherson2009-11-122-1/+7
| * | Gstreamer: Detect more mimetypesJustin McPherson2009-11-121-2/+9
| * | reduce the speed of CD drive to 2X while playing CD audio to limit CDJustin McPherson2009-11-121-3/+15
| * | gstreamer: Do not call gst_deinit() but do free the device and effect manager...Justin McPherson2009-11-121-1/+0
| * | Remove rogue \refs from documentation.Justin McPherson2009-11-122-2/+2
| * | Import change 924855 from phonon-svn.Justin McPherson2009-11-121-2/+6
| * | Import change 932546 from phonon-svn.Justin McPherson2009-11-1291-91/+91
| * | Import change 950964 from phonon-svn.Justin McPherson2009-11-121-2/+2
| * | Import change 953828 from phonon-svnJustin McPherson2009-11-121-1/+1
* | | 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
* | | | | Fixed a crash when configuring an audio effect with the Phonon dialogThierry Bastian2009-11-121-2/+3
| |_|_|/ |/| | |
* | | | BT: JavaScriptCore makes applications crash on leopardRichard Moe Gustavsen2009-11-102-2/+2
| |_|/ |/| |
* | | fix WebKit build on Windows CE 6Joerg Bornemann2009-11-106-4/+23
* | | Re-apply change e53c26b52c890f242491e0dfed4201313d98f720 by Marius Storm-OlsenMarius Storm-Olsen2009-11-101-1/+1
* | | Re-apply change 2a9596d85a6c44fe1eba98447ab95ca913f10e29 by Joerg BornemannJoerg Bornemann2009-11-101-0/+11
* | | Re-apply change 914d5847532a85a564a5df4a2bc8bdccb0f91abb by Shane KearnsShane Kearns2009-11-101-0/+15
* | | Re-apply change 4f62d29e8ae464c223af5bc08ae219d9b198da63 by David BoddieDavid Boddie2009-11-101-0/+17
* | | Re-apply change 0951f86be22633e1ff763de935f9c35a20f8a575 by Thiago MacieiraThiago Macieira2009-11-101-0/+37
* | | Re-apply change 16d98a3fa8e5cf5f41e35e257b8791ce030a4ce1 by Thiago MacieiraThiago Macieira2009-11-101-1/+2
* | | Re-apply change 62ed4c43c8c2fe3457de6d7570c2ae4a09a5ecf0 by David BoddieDavid Boddie2009-11-102-7/+91
* | | Re-apply change b065fda13c29110fc81f77c9bbf1069d562b4d67 by Martin SmithMartin Smith2009-11-101-1/+1
* | | Re-apply change fdb9419f23d1cd2a9ddfc1f7e2fb58f6e845483b by Jocelyn TurcotteJocelyn Turcotte2009-11-101-2/+6
* | | Re-apply change 29afcb69d6023aba012051bd2a026b57b3689732 by Liang QILiang QI2009-11-104-2/+10
* | | Updated WebKit from /home/jturcott/dev/webkit/ to qtwebkit/qtwebkit-4.6 ( 363...Jocelyn Turcotte2009-11-1024-390/+598
* | | Merge branch '4.6-api-review' into 4.6Marius Storm-Olsen2009-11-092-2/+2
|\ \ \ | |_|/ |/| |
| * | API review: Rename numRects() -> rectCount()Marius Storm-Olsen2009-11-091-1/+1
| * | API review: Rename functions numColors(), setNumColors() and numBytes()Marius Storm-Olsen2009-11-061-1/+1
* | | Merge commit 'origin/4.6' into 4.6Olivier Goffart2009-11-0624-72/+579
|\ \ \
| * \ \ Merge branch '4.6-s60' into 4.6axis2009-11-0619-64/+458
| |\ \ \ | | |/ / | |/| / | | |/
| | * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6-s60axis2009-11-0542-234/+684
| | |\
| | * \ Merge commit 's60/4.6' into mmfphononFrans Englich2009-11-04493-4562/+14330
| | |\ \
| | * | | Implemented metadata handling in Phonon MMF backendGareth Stockwell2009-11-048-2/+71
| | * | | Removed some logging from MMF Phonon backendGareth Stockwell2009-11-041-2/+2
| | * | | Fixed crash opening audio clip when video clip currently openGareth Stockwell2009-11-031-0/+3
| | * | | Merge branch '4.6' into mmfphononGareth Stockwell2009-11-0337-186/+415
| | |\ \ \