diff options
| author | Jason McDonald <jason.mcdonald@nokia.com> | 2010-09-08 12:27:43 +1000 |
|---|---|---|
| committer | Jason McDonald <jason.mcdonald@nokia.com> | 2010-09-08 12:27:43 +1000 |
| commit | c4bf6792f6ffd551785b96d44f31d21543fe338e (patch) | |
| tree | ca846e12f54633b848803a2ce16a1021c674d9e9 /tools | |
| parent | 4283bd37c6367c519b4d5f2640417f805e7f3196 (diff) | |
Revert "let WebKit inject itself into the qt configuration"
This reverts commit b35310bba20f0c33a61b03ea4eec6108ec873a7c.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/configure/configureapp.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index 6e24027f3a..a6cd6c138e 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -2658,7 +2658,8 @@ void Configure::generateOutputVars() qtConfig += "audio-backend"; } - // Don't add "webkit" to QT_CONFIG here - it injects itself via the module. + if (dictionary["WEBKIT"] == "yes") + qtConfig += "webkit"; if (dictionary["DECLARATIVE"] == "yes") { if (dictionary[ "SCRIPT" ] == "no") { |