diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-01-06 14:56:22 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-09 07:38:45 +0100 |
| commit | f917ea79ef75917ce9f7d166fd5f8e2b772b9058 (patch) | |
| tree | f90628dc04c4b4cc8cd24db463146e574091879d | |
| parent | 990c994954142e9f3b16041a5b9ec08bc455be24 (diff) | |
Updated WebKit import
The repository pointed at is now significantly smaller and contains
a snapshot of WebKit only, excluding content like layout tests or
their platform specific results.
In addition the phonon dependency in qt.pro has been removed from WebKit,
as it is not accurate.
Change-Id: Ic2721435a6ce2328d11c1a8f5d9ce1881fc8ebb3
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
| -rw-r--r-- | .gitmodules | 2 | ||||
| -rw-r--r-- | qt.pro | 2 | ||||
| m--------- | qtwebkit | 0 |
3 files changed, 2 insertions, 2 deletions
diff --git a/.gitmodules b/.gitmodules index 7ee5f34a..f7ee3785 100644 --- a/.gitmodules +++ b/.gitmodules @@ -45,7 +45,7 @@ url = git://gitorious.org/qt/qtqa.git [submodule "qtwebkit"] path = qtwebkit - url = git://gitorious.org/webkit/qtwebkit.git + url = git://gitorious.org/qtwebkit/qt5-module.git [submodule "qtlocation"] path = qtlocation url = git://gitorious.org/qt/qtlocation.git @@ -25,7 +25,7 @@ module_qtdeclarative.depends = module_qtbase module_qtxmlpatterns module_qtwebkit.file = qtwebkit.pri module_qtwebkit.makefile = Makefile.qtwebkit -module_qtwebkit.depends = module_qtbase module_qtscript module_qtdeclarative module_qtphonon +module_qtwebkit.depends = module_qtbase module_qtscript module_qtdeclarative # The qtwebkit subdir does not follow the "module-*" scheme, so make our own target that does. module_qtwebkit_target.target = module-qtwebkit module_qtwebkit_target.commands = diff --git a/qtwebkit b/qtwebkit -Subproject d99e465701f48f704a8f1df04e4dc74a58e9ccc +Subproject 6300a96eca9f152b379f1bcf3d9efdc5572d989 |