diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-20 17:50:44 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2020-10-20 16:45:15 +0000 |
| commit | e8873003f054034b76621a47204f6fe604f71b8a (patch) | |
| tree | 05b95a577e6e0f98c0d11461a2b08556141b07f7 /src/gui | |
| parent | bb71abdfbdd75d22fc81f015eff3aa41728a576f (diff) | |
Fix crash in tst_QSystemTrayIcon::lastWindowClosed()
Handle null QIcons. Note this was already fixed in 5.15 separately,
see 6c8adfaf5dc.
Fixes: QTBUG-87729
Change-Id: Ia759fbe95fafcea9451d393dc1aa077f5651919b
Reviewed-by: Liang Qi <liang.qi@qt.io>
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/platform/unix/dbustray/qdbustraytypes.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/gui/platform/unix/dbustray/qdbustraytypes.cpp b/src/gui/platform/unix/dbustray/qdbustraytypes.cpp index 3ebe7a1236..f2fec41aff 100644 --- a/src/gui/platform/unix/dbustray/qdbustraytypes.cpp +++ b/src/gui/platform/unix/dbustray/qdbustraytypes.cpp @@ -66,6 +66,8 @@ static const int IconNormalMediumSize = 64; QXdgDBusImageVector iconToQXdgDBusImageVector(const QIcon &icon) { QXdgDBusImageVector ret; + if (icon.isNull()) + return ret; QIconEngine *engine = const_cast<QIcon &>(icon).data_ptr()->engine; QList<QSize> sizes = engine->availableSizes(QIcon::Normal, QIcon::Off); |