diff options
| author | Olivier Goffart <olivier.goffart@nokia.com> | 2010-12-13 10:51:13 (GMT) |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2010-12-13 10:51:13 (GMT) |
| commit | a65cee5791c6af16485d38bfe31e8cd01b9e1295 (patch) | |
| tree | 2701e88815999079283da436c13cc0b33b6a9922 /src/gui/itemviews | |
| parent | d369ae7b831744c796571aa86b5d6570b09e70e4 (diff) | |
| parent | 8729352726bbdca80e2813eee815e6a1a3ad06ff (diff) | |
| download | Qt-a65cee5791c6af16485d38bfe31e8cd01b9e1295.zip Qt-a65cee5791c6af16485d38bfe31e8cd01b9e1295.tar.gz Qt-a65cee5791c6af16485d38bfe31e8cd01b9e1295.tar.bz2 | |
Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into qt-master-from-4.7
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; |