summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorPaul Olav Tvete <paul.tvete@nokia.com>2010-11-01 12:44:36 (GMT)
committerPaul Olav Tvete <paul.tvete@nokia.com>2010-11-01 12:44:36 (GMT)
commit05b65c2f9df1c2c56c72f313401a6adb422d381b (patch)
tree0de9c7738f1613a5d0620c1a3572f67bdf8aa7a9 /configure
parent415358416981249dc00446ba3368be1b7c0cba51 (diff)
downloadQt-05b65c2f9df1c2c56c72f313401a6adb422d381b.zip
Qt-05b65c2f9df1c2c56c72f313401a6adb422d381b.tar.gz
Qt-05b65c2f9df1c2c56c72f313401a6adb422d381b.tar.bz2
Fix cross-compilation for Lighthouse after 3d86d2a8e5e3c68f9e0022e67629
Reviewed-by: Morten Johan Sørvig
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure2
1 files changed, 1 insertions, 1 deletions
diff --git a/configure b/configure
index 08d2f54..61f2413 100755
--- a/configure
+++ b/configure
@@ -2938,7 +2938,7 @@ if [ '!' -f "${XQMAKESPEC}/qplatformdefs.h" ]; then
fi
# now look at the configs and figure out what platform we are config'd for
-[ "$CFG_EMBEDDED" = "no" ] \
+[ "$CFG_EMBEDDED" = "no" ] && [ "$PLATFORM_QPA" != "yes" ] \
&& [ '!' -z "`getQMakeConf \"$XQMAKESPEC\" | grep QMAKE_LIBS_X11 | awk '{print $3;}'`" ] \
&& PLATFORM_X11=yes
### echo "$XQMAKESPEC" | grep mkspecs/qws >/dev/null 2>&1 && PLATFORM_QWS=yes