Merge remote-tracking branch 'origin/2.5'

Conflicts:
	qtcreator.pri
	qtcreator.qbp
	src/plugins/find/treeviewfind.cpp

Change-Id: Iaae61c98938df24bda5521a923303db89eb7f8fe

src/plugins/debugger/cdb/cdbengine.cpp

@@ -561,6 +561,7 @@ bool CdbEngine::setToolTipExpression(const QPoint &mousePos,
     }
     DebuggerToolTipWidget *tw = new DebuggerToolTipWidget;
     tw->setContext(context);
+    tw->setDebuggerModel(LocalsWatch);
     tw->setExpression(exp);
     tw->acquireEngine(this);
     DebuggerToolTipManager::instance()->showToolTip(mousePos, editor, tw);