diff -r d1dadafc5584 -r 26079c1bb561 contentstorage/caclient/src/caiconcache.cpp --- a/contentstorage/caclient/src/caiconcache.cpp Mon Sep 27 11:31:59 2010 +0300 +++ b/contentstorage/caclient/src/caiconcache.cpp Wed Oct 06 16:00:22 2010 +0300 @@ -153,7 +153,11 @@ QString CaIconCache::key(const CaEntry &entry, const QSizeF &size) { QString key; - if (!entry.iconDescription().filename().isEmpty()) { + if (!entry.iconDescription().skinId().isEmpty()) { + key.append(entry.iconDescription().skinId()); + key.append(separator); + key.append(entry.entryTypeName()); + } else if (!entry.iconDescription().filename().isEmpty()) { key.append(entry.iconDescription().filename()); key.append(separator); key.append(entry.entryTypeName()); @@ -161,8 +165,8 @@ key.append(separator); key.append(entry.id()); } + key.append(separator); if (size.isValid()) { - key.append(separator); key += QString::number(size.height()); key.append(separator); key += QString::number(size.width());