summaryrefslogtreecommitdiffstats
path: root/configure
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 /configure
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 'configure')
-rwxr-xr-xconfigure2
1 files changed, 1 insertions, 1 deletions
diff --git a/configure b/configure
index bd69a0a..159feaf 100755
--- a/configure
+++ b/configure
@@ -7163,7 +7163,7 @@ if [ "$CFG_WEBKIT" = "auto" ]; then
fi
if [ "$CFG_WEBKIT" = "yes" ]; then
- QT_CONFIG="$QT_CONFIG webkit"
+ # Don't add "webkit" to QT_CONFIG here - it injects itself via the module.
# The reason we set CFG_WEBKIT, is such that the printed overview of what will be enabled, shows correctly.
CFG_WEBKIT="yes"
else