diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-12-11 00:07:41 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-12-11 00:07:41 (GMT) |
| commit | 954cbb597f322acbc5f023f22503311ce2fc791a (patch) | |
| tree | e1a3f886dbe575ee24b2929525fe69a23fc51dff /src | |
| parent | c8a2533cb39ce0c7479880cd889ad594d569ecc0 (diff) | |
| parent | 275cf4baf5fb4c0fe28c192a1f5c295cb6032549 (diff) | |
| download | Qt-954cbb597f322acbc5f023f22503311ce2fc791a.zip Qt-954cbb597f322acbc5f023f22503311ce2fc791a.tar.gz Qt-954cbb597f322acbc5f023f22503311ce2fc791a.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
QScript tests, sync the tests with the v8 branch
We should not cache ICO files.
Diffstat (limited to 'src')
| -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; |