feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Debugger: Pinned LLDB tooltip stepping with out-of-source builds

Browse Source 
Previously it "released" on step as the scope paths from the code
model and the debugger report "differed" ("a/b/../c" vs "a/c")

Change-Id: Ida094581cfaa53b00f9186495870854ca431f041
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
This commit is contained in:
hjk
2014-11-14 13:42:51 +01:00
parent 7066e3348d
commit 51012b117d
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/debugger/debuggertooltipmanager.cpp
View File

@@ -52,6 +52,7 @@
#include <QClipboard>
#include <QDebug>
#include <QDesktopWidget>
#include <QFileInfo>
#include <QLabel>
#include <QScrollBar>
#include <QSortFilterProxyModel>
@@ -772,15 +773,22 @@ DebuggerToolTipContext::DebuggerToolTipContext()
{
}
static bool filesMatch(const QString &file1, const QString &file2)
{
QFileInfo f1(file1);
QFileInfo f2(file2);
return f1.canonicalFilePath() == f2.canonicalFilePath();
}
bool DebuggerToolTipContext::matchesFrame(const QString &frameFile, const QString &frameFunction) const
{
return (fileName.isEmpty() || frameFile.isEmpty() || fileName == frameFile)
return (fileName.isEmpty() || frameFile.isEmpty() || filesMatch(fileName, frameFile))
&& (function.isEmpty() || frameFunction.isEmpty() || function == frameFunction);
}
bool DebuggerToolTipContext::isSame(const DebuggerToolTipContext &other) const
{
return fileName == other.fileName
return filesMatch(fileName, other.fileName)
&& function == other.function
&& iname == other.iname;
}