diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2009-06-26 10:31:19 +0200 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-06-26 10:31:19 +0200 |
| commit | b914c388a809c17e4f76a4dcc1d3a1006e13c115 (patch) | |
| tree | ef6723688578c7ff13fed8b4ea0c961aaf98fe09 /config.tests | |
| parent | 7278c142089d46946d1ad2558eae949220dfe0c4 (diff) | |
| parent | d553f376a34ea1d27492a1a5fd14f79616f6a27c (diff) | |
Merge branch '4.5'
Conflicts:
src/3rdparty/webkit/VERSION
src/3rdparty/webkit/WebCore/ChangeLog
src/network/access/qnetworkreplyimpl.cpp
Diffstat (limited to 'config.tests')
| -rwxr-xr-x | config.tests/unix/compile.test | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config.tests/unix/compile.test b/config.tests/unix/compile.test index f9c18fced9..550890f204 100755 --- a/config.tests/unix/compile.test +++ b/config.tests/unix/compile.test @@ -64,7 +64,7 @@ test -d "$OUTDIR/$TEST" || mkdir -p "$OUTDIR/$TEST" cd "$OUTDIR/$TEST" -test -e Makefile && make distclean >/dev/null 2>&1 +test -r 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" |