diff options
| author | Olivier Goffart <ogoffart@woboq.com> | 2015-09-07 15:09:21 +0200 |
|---|---|---|
| committer | Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com> | 2015-09-11 12:42:15 +0000 |
| commit | 1464118b67a030d290eb14e7c6612202273e1366 (patch) | |
| tree | e0efb3c98e4e2da3a363db0f1bf4b6c9b35d56df /src/gui/image/qiconloader.cpp | |
| parent | 4b224816aa2902e10835a560d14e305cfdc32bac (diff) | |
QIcon: add a hook in the engine so a non null QIconEngine can still be a null icon
Implement it in the QIconLoader
We have to change detach() because some code does:
icon = QIcon::fromTheme("foobar"); if (icon.isNull()) icon.addPixmap(...);
so addPixmap and addFile have to work on a null QIcon by resetting
the iconEngine.
Change-Id: I07719bef93930cf4692384a8c64e21a97dcce25c
Reviewed-by: David Faure <david.faure@kdab.com>
Diffstat (limited to 'src/gui/image/qiconloader.cpp')
| -rw-r--r-- | src/gui/image/qiconloader.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/gui/image/qiconloader.cpp b/src/gui/image/qiconloader.cpp index 3ead72dfbb..3fd1f57ac4 100644 --- a/src/gui/image/qiconloader.cpp +++ b/src/gui/image/qiconloader.cpp @@ -587,6 +587,11 @@ void QIconLoaderEngine::virtual_hook(int id, void *data) name = m_info.iconName; } break; + case QIconEngine::IsNullHook: + { + *reinterpret_cast<bool*>(data) = m_info.entries.isEmpty(); + } + break; default: QIconEngine::virtual_hook(id, data); } |