whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
bb10
Allan Sandfeld Jensen 2020-10-20 17:50:44 +02:00 committed by Liang Qi
parent bb71abdfbd
commit e8873003f0
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/platform/unix/dbustray/qdbustraytypes.cpp
View File

@ -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);