equal
deleted
inserted
replaced
179 } |
179 } |
180 |
180 |
181 QString HbEffectController::expandFileName(const QString &fn, bool *fromTheme, bool *shared) |
181 QString HbEffectController::expandFileName(const QString &fn, bool *fromTheme, bool *shared) |
182 { |
182 { |
183 // Sharing not supported if the file is in Qt resource. |
183 // Sharing not supported if the file is in Qt resource. |
184 if (fn.startsWith(QLatin1String(":/")) && shared && *shared) { |
184 if (shared && *shared && (fn.startsWith(QLatin1String(":/")) || HbIconLoader::isInPrivateDirectory(fn))) { |
185 *shared = false; |
185 *shared = false; |
186 return fn; |
186 return fn; |
187 } else { |
187 } else { |
188 // Try the theme, will return the same name if not found in the theme. |
188 // Try the theme, will return the same name if not found in the theme. |
189 bool temp; |
189 bool temp; |