From 3992e3c113155055540a6b1d30d82822a08c4b64 Mon Sep 17 00:00:00 2001
From: Eike Ziller <eike.ziller@qt.io>
Date: Tue, 10 Mar 2020 13:25:50 +0100
Subject: [PATCH] macOS: Fix label color in tool buttons

For example the "Ignore Whitespace" button in the diff viewer

Change-Id: I9882b9d2f3e22635bfbb047904ef284dd515db9f
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
---
 src/plugins/coreplugin/manhattanstyle.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/plugins/coreplugin/manhattanstyle.cpp b/src/plugins/coreplugin/manhattanstyle.cpp
index aa60cf34570..b55b885615d 100644
--- a/src/plugins/coreplugin/manhattanstyle.cpp
+++ b/src/plugins/coreplugin/manhattanstyle.cpp
@@ -857,7 +857,11 @@ void ManhattanStyle::drawControl(ControlElement element, const QStyleOption *opt
             }
         }
         break;
-
+    case CE_ToolButtonLabel:
+        // Directly use QCommonStyle to circumvent funny painting in QMacStyle
+        // which ignores the palette and adds an alpha
+        QCommonStyle::drawControl(element, option, painter, widget);
+        break;
     default:
         QProxyStyle::drawControl(element, option, painter, widget);
         break;