summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>2010-08-17 16:59:51 (GMT)
committerOswald Buddenhagen <oswald.buddenhagen@nokia.com>2010-08-23 11:54:03 (GMT)
commitb5b6cbb477b50c582d545b0e5e3a04626834e7e2 (patch)
tree842f52d4b8ad03303ee56b2b1a24f5a765c03f3d /tools
parent82d5f0ae622d2579b925a5f6a8054eeeccb9a233 (diff)
downloadQt-b5b6cbb477b50c582d545b0e5e3a04626834e7e2.zip
Qt-b5b6cbb477b50c582d545b0e5e3a04626834e7e2.tar.gz
Qt-b5b6cbb477b50c582d545b0e5e3a04626834e7e2.tar.bz2
let WebKit inject itself into the qt configuration
i.e., don't explicitly deal with qt_webkit_version.pri outside of the webkit source directory. Task-number: QTBUG-12379 Reviewed-by: Simon Hausmann
Diffstat (limited to 'tools')
-rw-r--r--tools/configure/configureapp.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
index 0c716d1..3a0fcde 100644
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -2667,8 +2667,7 @@ void Configure::generateOutputVars()
qtConfig += "audio-backend";
}
- if (dictionary["WEBKIT"] == "yes")
- qtConfig += "webkit";
+ // Don't add "webkit" to QT_CONFIG here - it injects itself via the module.
if (dictionary["DECLARATIVE"] == "yes") {
if (dictionary[ "SCRIPT" ] == "no") {