diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-03-28 12:33:32 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-03-28 12:33:32 +0100 |
| commit | ad809526d63b2c6a1dd94282fa0a807f72ee580d (patch) | |
| tree | 05501efa0dae0b4b8cf72d254efbbbab2ad3cb2d /src/widgets/dialogs/qfilesystemmodel.cpp | |
| parent | 9149f31aeaf3fce0c5ba5c20da0b9f2b56368abb (diff) | |
| parent | c7cca2dd74bcfb0a2020fbb537fd47b50b2775c0 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
src/plugins/platforms/qnx/qqnxtheme.cpp
src/widgets/dialogs/qfileinfogatherer.cpp
src/widgets/dialogs/qfilesystemmodel.cpp
Change-Id: Ifa536969c4beafcdfeebbf6beda1674b86750be8
Diffstat (limited to 'src/widgets/dialogs/qfilesystemmodel.cpp')
| -rw-r--r-- | src/widgets/dialogs/qfilesystemmodel.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/widgets/dialogs/qfilesystemmodel.cpp b/src/widgets/dialogs/qfilesystemmodel.cpp index a4009de68d..ee1c8ad0fd 100644 --- a/src/widgets/dialogs/qfilesystemmodel.cpp +++ b/src/widgets/dialogs/qfilesystemmodel.cpp @@ -800,7 +800,7 @@ QString QFileSystemModelPrivate::name(const QModelIndex &index) const if (!index.isValid()) return QString(); QFileSystemNode *dirNode = node(index); - if (fileInfoGatherer.resolveSymlinks() && dirNode->isSymLink(/* ignoreNtfsSymLinks = */ true)) { + if (fileInfoGatherer.resolveSymlinks() && !resolvedSymLinks.isEmpty() && dirNode->isSymLink(/* ignoreNtfsSymLinks = */ true)) { QString fullPath = QDir::fromNativeSeparators(filePath(index)); if (resolvedSymLinks.contains(fullPath)) return resolvedSymLinks[fullPath]; @@ -1522,9 +1522,9 @@ QDir::Filters QFileSystemModel::filter() const \property QFileSystemModel::resolveSymlinks \brief Whether the directory model should resolve symbolic links - This is only relevant on operating systems that support symbolic links. + This is only relevant on Windows. - By default, this property is false. + By default, this property is true. */ void QFileSystemModel::setResolveSymlinks(bool enable) { |