summaryrefslogtreecommitdiffstats
path: root/qt.pro
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@nokia.com>2012-06-13 16:39:19 +0200
committerQt by Nokia <qt-info@nokia.com>2012-06-19 10:19:06 +0200
commit222a34624901df4727e2608c3e7da340aba1ab7f (patch)
tree8738a474c3f4e2bc626002685e52d3137dbd3fe5 /qt.pro
parent78b8403e415e7e8d9405daebc9619c4a7cb85910 (diff)
Update WebKit
This removes the QtScript dependency and prepares for a future build flag to ensure -Werror remains disabled. Change-Id: I95cf773c1e21d08d3afe881458c352398e3c9e84 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'qt.pro')
-rw-r--r--qt.pro14
1 files changed, 11 insertions, 3 deletions
diff --git a/qt.pro b/qt.pro
index 7339946d..c2058334 100644
--- a/qt.pro
+++ b/qt.pro
@@ -29,7 +29,7 @@ module_qtdeclarative.depends = module_qtbase module_qtjsbackend
module_qtwebkit.file = qtwebkit.pri
module_qtwebkit.makefile = Makefile.qtwebkit
-module_qtwebkit.depends = module_qtbase module_qtscript module_qtdeclarative module_qtquick1
+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 =
@@ -156,8 +156,16 @@ exists(qtjsondb/qtjsondb.pro) {
module_qtsystems.depends += module_qtjsondb
module_qtlocation.depends += module_qtjsondb
}
-exists(qtlocation/qtlocation.pro): SUBDIRS += module_qtlocation
-exists(qtsensors/qtsensors.pro): SUBDIRS += module_qtsensors
+exists(qtlocation/qtlocation.pro) {
+ SUBDIRS += module_qtlocation
+ # These modules do not require qtlocation, but can use it if it is available
+ module_qtwebkit.depends += module_qtlocation
+}
+exists(qtsensors/qtsensors.pro) {
+ SUBDIRS += module_qtsensors
+ # These modules do not require qtsensors, but can use it if it is available
+ module_qtwebkit.depends += module_qtsensors
+}
exists(qtsystems/qtsystems.pro) {
SUBDIRS += module_qtsystems
# These modules do not require qtsystems, but can use it if it is available