diff options
| author | Łukasz Matysiak <lukasz.matysiak@qt.io> | 2024-05-09 15:01:38 +0200 |
|---|---|---|
| committer | Łukasz Matysiak <lukasz.matysiak@qt.io> | 2024-05-10 10:15:42 +0200 |
| commit | f097cbd9bf975439ed55dbe563d45948a0a43794 (patch) | |
| tree | 8bf72c8fb3d2d5065359933927ebb1b9e5dc88da /src/corelib/io | |
| parent | 1f2a230b898af9da73463bca27b5883d36da7a91 (diff) | |
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.
Pick-to: 6.7
Task-number: QTBUG-115777
Change-Id: I734f525e870f93a7ec955d379dcc2137b591e171
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/io')
| -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 bda2962f8d..2f6c0ae184 100644 --- a/src/corelib/io/qfilesystemengine_unix.cpp +++ b/src/corelib/io/qfilesystemengine_unix.cpp @@ -642,7 +642,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())); |