summaryrefslogtreecommitdiffstats
path: root/src/3rdparty
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.6'Thiago Macieira2009-12-2611-29/+142
|\
| * Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2009-12-218-13/+125
| * update harfbuzz to 2b78f0d78ad3075fd1657d1260b31219e1a5155Lars Knoll2009-12-212-3/+4
| * Merge remote branch 'staging/4.6' into 4.6Simon Hausmann2009-12-171-2/+2
| |\
| | * Doc: Minor fixes to language.David Boddie2009-12-141-2/+2
| * | qreal-izationAleksandar Sasha Babic2009-12-111-11/+11
| |/
* | Merge branch '4.6'Thiago Macieira2009-12-0227-30/+331
|\ \ | |/
| * Merge commit 'upstream/4.6' into 4.6Bradley T. Hughes2009-12-027-13/+102
| |\
| | * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-st...axis2009-12-015-11/+100
| | |\
| | | * Merge branch 'mmfphonon' into 4.6Gareth Stockwell2009-11-305-11/+100
| | | |\
| | | | * Clip video rect to physical screen dimensionsGareth Stockwell2009-11-261-1/+12
| | | | * Tidied up logic of retrieving video window in Phonon MMF backendGareth Stockwell2009-11-261-2/+1
| | | | * Suspend DSA while drawing is in progressGareth Stockwell2009-11-264-1/+85
| | | | * Changed video widget native paint mode to zero-fill native windowGareth Stockwell2009-11-262-7/+2
| | * | | Compile webkit for win32-iccJan-Arve Sæther2009-11-302-2/+2
| | |/ /
| | * | Merge commit 'upstream/4.6' into oslo-staging-2/4.6Olivier Goffart2009-11-271-2/+2
| | |\ \
| | * | | Compile QtScript for win32-iccJan-Arve Sæther2009-11-272-2/+2
| * | | | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2009-11-306-4/+40
| * | | | Enable YARR when YARR_JIT is enabledKent Hansen2009-11-301-0/+2
| * | | | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2009-11-2911-11/+147
| * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Simon Hausmann2009-11-291-1/+1
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | 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
| * | | | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2009-11-255-3/+41
| * | | | Fix crash of QtWebKit on any page with Flash when compiled witn MinGW.Jocelyn Turcotte2009-11-251-2/+2
| | |/ / | |/| |
* | | | Merge branch '4.6'Thiago Macieira2009-11-25114-2084/+4426
|\ \ \ \ | | |/ / | |/| |
| * | | 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