summaryrefslogtreecommitdiffstats
path: root/src/3rdparty
Commit message (Expand)AuthorAgeFilesLines
* Merge commit oslo-staging-2/4.6 into upstream/4.6Olivier Goffart2009-11-271-1/+1
|\
| * Fix uninitialized error variable if the stream doesn't existGordon Schumacher2009-11-261-1/+1
* | Fix crash of QtWebKit on any page with Flash when compiled witn MinGW.Jocelyn Turcotte2009-11-251-2/+2
|/
* Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2009-11-235-1/+51
* Fix symbol exports in QtScript with gccSimon Hausmann2009-11-232-0/+11
* Merge commit 'b345b96dc14cc0da3a9ff44216d447e6f2c8ad97' from oslo-staging-1 i...Simon Hausmann2009-11-202-2/+2
|\
| * Revert "Revert "Fix detection of linux-g++""Simon Hausmann2009-11-192-2/+2
* | Fix for compile error in Phonon MMF backendGareth Stockwell2009-11-196-58/+12
|/
* Merge branch '4.6' of oslo-staging-1 into 4.6Simon Hausmann2009-11-1911-85/+107
|\
| * Fix JavaScriptCore on 32-bit Sparc: these machines are big-endianThiago Macieira2009-11-181-0/+10
| * Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2009-11-187-6/+63
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Simon Hausmann2009-11-1832-425/+443
| |\
| * | upgraded harfbuzz to lastest versionLars Knoll2009-11-182-10/+34
| * | remove unneeded JavaScriptCore.proKent Hansen2009-11-181-69/+0
* | | Merge oslo-staging-2/4.6 into upstream/4.6Olivier Goffart2009-11-1914-50/+50
|\ \ \
| * | | Ran the script utils/normalizeOlivier Goffart2009-11-1814-50/+50
* | | | Revert "Fix detection of linux-g++"Paul Olav Tvete2009-11-192-2/+2
| |_|/ |/| |
* | | Fix the mentioning of the LGPL licensing of QtScript and QtWebKitSimon Hausmann2009-11-181-5/+2
* | | 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