From 82803f5a68b12b3b1b8d05f6657b83c0d7a3565d Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Fri, 7 Oct 2016 16:46:43 +0200
Subject: [PATCH] Valgrind: Create only one extra configuration aspect

Let only the Callgrind tool create one, Memcheck shares it now.

Task-number: QTCREATORBUG-17053
Change-Id: I29d17ef5801ab295c2523f0748616b9e2aab29ce
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
---
 src/plugins/valgrind/memchecktool.cpp | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/plugins/valgrind/memchecktool.cpp b/src/plugins/valgrind/memchecktool.cpp
index 89e7c40f6aa..ca51ee56dff 100644
--- a/src/plugins/valgrind/memchecktool.cpp
+++ b/src/plugins/valgrind/memchecktool.cpp
@@ -711,10 +711,11 @@ public:
         return m_tool->createRunControl(runConfiguration, mode);
     }
 
-    IRunConfigurationAspect *createRunConfigurationAspect(ProjectExplorer::RunConfiguration *rc) override
-    {
-        return createValgrindRunConfigurationAspect(rc);
-    }
+    // Do not create an aspect, let the Callgrind tool create one and use that, too.
+//    IRunConfigurationAspect *createRunConfigurationAspect(ProjectExplorer::RunConfiguration *rc) override
+//    {
+//        return createValgrindRunConfigurationAspect(rc);
+//    }
 
 public:
     MemcheckTool *m_tool;