summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@nokia.com>2010-01-11 15:19:54 (GMT)
committeraxis <qt-info@nokia.com>2010-01-11 15:19:54 (GMT)
commit2a4efd12c8498cf8a23fc9d3c2d6283a65a5890e (patch)
tree2ccea960ea6d38db804973dc0090b28015c265e9
parent2fb8ea9aa787d59ac16250eade0adfea08f1ca9d (diff)
downloadQt-2a4efd12c8498cf8a23fc9d3c2d6283a65a5890e.zip
Qt-2a4efd12c8498cf8a23fc9d3c2d6283a65a5890e.tar.gz
Qt-2a4efd12c8498cf8a23fc9d3c2d6283a65a5890e.tar.bz2
configure/S60: Make work on Linux 64bit.
Acked-by: axis
-rwxr-xr-xconfigure5
1 files changed, 3 insertions, 2 deletions
diff --git a/configure b/configure
index cf8564e..bb0d11a 100755
--- a/configure
+++ b/configure
@@ -4522,7 +4522,7 @@ if [ "$CFG_ZLIB" = "auto" ]; then
fi
if [ "$CFG_S60" = "auto" ]; then
- if echo "$XQMAKESPEC" | grep symbian >& /dev/null; then
+ if echo "$XQMAKESPEC" | grep symbian > /dev/null; then
CFG_S60=yes
else
CFG_S60=no
@@ -7052,7 +7052,8 @@ fi
[ '!' -z "$AWK" ] && QCONFIG_FLAGS=`echo $QCONFIG_FLAGS | $AWK '{ gsub(" ", "\n"); print }' | sort | uniq`
QCONFIG_FLAGS=`echo $QCONFIG_FLAGS`
-if echo $XPLATFORM | grep symbian >& /dev/null; then
+if echo $XPLATFORM | grep symbian >/dev/null
+then
# Enable Symbian DLLs and export rules.
# We cannot use Linux's default export rules since they export everything.
QCONFIG_FLAGS="$QCONFIG_FLAGS QT_DLL"