diff options
| author | Paul Olav Tvete <paul.tvete@nokia.com> | 2010-09-29 10:06:36 (GMT) |
|---|---|---|
| committer | Paul Olav Tvete <paul.tvete@nokia.com> | 2010-09-29 10:06:36 (GMT) |
| commit | a5cf78de2c7542ee64756f2bb894b56933e6d184 (patch) | |
| tree | 0421f9ca2d7caeb28386fa1208c4b4e9595296b4 /configure | |
| parent | dc8d0961a50e28224dc36febb3530c47444f8638 (diff) | |
| parent | e28b1810ba5979dcf2146f9389007b4cfd67a31c (diff) | |
| download | Qt-a5cf78de2c7542ee64756f2bb894b56933e6d184.zip Qt-a5cf78de2c7542ee64756f2bb894b56933e6d184.tar.gz Qt-a5cf78de2c7542ee64756f2bb894b56933e6d184.tar.bz2 | |
Merge remote branch 'lighthouse/4.7' into lighthouse-master
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 6 |
1 files changed, 0 insertions, 6 deletions
@@ -6156,12 +6156,6 @@ if [ "$PLATFORM_QPA" = "yes" ]; then fi fi - # MIT_SHM is required for testlite - 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 - QT_CONFIG="$QT_CONFIG mitshm" - fi - fi fi |