summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkus Goetz <Markus.Goetz@nokia.com>2010-03-04 11:18:58 (GMT)
committerMarkus Goetz <Markus.Goetz@nokia.com>2010-03-04 11:40:31 (GMT)
commita3bc8b9ac990cf07b2b9775a1e281a10a9804086 (patch)
tree6e5a61c8eb79f174d814fc3c9a90befc8f04bf32
parent7727a4355876607a1a022ff54e2570dae883f79c (diff)
downloadQt-a3bc8b9ac990cf07b2b9775a1e281a10a9804086.zip
Qt-a3bc8b9ac990cf07b2b9775a1e281a10a9804086.tar.gz
Qt-a3bc8b9ac990cf07b2b9775a1e281a10a9804086.tar.bz2
Do not use realpath() with uclibc
Task-number: QTBUG-8365 Reviewed-by: denis
-rw-r--r--src/corelib/io/qfsfileengine.cpp3
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('/'));