aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitmodules2
-rw-r--r--qt.pro2
m---------qtwebkit0
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
diff --git a/qt.pro b/qt.pro
index e61a5ea6..8e84f151 100644
--- a/qt.pro
+++ b/qt.pro
@@ -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