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

* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  tst_qhostinfo: Compile fix
  Document some stuff in QHostInfo and QAbstractSocket
  tst_qhostinfo: Mixed up descriptions for test case data
  qhostinfo benchmark: Use local _data instead of _global
  DNS Cache: Also check inside the DNS threads
  qhostinfo benchmark: Benchmark the with-cache and without-cache
  tst_qftp: Do not use 1.2.3.4 as IP
  Dont use gestures if there is no touch screen.
  showFullscreen() broken if UnifiedTitleAndToolBarOnMac is enabled
  Fix atk warning on startup in Qt apps wit QGtkStyle
  Do not use realpath() with uclibc

1 files changed, 3 insertions, 0 deletions

diff --git a/src/corelib/io/qfsfileengine.cpp b/src/corelib/io/qfsfileengine.cpp
index c842e49..eeee970 100644
--- a/src/corelib/io/qfsfileengine.cpp
+++ b/src/corelib/io/qfsfileengine.cpp
@@ -145,6 +145,8 @@ QString QFSFileEnginePrivate::canonicalized(const QString &path)
 #endif
     // Mac OS X 10.5.x doesn't support the realpath(X,0) extenstion we use here.
 #if defined(Q_OS_LINUX) || defined(Q_OS_SYMBIAN)
+    // ... but Linux with uClibc does not have it
+#if !defined(__UCLIBC__)
     char *ret = realpath(path.toLocal8Bit().constData(), (char*)0);
     if (ret) {
         QString canonicalPath = QDir::cleanPath(QString::fromLocal8Bit(ret));
@@ -152,6 +154,7 @@ QString QFSFileEnginePrivate::canonicalized(const QString &path)
         return canonicalPath;
     }
 #endif
+#endif
 
     QFileInfo fi;
     const QChar slash(QLatin1Char('/'));