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/x11 | |
| 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/x11')
| -rwxr-xr-x | config.tests/x11/notype.test | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config.tests/x11/notype.test b/config.tests/x11/notype.test index 3a01d8f..1b534c8 100755 --- a/config.tests/x11/notype.test +++ b/config.tests/x11/notype.test @@ -27,7 +27,7 @@ if [ $XPLATFORM = "solaris-g++" -o $XPLATFORM = "hpux-g++" -o $XPLATFORM = "aix- NOTYPE=yes test -d "$OUTDIR/config.tests/x11/notype" || mkdir -p "$OUTDIR/config.tests/x11/notype" - "$OUTDIR/bin/qmake" -nocache -spec "$QMKSPEC" "$SRCDIR/config.tests/x11/notype/notypetest.pro" -o "$OUTDIR/config.tests/x11/notype/Makefile" >/dev/null 2>&1 + "$OUTDIR/bin/qmake" -nocache -spec "$QMKSPEC" "QT_BUILD_TREE=$OUTDIR" "$SRCDIR/config.tests/x11/notype/notypetest.pro" -o "$OUTDIR/config.tests/x11/notype/Makefile" >/dev/null 2>&1 cd "$OUTDIR/config.tests/x11/notype" if [ "$VERBOSE" = "yes" ]; then |