feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

ICore: Change some path API to use FilePath

Browse Source 
Change-Id: Id841d6177206a021c9e606ce560b47d1ae6e52b9
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Eike Ziller
2021-04-22 16:15:26 +02:00
parent b2c0554733
commit c1f90aeca2
79 changed files with 260 additions and 244 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/help/helpmanager.cpp
View File

@@ -125,8 +125,7 @@ HelpManager *HelpManager::instance()
QString HelpManager::collectionFilePath()
{
return QDir::cleanPath(ICore::userResourcePath()
+ QLatin1String("/helpcollection.qhc"));
return ICore::userResourcePath().pathAppended("helpcollection.qhc").toString();
}
void HelpManager::registerDocumentation(const QStringList &files)

10
src/plugins/help/helpplugin.cpp
View File

@@ -189,14 +189,14 @@ bool HelpPlugin::initialize(const QStringList &arguments, QString *error)
HelpPluginPrivate::HelpPluginPrivate()
{
const QString &locale = ICore::userInterfaceLanguage();
const QString locale = ICore::userInterfaceLanguage();
if (!locale.isEmpty()) {
auto qtr = new QTranslator(this);
auto qhelptr = new QTranslator(this);
const QString &creatorTrPath = ICore::resourcePath() + "/translations";
const QString &qtTrPath = QLibraryInfo::location(QLibraryInfo::TranslationsPath);
const QString &trFile = QLatin1String("assistant_") + locale;
const QString &helpTrFile = QLatin1String("qt_help_") + locale;
const QString creatorTrPath = ICore::resourcePath().pathAppended("translations").toString();
const QString qtTrPath = QLibraryInfo::location(QLibraryInfo::TranslationsPath);
const QString trFile = QLatin1String("assistant_") + locale;
const QString helpTrFile = QLatin1String("qt_help_") + locale;
if (qtr->load(trFile, qtTrPath) || qtr->load(trFile, creatorTrPath))
QCoreApplication::installTranslator(qtr);
if (qhelptr->load(helpTrFile, qtTrPath) || qhelptr->load(helpTrFile, creatorTrPath))

5
src/plugins/help/macwebkithelpviewer.mm
View File

@@ -584,8 +584,9 @@ void MacWebKitHelpViewer::setHtml(const QString &html)
{
@autoreleasepool {
[m_widget->webView().mainFrame
loadHTMLString:html.toNSString()
baseURL:[NSURL fileURLWithPath:Core::ICore::resourcePath().toNSString()]];
loadHTMLString:html.toNSString()
baseURL:[NSURL
fileURLWithPath:Core::ICore::resourcePath().toString().toNSString()]];
}
}