forked from qt-creator/qt-creator
Debugger: Fix pending path handling
Change-Id: Ie4ef081ca6708144c8a739b0d9cf63b07ad1d913 Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
@@ -272,6 +272,7 @@ void BreakpointParameters::updateFromGdbOutput(const GdbMi &bkpt, const Utils::F
|
|||||||
QTC_ASSERT(bkpt.isValid(), return);
|
QTC_ASSERT(bkpt.isValid(), return);
|
||||||
|
|
||||||
QString originalLocation;
|
QString originalLocation;
|
||||||
|
QString reportedLocation;
|
||||||
QString file;
|
QString file;
|
||||||
QString fullName;
|
QString fullName;
|
||||||
|
|
||||||
@@ -308,7 +309,7 @@ void BreakpointParameters::updateFromGdbOutput(const GdbMi &bkpt, const Utils::F
|
|||||||
// Any content here would be interesting only if we did accept
|
// Any content here would be interesting only if we did accept
|
||||||
// spontaneously appearing breakpoints (user using gdb commands).
|
// spontaneously appearing breakpoints (user using gdb commands).
|
||||||
if (file.isEmpty())
|
if (file.isEmpty())
|
||||||
file = child.data();
|
reportedLocation = child.data();
|
||||||
pending = true;
|
pending = true;
|
||||||
} else if (child.hasName("at")) {
|
} else if (child.hasName("at")) {
|
||||||
// Happens with gdb 6.4 symbianelf.
|
// Happens with gdb 6.4 symbianelf.
|
||||||
@@ -371,6 +372,9 @@ void BreakpointParameters::updateFromGdbOutput(const GdbMi &bkpt, const Utils::F
|
|||||||
if (!name.isEmpty())
|
if (!name.isEmpty())
|
||||||
fileName = fileRoot.withNewPath(name);
|
fileName = fileRoot.withNewPath(name);
|
||||||
|
|
||||||
|
if (fileName.isEmpty())
|
||||||
|
updateLocation(reportedLocation);
|
||||||
|
|
||||||
if (fileName.isEmpty())
|
if (fileName.isEmpty())
|
||||||
updateLocation(originalLocation);
|
updateLocation(originalLocation);
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user