diff options
| author | Christian Stenger <christian.stenger@theqtcompany.com> | 2016-04-08 12:29:22 +0200 |
|---|---|---|
| committer | Christian Stenger <christian.stenger@theqtcompany.com> | 2016-04-08 10:38:05 +0000 |
| commit | ed7d5e0d626505a4880d57738ef0403632ed7014 (patch) | |
| tree | de339ca28a8f588e6c87aa1f2ad46d1460382cf0 /src | |
| parent | c68d270b0cab7d4668f185c31482676eea7c0311 (diff) | |
| download | qt-creator-ed7d5e0d626505a4880d57738ef0403632ed7014.tar.gz | |
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>
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/valgrind/memchecktool.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
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()) { |