summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/webkit/WebKit/qt
Commit message (Expand)AuthorAgeFilesLines
* QtWebKit: Add missing namespace wrapper temporarily until next import.Jocelyn Turcotte2010-04-122-0/+5
* Update src/3rdparty/webkit from trunk.Jocelyn Turcotte2010-04-1215-47/+327
* QtWebKit: Add missing namespace wrapper temporarily until next import.Jocelyn Turcotte2010-04-062-0/+5
* Update src/3rdparty/webkit from trunk.Jocelyn Turcotte2010-04-0696-1271/+5932
* Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-03-309-90/+162
|\
| * Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2010-03-299-90/+162
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.7Alexis Menard2010-03-251-1/+1
|\ \ | |/
| * Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2010-03-241-1/+1
* | Merge branch '4.6-s60' into 4.7-s60axis2010-03-223-0/+32
|\ \ | |/
| * Fixed updating the VKB display when inputting into QGraphicsWebView.axis2010-03-223-0/+32
* | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Rohan McGovern2010-03-062-5/+18
|\ \ | |/
| * Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2010-03-052-5/+18
* | Revert "Updated WebKit from /home/jturcott/dev/webkit to qtwebkit-4.7-merged ...Jocelyn Turcotte2010-02-2393-4172/+1022
* | Compile with QT_USE_FAST_OPERATOR_PLUSOlivier Goffart2010-02-231-2/+2
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-02-2393-1022/+4172
|\ \
| * | Updated WebKit from /home/jturcott/dev/webkit to qtwebkit-4.7-merged ( 5381ce...Jocelyn Turcotte2010-02-2393-1024/+4174
| * | Compile with QT_USE_FAST_OPERATOR_PLUSOlivier Goffart2010-02-211-2/+2
| |/
* | Doc: Simplified Commercial Editions for Qt 4.7.David Boddie2010-02-191-3/+0
|/
* Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2010-02-013-1/+154
* Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2010-01-293-1/+121
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-01-281-0/+5
|\
| * Fixed an endless loop if printing web pages.Trond Kjernåsen2010-01-281-0/+5
* | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2010-01-252-0/+14
|/
* Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2010-01-202-2/+18
* Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2010-01-143-0/+17
* Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2010-01-127-0/+248
* Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2010-01-072-0/+25
* Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2010-01-072-0/+29
* Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2009-12-303-0/+1327
* Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2009-12-293-2/+35
* Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2009-12-214-12/+104
* Doc: Minor fixes to language.David Boddie2009-12-141-2/+2
* Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2009-11-297-6/+117
* Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2009-11-231-0/+19
* Merge branch '4.6' of oslo-staging-1 into 4.6Simon Hausmann2009-11-193-4/+34
|\
| * Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2009-11-183-4/+34
* | Merge oslo-staging-2/4.6 into upstream/4.6Olivier Goffart2009-11-196-23/+23
|\ \ | |/ |/|
| * Ran the script utils/normalizeOlivier Goffart2009-11-186-23/+23
* | Fix the mentioning of the LGPL licensing of QtScript and QtWebKitSimon Hausmann2009-11-181-5/+2
|/
* Merge remote branch 'staging/4.6' into 4.6Simon Hausmann2009-11-1714-147/+765
|\
| * 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-1614-127/+578
| * Re-apply change d0c5bcf3b5793e73a059dea083b0f9ea0b16bfb3 by David BoddieDavid Boddie2009-11-122-7/+91
| * Updated WebKit from /home/jturcott/dev/webkit/ to qtwebkit/qtwebkit-4.6 ( 361...Jocelyn Turcotte2009-11-127-108/+191
* | Make the render() test pass when pixmaps aren't 32 bit.Paul Olav Tvete2009-11-121-1/+4
|/
* Re-apply change 4f62d29e8ae464c223af5bc08ae219d9b198da63 by David BoddieDavid Boddie2009-11-101-0/+17
* 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 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-1016-317/+558