Merge remote-tracking branch 'origin/2.5'

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

Change-Id: Iaae61c98938df24bda5521a923303db89eb7f8fe

src/plugins/debugger/gdb/gdbengine.cpp

@@ -3932,6 +3932,7 @@ bool GdbEngine::showToolTip()
         return true;
     }
     DebuggerToolTipWidget *tw = new DebuggerToolTipWidget;
+    tw->setDebuggerModel(TooltipsWatch);
     tw->setExpression(expression);
     tw->setContext(*m_toolTipContext);
     tw->acquireEngine(this);