Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt

Conflicts:
	src/corelib/io/qprocess.h

1 files changed, 1 insertions, 1 deletions

diff --git a/configure b/configure
index 6bd755258..48a020214 100755
--- a/configure
+++ b/configure
@@ -103,7 +103,7 @@ EOF
     "$TEST_COMPILER" "$@" -o /dev/null conftest.cpp
     ret=$?
     rm -f conftest.cpp conftest.o
-    return $?
+    return $ret
 }
 
 # relies on $TEST_COMPILER being set correctly