diff options
| author | Nick Ratelle <nratelle@qnx.com> | 2012-01-24 22:26:13 (GMT) |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-09 19:28:02 (GMT) |
| commit | 6c5e12a40ac8b2613c415349dc8b59bbe99b909e (patch) | |
| tree | dcff1074f15f44a2f8890e4d4be78aced5d8f674 /src/corelib | |
| parent | 679def06d8cddbf4869ddc400546c4f5b2fbc61f (diff) | |
| download | Qt-6c5e12a40ac8b2613c415349dc8b59bbe99b909e.zip Qt-6c5e12a40ac8b2613c415349dc8b59bbe99b909e.tar.gz Qt-6c5e12a40ac8b2613c415349dc8b59bbe99b909e.tar.bz2 | |
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.
cherry-picked from qt5/qtbase ee592fc042efc19acbc5407f5277abe7372c138d
Change-Id: I715b1a226cc89831333f70a295c5d269bf6a8baf
Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
Diffstat (limited to 'src/corelib')
| -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 f9ee7a5..7bdb4d8 100644 --- a/src/corelib/io/qfilesystemengine_unix.cpp +++ b/src/corelib/io/qfilesystemengine_unix.cpp @@ -174,7 +174,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())); |