From ed7d5e0d626505a4880d57738ef0403632ed7014 Mon Sep 17 00:00:00 2001
From: Christian Stenger <christian.stenger@theqtcompany.com>
Date: Fri, 8 Apr 2016 12:29:22 +0200
Subject: Valgrind: Fix compile on Win

Fixes compile error C3487 ('const Valgrind::XmlProtocol::Frame':
all return expressions in a lambda must have the same type: previously
it was 'Valgrind::XmlProtocol::Frame')

Change-Id: I6545cd2eda1fba4058bf0dc59ed835fed07f86e8
Reviewed-by: hjk <hjk@theqtcompany.com>
---
 src/plugins/valgrind/memchecktool.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/plugins/valgrind/memchecktool.cpp b/src/plugins/valgrind/memchecktool.cpp
index 95314de317..5ed8152098 100644
--- a/src/plugins/valgrind/memchecktool.cpp
+++ b/src/plugins/valgrind/memchecktool.cpp
@@ -97,13 +97,14 @@ namespace Internal {
 static ErrorListModel::RelevantFrameFinder makeFrameFinder(const QStringList &projectFiles)
 {
     return [projectFiles](const Error &error) {
+        const Frame defaultFrame = Frame();
         const QVector<Stack> stacks = error.stacks();
         if (stacks.isEmpty())
-            return Frame();
+            return defaultFrame;
         const Stack &stack = stacks[0];
         const QVector<Frame> frames = stack.frames();
         if (frames.isEmpty())
-            return Frame();
+            return defaultFrame;
 
         //find the first frame belonging to the project
         if (!projectFiles.isEmpty()) {
-- 
cgit v1.2.1