Update WebKit

This updates WebKit to the latest snapshot that enables the build of WebKit2
on Windows and also drastically simplifies the build of WebKit within Qt
to be built the same way as the other modules, i.e. using qmake && make

Change-Id: I6e82e75ae0c3b62aff879f4339fcdce39e7f6954
Reviewed-by: Tor Arne Vestbø <[email protected]>

build.dependencies

@@ -37,21 +37,6 @@ use Config;
     "qtwayland",
 );
 
-if ("$Config{osname}" =~ /mswin/i) {
-    %build_commands = (
-        "qtwebkit" => "perl Tools/Scripts/build-webkit --qt --no-netscape-plugin --no-webkit2",
-    );
-    push @nondefault_modules, ("qtwebkit", "qtwebkit-examples-and-demos");
-} else {
-    %build_commands = (
-        "qtwebkit" => "perl Tools/Scripts/build-webkit --qt --release --no-netscape-plugin",
-    );
-}
-
-%install_commands = (
-    "qtwebkit" => "perl Tools/Scripts/build-webkit --qt --makeargs=\"install\"",
-);
-
 # Platform specific modules
 
 if ("$Config{osname}" =~ /linux/i) {

qt.pro

@@ -26,14 +26,9 @@ module_qtdeclarative.subdir = qtdeclarative
 module_qtdeclarative.target = module-qtdeclarative
 module_qtdeclarative.depends = module_qtbase module_qtjsbackend
 
-module_qtwebkit.file = qtwebkit.pri
-module_qtwebkit.makefile = Makefile.qtwebkit
+module_qtwebkit.file = qtwebkit/WebKit.pro
 module_qtwebkit.depends = module_qtbase 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 =
-module_qtwebkit_target.depends = sub-qtwebkit-pri
-QMAKE_EXTRA_TARGETS += module_qtwebkit_target
+module_qtwebkit.target = module-qtwebkit
 
 module_qtwebkit_examples_and_demos.subdir = qtwebkit-examples-and-demos
 module_qtwebkit_examples_and_demos.target = module-qtwebkit-examples-and-demos