Merge remote-tracking branch 'origin/4.6'

Conflicts:
	qbs/modules/qtc/qtc.qbs
	qtcreator.pri
	src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp

Change-Id: I2445882a270731b866b04f28ff87d161224c539a

src/plugins/clangcodemodel/clanghoverhandler.cpp

@@ -196,7 +196,7 @@ void ClangHoverHandler::processToolTipInfo(const CppTools::ToolTipInfo &info)
     }
 
     if (!info.sizeInBytes.isEmpty())
-        text.append(tr("\n\n%1 bytes").arg(info.sizeInBytes));
+        text.append("\n\n" + tr("%1 bytes").arg(info.sizeInBytes));
 
     setToolTip(text);
     m_reportPriority(priority());