Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into qt-integration

* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (23 commits)
  Check if the timeout expired during the time update in qt_safe_select
  Fix crashes when deleting QWidgets and QGraphicsItems in touch event handlers.
  Fix tst_QTouchEvent::touchUpdateAndEndNeverPropagate()
  Document QTextEncoder::fromUnicode as QT3 support member
  Install private headers when configuring Qt with -developer-build.
  Ensure that QProcessEnvironment::operator== doesn't crash
  Fixes a qfileinfo autotest.
  Fix compilation if QT_NO_DATESTRING is defined.
  Fix compilation: private headers must be #included with ""
  Use realpath() only on systems we know it works on.
  Mixed up top/bottom
  QGtkStyle: support for the inner-border property in GtkButtons
  Fixed uninitialized background artifacts in QWidget::render.
  Compile with -no-exceptions on Mac.
  Fixed searching and copy/paste from PDF documents.
  Autotest: ensure that QSharedPointer does proper autocasting through
  Compile on Windows CE.
  Add copyright header so the autotest will pass.
  Add support for the Selected QIcon::Mode when rendering the systray icon (Mac)
  Added a manual test for testing a z-order of overlapping widgets.
  ...

1 files changed, 1 insertions, 1 deletions

diff --git a/configure b/configure
index 6dc3898..486dc0c 100755
--- a/configure
+++ b/configure
@@ -131,7 +131,7 @@ compilerSupportsFlag()
     cat >conftest.cpp <<EOF
 int main() { return 0; }
 EOF
-    "$TEST_COMPILER" "$@" -o /dev/null conftest.cpp
+    "$TEST_COMPILER" "$@" -o conftest.o conftest.cpp
     ret=$?
     rm -f conftest.cpp conftest.o
     return $ret