diff options
| author | Olivier Goffart <ogoffart@woboq.com> | 2018-02-20 14:27:10 +0300 |
|---|---|---|
| committer | Camila San <hello@camila.codes> | 2018-05-16 21:26:09 +0300 |
| commit | ad276a4bce43bb09658043e11141eba10ccda032 (patch) | |
| tree | 57cbf145dc77a4c62452c6f2e2d7e705ab8bb8bf /src/gui/folder.cpp | |
| parent | 5e2270bd570c06905c5be953f7d1eaa055d503ac (diff) | |
Folder: normalize the local path.
We otherwise normalize all path in the C form, so we must have
the Folder's path normalized the same. Or all comparizon will fail
(such as knowing if a file from the SocketAPI or the FilesystemWatcher
are part of the folder)
Issue #4424
Diffstat (limited to 'src/gui/folder.cpp')
| -rw-r--r-- | src/gui/folder.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/gui/folder.cpp b/src/gui/folder.cpp index 81a782db1..389213b70 100644 --- a/src/gui/folder.cpp +++ b/src/gui/folder.cpp @@ -119,6 +119,10 @@ void Folder::checkLocalPath() { const QFileInfo fi(_definition.localPath); _canonicalLocalPath = fi.canonicalFilePath(); +#ifdef Q_OS_MAC + // Workaround QTBUG-55896 (Should be fixed in Qt 5.8) + _canonicalLocalPath = _canonicalLocalPath.normalized(QString::NormalizationForm_C); +#endif if (_canonicalLocalPath.isEmpty()) { qCWarning(lcFolder) << "Broken symlink:" << _definition.localPath; _canonicalLocalPath = _definition.localPath; |