diff --git a/src/plugins/coreplugin/icore.cpp b/src/plugins/coreplugin/icore.cpp index 8558527758593677c5f3a20193658eb4a2bd36d8..2a616b592ecb22ff17cf64e9d5d1169620dc1f85 100644 --- a/src/plugins/coreplugin/icore.cpp +++ b/src/plugins/coreplugin/icore.cpp @@ -511,6 +511,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 diff --git a/src/plugins/coreplugin/icore.h b/src/plugins/coreplugin/icore.h index f8d8b261c262ced071367188abcf360a4aeae185..461035772f1ce22d1c769a9290b2495687a89ae7 100644 --- a/src/plugins/coreplugin/icore.h +++ b/src/plugins/coreplugin/icore.h @@ -112,6 +112,7 @@ public: static QString resourcePath(); static QString userResourcePath(); + static QString documentationPath(); static QString versionString(); static QString buildCompatibilityString(); diff --git a/src/plugins/help/helpplugin.cpp b/src/plugins/help/helpplugin.cpp index d3fca830853309a387a7d77b2ac4587ab6e1c41d..65c1c210474ae0e75649f0b3b103fb9f081a1742 100644 --- a/src/plugins/help/helpplugin.cpp +++ b/src/plugins/help/helpplugin.cpp @@ -105,12 +105,6 @@ const char SB_OPENPAGES[] = "OpenPages"; #define IMAGEPATH ":/help/images/" -static QString docPath() -{ - return QLatin1String(Utils::HostOsInfo::isMacHost() - ? "/../Resources/doc/" : "/../share/doc/qtcreator/"); -} - using namespace Core; static QToolButton *toolButton(QAction *action) @@ -391,7 +385,7 @@ void HelpPlugin::extensionsInitialized() QStringList filesToRegister; // we might need to register creators inbuild help filesToRegister.append(QDir::cleanPath(QCoreApplication::applicationDirPath() - + docPath() + QLatin1String("qtcreator.qch"))); + + ICore::documentationPath() + QLatin1String("/qtcreator.qch"))); Core::HelpManager::instance()->registerDocumentation(filesToRegister); }