Merge remote-tracking branch 'origin/2.8'

Conflicts:
	src/plugins/coreplugin/documentmanager.cpp

Change-Id: I6dc025bc0f31eb694c8d9e2dd4ea5cc888ee8a94

src/plugins/coreplugin/icore.cpp

@@ -504,6 +504,13 @@ QString ICore::userResourcePath()
     return urp;
 }
 
+QString ICore::documentationPath()
+{
+    const QString docPath = QLatin1String(Utils::HostOsInfo::isMacHost()
+                                            ? "/../Resources/doc" : "/../share/doc/qtcreator");
+    return QDir::cleanPath(QCoreApplication::applicationDirPath() + docPath);
+}
+
 static QString compilerString()
 {
 #if defined(Q_CC_CLANG) // must be before GNU, because clang claims to be GNU too