diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2019-01-07 13:24:12 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2019-01-07 13:24:12 +0100 |
| commit | 04a4bacbf91974874b7743d82956842bc4b7cbcd (patch) | |
| tree | 091e27ce8fb601b36b6b82837f281ac70439ca55 /src/plugins/debugger/breakhandler.cpp | |
| parent | 9ee785a4efc0ddbf1edf705de690955a97e0a34b (diff) | |
| parent | bcafe202c9f8a7c4bad4cf60095138b1d6cbf2ac (diff) | |
Merge remote-tracking branch 'origin/4.8'
Conflicts:
src/plugins/coreplugin/dialogs/externaltoolconfig.ui
Change-Id: Ie38e9028cee599578c59b22325d85c097335243e
Diffstat (limited to 'src/plugins/debugger/breakhandler.cpp')
| -rw-r--r-- | src/plugins/debugger/breakhandler.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/plugins/debugger/breakhandler.cpp b/src/plugins/debugger/breakhandler.cpp index faf3b16b263..d4cd874a4b9 100644 --- a/src/plugins/debugger/breakhandler.cpp +++ b/src/plugins/debugger/breakhandler.cpp @@ -102,6 +102,8 @@ public: TextMark::updateLineNumber(lineNumber); QTC_ASSERT(m_bp, return); m_bp->setLineNumber(lineNumber); + if (GlobalBreakpoint gbp = m_bp->globalBreakpoint()) + gbp->m_params.lineNumber = lineNumber; } void updateFileName(const FileName &fileName) final @@ -109,6 +111,8 @@ public: TextMark::updateFileName(fileName); QTC_ASSERT(m_bp, return); m_bp->setFileName(fileName.toString()); + if (GlobalBreakpoint gbp = m_bp->globalBreakpoint()) + gbp->m_params.fileName = fileName.toString(); } bool isDraggable() const final { return true; } |