diff options
| author | Olivier Goffart <ogoffart@trolltech.com> | 2009-10-07 11:58:02 (GMT) |
|---|---|---|
| committer | Olivier Goffart <ogoffart@trolltech.com> | 2009-10-07 15:56:43 (GMT) |
| commit | db182f75b69cd47ce8abbcc5acb2551306919a05 (patch) | |
| tree | 726e5731b1f923cac6527b77c043874b27c256c0 /src/gui/image/qicon.cpp | |
| parent | 3cad63946965416c89703fbf3d9730e856283c06 (diff) | |
| download | Qt-db182f75b69cd47ce8abbcc5acb2551306919a05.zip Qt-db182f75b69cd47ce8abbcc5acb2551306919a05.tar.gz Qt-db182f75b69cd47ce8abbcc5acb2551306919a05.tar.bz2 | |
QGuiPlatformPlugin: QFileIconProvider and QIcon backend.
Add a backend for QFileIconProvider in the platform plugin
Also change the QIcon::fromTheme backend in the platform plugin:
On KDE, we unfortunately can't use KIcon as backend, as the current
API doesn't let us know easily (and quickly) wether we should use
the fallback or not (KDE always fallback to the question mark
"unknown" icon)
So we will use the QIconLoader even on KDE.
But we need to make sure that the theme name and the icon search paths
are correct. Ask that to the platform plugin
Reviewed-by: Jens Bache-Wiig
Diffstat (limited to 'src/gui/image/qicon.cpp')
| -rw-r--r-- | src/gui/image/qicon.cpp | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/gui/image/qicon.cpp b/src/gui/image/qicon.cpp index 3448459..e0779a0 100644 --- a/src/gui/image/qicon.cpp +++ b/src/gui/image/qicon.cpp @@ -962,15 +962,10 @@ QString QIcon::themeName() */ QIcon QIcon::fromTheme(const QString &name, const QIcon &fallback) { - static QCache <QString, QIcon> iconCache; QIcon icon; - icon = qt_guiPlatformPlugin()->loadIcon(name); - if (!icon.isNull()) - return icon; - if (iconCache.contains(name)) { icon = *iconCache.object(name); } else { |