contentstorage/caclient/s60/src/camenuiconutility.cpp
changeset 103 b99b84bcd2d1
parent 83 156f692b1687
child 99 7aaf39b772ac
equal deleted inserted replaced
83:156f692b1687 103:b99b84bcd2d1
    53     }
    53     }
    54     
    54     
    55     if (icon.isNull() || !(icon.size().isValid())) {
    55     if (icon.isNull() || !(icon.size().isValid())) {
    56         QString fileName(entry.iconDescription().filename());
    56         QString fileName(entry.iconDescription().filename());
    57         if (!fileName.isEmpty()) {
    57         if (!fileName.isEmpty()) {
    58         
    58             icon = HbIcon(fileName);
    59             // TODO:
       
    60             // work-around for HbIcon::size() method locking files if returns 
       
    61             // default size, error id: ou1cimx1#279208 Case: mcl06HsDo07 - 
       
    62             // "Cannot delete file" when trying to uninstall sisx file
       
    63             
       
    64             if (entry.entryTypeName() == XQConversions::s60DescToQString(
       
    65                     KCaTypeWidget)) {
       
    66                 icon = QIcon(fileName);
       
    67                 qWarning("Widget icon created by QIcon, "
       
    68                         "as work-around for HbIcon::size");
       
    69             } else {
       
    70                 icon = HbIcon(fileName);
       
    71             }
       
    72         }
    59         }
    73     }
    60     }
    74     return icon;
    61     return icon;
    75 }
    62 }
    76 
    63