diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-02-01 03:01:27 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-02-01 03:01:27 +0100 |
| commit | 454f01b7b05ec61ff7c76a23e5dd4a612626d409 (patch) | |
| tree | d7d52f1f631d25e91fd7de5334c3c0811c940720 /src/designer | |
| parent | c365f6ee6fc21aeacf5564db5d62cce125967f3c (diff) | |
| parent | b3b244669a16b49f037bd4b8b1faa9d677c2b900 (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: I674982e1a1f7d47bb1541f544ff1506a7cbe3a72
Diffstat (limited to 'src/designer')
| -rw-r--r-- | src/designer/src/lib/shared/iconselector.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/designer/src/lib/shared/iconselector.cpp b/src/designer/src/lib/shared/iconselector.cpp index 05aaa9c98..ccfdc5c18 100644 --- a/src/designer/src/lib/shared/iconselector.cpp +++ b/src/designer/src/lib/shared/iconselector.cpp @@ -591,8 +591,7 @@ void IconThemeEditor::updatePreview(const QString &t) { // Update preview label with icon. if (t.isEmpty() || !QIcon::hasThemeIcon(t)) { // Empty - const QPixmap *currentPixmap = d->m_themeLabel->pixmap(); - if (currentPixmap == nullptr || currentPixmap->cacheKey() != d->m_emptyPixmap.cacheKey()) + if (d->m_themeLabel->pixmap(Qt::ReturnByValue).cacheKey() != d->m_emptyPixmap.cacheKey()) d->m_themeLabel->setPixmap(d->m_emptyPixmap); } else { const QIcon icon = QIcon::fromTheme(t); |