From 8f9e537dcfa7fbbbfd76993070f29109156dcb8c Mon Sep 17 00:00:00 2001 From: Tim Jenssen Date: Wed, 26 Jul 2017 17:16:27 +0200 Subject: [PATCH] Icons: warn about invalid resources Also give a 1x1 pixmap back to avoid paint engine error messages. Change-Id: Ibd7793d133952c4c3169796432b42572af0ace21 Reviewed-by: Alessandro Portale --- src/libs/utils/icon.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/libs/utils/icon.cpp b/src/libs/utils/icon.cpp index e3a9a92ee89..f451d9697e2 100644 --- a/src/libs/utils/icon.cpp +++ b/src/libs/utils/icon.cpp @@ -36,6 +36,7 @@ #include #include #include +#include namespace Utils { @@ -67,7 +68,12 @@ static MasksAndColors masksAndColors(const Icon &icon, int dpr) const QColor color = creatorTheme()->color(i.second); const QString dprFileName = StyleHelper::availableImageResolutions(i.first).contains(dpr) ? StyleHelper::imageFileWithResolution(fileName, dpr) : fileName; - result.append(qMakePair(QPixmap(dprFileName), color)); + QPixmap pixmap; + if (!pixmap.load(dprFileName)) { + pixmap = QPixmap(1, 1); + qWarning() << "Could not load image: " << dprFileName; + } + result.append({pixmap, color}); } return result; }