diff options
| author | Yang Yuyin <yangyuyin@uniontech.com> | 2021-03-10 09:41:15 +0800 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-03-30 15:11:46 +0000 |
| commit | bf89fa82a270c7ea6c4a43cd6ce9177257e11771 (patch) | |
| tree | 8f65a09b5f1051140d54099aecc8b7ac21fc693f | |
| parent | bdf13bf3cb583218081804c2d68c699e0697f476 (diff) | |
QIcon::setIsMask: delete extra judgment
QIcon::detach can judgment if the d pointer is nullptr
Change-Id: I90fd5f50ed2565a5654b978c4603635e62677953
Reviewed-by: David Skoland <david.skoland@qt.io>
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
(cherry picked from commit 2a9c93a3483e60257d2625b70b395cc20dcc88ce)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/gui/image/qicon.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/gui/image/qicon.cpp b/src/gui/image/qicon.cpp index d3fe8791b7..2b607ac5be 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; |