summaryrefslogtreecommitdiffstats
path: root/qt.pro
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@nokia.com>2012-09-14 17:27:00 +0200
committerQt by Nokia <qt-info@nokia.com>2012-09-14 17:31:31 +0200
commit5de69ba432d7f7f6f2b416dd1c112be2032784f1 (patch)
tree161aac8015fe9bec6c9d6574b6bdb3f9e552243c /qt.pro
parentc1a3e0c2f2b9ecb16299a2e6d1f757e0c66fd1e7 (diff)
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ø <tor.arne.vestbo@nokia.com>
Diffstat (limited to 'qt.pro')
-rw-r--r--qt.pro9
1 files changed, 2 insertions, 7 deletions
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