From f602d82b542fb41099f6a1eb5a73a0e341e68fa0 Mon Sep 17 00:00:00 2001 From: Alexis Menard Date: Fri, 10 Dec 2010 13:22:18 +0100 Subject: We should not cache ICO files. Otherwise first .ico file will be cached for this extension and all the other icons will have the same appearance. Reviewed-by: prasanth --- src/gui/itemviews/qfileiconprovider.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gui/itemviews/qfileiconprovider.cpp b/src/gui/itemviews/qfileiconprovider.cpp index 4748f89..570c0ab 100644 --- a/src/gui/itemviews/qfileiconprovider.cpp +++ b/src/gui/itemviews/qfileiconprovider.cpp @@ -234,7 +234,7 @@ QIcon QFileIconProviderPrivate::getWinIcon(const QFileInfo &fileInfo) const const QString fileExtension = QLatin1Char('.') + fileInfo.suffix().toUpper(); QString key; - if (fileInfo.isFile() && !fileInfo.isExecutable() && !fileInfo.isSymLink()) + if (fileInfo.isFile() && !fileInfo.isExecutable() && !fileInfo.isSymLink() && fileExtension != QLatin1String(".ICO")) key = QLatin1String("qt_") + fileExtension; QPixmap pixmap; -- cgit v0.12