Merge remote-tracking branch 'origin/2.6'

Conflicts:
	share/share.qbs
	src/plugins/cpptools/cppchecksymbols.cpp
	src/plugins/texteditor/behaviorsettingswidget.cpp

Change-Id: Ia34060984f9c036b2f28a6411d796d41f55a3e37

src/plugins/debugger/qml/qmlinspectoragent.cpp

@@ -121,6 +121,17 @@ void QmlInspectorAgent::updateWatchData(const WatchData &data)
     }
 }
 
+void QmlInspectorAgent::watchDataSelected(const WatchData *data)
+{
+    if (debug)
+        qDebug() << __FUNCTION__ << '(' << data->id << ')';
+
+    if (data->id) {
+        QTC_ASSERT(m_debugIdLocations.keys().contains(data->id), return);
+        emit jumpToObjectDefinition(m_debugIdLocations.value(data->id));
+    }
+}
+
 bool QmlInspectorAgent::selectObjectInTree(int debugId)
 {
     if (debug) {