diff options
| author | Mark Brand <mabrand@mabrand.nl> | 2012-09-11 23:45:02 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-09-14 01:01:47 +0200 |
| commit | a0c6987dbb139829f9ea61a66cb863b1baa1f183 (patch) | |
| tree | e600a750b324d688854632da7efc224ec5aa3963 /config.tests | |
| parent | 3a13f3f16e45288f7717dcfe3e968e5cccc05d90 (diff) | |
smuggle QT_BUILD_TREE to device_config.prf even during tests
Otherwise CROSS_COMPILE is not available for config.tests
because qdevice.pri is not found in such configurations as:
./configure -xplatform win32-g++-4.6 \
-device-option CROSS_COMPILE=$TARGET \
-prefix=$PREFIX/$TARGET \
-prefix-install
Normally, we don't want to use .qmake.cache during tests,
but we need that mechanism here.
Change-Id: If255f9657fa4206c4875a730f467d58b8a1c6ac1
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
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 f4a7f29b1a..b8f67433f8 100755 --- a/config.tests/unix/compile.test +++ b/config.tests/unix/compile.test @@ -68,7 +68,8 @@ 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" "QT_BUILD_TREE=$OUTDIR" "$SRCDIR/$TEST/$EXE.pro" -o "$OUTDIR/$TEST/Makefile" +echo "QT_BUILD_TREE = $OUTDIR" > "$OUTDIR/$TEST/.qmake.cache" +"$OUTDIR/bin/qmake" -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" if [ "$VERBOSE" = "yes" ]; then $MAKE |