From 338d0ceab1f37489299895146364438a9e1cd0eb Mon Sep 17 00:00:00 2001
From: Alessandro Portale <alessandro.portale@theqtcompany.com>
Date: Wed, 4 May 2016 13:39:12 +0200
Subject: [PATCH] ProjectExplorer: Use a better "Cancel build" icon in the menu

Change-Id: I442a76a7a4e98b358ac3714eef8e60d482a6e39b
Reviewed-by: hjk <hjk@theqtcompany.com>
---
 src/plugins/projectexplorer/compileoutputwindow.cpp | 5 ++++-
 src/plugins/projectexplorer/projectexplorer.cpp     | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/plugins/projectexplorer/compileoutputwindow.cpp b/src/plugins/projectexplorer/compileoutputwindow.cpp
index e460371e088..ed406f17ba6 100644
--- a/src/plugins/projectexplorer/compileoutputwindow.cpp
+++ b/src/plugins/projectexplorer/compileoutputwindow.cpp
@@ -41,6 +41,7 @@
 #include <texteditor/fontsettings.h>
 #include <texteditor/behaviorsettings.h>
 #include <utils/ansiescapecodehandler.h>
+#include <utils/proxyaction.h>
 #include <utils/theme/theme.h>
 
 #include <QIcon>
@@ -164,7 +165,9 @@ CompileOutputWindow::CompileOutputWindow(QAction *cancelBuildAction) :
     p.setColor(QPalette::HighlightedText, activeHighlightedText);
     m_outputWindow->setPalette(p);
 
-    m_cancelBuildButton->setDefaultAction(cancelBuildAction);
+    Utils::ProxyAction *cancelBuildProxyButton =
+            Utils::ProxyAction::proxyActionWithIcon(cancelBuildAction, Core::Icons::STOP_SMALL_TOOLBAR.icon());
+    m_cancelBuildButton->setDefaultAction(cancelBuildProxyButton);
     m_zoomInButton->setToolTip(tr("Increase Font Size"));
     m_zoomInButton->setIcon(Core::Icons::PLUS.icon());
     m_zoomOutButton->setToolTip(tr("Decrease Font Size"));
diff --git a/src/plugins/projectexplorer/projectexplorer.cpp b/src/plugins/projectexplorer/projectexplorer.cpp
index 3f9a967dbf6..0b5e1467429 100644
--- a/src/plugins/projectexplorer/projectexplorer.cpp
+++ b/src/plugins/projectexplorer/projectexplorer.cpp
@@ -882,7 +882,7 @@ bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *er
     mbuild->addAction(cmd, Constants::G_BUILD_CLEAN);
 
     // cancel build action
-    dd->m_cancelBuildAction = new QAction(Core::Icons::STOP_SMALL_TOOLBAR.icon(), tr("Cancel Build"), this);
+    dd->m_cancelBuildAction = new QAction(Core::Icons::STOP_SMALL.icon(), tr("Cancel Build"), this);
     cmd = ActionManager::registerAction(dd->m_cancelBuildAction, Constants::CANCELBUILD);
     mbuild->addAction(cmd, Constants::G_BUILD_CANCEL);