summaryrefslogtreecommitdiff
path: root/util/webkit
Commit message (Collapse)AuthorAgeFilesLines
* Simplify WebKit import into src/3rdparty/webkitSimon Hausmann2009-08-141-2/+2
| | | | | | Limit the changelog to WebKit/qt. Reviewed-by: Trust me
* Fix WebKit import into src/3rdparty/webkitSimon Hausmann2009-08-141-0/+3
| | | | | | Exclude platform/wince and platform/graphics/haiku Reviewed-by: Trust me
* Fix WebKit import from the trunk (part 2)Simon Hausmann2009-08-121-1/+27
| | | | | | Fix generation of WebKit version file by including the xcconfig file. Reviewed-by: Trust me
* Fix import of WebKit.Simon Hausmann2009-08-121-1/+0
| | | | | | Don't try to remove WebCore/svg/graphics/wince, it doesn't exist anymore. Reviewed-by: Trust me
* Updated WebKit to qtwebkit-4.6-snapshot-29072009Simon Hausmann2009-07-291-1/+1
| | | | | Reviewed-by: Trust me (and also trust Pulse :)
* Fix webkit import from the trunkSimon Hausmann2009-07-281-2/+14
| | | | | | | Exclude more files from the import that are not needed for the Qt build, and include jsc for qtscript debugging. Reviewed-by: Trust me
* Update to today's WebKit 4.6 snapshotSimon Hausmann2009-07-131-1/+1
|
* Fix import of WebKit from the trunkSimon Hausmann2009-07-131-2/+0
| | | | | | Don't try to remove the scons files, as they were removed upstream. Reviewed-by: Trust me
* Merge branch '4.5' of scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-07-131-1/+1
|\
| * Fix WebKit import urlSimon Hausmann2009-07-131-1/+1
| | | | | | | | | | | | Fix the contents of src/3rdparty/webkit/VERSION to point to gitorious.org Reviewed-by: Trust me
* | Small fix for the WebKit import from the trunk.Simon Hausmann2009-06-291-1/+1
| | | | | | | | Don't try to remove the symbian/ directory, it doesn't exist anymore.
* | Update WebKit to today's snapshot, after receiving a green light from pulse.Simon Hausmann2009-06-291-1/+1
| |
* | Update src/3rdparty/webkit to a new snapshot.Simon Hausmann2009-06-241-1/+1
| |
* | Lock down src/3rdparty/webkit to a specific tag.Simon Hausmann2009-06-151-1/+9
| | | | | | | | | | | | | | Also removed some unused files from the import. Reviewed-by: Tor Arne Reviewed-by: Kent Hansen
* | Fix webkit import from the trunk.Simon Hausmann2009-06-031-5/+1
| | | | | | | | | | | | Updated the file list, the SVG filters have been removed. Reviewed-by: Trust me
* | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-05-191-1/+1
|\ \ | |/
| * Fix webkit import on cygwin and gentooSimon Hausmann2009-05-191-1/+1
| | | | | | | | | | | | Use .XXXXX in mktemp. Reviewed-by: Janne Koskinen <janne.p.koskinen@digia.com>
* | Slim down WebKit import a bit moreSimon Hausmann2009-05-071-0/+1
| | | | | | | | | | | | Remove v8 JS bindings. Reviewed-by: Trust me
* | Reduced the number of files in the WebKit importSimon Hausmann2009-05-061-0/+6
| | | | | | | | | | | | Exclude chromium files from the import. Reviewed-by: Trust me
* | Fixed import of WebKit trunkSimon Hausmann2009-05-041-2/+0
| | | | | | | | | | | | Don't try to remove scons files that don't exist anymore. Reviewed-by: Trust me
* | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-021-1/+1
|\ \ | |/ | | | | | | Conflicts: tools/linguist/shared/profileevaluator.cpp
| * Make mkdist-webkit work from in-source buildsSimon Hausmann2009-04-021-1/+1
| | | | | | | | | | | | | | Explicitly unset QTDIR_build, to make sure we generate Makefiles with real rules to call the extra tools. Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@nokia.com>
* | Changed WebKit import script to default to import from the trunk instead of 4.5Simon Hausmann2009-04-021-1/+1
| | | | | | | | Reviewed-by: Trust me
* | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-021-16/+19
|\ \ | |/
| * Simplify WebKit import scriptSimon Hausmann2009-04-021-16/+19
| | | | | | | | | | | | | | Don't require any arguments by default, get the repo path from git config and updated the default tag. Reviewed-by: Trust me
| * Long live Qt 4.5!Lars Knoll2009-03-231-0/+314
|
* Fix up WebKit import from the trunk.Simon Hausmann2009-04-011-1/+0
| | | | | | acinclude.m4 has been moved to autotools/ Reviewed-by: Trust me
* Fix WebKit import from the trunk.Simon Hausmann2009-04-011-1/+0
| | | | | | WebCore/plugins/wx is gone. Reviewed-by: Trust me
* Exclude the autotools subdirectory when importing from WebKit trunk.Simon Hausmann2009-04-011-1/+1
| | | | Reviewed-by: Trust Me
* Long live Qt!Lars Knoll2009-03-231-0/+314