From bf89fa82a270c7ea6c4a43cd6ce9177257e11771 Mon Sep 17 00:00:00 2001 From: Yang Yuyin Date: Wed, 10 Mar 2021 09:41:15 +0800 Subject: [PATCH] QIcon::setIsMask: delete extra judgment QIcon::detach can judgment if the d pointer is nullptr Change-Id: I90fd5f50ed2565a5654b978c4603635e62677953 Reviewed-by: David Skoland Reviewed-by: Eirik Aavitsland (cherry picked from commit 2a9c93a3483e60257d2625b70b395cc20dcc88ce) Reviewed-by: Qt Cherry-pick Bot --- src/gui/image/qicon.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/gui/image/qicon.cpp b/src/gui/image/qicon.cpp index d3fe8791b7b..2b607ac5be7 100644 --- a/src/gui/image/qicon.cpp +++ b/src/gui/image/qicon.cpp @@ -1377,8 +1377,7 @@ bool QIcon::hasThemeIcon(const QString &name) */ void QIcon::setIsMask(bool isMask) { - if (d) - detach(); + detach(); if (!d) d = new QIconPrivate(new QPixmapIconEngine); d->is_mask = isMask;