diff options
| author | Olivier Goffart <olivier.goffart@nokia.com> | 2010-07-01 14:23:00 (GMT) |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2010-07-01 15:42:05 (GMT) |
| commit | 71547238ea4391636e37f5cf89905433faeb32d1 (patch) | |
| tree | 78c85b9ec50e7f7275f75bc2a6ebf9afec2d67eb /config.tests/unix/compile.test | |
| parent | 80c2fbd7bb49483daf0a038a5e2ff85472a88ad2 (diff) | |
| download | Qt-71547238ea4391636e37f5cf89905433faeb32d1.zip Qt-71547238ea4391636e37f5cf89905433faeb32d1.tar.gz Qt-71547238ea4391636e37f5cf89905433faeb32d1.tar.bz2 | |
Symbian on Linux: $QTDIR/bin is not necessarily in the path.
So it would not find elf2e32_qtwrapper
use the qtPrepareTool macro that does the right thing.
But this macro need QT_BUILD_TREE to be defined, which is not defined
yet early in the test process. So change the tests accordingly
Reviewed-by: ossi
Diffstat (limited to 'config.tests/unix/compile.test')
| -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 99ebfd2..29ddea7 100755 --- a/config.tests/unix/compile.test +++ b/config.tests/unix/compile.test @@ -68,7 +68,7 @@ test -r Makefile && $MAKE distclean >/dev/null 2>&1 # Make sure output from possible previous tests is gone rm -f "$EXE" "${EXE}.exe" -"$OUTDIR/bin/qmake" -nocache -spec "$QMKSPEC" "CONFIG+=$QMAKE_CONFIG" "CONFIG-=debug_and_release" "LIBS*=$LFLAGS" "LIBS+=$MAC_ARCH_LFLAGS" "INCLUDEPATH*=$INCLUDEPATH" "QMAKE_CXXFLAGS*=$CXXFLAGS" "QMAKE_CXXFLAGS+=$MAC_ARCH_CXXFLAGS" "$SRCDIR/$TEST/$EXE.pro" -o "$OUTDIR/$TEST/Makefile" +"$OUTDIR/bin/qmake" -nocache -spec "$QMKSPEC" "CONFIG+=$QMAKE_CONFIG" "CONFIG-=debug_and_release" "LIBS*=$LFLAGS" "LIBS+=$MAC_ARCH_LFLAGS" "INCLUDEPATH*=$INCLUDEPATH" "QMAKE_CXXFLAGS*=$CXXFLAGS" "QMAKE_CXXFLAGS+=$MAC_ARCH_CXXFLAGS" "QT_BUILD_TREE=$OUTDIR" "$SRCDIR/$TEST/$EXE.pro" -o "$OUTDIR/$TEST/Makefile" if [ "$VERBOSE" = "yes" ]; then $MAKE |