diff options
author | Alessandro Portale <alessandro.portale@qt.io> | 2017-09-05 12:59:31 +0200 |
---|---|---|
committer | Alessandro Portale <alessandro.portale@qt.io> | 2017-09-19 09:03:12 +0000 |
commit | 6b0b8c24b55bc8507d4acea370b5c1837e746cff (patch) | |
tree | 872ec7bc0e571b70bc504b5ee2eb532863f9292c /src/plugins/coreplugin/find | |
parent | f4ff420036656e453c26d1502bf1b8f96f4cea59 (diff) | |
download | qt-creator-6b0b8c24b55bc8507d4acea370b5c1837e746cff.tar.gz |
Utils: Let FancyLineEdit have QIcons instead of QPixmaps
A QIcon contains variants for different resolutions. This change
makes sure that in a Multi-screen/mixed-scaling-mode scenario,
the right of those resolutions is chosen, depending on which screen
the line edit currently is.
Task-number: QTCREATORBUG-18869
Change-Id: I8775e9e2c9b15c2863e9415751e1306f9e43c9aa
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Diffstat (limited to 'src/plugins/coreplugin/find')
-rw-r--r-- | src/plugins/coreplugin/find/findtoolbar.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/plugins/coreplugin/find/findtoolbar.cpp b/src/plugins/coreplugin/find/findtoolbar.cpp index c4cfe718cf..8b9016d8f2 100644 --- a/src/plugins/coreplugin/find/findtoolbar.cpp +++ b/src/plugins/coreplugin/find/findtoolbar.cpp @@ -666,11 +666,11 @@ void FindToolBar::updateIcons() bool regexp = effectiveFlags & FindRegularExpression; bool preserveCase = effectiveFlags & FindPreserveCase; if (!casesensitive && !wholewords && !regexp && !preserveCase) { - const QPixmap pixmap = Utils::Icons::MAGNIFIER.pixmap(); - m_ui.findEdit->setButtonPixmap(Utils::FancyLineEdit::Left, pixmap); + const QIcon icon = Utils::Icons::MAGNIFIER.icon(); + m_ui.findEdit->setButtonIcon(Utils::FancyLineEdit::Left, icon); } else { - m_ui.findEdit->setButtonPixmap(Utils::FancyLineEdit::Left, - IFindFilter::pixmapForFindFlags(effectiveFlags)); + m_ui.findEdit->setButtonIcon(Utils::FancyLineEdit::Left, + IFindFilter::pixmapForFindFlags(effectiveFlags)); } } |