summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/webkit/WebKit
Commit message (Expand)AuthorAgeFilesLines
* Remove old QtWebKit.Alexis Menard2011-05-30149-58654/+0
* Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-03-221-2/+2
|\
| * Bump Qt version to 4.7.4Timo Turunen2011-03-211-2/+2
* | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2011-03-111-2/+2
|\ \ | |/
| * Bump Qt version to 4.7.3Timo Turunen2011-03-091-2/+2
* | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-231-2/+2
|\ \ | |/
| * Bump QtWebKit version to 2.0.2Ademar de Souza Reis Jr2011-02-171-2/+2
* | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-103-15/+16
|\ \ | |/
| * Doc: Fixed QML, unindented snippet.David Boddie2011-02-011-5/+5
| * Doc: fixing bugs and misspelling based on feedbackMorten Engvoldsen2011-01-251-1/+1
| * Merge branch '4.7' of ../qt into 4.7David Boddie2011-01-132-2/+2
| |\
| * \ Merge branch 'qdoc-simplified' into mimir-simplifiedDavid Boddie2010-12-075-19/+49
| |\ \
| * | | doc: Changed a table into 3 tables to eliminate a \raw.Martin Smith2010-10-251-9/+10
* | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-172-2/+2
|\ \ \ \ | | |_|/ | |/| |
| * | | Update copyright year to 2011.Jason McDonald2011-01-102-2/+2
| | |/ | |/|
* | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-255-19/+49
|\ \ \ | |/ /
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-11-243-19/+37
| |\ \
| | * \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-s60axis2010-11-192-17/+35
| | |\ \
| | | * | Fixed handling of QInputMethodEvents with nonzero replacementLength.axis2010-11-192-2/+22
| | | * | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2010-08-054-2/+46
| | | * | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2010-07-273-19/+46
| | | * | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2010-06-261-1/+25
| | | * | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2010-06-182-0/+14
| | | * | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2010-06-188-12/+206
| | | * | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2010-05-312-1/+11
| | | * | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2010-05-301-11/+27
| | | * | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2010-05-214-13/+137
| | | * | Re-apply change 5107946e97cbc480a9329565c29b7384c8ba0860 by IainIain2010-04-262-2/+3
| | | * | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2010-04-263-3/+13
| | | * | Fix the include header <qstring.h> -> <QtCore/qstring.h>Thiago Macieira2010-04-191-1/+1
| | | * | Re-apply change f14ae11e6731bd7416f45c3ef7ce464587862223 by IainIain2010-04-172-2/+3
| | | * | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2010-04-175-33/+55
| | | * | Update WebKit DEF files on SymbianIain2010-04-152-2/+3
| | * | | Bump Qt version to 4.7.2.Jason McDonald2010-11-121-2/+2
| | | |/ | | |/|
| * | | Ensure WebView press delay timer is cancelled when grab is taken.Martin Jones2010-11-232-0/+12
| |/ /
* | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-071-1/+5
|\ \ \ | |/ /
| * | Fixes assert in QDeclarativeWebViewThomas Hartmann2010-10-061-1/+5
* | | Merge remote branch 'origin/4.7' into master-from-4.7Rohan McGovern2010-10-041-5/+7
|\ \ \ | |/ /
| * | Clarified documentation of loadFinished() signal.Jerome Pasion2010-09-241-5/+7
* | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2010-09-214-6/+96
|\ \ \ | |/ /
| * | Updated WebKit to 715b53069911a31a559aa0b3d94ffc6a5ac20988Simon Hausmann2010-09-124-6/+96
* | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-09-101-33/+67
|\ \ \ | |/ /
| * | Merge branch '4.7' into qmldocsDavid Boddie2010-09-071-1/+5
| |\ \
| | * | Ensure WebView gets focus when an editable node is clicked on.Martin Jones2010-09-061-1/+5
| * | | Doc: More work on the QML documentation.David Boddie2010-09-071-28/+58
| * | | Doc: qdoc fixes.David Boddie2010-09-021-4/+4
| |/ /
* | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-08-301-1/+1
|\ \ \ | |/ /
| * | let WebKit inject itself into the qt configurationOswald Buddenhagen2010-08-231-1/+1
* | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-08-251-0/+1
|\ \ \ | |/ /
| * | qdoc: Reorganized the QML elements table to be a dictionary...Martin Smith2010-08-161-0/+1