diff options
| author | Jens Bache-Wiig <jbache@trolltech.com> | 2010-03-04 10:16:16 (GMT) |
|---|---|---|
| committer | Jens Bache-Wiig <jbache@trolltech.com> | 2010-03-04 10:19:16 (GMT) |
| commit | 7727a4355876607a1a022ff54e2570dae883f79c (patch) | |
| tree | c88526dd233bc33136b17d49f8af60946649f2a3 /src/gui/image/qicon.cpp | |
| parent | 6f974452ec60ec03fd64bb2d12be6544435ae6be (diff) | |
| download | Qt-7727a4355876607a1a022ff54e2570dae883f79c.zip Qt-7727a4355876607a1a022ff54e2570dae883f79c.tar.gz Qt-7727a4355876607a1a022ff54e2570dae883f79c.tar.bz2 | |
Do not crash when loading themed icons statically
We do not officially support static loading of icons.
In fact they still crash for simple png cases due to missing
X11 resources. But since we lazily create themed icons
we can certainly avoid the crash in this case. You will
not be able to use fallbacks here though, since we cannot
know if a fallback should be used or not in this case.
Reviewed-by: ogoffart
Task-number: QTBUG-8666
Diffstat (limited to 'src/gui/image/qicon.cpp')
| -rw-r--r-- | src/gui/image/qicon.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/gui/image/qicon.cpp b/src/gui/image/qicon.cpp index bf6eb8d..fad51f4 100644 --- a/src/gui/image/qicon.cpp +++ b/src/gui/image/qicon.cpp @@ -982,7 +982,9 @@ QIcon QIcon::fromTheme(const QString &name, const QIcon &fallback) icon = *cachedIcon; } - if (icon.availableSizes().isEmpty()) + // Note the qapp check is to allow lazy loading of static icons + // Supporting fallbacks will not work for this case. + if (qApp && icon.availableSizes().isEmpty()) return fallback; return icon; |