From 1f7f73b86a2cb98eb60e2ac6c0ecefa3a98e8753 Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago.macieira@intel.com>
Date: Fri, 17 Jul 2015 14:41:48 -0700
Subject: compile.test: append any unknown arguments to the qmake command-line

This allows setting of variables, like FOO=bar.

Yes, it's intentional that there are no quotes.

Change-Id: Ib306f8f647014b399b87ffff13f1d9e6a10fa2f8
(cherry picked from commit e79200bf7f8dbd4f8aa03c8be07a6dfc4328fa50)
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Mike Krus <mike.krus@kdab.com>
---
 config.tests/unix/compile.test | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'config.tests')

diff --git a/config.tests/unix/compile.test b/config.tests/unix/compile.test
index 69d4285321..bc5258cf4b 100755
--- a/config.tests/unix/compile.test
+++ b/config.tests/unix/compile.test
@@ -17,6 +17,7 @@ CFLAGS="$SYSROOT_FLAG"
 CXXFLAGS="$SYSROOT_FLAG"
 MAC_ARCH_CXXFLAGS=""
 MAC_ARCH_LFLAGS=""
+QMAKE_ARGS=
 while [ "$#" -gt 0 ]; do
     PARAM=$1
     case $PARAM in
@@ -56,7 +57,9 @@ while [ "$#" -gt 0 ]; do
 	CXXFLAGS="$CXXFLAGS $PARAM \"$2\""
 	shift
 	;;
-    *)  ;;
+    *)
+        QMAKE_ARGS="$QMAKE_ARGS $PARAM"
+        ;;
     esac
     shift
 done
@@ -83,6 +86,7 @@ set -- \
      "QMAKE_CFLAGS+=$MAC_ARCH_CFLAGS" \
      "QMAKE_CXXFLAGS*=$CXXFLAGS" \
      "QMAKE_CXXFLAGS+=$MAC_ARCH_CXXFLAGS" \
+     $QMAKE_ARGS \
      "$SRCDIR/$TEST/$EXE.pro" \
      -o "$OUTDIR/$TEST/Makefile"
 if [ "$VERBOSE" = "yes" ]; then
-- 
cgit v1.2.3