From 5de69ba432d7f7f6f2b416dd1c112be2032784f1 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Fri, 14 Sep 2012 17:27:00 +0200 Subject: Update WebKit MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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ø --- qt.pro | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'qt.pro') diff --git a/qt.pro b/qt.pro index 63d31f2e..efa9a2bc 100644 --- a/qt.pro +++ b/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 -- cgit v1.2.3