Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6 | Simon Hausmann | 2009-11-18 | 32 | -425/+443 |
|\ | |||||
| * | Fix the mentioning of the LGPL licensing of QtScript and QtWebKit | Simon Hausmann | 2009-11-18 | 1 | -5/+2 |
| * | Merge remote branch 'mainline/4.6' into 4.6 | Oswald Buddenhagen | 2009-11-18 | 29 | -418/+439 |
| |\ | |||||
| | * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6 | Justin McPherson | 2009-11-17 | 93 | -1893/+4184 |
| | |\ | |||||
| | | * | Merge oslo-staging-2/4.6 into upstream/4.6 | Olivier Goffart | 2009-11-17 | 25 | -411/+414 |
| | | |\ | |||||
| | | | * | Merge commit 's60/4.6' into mmfphonon | Frans Englich | 2009-11-16 | 123 | -448/+979 |
| | | | |\ | |||||
| | | | * \ | Merge branch '4.6' into mmfphonon | Frans Englich | 2009-11-16 | 48 | -340/+921 |
| | | | |\ \ | |||||
| | | | * | | | Implemented aspect ratio and scale mode handling in Phonon MMF backend | Gareth Stockwell | 2009-11-13 | 17 | -337/+380 |
| | | | * | | | Allowed execution of pause command when backend is in error state | Gareth Stockwell | 2009-11-09 | 1 | -1/+1 |
| | | | * | | | Removed infinite recursion from Phonon::MMF::MediaObject::errorType | Gareth Stockwell | 2009-11-09 | 1 | -1/+1 |
| | | | * | | | Merge branch 'mmfphonon' of scm.dev.nokia.troll.no:qt/qt-s60-public into mmfp... | Gareth Stockwell | 2009-11-09 | 8 | -42/+9 |
| | | | |\ \ \ | |||||
| | | | | * | | | Replace mmfphonondebug.lib with #ifndef QT_NO_DEBUG. | Frans Englich | 2009-11-09 | 8 | -42/+9 |
| | | | * | | | | Fixed compiler warning for RVCT 2.2 | Gareth Stockwell | 2009-11-09 | 1 | -23/+24 |
| | | | |/ / / | |||||
| | | | * | | | Removed logging from Phonon MMF backend | Gareth Stockwell | 2009-11-05 | 1 | -8/+0 |
| | * | | | | | Fix compilation of Phonon DS9 backend when Qt is built statically. | Andrew den Exter | 2009-11-12 | 3 | -6/+7 |
| | * | | | | | Fix assert on windows when deleting phonon nodes from a running graph. | Andrew den Exter | 2009-11-12 | 1 | -1/+18 |
| | * | | | | | Phonon; Integrate changes to .desktop file | Justin McPherson | 2009-11-11 | 1 | -0/+42 |
| | * | | | | | Phonon; Integrate changes to cmake files. | Justin McPherson | 2009-11-11 | 4 | -20/+38 |
| | * | | | | | Gstreamer: Do not assume that the list index is the same as the device | Justin McPherson | 2009-11-11 | 1 | -2/+10 |
| | * | | | | | Gstreamer: Added DVD support | Justin McPherson | 2009-11-11 | 1 | -15/+19 |
| | * | | | | | Gstreamer: Do not assume that the list index is the same as the device id. | Justin McPherson | 2009-11-11 | 1 | -4/+7 |
| | * | | | | | gstreamer: Set the glib app name only once and do it in the backend. | Justin McPherson | 2009-11-11 | 2 | -1/+7 |
| | * | | | | | Gstreamer: Detect more mimetypes | Justin McPherson | 2009-11-11 | 1 | -2/+9 |
| | * | | | | | reduce the speed of CD drive to 2X while playing CD audio to limit CD | Justin McPherson | 2009-11-11 | 1 | -3/+15 |
| | * | | | | | gstreamer: Do not call gst_deinit() but do free the device and effect manager... | Justin McPherson | 2009-11-11 | 1 | -1/+0 |
| | * | | | | | Remove rogue \refs from documentation. | Justin McPherson | 2009-11-11 | 2 | -2/+2 |
| | * | | | | | Import change 924855 from phonon-svn. | Justin McPherson | 2009-11-11 | 1 | -2/+6 |
| | * | | | | | Import change 932546 from phonon-svn. | Justin McPherson | 2009-11-11 | 91 | -91/+91 |
| | * | | | | | Import change 950964 from phonon-svn. | Justin McPherson | 2009-11-11 | 1 | -2/+2 |
| | * | | | | | Import change 953828 from phonon-svn | Justin McPherson | 2009-11-11 | 1 | -1/+1 |
| * | | | | | | Merge remote branch 'mainline/4.6' into 4.6 | Oswald Buddenhagen | 2009-11-17 | 67 | -1480/+3767 |
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | |||||
| * | | | | | | Fix detection of linux-g++ | Harald Fernengel | 2009-11-17 | 2 | -2/+2 |
* | | | | | | | upgraded harfbuzz to lastest version | Lars Knoll | 2009-11-18 | 2 | -10/+34 |
* | | | | | | | remove unneeded JavaScriptCore.pro | Kent Hansen | 2009-11-18 | 1 | -69/+0 |
| |/ / / / / |/| | | | | | |||||
* | | | | | | Merge remote branch 'staging/4.6' into 4.6 | Simon Hausmann | 2009-11-17 | 60 | -1470/+3721 |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | |||||
| * | | | | | Fix inputMethods QWebPage autotest failure. | Simon Hausmann | 2009-11-16 | 1 | -3/+3 |
| * | | | | | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ... | Simon Hausmann | 2009-11-16 | 56 | -1446/+3491 |
| * | | | | | Merge commit 'upstream/4.6' into 4.6 | Bradley T. Hughes | 2009-11-13 | 1 | -2/+3 |
| |\ \ \ \ \ | | |/ / / / | |||||
| * | | | | | Re-apply change 945e079e60506e88435802d0a764c8b4121ad16f by Richard Moe Gusta... | Richard Moe Gustavsen | 2009-11-12 | 1 | -1/+1 |
| * | | | | | Re-apply change f80c224ddd3c3c4a408c8f88e6cf5114ee107c89 by Joerg Bornemann | Joerg Bornemann | 2009-11-12 | 2 | -1/+6 |
| * | | | | | Re-apply change a6123418522a3865d462cb64022f567462603af1 by Thiago Macieira | Thiago Macieira | 2009-11-12 | 1 | -0/+37 |
| * | | | | | Re-apply change d09f0e3949d4e705ef60516a9ccfacad736dff43 by Thiago Macieira | Thiago Macieira | 2009-11-12 | 1 | -1/+2 |
| * | | | | | Re-apply change d0c5bcf3b5793e73a059dea083b0f9ea0b16bfb3 by David Boddie | David Boddie | 2009-11-12 | 2 | -7/+91 |
| * | | | | | Updated WebKit from /home/jturcott/dev/webkit/ to qtwebkit/qtwebkit-4.6 ( 361... | Jocelyn Turcotte | 2009-11-12 | 17 | -159/+238 |
* | | | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6 | Gunnar Sletta | 2009-11-13 | 8 | -12/+43 |
|\ \ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge commit upstream/4.6 into oslo-staging-2/4.6 | Olivier Goffart | 2009-11-13 | 99 | -146/+249 |
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | |||||
| | * | | | | | Merge oslo-staging-2/4.6 into upstream/4.6 | Olivier Goffart | 2009-11-13 | 1 | -2/+3 |
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | | | |||||
| * | | | | | | Make the render() test pass when pixmaps aren't 32 bit. | Paul Olav Tvete | 2009-11-12 | 1 | -1/+4 |
| * | | | | | | Fix QT_NO_PHONON_SETTINGSGROUP | Jørgen Lind | 2009-11-12 | 3 | -4/+14 |
| * | | | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-st... | axis | 2009-11-12 | 3 | -5/+22 |
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | |