summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/webkit
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ | |/
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-02-201-2/+2
| |\
| | * Bump QtWebKit version to 2.0.2Ademar de Souza Reis Jr2011-02-171-2/+2
* | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-02-181-1/+1
|\ \ \ | |/ /
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-02-181-1/+1
| |\ \ | | |/ | |/|
| | * Changed the localized vendor name for Qt SIS packages to "Nokia"Eckhart Koppen2011-02-171-1/+1
* | | 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-1335-35/+35
| |\ \ | | |/
| * | 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-1735-35/+35
|\ \ \ \ | | |_|/ | |/| |
| * | | Update copyright year to 2011.Jason McDonald2011-01-1035-35/+35
| | |/ | |/|
* | | qt project files: create pkg-config files for mingwMark Brand2011-01-101-3/+1
* | | 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-055-3/+47
| | | * | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2010-07-274-20/+47
| | | * | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2010-07-134-2/+27
| | | * | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2010-06-268-18/+84
| | | * | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2010-06-203-1/+37
| | | * | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2010-06-183-1/+15
| | | * | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2010-06-1812-14/+248
| | | * | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2010-06-163-2/+15
| | * | | 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 remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-10-261-3/+3
|\ \ \
| * | | Handle Objective-C/C++ sources in SOURCES gracefullyTor Arne Vestbø2010-10-201-3/+3
* | | | Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-10-222-2/+6
|\ \ \ \ | |/ / /
| * | | Apply WebKit revision 60451 manually to fix Clang build issueTor Arne Vestbø2010-10-151-1/+1
| * | | 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 'qt/master' into lighthouse-masterPaul Olav Tvete2010-10-0512-10/+339
|\ \ \ \ | |/ / /
| * | | Merge remote branch 'origin/4.7' into master-from-4.7Rohan McGovern2010-10-041-5/+7
| |\ \ \ | | |/ /
| | * | Merge branch '4.7-upstream' into 4.7-docA-Team2010-09-2411-5/+332
| | |\ \
| | * | | Clarified documentation of loadFinished() signal.Jerome Pasion2010-09-241-5/+7
| * | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-09-2811-5/+332
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Updated WebKit to 6e15c3404d15a8ab72242152ec966e5e388161a2Simon Hausmann2010-09-2411-5/+332
| | |/ /
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtGunnar Sletta2010-09-2719-72/+474
|\ \ \ \ | |/ / /
| * | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2010-09-222-3/+3
| |\ \ \ | | |/ /
| | * | apply msvc flags to wince tooRomain Pokrzywka2010-09-212-2/+2
| | * | Enable building Qt/Webkit with debug symbolsAnders Bakken2010-09-201-1/+1
| * | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2010-09-2118-69/+471
| |\ \ \ | | |/ /