Make QFileSystemEngine::canonicalName use the realpath function on VxWorks
Despite realpath being available on VxWorks (when the INCLUDE_IO_REALPATH component is used in the VIP), canonicalName doesn't use it, because the system reports _POSIX_VERSION as 200112. Fix the problem by adding an additional condition so that VxWorks correctly uses realpath. Task-number: QTBUG-115777 Change-Id: I734f525e870f93a7ec955d379dcc2137b591e171 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> (cherry picked from commit f097cbd9bf975439ed55dbe563d45948a0a43794) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
parent
ee598d0b0e
commit
27407322e8
@ -647,7 +647,7 @@ QFileSystemEntry QFileSystemEngine::canonicalName(const QFileSystemEntry &entry,
|
||||
{
|
||||
Q_CHECK_FILE_NAME(entry, entry);
|
||||
|
||||
#if !defined(Q_OS_DARWIN) && !defined(Q_OS_QNX) && !defined(Q_OS_ANDROID) && !defined(Q_OS_HAIKU) && _POSIX_VERSION < 200809L
|
||||
#if !defined(Q_OS_DARWIN) && !defined(Q_OS_QNX) && !defined(Q_OS_ANDROID) && !defined(Q_OS_HAIKU) && _POSIX_VERSION < 200809L && !defined(Q_OS_VXWORKS)
|
||||
// realpath(X,0) is not supported
|
||||
Q_UNUSED(data);
|
||||
return QFileSystemEntry(slowCanonicalized(absoluteName(entry).filePath()));
|
||||
|
Loading…
x
Reference in New Issue
Block a user