diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2009-06-24 23:16:41 +0200 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-06-24 23:16:41 +0200 |
| commit | fd5c6436d4be5ce6db57a8a34951c8ab4dac9000 (patch) | |
| tree | 2b2ce0df9cd0bfcc1c8a0566668c92df8be94206 /config.tests | |
| parent | 117b9bb3d576d9974b3d05174d1fccf98e47cb22 (diff) | |
| parent | 5f5cf5b798cc7e65e47987b654beaf9d762406eb (diff) | |
Merge branch '4.5'
Conflicts:
tests/auto/qsqldatabase/tst_databases.h
Diffstat (limited to 'config.tests')
| -rwxr-xr-x | config.tests/unix/compile.test | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/config.tests/unix/compile.test b/config.tests/unix/compile.test index a854bd1835..f9c18fced9 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 |