diff options
| author | Rafael Roquetto <rafael.roquetto.qnx@kdab.com> | 2012-09-11 09:45:20 -0300 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-09-11 17:40:30 +0200 |
| commit | 6e8e1da0a8267d2f8f568403e6ab9fe53b01cd29 (patch) | |
| tree | cc877bbf8ac14b37e8e1be750fefeb1a40053f0f /src/corelib/io/qfilesystemengine_unix.cpp | |
| parent | 074a5ce50e10785bd7c10d9b3120905b9042f9e0 (diff) | |
QNX: fix call to realpath() on QFileSystemEngine
QNX6, as opposed to later QNX versions, does not define the behavior of
realpath() when the second parameter is NULL. We leave it then for the
compiler to decide which implementation to call, by relying on the _POSIX_VERSION_
macro, which in QNX6 happens to evaluate to < 200801L.
Change-Id: I3a6d3859858f56b69f0d391384c2703083a01257
Reviewed-by: Qt Doc Bot <qt_docbot@qt-project.org>
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.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 9e2c69f088..1bc3c4dea6 100644 --- a/src/corelib/io/qfilesystemengine_unix.cpp +++ b/src/corelib/io/qfilesystemengine_unix.cpp @@ -191,7 +191,7 @@ QFileSystemEntry QFileSystemEngine::canonicalName(const QFileSystemEntry &entry, } } # else -# if (_POSIX_VERSION >= 200801L || defined(Q_OS_QNX)) +# if _POSIX_VERSION >= 200801L ret = realpath(entry.nativeFilePath().constData(), (char*)0); # else ret = (char*)malloc(PATH_MAX); |