KDirectoryContentsCounter: fix support of symlinks dir

BUG: 428712
FIXED-IN: 20.12

diff --git a/src/kitemviews/private/kdirectorycontentscounter.cpp b/src/kitemviews/private/kdirectorycontentscounter.cpp
index d33277a3b9d45c86bb9ecc69c5029023b3600aa6..a2a27ad28707717931119b7387f5f86ff74c3668 100644 (file)
--- a/src/kitemviews/private/kdirectorycontentscounter.cpp
+++ b/src/kitemviews/private/kdirectorycontentscounter.cpp
@@ -115,7 +115,7 @@ void KDirectoryContentsCounter::slotResult(const QString& path, int count, long
     }
 
     // sends the results
     }
 
     // sends the results

-    Q_EMIT result(resolvedPath, count, size);
+    Q_EMIT result(path, count, size);

 }
 
 void KDirectoryContentsCounter::slotDirWatchDirty(const QString& path)
 }
 
 void KDirectoryContentsCounter::slotDirWatchDirty(const QString& path)


@@ -160,11 +160,12 @@ void KDirectoryContentsCounter::slotItemsRemoved()
 
 void KDirectoryContentsCounter::startWorker(const QString& path)
 {
 
 void KDirectoryContentsCounter::startWorker(const QString& path)
 {

-    const bool alreadyInCache = s_cache->contains(path);
+    const QString resolvedPath = QFileInfo(path).canonicalFilePath();
+    const bool alreadyInCache = s_cache->contains(resolvedPath);

     if (alreadyInCache) {
         // fast path when in cache
         // will be updated later if result has changed
     if (alreadyInCache) {
         // fast path when in cache
         // will be updated later if result has changed

-        const auto pair = s_cache->value(path);
+        const auto pair = s_cache->value(resolvedPath);

         Q_EMIT result(path, pair.first, pair.second);
     }
 
         Q_EMIT result(path, pair.first, pair.second);
     }