diff options
| author | Christian Strømme <christian.stromme@nokia.com> | 2011-03-10 12:38:14 (GMT) |
|---|---|---|
| committer | Christian Strømme <christian.stromme@nokia.com> | 2011-03-10 13:04:03 (GMT) |
| commit | d4bfaafbd7dc59f971c1abe67e8245163ca39132 (patch) | |
| tree | de3f8ac752aa53db3c0da9a24c1be600802423eb /configure | |
| parent | cff4ff892778c6665f0283eb4bc5adf30f32c9b3 (diff) | |
| download | Qt-d4bfaafbd7dc59f971c1abe67e8245163ca39132.zip Qt-d4bfaafbd7dc59f971c1abe67e8245163ca39132.tar.gz Qt-d4bfaafbd7dc59f971c1abe67e8245163ca39132.tar.bz2 | |
Configuring a static Qt build did not exclude WebKit if the -webkit option was given.
Since the script only checked the value of canBuildWebKit when
CFG_WEBKIT was set to "auto", a static WebKit build was still possible,
this again resulted in build (linking) errors later in the build process.
Note: The changes in this patch means that -static will take precedence
over -webkit.
Reviewed-by: Simon Hausmann
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -7479,7 +7479,7 @@ else QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_SVG" fi -if [ "$CFG_WEBKIT" = "auto" ]; then +if [ "$CFG_WEBKIT" != "no" ]; then CFG_WEBKIT="$canBuildWebKit" fi |