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

Debugger: Fix some breakpoint file name display breakage

Browse Source 
For unclaimed breakpoints the wodking directory was shown
as path.

Amends commit a7dd0e50a2.

Change-Id: I9614b3672d32fb18e35dc98c12a60e3b27eebf84
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2020-03-19 10:46:41 +01:00
parent 62ac17e608
commit f2f6452977
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/debugger/breakhandler.cpp
View File

@@ -1793,8 +1793,8 @@ void BreakpointItem::destroyMarker()
FilePath BreakpointItem::markerFileName() const
{
// Some heuristics to find a "good" file name.
if (!m_parameters.fileName.exists())
return FilePath::fromString(m_parameters.fileName.toFileInfo().absolutePath());
if (m_parameters.fileName.exists())
return FilePath::fromString(m_parameters.fileName.toFileInfo().absoluteFilePath());
const FilePath origFileName = requestedParameters().fileName;
if (m_parameters.fileName.endsWith(origFileName.fileName()))
@@ -2268,7 +2268,7 @@ void GlobalBreakpointItem::updateFileName(const FilePath &fileName)
FilePath GlobalBreakpointItem::markerFileName() const
{
// Some heuristics to find a "good" file name.
if (!m_params.fileName.exists())
if (m_params.fileName.exists())
return FilePath::fromString(m_params.fileName.toFileInfo().absoluteFilePath());
return m_params.fileName;
}