diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2018-10-22 09:53:54 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2018-10-22 09:53:54 +0200 |
| commit | 95db30bd3a5808890c03864a1da84d443cc8bf38 (patch) | |
| tree | 92415e861f4818a28fdc2b4526bddfe1e3df46a6 /src/plugins/debugger/disassembleragent.cpp | |
| parent | 16de556c8699766e661de00cba0fc8de58109517 (diff) | |
| parent | 1cad74a7d426c0eeac53cd838cdc89c9788f84aa (diff) | |
| download | qt-creator-95db30bd3a5808890c03864a1da84d443cc8bf38.tar.gz | |
Merge remote-tracking branch 'origin/4.8'
Conflicts:
src/plugins/debugger/debuggeritem.cpp
tests/unit/unittest/unittest.pro
Change-Id: Id2e4e9c2bc87b2556d7c2845aea3fe2fa11b630b
Diffstat (limited to 'src/plugins/debugger/disassembleragent.cpp')
| -rw-r--r-- | src/plugins/debugger/disassembleragent.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/plugins/debugger/disassembleragent.cpp b/src/plugins/debugger/disassembleragent.cpp index 3244919ebe..1fad2a4b63 100644 --- a/src/plugins/debugger/disassembleragent.cpp +++ b/src/plugins/debugger/disassembleragent.cpp @@ -400,6 +400,7 @@ void DisassemblerAgent::updateBreakpointMarker(const Breakpoint &bp) auto marker = new DisassemblerBreakpointMarker(bp, lineNumber); d->breakpointMarks.append(marker); + QTC_ASSERT(d->document, return); d->document->addMark(marker); } |