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

src/plugins/debugger/breakhandler.cpp

@@ -1160,14 +1160,6 @@ 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();
@@ -1175,6 +1167,7 @@ void BreakHandler::removeSessionData()
         it->destroyMarker();
     m_storage.clear();
     endResetModel();
+    loadBreakpoints();
 }
 
 void BreakHandler::breakByFunction(const QString &functionName)