From e8705deb1c038d79a47e84274b4c3fdc6d2275aa Mon Sep 17 00:00:00 2001
From: Eike Ziller <eike.ziller@qt.io>
Date: Mon, 17 Jun 2019 09:14:11 +0200
Subject: [PATCH] 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>
---
 src/plugins/coreplugin/dialogs/shortcutsettings.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/coreplugin/dialogs/shortcutsettings.cpp b/src/plugins/coreplugin/dialogs/shortcutsettings.cpp
index 191de4a4121..675996881df 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;
 }