diff options
| author | Lorn Potter <lorn.potter@nokia.com> | 2010-06-27 23:36:19 (GMT) |
|---|---|---|
| committer | Lorn Potter <lorn.potter@nokia.com> | 2010-06-27 23:36:19 (GMT) |
| commit | 580586d63a219bd63816071426fafec63a864d0d (patch) | |
| tree | 59540e07c7e56b51d5b6275e2018c4b5cdef2c1e /configure | |
| parent | 361f409d513b7360b1a6f919799cc1948835aef3 (diff) | |
| parent | 59c58576efd3ceff7add46a359fd99e56a2fb279 (diff) | |
| download | Qt-580586d63a219bd63816071426fafec63a864d0d.zip Qt-580586d63a219bd63816071426fafec63a864d0d.tar.gz Qt-580586d63a219bd63816071426fafec63a864d0d.tar.bz2 | |
Merge branch '4.7' of git://gitorious.org/qt/qt into 4.7
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 6 |
1 files changed, 6 insertions, 0 deletions
@@ -6937,6 +6937,12 @@ if [ "$CFG_GUI" = "no" ]; then canBuildWebKit="no" fi +if [ "$CFG_SHARED" = "no" ]; then + echo + echo "WARNING: Using static linking will disable the WebKit module." + echo + canBuildWebKit="no" +fi CFG_CONCURRENT="yes" if [ "$canBuildQtConcurrent" = "no" ]; then |