summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/webkit
Commit message (Expand)AuthorAgeFilesLines
* fix qt_webkit_version.pri install for in-Qt buildsOswald Buddenhagen2010-08-311-13/+21
* 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
* qdoc: Reorganized the QML elements table to be a dictionary...Martin Smith2010-08-161-0/+1
* 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
* 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
| |\
| * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-07-011-1/+1
| |\ \
| | * | Avkon removal configured with -no-s60mread2010-07-011-1/+1
* | | | Updated WebKit to d59845f6fec84f15da116f50a1a0e52ce26116e9Simon Hausmann2010-07-029-4/+46
| |_|/ |/| |
* | | Updated WebKit to cd3aee284bddf4ff9d26f3bcaa7c33d478e81e10Simon Hausmann2010-07-017-24/+74
|/ /
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-07-011-0/+2
|\ \
| * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-06-301-0/+2
| |\ \ | | |/ | |/|
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-06-291-0/+2
| | |\
| | | * DocsBea Lam2010-06-281-0/+2
* | | | Updated WebKit to 0eee8df53d1873669a9dda8f9c0340543258a316Simon Hausmann2010-07-0114-35/+298
|/ / /
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-06-291-1/+1
|\ \ \ | |/ / |/| |
| * | Fixed deployment paths for WebKit declarative plugin.axis2010-06-291-1/+1
| |/
* | Updated WebKit to 38d650efc92427cd6452f6685d3c40d22428cdb7Simon Hausmann2010-06-285-2/+27
|/
* Updated WebKit to 2f598e9b7b376d851fe089bc1dc729bcf0393a06Simon Hausmann2010-06-2415-128/+274
* Moved the QML WebKit integration into QtWebKit.sisSimon Hausmann2010-06-242-7/+7
* Updated WebKit to b3589e88fb8d581fb523578763831109f914dc2eSimon Hausmann2010-06-238-5/+47
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Simon Hausmann2010-06-2281-6308/+3063
|\
| * Updated WebKit to 45d1c9149ef8940081fa8dd35854d2b95ebaf3cdSimon Hausmann2010-06-2133-322/+996
| * Updated WebKit to 4ad38c43081bedb69c7e26a9ca0fb2c50456066dSimon Hausmann2010-06-217-39/+98
| * Updated WebKit to 19de3d2848b715f937eb375a078672cc8e9b8185Simon Hausmann2010-06-2029-5961/+0
| * Updated WebKit to 19de3d2848b715f937eb375a078672cc8e9b8185Simon Hausmann2010-06-194-3/+17
| * Updated WebKit to 515aae71494436816cd0250cdc52caa4f2566aefSimon Hausmann2010-06-184-5/+13
| * Updated WebKit to e32cb21d4f1787147bcb681883b96a95f867749aSimon Hausmann2010-06-1813-16/+265
| * Updated WebKit to a99218d1984be36e00966f988123fa7e2b18eec5Simon Hausmann2010-06-185-4/+20
| * Updated WebKit to d7a095a2a9514e1f132b779b99279585820b46f5Simon Hausmann2010-06-188-10/+38
| * Updated WebKit to c6f08f4c13f88491a5d1ae1794c72166af0c26baSimon Hausmann2010-06-1811-4/+1672
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-211-2/+2
|\ \ | |/ |/|
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-06-182-2/+19
| |\
| * | Doc: Fixed documentation errors.David Boddie2010-06-181-2/+2
* | | Updated WebKit to 6623b5da196390748dc619461739f9cb84524736Simon Hausmann2010-06-1716-99/+541
| |/ |/|
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into qt-4.7-from-4.6Simon Hausmann2010-06-162-2/+19
|\ \ | |/ |/|