diff options
| author | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2024-07-31 16:22:01 +0200 |
|---|---|---|
| committer | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2024-07-31 22:54:58 +0200 |
| commit | b2b4bc2f2fb5de53e262c88023f278f782b80de5 (patch) | |
| tree | 45374bd37fe281d9a46c41b6fc47588703194691 /src/plugins/platforms/android/qandroidplatformiconengine.cpp | |
| parent | d042c14c9940c6aabaa5b39d3061c0f9e50fff06 (diff) | |
Icon engines: don't paint on a null-pixmap
If the pixmap created is null (perhaps because the size is null), then
don't paint into it. It might crash as we might end up with an invalid
device context.
Task-number: QTBUG-127085
Pick-to: 6.8 6.7
Change-Id: I03b3beabe02f150a2970013c15842369d3a27596
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Diffstat (limited to 'src/plugins/platforms/android/qandroidplatformiconengine.cpp')
| -rw-r--r-- | src/plugins/platforms/android/qandroidplatformiconengine.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/plugins/platforms/android/qandroidplatformiconengine.cpp b/src/plugins/platforms/android/qandroidplatformiconengine.cpp index a88696886dd..ff96e8fc00d 100644 --- a/src/plugins/platforms/android/qandroidplatformiconengine.cpp +++ b/src/plugins/platforms/android/qandroidplatformiconengine.cpp @@ -572,8 +572,10 @@ QPixmap QAndroidPlatformIconEngine::scaledPixmap(const QSize &size, QIcon::Mode m_pixmap.fill(Qt::transparent); m_pixmap.setDevicePixelRatio(scale); - QPainter painter(&m_pixmap); - paint(&painter, QRect(QPoint(), size), mode, state); + if (!m_pixmap.isNull()) { + QPainter painter(&m_pixmap); + paint(&painter, QRect(QPoint(), size), mode, state); + } m_cacheKey = cacheKey; } |