From 83d87c956cdfdbd7a775b5b555f1d4392f6ee58e Mon Sep 17 00:00:00 2001 From: Christian Ehrlicher Date: Thu, 7 Dec 2023 18:41:15 +0100 Subject: [PATCH] QAbstractFileIconEngine: reimplement isNull() QPixmapIconEngine as base class of QAbstractFileIconEngine implements isNull() by checking if there are pixmaps available. As QAbstractFileIconEngine does it's own caching mechanism, that check is failing. Since we can assume that the os returns a valid icon for every file, QAbstractFileIconEngine::isNull() can always return false. Pick-to: 6.5 Fixes: QTBUG-119797 Task-number: QTBUG-118667 Change-Id: I713a3cda6a4d14bb3dea374b40d8e8219278e5db Reviewed-by: Volker Hilsheimer (cherry picked from commit 2bccacab21a02a07e4af9673ad48c9c36c934bb8) Reviewed-by: Qt Cherry-pick Bot --- src/gui/image/qabstractfileiconengine_p.h | 1 + 1 file changed, 1 insertion(+) diff --git a/src/gui/image/qabstractfileiconengine_p.h b/src/gui/image/qabstractfileiconengine_p.h index cdabdc7b770..99d16d32243 100644 --- a/src/gui/image/qabstractfileiconengine_p.h +++ b/src/gui/image/qabstractfileiconengine_p.h @@ -30,6 +30,7 @@ public: QPixmap pixmap(const QSize &size, QIcon::Mode mode, QIcon::State) override; QPixmap scaledPixmap(const QSize &size, QIcon::Mode mode, QIcon::State, qreal scale) override; QSize actualSize(const QSize &size, QIcon::Mode mode, QIcon::State state) override; + bool isNull() override { return false; } QFileInfo fileInfo() const { return m_fileInfo; } QPlatformTheme::IconOptions options() const { return m_options; }