From e8873003f054034b76621a47204f6fe604f71b8a Mon Sep 17 00:00:00 2001
From: Allan Sandfeld Jensen <allan.jensen@qt.io>
Date: Tue, 20 Oct 2020 17:50:44 +0200
Subject: 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>
---
 src/gui/platform/unix/dbustray/qdbustraytypes.cpp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/gui/platform')

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);
 
-- 
cgit v1.2.3