diff options
| author | Christian Strømme <christian.stromme@nokia.com> | 2010-10-05 15:48:37 (GMT) |
|---|---|---|
| committer | Christian Strømme <christian.stromme@nokia.com> | 2010-10-05 15:48:37 (GMT) |
| commit | 06afa508f2de34cbce9a2798d9418d62e480c283 (patch) | |
| tree | 71163725d42c94b1f681b1051c759da46e18206d | |
| parent | e601d471aa647beb9c6cbbe077c5cdee37fd43fb (diff) | |
| download | Qt-06afa508f2de34cbce9a2798d9418d62e480c283.zip Qt-06afa508f2de34cbce9a2798d9418d62e480c283.tar.gz Qt-06afa508f2de34cbce9a2798d9418d62e480c283.tar.bz2 | |
Issue a warning and disable webkit build when xrender is disabled on X11
Nsplugin fails to build when xrender is disabled and webkit is enabled.
This commit modifies configure to automatically disable webkit on X11
when this situation occurs.
Reviewed by: Simon Hausmann
| -rwxr-xr-x | configure | 6 |
1 files changed, 6 insertions, 0 deletions
@@ -5745,6 +5745,12 @@ if [ "$PLATFORM_X11" = "yes" ]; then fi fi + # Additional check to decide if WebKit support will be included + if [ "$CFG_XRENDER" = "no" ] && [ "$CFG_WEBKIT" != "no" ]; then + echo "Warning: -no-xrender will disable the QtWebkit module." + CFG_WEBKIT="no" + fi + # auto-detect MIT-SHM support if [ "$CFG_MITSHM" != "no" ]; then if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/mitshm "mitshm" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS; then |