summaryrefslogtreecommitdiffstats
path: root/src/3rdparty
Commit message (Expand)AuthorAgeFilesLines
* 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
| | |\ \ \
| | * | | | Fixed volume calculation in Phonon MMF backendGareth Stockwell2009-11-031-1/+2
| | * | | | Fixed state bug in Phonon MMF backendGareth Stockwell2009-11-031-3/+3
| | * | | | Improve error handling.Frans Englich2009-10-237-51/+57
| | * | | | Video screen region is updated in response to ancestors of video widgetGareth Stockwell2009-10-238-11/+326
| * | | | | update harfbuzz once again, adding N'Ko supportLars Knoll2009-11-064-6/+99
| * | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Gunnar Sletta2009-11-0634-152/+517
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| * | | | | Fix a bug in malayalam renderingLars Knoll2009-11-052-0/+6
| * | | | | update harfbuzz to fix assamese shaping bugLars Knoll2009-11-052-2/+16
* | | | | | Fix Phonon's video renderer on windows with openglThierry Bastian2009-11-061-1/+6
| |/ / / / |/| | | |
* | | | | Re-apply change 62923e7edacf6a1d28accaff70cbdc0176890d62 by Joerg BornemannJoerg Bornemann2009-11-041-0/+11
* | | | | Re-apply change cadd19cd98b9a6ff7ff8755f7774027400aadb0f by Shane KearnsShane Kearns2009-11-041-0/+15
* | | | | Re-apply change b4be512bffba65bf4577a2b8275d7c38ce5501a1 by David BoddieDavid Boddie2009-11-041-0/+17
* | | | | Re-apply change 7293097060383bcb75ee9f3e6a270de3b5bee2dc by Thiago MacieiraThiago Macieira2009-11-041-0/+37
* | | | | Re-apply change cbb2efb13cdf05aabc245e2b0157883146cf069d by Thiago MacieiraThiago Macieira2009-11-041-1/+2
* | | | | Re-apply change 914de965a8380e7620209c7b26e984ed9fbccc57 by David BoddieDavid Boddie2009-11-042-7/+91
* | | | | Re-apply change 422c747c5108f9f0c544b5dd0789df32aa498fb7 by Martin SmithMartin Smith2009-11-041-1/+1
* | | | | Re-apply change 2fbc823bb66db6ef6f6acc74d2baa96ebe1dec81 by Jocelyn TurcotteJocelyn Turcotte2009-11-041-2/+6
* | | | | Re-apply change 1db4a133a9d35e00bad50541fb8d64079a7debea by Liang QILiang QI2009-11-044-2/+10
* | | | | Updated WebKit from /home/jturcott/dev/webkit/ to qtwebkit/qtwebkit-4.6 ( 16a...Jocelyn Turcotte2009-11-0440-342/+530
|/ / / /
* | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Eskil Abrahamsen Blomfeldt2009-11-045-46/+54
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge branch '4.6-s60' into 4.6axis2009-11-044-2/+10
| |\ \ \ | | | |/ | | |/|
| | * | Fix tst_qwebpage and tst_qwebframe compilation on Symbian.Liang QI2009-11-034-2/+10
| * | | WebKit line ending fix in AccessibilityAllInOne.cpp.Jocelyn Turcotte2009-11-041-44/+44
* | | | update harfbuzz to the latest version from fd.orgLars Knoll2009-11-048-82/+167
|/ / /
* | | Re-apply change fa1856bcb2eff41dadf0900202dd43f44ddb2343 by Joerg BornemannJoerg Bornemann2009-11-031-0/+11
* | | Re-apply change 71913d435213188959441a89454de6308fd76484 by Jocelyn TurcotteJocelyn Turcotte2009-11-031-23/+0
* | | Re-apply change 6bc9ef388590b4bfb281d2e1510dc7c3d1837349 by Shane KearnsShane Kearns2009-11-031-0/+15
* | | Re-apply change 6f36d0aafaccbb9affe8ac1b82c225d985aa7491 by David BoddieDavid Boddie2009-11-031-0/+17
* | | Re-apply change e2ef97128c006ac2a5c99c67bb54eebaa3b45720 by Thiago MacieiraThiago Macieira2009-11-031-0/+37
* | | Re-apply change 3f7a99565de7ed17d7ac4c0a25b02997b094b1a9 by Thiago MacieiraThiago Macieira2009-11-031-1/+2
* | | Re-apply change 0e917ae9587aa0727e6b26ba3eb0157362748fb7 by Jocelyn TurcotteJocelyn Turcotte2009-11-032-107/+107
* | | Re-apply change 37dc859e7e2e0f135e4c40bc7f6f824fcdb21e86 by David BoddieDavid Boddie2009-11-032-7/+91
* | | Re-apply change 4ce556b952545494a8adb96f628c219a38406562 by Oswald BuddenhagenOswald Buddenhagen2009-11-031-1/+1
* | | Re-apply change cef1901dbd96be81fc4139b50b094dfae5223e6f by Martin SmithMartin Smith2009-11-031-1/+1
* | | Re-apply change 6125aabeccb01a07c706fe4227279eb827e8e890 by Jocelyn TurcotteJocelyn Turcotte2009-11-031-2/+6
* | | Updated WebKit from /home/jturcott/dev/webkit/ to qtwebkit-4.6-snapshot-20091...Jocelyn Turcotte2009-11-03492-4844/+14466
* | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.6David Boddie2009-11-034-6/+6
|\ \ \ | |/ / |/| |
| * | Doc/i18n: Fixed source strings for translation.David Boddie2009-11-033-5/+5
| * | Doc: Fixed license information.David Boddie2009-11-031-1/+1