diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-10 13:34:04 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-10 13:34:04 (GMT) |
| commit | c765eb96672b6501f13491f6e9f7e7ed46ba9385 (patch) | |
| tree | 1994fa767b66ace285562fd29470bac7dde5c89d | |
| parent | 5c36cc0ba648d5efa7592e86d49b23086cdbb8ff (diff) | |
| parent | d4bfaafbd7dc59f971c1abe67e8245163ca39132 (diff) | |
| download | Qt-c765eb96672b6501f13491f6e9f7e7ed46ba9385.zip Qt-c765eb96672b6501f13491f6e9f7e7ed46ba9385.tar.gz Qt-c765eb96672b6501f13491f6e9f7e7ed46ba9385.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Configuring a static Qt build did not exclude WebKit if the -webkit option was given.
| -rwxr-xr-x | configure | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -7481,7 +7481,7 @@ else QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_SVG" fi -if [ "$CFG_WEBKIT" = "auto" ]; then +if [ "$CFG_WEBKIT" != "no" ]; then CFG_WEBKIT="$canBuildWebKit" fi |