summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPierre Rossi <pierre.rossi@nokia.com>2011-09-05 14:38:16 +0200
committerPaul Olav Tvete <paul.tvete@nokia.com>2011-09-06 10:06:38 +0200
commit48ba459580c9e4ce28dbb2c3ce433175148da5a1 (patch)
treeb3987cbea94f0421e835afbbf3a9986bb41f680c
parent0a2282f97a2d74ac52d6ba8f33b1eaba0df3668d (diff)
QPA mkspecs syntax fix
QPA mkspecs are of the same form as the rest, we don't want to parse this in a different way. This was resulting in the COMPILER variable being wrong and in turn QT_GCC_*_VERSION and the like not being set. Change-Id: Ia703be95dbe586e1a8e897c3e244202363fb8c6a Reviewed-on: http://codereview.qt.nokia.com/4195 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Paul Olav Tvete <paul.tvete@nokia.com>
-rwxr-xr-xconfigure2
1 files changed, 1 insertions, 1 deletions
diff --git a/configure b/configure
index 6a7027e46a..1f9117b518 100755
--- a/configure
+++ b/configure
@@ -7320,7 +7320,7 @@ if [ '!' -z "$I_FLAGS" ]; then
fi
# turn off exceptions for the compilers that support it
-if [ "$PLATFORM_QWS" = "yes" -o "$PLATFORM_QPA" = "yes" ]; then
+if [ "$PLATFORM_QWS" = "yes" ]; then
COMPILER=`echo $XPLATFORM | cut -f 3- -d-`
elif [ "$XPLATFORM" != "$PLATFORM" ]; then
COMPILER=`echo $XPLATFORM | cut -f 2- -d-`