QNX: fix call to realpath() on QFileSystemEngine
authorRafael Roquetto <rafael.roquetto.qnx@kdab.com>
Tue, 11 Sep 2012 12:45:20 +0000 (09:45 -0300)
committerQt by Nokia <qt-info@nokia.com>
Tue, 11 Sep 2012 15:40:30 +0000 (17:40 +0200)
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>
src/corelib/io/qfilesystemengine_unix.cpp

index 9e2c69f..1bc3c4d 100644 (file)
@@ -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);