Merge remote-tracking branch 'origin/4.8'

Conflicts:
	src/plugins/cpptools/compileroptionsbuilder.cpp

Change-Id: I522f91de70aff28692d7c3a050e8d52df0b82a76

src/plugins/debugger/debuggertooltipmanager.cpp

@@ -1185,7 +1185,6 @@ void DebuggerToolTipManagerPrivate::slotTooltipOverrideRequested
 {
     QTC_ASSERT(handled, return);
     QTC_ASSERT(editorWidget, return);
-    *handled = false;
 
     if (!boolSetting(UseToolTipsInMainEditor))
         return;