diff options
| author | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-12-01 09:55:59 (GMT) |
|---|---|---|
| committer | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-12-01 09:55:59 (GMT) |
| commit | 37d7bbf8b055c46de9b45333ab08934e71f60633 (patch) | |
| tree | d2ed3de365af35a6764da80c46999f9821129cb5 | |
| parent | 6c8d6127d29266310ee797a19f3388ca7daadd92 (diff) | |
| parent | 448bd8a0b69eab922df956bb0fbdb94abeb5c7ea (diff) | |
| download | Qt-37d7bbf8b055c46de9b45333ab08934e71f60633.zip Qt-37d7bbf8b055c46de9b45333ab08934e71f60633.tar.gz Qt-37d7bbf8b055c46de9b45333ab08934e71f60633.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6
| -rw-r--r-- | src/corelib/io/qfsfileengine.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/corelib/io/qfsfileengine.cpp b/src/corelib/io/qfsfileengine.cpp index b8f6e2c..37b0ea1 100644 --- a/src/corelib/io/qfsfileengine.cpp +++ b/src/corelib/io/qfsfileengine.cpp @@ -138,12 +138,13 @@ QString QFSFileEnginePrivate::canonicalized(const QString &path) if (path.isEmpty()) return path; -#if defined(Q_OS_UNIX) || defined(Q_OS_SYMBIAN) // FIXME let's see if this stuff works, then we might be able to remove some of the other code. - // baaad Mac: 10.5 and 10.6 crash if trying to free a value returned by - // realpath() if the input path is just the root component. +#if defined(Q_OS_UNIX) && !defined(Q_OS_SYMBIAN) if (path.size() == 1 && path.at(0) == QLatin1Char('/')) return path; +#endif + // Mac OS X 10.5.x doesn't support the realpath(X,0) extenstion we use here. +#if (defined(Q_OS_UNIX) && !defined(Q_OS_MAC)) || defined(Q_OS_SYMBIAN) char *ret = realpath(path.toLocal8Bit().constData(), (char*)0); if (ret) { QString canonicalPath = QDir::cleanPath(QString::fromLocal8Bit(ret)); |