From b4c1e48fdc55086c5cc88851d7abf1f50b0c2d33 Mon Sep 17 00:00:00 2001
From: Alessandro Portale <alessandro.portale@qt.io>
Date: Tue, 22 Dec 2020 16:58:18 +0100
Subject: [PATCH] ProjectExplorer: Don't enforce FlatModel::data's
 ForegroundRole

Only return a concrete color for the "pseudo disabled" state of the
node, otherwise return QVariant().

This permits the theming of the projecty tree via palette or stylesheet
(as the QmlDesigner does).

Task-number: QTCREATORBUG-24402
Change-Id: I510faf4d58a12947dd665eef6f5c9da8845fc2dd
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
---
 src/plugins/projectexplorer/projectmodels.cpp | 6 ++----
 src/plugins/projectexplorer/projectmodels.h   | 2 --
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/plugins/projectexplorer/projectmodels.cpp b/src/plugins/projectexplorer/projectmodels.cpp
index b846c2cd320..6a92973c0b0 100644
--- a/src/plugins/projectexplorer/projectmodels.cpp
+++ b/src/plugins/projectexplorer/projectmodels.cpp
@@ -107,9 +107,6 @@ FlatModel::FlatModel(QObject *parent)
 
     for (Project *project : SessionManager::projects())
         handleProjectAdded(project);
-
-    m_disabledTextColor = Utils::creatorTheme()->color(Utils::Theme::TextColorDisabled);
-    m_enabledTextColor = Utils::creatorTheme()->color(Utils::Theme::TextColorNormal);
 }
 
 QVariant FlatModel::data(const QModelIndex &index, int role) const
@@ -166,7 +163,8 @@ QVariant FlatModel::data(const QModelIndex &index, int role) const
         return font;
     }
     case Qt::ForegroundRole:
-        return node->isEnabled() ? m_enabledTextColor : m_disabledTextColor;
+        return node->isEnabled() ? QVariant()
+                                 : Utils::creatorTheme()->color(Utils::Theme::TextColorDisabled);
     case Project::FilePathRole:
         return node->filePath().toString();
     case Project::isParsingRole:
diff --git a/src/plugins/projectexplorer/projectmodels.h b/src/plugins/projectexplorer/projectmodels.h
index b92a2471b97..25e2dbe6e85 100644
--- a/src/plugins/projectexplorer/projectmodels.h
+++ b/src/plugins/projectexplorer/projectmodels.h
@@ -118,8 +118,6 @@ private:
 
     QTimer m_timer;
     QSet<ExpandData> m_toExpand;
-    QColor m_enabledTextColor;
-    QColor m_disabledTextColor;
 };
 
 } // namespace Internal