diff options
| author | Alexis Menard <alexis.menard@nokia.com> | 2010-12-10 12:22:18 (GMT) |
|---|---|---|
| committer | Alexis Menard <alexis.menard@nokia.com> | 2010-12-10 12:23:13 (GMT) |
| commit | f602d82b542fb41099f6a1eb5a73a0e341e68fa0 (patch) | |
| tree | 8ca1df8c41a781740bece59e53b33f77b7edbaaa /src/gui/itemviews | |
| parent | 85a7b344571b5bb4b06bdef88a11a4e01f97d6ad (diff) | |
| download | Qt-f602d82b542fb41099f6a1eb5a73a0e341e68fa0.zip Qt-f602d82b542fb41099f6a1eb5a73a0e341e68fa0.tar.gz Qt-f602d82b542fb41099f6a1eb5a73a0e341e68fa0.tar.bz2 | |
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
Diffstat (limited to 'src/gui/itemviews')
| -rw-r--r-- | src/gui/itemviews/qfileiconprovider.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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; |