diff options
author | Nick Ratelle <nratelle@qnx.com> | 2012-01-24 17:26:13 -0500 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-08 18:49:40 +0100 |
commit | ee592fc042efc19acbc5407f5277abe7372c138d (patch) | |
tree | 1110688b296ec1444240545c05073006b958f4a4 /src/corelib/io/qfilesystemengine_unix.cpp | |
parent | 547a1f53050b887bacb766ea95381cde072a6d3e (diff) |
realpath(X,0) IS supported on QNX.
Adds check for Q_OS_QNX to force
QFileSystemEntry QFileSystemEngine::canonicalName() use realpath(X, 0) on QNX
as well.
Change-Id: Id0a32277e6d043753c42101c91a393ebedb48a0a
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/io/qfilesystemengine_unix.cpp')
-rw-r--r-- | src/corelib/io/qfilesystemengine_unix.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/io/qfilesystemengine_unix.cpp b/src/corelib/io/qfilesystemengine_unix.cpp index 23a6b81a58..8d08bb5944 100644 --- a/src/corelib/io/qfilesystemengine_unix.cpp +++ b/src/corelib/io/qfilesystemengine_unix.cpp @@ -169,7 +169,7 @@ QFileSystemEntry QFileSystemEngine::canonicalName(const QFileSystemEntry &entry, if (entry.isEmpty() || entry.isRoot()) return entry; -#if !defined(Q_OS_MAC) && _POSIX_VERSION < 200809L +#if !defined(Q_OS_MAC) && !defined(Q_OS_QNX) && _POSIX_VERSION < 200809L // realpath(X,0) is not supported Q_UNUSED(data); return QFileSystemEntry(slowCanonicalized(absoluteName(entry).filePath())); |