diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2019-06-17 09:14:11 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2019-06-17 07:45:12 +0000 |
| commit | e8705deb1c038d79a47e84274b4c3fdc6d2275aa (patch) | |
| tree | a1235be21684ec29954872f2cb087658bdc2824a | |
| parent | e3690ad7ac6d749c8a489676163864f5abbf99d7 (diff) | |
| download | qt-creator-e8705deb1c038d79a47e84274b4c3fdc6d2275aa.tar.gz | |
Fix display of keyboard shortcuts
Was using wrong foreground color for the "no collision" case.
Fix-up of 963dc84cc5d1e412344e3a0fbf4a476541da2d19
Fixes: QTCREATORBUG-22333
Change-Id: I5b4934b69bd9ff2002846ffda700673b6e1cab24
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
| -rw-r--r-- | src/plugins/coreplugin/dialogs/shortcutsettings.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/coreplugin/dialogs/shortcutsettings.cpp b/src/plugins/coreplugin/dialogs/shortcutsettings.cpp index 191de4a412..675996881d 100644 --- a/src/plugins/coreplugin/dialogs/shortcutsettings.cpp +++ b/src/plugins/coreplugin/dialogs/shortcutsettings.cpp @@ -552,7 +552,7 @@ bool ShortcutSettingsWidget::markCollisions(ShortcutItem *item) } item->m_item->setForeground(2, hasCollision ? Utils::creatorTheme()->color(Utils::Theme::TextColorError) - : commandList()->palette().window()); + : commandList()->palette().windowText()); return hasCollision; } |