Merge branch '2.7'

Conflicts:
	doc/src/qtquick/qtquick-components.qdoc
	doc/src/qtquick/qtquick-designer.qdoc
	qtcreator.pri
	qtcreator.qbs
	src/plugins/cppeditor/cppinsertdecldef.cpp
	src/plugins/qnx/qnxruncontrolfactory.cpp

Change-Id: I0a37a07c42719bc0d9ef5b3ac4641d01a63c0d88

1 files changed, 1 insertions, 8 deletions

diff --git a/src/plugins/debugger/breakhandler.cpp b/src/plugins/debugger/breakhandler.cpp
index 75a6d7056f0..88df5dae22d 100644
--- a/src/plugins/debugger/breakhandler.cpp
+++ b/src/plugins/debugger/breakhandler.cpp
@@ -1162,19 +1162,12 @@ void BreakHandler::saveSessionData()
 void BreakHandler::loadSessionData()
 {
     beginResetModel();
-    m_storage.clear();
-    endResetModel();
-    loadBreakpoints();
-}
-
-void BreakHandler::removeSessionData()
-{
-    beginResetModel();
     Iterator it = m_storage.begin(), et = m_storage.end();
     for ( ; it != et; ++it)
         it->destroyMarker();
     m_storage.clear();
     endResetModel();
+    loadBreakpoints();
 }
 
 void BreakHandler::breakByFunction(const QString &functionName)