From a0c6987dbb139829f9ea61a66cb863b1baa1f183 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Tue, 11 Sep 2012 23:45:02 +0200 Subject: 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 --- config.tests/unix/compile.test | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/config.tests/unix/compile.test b/config.tests/unix/compile.test index f4a7f29..b8f6743 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 -- cgit v0.12