Skip to content
Snippets Groups Projects
Commit 6c580fd7 authored by kh1's avatar kh1
Browse files

Make sure we can open local files as well.

Reviewed-by: ck
parent 9aa64498
No related branches found
No related tags found
No related merge requests found
...@@ -94,13 +94,7 @@ struct ExtensionMap { ...@@ -94,13 +94,7 @@ struct ExtensionMap {
bool HelpViewer::isLocalUrl(const QUrl &url) bool HelpViewer::isLocalUrl(const QUrl &url)
{ {
const QString &scheme = url.scheme(); return url.scheme() == QLatin1String("qthelp");
return scheme.isEmpty()
|| scheme == QLatin1String("file")
|| scheme == QLatin1String("qrc")
|| scheme == QLatin1String("data")
|| scheme == QLatin1String("qthelp")
|| scheme == QLatin1String("about");
} }
bool HelpViewer::canOpenPage(const QString &url) bool HelpViewer::canOpenPage(const QString &url)
......
...@@ -124,10 +124,8 @@ HelpNetworkAccessManager::HelpNetworkAccessManager(QObject *parent) ...@@ -124,10 +124,8 @@ HelpNetworkAccessManager::HelpNetworkAccessManager(QObject *parent)
QNetworkReply *HelpNetworkAccessManager::createRequest(Operation op, QNetworkReply *HelpNetworkAccessManager::createRequest(Operation op,
const QNetworkRequest &request, QIODevice* outgoingData) const QNetworkRequest &request, QIODevice* outgoingData)
{ {
if (!HelpViewer::isLocalUrl(request.url()) if (!HelpViewer::isLocalUrl(request.url()))
&& request.url().scheme() == QLatin1String("http")) {
return QNetworkAccessManager::createRequest(op, request, outgoingData); return QNetworkAccessManager::createRequest(op, request, outgoingData);
}
QString url = request.url().toString(); QString url = request.url().toString();
const QHelpEngineCore &engine = LocalHelpManager::helpEngine(); const QHelpEngineCore &engine = LocalHelpManager::helpEngine();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment