From f39e9be2f2da2f675d0df2032dd5bdf69c7aee39 Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Fri, 24 Jan 2020 12:10:56 +0100 Subject: [PATCH] Utils: Use themed text color in EnvironmentWidget Since we also have dark themes, we cannot always use black. Use the application global QPalette colors which originate from the theme. Task-number: QTCREATORBUG-23358 Change-Id: Id997e3b0d125d8e39fe7951b5dc827288b8086bb Reviewed-by: David Schulz --- src/libs/utils/namevaluemodel.cpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/libs/utils/namevaluemodel.cpp b/src/libs/utils/namevaluemodel.cpp index 0093df01902..0486485e711 100644 --- a/src/libs/utils/namevaluemodel.cpp +++ b/src/libs/utils/namevaluemodel.cpp @@ -30,9 +30,9 @@ #include #include -#include -#include #include +#include +#include #include namespace Utils { @@ -179,9 +179,11 @@ QVariant NameValueModel::data(const QModelIndex &index, int role) const f.setStrikeOut(!d->m_resultNameValueDictionary.isEnabled(resultIterator)); return f; } - case Qt::ForegroundRole: - return changes(d->m_resultNameValueDictionary.key(resultIterator)) - ? QBrush(Qt::blue) : QBrush(); + case Qt::ForegroundRole: { + const QPalette p = QGuiApplication::palette(); + return p.color(changes(d->m_resultNameValueDictionary.key(resultIterator)) + ? QPalette::Link : QPalette::Text); + } } return QVariant(); }