summaryrefslogtreecommitdiffstats
path: root/config.tests/unix
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@nokia.com>2009-06-24 21:16:41 (GMT)
committerThiago Macieira <thiago.macieira@nokia.com>2009-06-24 21:16:41 (GMT)
commitfd5c6436d4be5ce6db57a8a34951c8ab4dac9000 (patch)
tree2b2ce0df9cd0bfcc1c8a0566668c92df8be94206 /config.tests/unix
parent117b9bb3d576d9974b3d05174d1fccf98e47cb22 (diff)
parent5f5cf5b798cc7e65e47987b654beaf9d762406eb (diff)
downloadQt-fd5c6436d4be5ce6db57a8a34951c8ab4dac9000.zip
Qt-fd5c6436d4be5ce6db57a8a34951c8ab4dac9000.tar.gz
Qt-fd5c6436d4be5ce6db57a8a34951c8ab4dac9000.tar.bz2
Merge branch '4.5'
Conflicts: tests/auto/qsqldatabase/tst_databases.h
Diffstat (limited to 'config.tests/unix')
-rwxr-xr-xconfig.tests/unix/compile.test3
1 files changed, 2 insertions, 1 deletions
diff --git a/config.tests/unix/compile.test b/config.tests/unix/compile.test
index a854bd1..f9c18fc 100755
--- a/config.tests/unix/compile.test
+++ b/config.tests/unix/compile.test
@@ -64,7 +64,8 @@ test -d "$OUTDIR/$TEST" || mkdir -p "$OUTDIR/$TEST"
cd "$OUTDIR/$TEST"
-make distclean >/dev/null 2>&1
+test -e Makefile && make distclean >/dev/null 2>&1
+
"$OUTDIR/bin/qmake" -nocache -spec "$QMKSPEC" "CONFIG+=$QMAKE_CONFIG" "LIBS*=$LFLAGS" "LIBS+=$MAC_ARCH_LFLAGS" "INCLUDEPATH*=$INCLUDEPATH" "QMAKE_CXXFLAGS*=$CXXFLAGS" "QMAKE_CXXFLAGS+=$MAC_ARCH_CXXFLAGS" "$SRCDIR/$TEST/$EXE.pro" -o "$OUTDIR/$TEST/Makefile"
if [ "$VERBOSE" = "yes" ]; then