lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-02-01 11:26:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Updated WebKit import

Browse Source 
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>
This commit is contained in:
Simon Hausmann
2012-01-06 14:56:22 +01:00
committed by Qt by Nokia
parent 990c994954
commit f917ea79ef
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitmodules vendored
View File

@@ -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

2
qt.pro
View File

@@ -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 =

2
qtwebkit

Submodule qtwebkit updated: d99e465701...6300a96eca