diff options
author | Karsten Heimrich <karsten.heimrich@qt.io> | 2021-05-31 16:25:21 +0200 |
---|---|---|
committer | Karsten Heimrich <karsten.heimrich@qt.io> | 2021-06-05 01:16:06 +0200 |
commit | ded82d1b073adb769afd28104515d240e8e1dd3f (patch) | |
tree | 933acea7f79e2e21af71e9e38c37868974a87d7e /src/corelib/io/qfsfileengine_win.cpp | |
parent | 0564ebdb3641d7325f73dbbf2cbb04e6dca92d83 (diff) |
Implement QFileInfo::junctionTarget(), adjust auto-test
The change in 004e3e0dc2cab4a4534d2ed3ace41aad6bfbe45d introduces
Windows junction awareness, though users were still unable to resolve
the junction target. This change adds the ability to solve this.
Fixes: QTBUG-93869
Change-Id: I9f4d4ed87b92e757f7b6d8739e2a61b58c096f63
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Diffstat (limited to 'src/corelib/io/qfsfileengine_win.cpp')
-rw-r--r-- | src/corelib/io/qfsfileengine_win.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/corelib/io/qfsfileengine_win.cpp b/src/corelib/io/qfsfileengine_win.cpp index af7da61f9a..7ac1368ab3 100644 --- a/src/corelib/io/qfsfileengine_win.cpp +++ b/src/corelib/io/qfsfileengine_win.cpp @@ -647,6 +647,8 @@ QString QFSFileEngine::fileName(FileName file) const return QFileSystemEngine::getLinkTarget(d->fileEntry, d->metaData).filePath(); } else if (file == BundleName) { return QString(); + } else if (file == JunctionName) { + return QFileSystemEngine::getJunctionTarget(d->fileEntry, d->metaData).filePath(); } return d->fileEntry.filePath(); } |