diff --git a/src/plugins/debugger/breakhandler.cpp b/src/plugins/debugger/breakhandler.cpp index 180b2c0a07d..963aced456c 100644 --- a/src/plugins/debugger/breakhandler.cpp +++ b/src/plugins/debugger/breakhandler.cpp @@ -1107,7 +1107,7 @@ QVariant BreakpointItem::data(int column, int role) const return QVariant(); } -void BreakpointItem::addToCommand(DebuggerCommand *cmd) const +void BreakpointItem::addToCommand(DebuggerCommand *cmd, BreakpointPathUsage defaultPathUsage) const { QTC_ASSERT(m_globalBreakpoint, return); const BreakpointParameters &requested = requestedParameters(); @@ -1120,10 +1120,19 @@ void BreakpointItem::addToCommand(DebuggerCommand *cmd) const cmd->arg("function", requested.functionName); cmd->arg("oneshot", requested.oneShot); cmd->arg("enabled", requested.enabled); - cmd->arg("file", requested.fileName.path()); cmd->arg("line", requested.textPosition.line); cmd->arg("address", requested.address); cmd->arg("expression", requested.expression); + + BreakpointPathUsage pathUsage = (requested.pathUsage + == BreakpointPathUsage::BreakpointPathUsageEngineDefault) + ? defaultPathUsage + : requested.pathUsage; + + cmd->arg("file", + pathUsage == BreakpointPathUsage::BreakpointUseFullPath + ? requested.fileName.path() + : requested.fileName.fileName()); } void BreakpointItem::updateFromGdbOutput(const GdbMi &bkpt, const FilePath &fileRoot) diff --git a/src/plugins/debugger/breakhandler.h b/src/plugins/debugger/breakhandler.h index e850151c3be..0132e2bcaf6 100644 --- a/src/plugins/debugger/breakhandler.h +++ b/src/plugins/debugger/breakhandler.h @@ -107,7 +107,9 @@ public: int markerLineNumber() const; const BreakpointParameters &requestedParameters() const; - void addToCommand(DebuggerCommand *cmd) const; + void addToCommand(DebuggerCommand *cmd, + BreakpointPathUsage defaultPathUsage + = BreakpointPathUsage::BreakpointUseFullPath) const; void updateFromGdbOutput(const GdbMi &bkpt, const Utils::FilePath &fileRoot); int modelId() const;