Changeset 1118

Timestamp:

Mar 5, 2013, 11:42:11 PM (12 years ago)

Author:

Dmitry A. Kuminov

Message:

gui: Use canonical path in default file icon provider to pick up proper icons for symlinks.

This would return an icon for a symlink file itself which is usually not what symlink points to.

File:

• trunk/src/gui/itemviews/qfileiconprovider.cpp (modified) (1 diff)

trunk/src/gui/itemviews/qfileiconprovider.cpp

@@ -348 +348 @@
     }
 
-    QByteArray path = QDir::toNativeSeparators(
-        QDir::cleanPath(fileInfo.absoluteFilePath())).toLocal8Bit();
+    QByteArray path = QFile::encodeName(QDir::toNativeSeparators(
+        QDir::cleanPath(fileInfo.canonicalFilePath())));
     HPOINTER hicon = WinLoadFileIcon(path, FALSE);
     if (hicon == NULLHANDLE) {