diff options
Diffstat (limited to 'config.tests/unix/compile.test')
| -rwxr-xr-x | config.tests/unix/compile.test | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/config.tests/unix/compile.test b/config.tests/unix/compile.test index 69d4285321..f5db1847b8 100755 --- a/config.tests/unix/compile.test +++ b/config.tests/unix/compile.test @@ -10,13 +10,16 @@ OUTDIR=$5 TEST=$6 EXE=`basename "$6"` DESCRIPTION=$7 -shift 7 +QMAKE=$8 +QTCONF=$9 +shift 9 LFLAGS="$SYSROOT_FLAG" INCLUDEPATH="" 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 +59,9 @@ while [ "$#" -gt 0 ]; do CXXFLAGS="$CXXFLAGS $PARAM \"$2\"" shift ;; - *) ;; + *) + QMAKE_ARGS="$QMAKE_ARGS $PARAM" + ;; esac shift done @@ -70,7 +75,8 @@ test -r Makefile && $MAKE distclean >/dev/null 2>&1 rm -f "$EXE" "${EXE}.exe" set -- \ - "$OUTDIR/bin/qmake" \ + "$QMAKE" \ + -qtconf "$QTCONF" \ -nocache \ -spec "$QMKSPEC" \ "CONFIG+=$QMAKE_CONFIG" \ @@ -83,6 +89,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 |