Merge remote-tracking branch 'origin/4.8'

 Conflicts:
	tests/unit/unittest/unittest.pro

Change-Id: I4f0ab05f96ee60900a3a35fad4c7331238367593

1 files changed, 3 insertions, 2 deletions

diff --git a/src/plugins/debugger/breakhandler.cpp b/src/plugins/debugger/breakhandler.cpp
index 7ac4671ed8b..bf340113275 100644
--- a/src/plugins/debugger/breakhandler.cpp
+++ b/src/plugins/debugger/breakhandler.cpp
@@ -1408,8 +1408,9 @@ void BreakHandler::handleAlienBreakpoint(const QString &responseId, const Breakp
     } else {
         bp = new BreakpointItem(nullptr);
         bp->m_responseId = responseId;
-        bp->setState(BreakpointInserted);
-        bp->setParameters(params);
+        bp->m_parameters = params;
+        bp->m_state = BreakpointInserted;
+        bp->updateMarker();
         rootItem()->appendChild(bp);
         // This has no global breakpoint, so there's nothing to update here.
     }