From 6e8e1da0a8267d2f8f568403e6ab9fe53b01cd29 Mon Sep 17 00:00:00 2001 From: Rafael Roquetto Date: Tue, 11 Sep 2012 09:45:20 -0300 Subject: [PATCH] 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 Reviewed-by: Thomas McGuire Reviewed-by: Giuseppe D'Angelo --- src/corelib/io/qfilesystemengine_unix.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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);