summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/webkit
Commit message (Expand)AuthorAgeFilesLines
* Handle Objective-C/C++ sources in SOURCES gracefullyTor Arne Vestbø2010-10-201-3/+3
* 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 '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 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
|\ \ | |/
| * Fixed incorrect Symbian scoping.axis2010-09-161-2/+2
| * Updated WebKit to 715b53069911a31a559aa0b3d94ffc6a5ac20988Simon Hausmann2010-09-1218-71/+473
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-09-106-53/+107
|\ \ | |/
| * QtWebKit: Update tag files to match the same content on qtwebkit.gitJocelyn Turcotte2010-09-082-2/+2
| * QtWebKit: Downstream patch 2 fixing a crash on MSVC 64bit.Jocelyn Turcotte2010-09-082-1/+13
| * QtWebKit: Downstream patch 1 fixing a crash on MSVC 64bit.Jocelyn Turcotte2010-09-081-4/+4
| * Merge branch '4.7' into qmldocsDavid Boddie2010-09-072-3/+7
| |\
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-09-061-2/+2
| | |\
| | | * Fixed incorrect Symbian scoping.axis2010-09-061-2/+2
| | * | 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
| |/
| * fix qt_webkit_version.pri install for in-Qt buildsOswald Buddenhagen2010-08-311-13/+21
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-08-302-2/+2
|\ \ | |/
| * fix build after first webkit self-injection attemptOswald Buddenhagen2010-08-231-6/+0
| * let WebKit inject itself into the qt configurationOswald Buddenhagen2010-08-233-2/+8
* | 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
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-08-1334-108/+565
|\ \ | |/
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-08-114-3/+16
| |\
| | * Updated WebKit to 72b1c38579ca1fdb3f242e29cd16e5bfb4925813Simon Hausmann2010-08-104-3/+16
| * | doc: Changed some titles so lists of contents sort better.Martin Smith2010-08-101-1/+1
| |/
| * Updated WebKit to 413404da27312051bb3ff2cfd0f3fca42aa4b245Simon Hausmann2010-08-056-4/+48
| * Updated WebKit to d6aa024c84f61d0602bef4eef84efaed7cfeefccSimon Hausmann2010-08-0311-41/+113
| * Updated WebKit to e6e692bb056670e2781dd0bc473a60757ae53992Simon Hausmann2010-07-2923-65/+393
* | Remove the use of deprecated qVariant*Olivier Goffart2010-08-063-21/+21
* | Remove the use of deprecated qFindChild(ren)Olivier Goffart2010-08-061-1/+1
|/
* Updated WebKit to 0be9ff9f2b1ec2b748885ac15299bc1c65aca590Simon Hausmann2010-07-2613-12/+182
* Updated WebKit to 669858f9bbd4913fd16c642090375c81acbfdb04Simon Hausmann2010-07-236-2/+54
* Merge branch 'raptorConfigurePatches' into 4.7-s60axis2010-07-211-2/+10
|\
| * Added automatic sqlite extraction for Symbian to QtWebKit.axis2010-07-211-2/+10
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-07-1659-160/+979
|\ \ | |/
| * Updated WebKit to ad96ca2f9b57271da4ea7432022ac686ee0981c2Simon Hausmann2010-07-0959-160/+979
* | Doc: Fixed incorrect QML property type.David Boddie2010-07-081-1/+1
|/
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-07-032-1/+2
|\
| * Fixed Qt symbian/linux-armcc mkspec when configured with -qtlibinfix.axis2010-07-021-0/+1
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7mread2010-07-027-24/+74
| |\