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

Make sure we can open local files as well.

Browse Source 
Reviewed-by: ck
This commit is contained in:
kh1
2010-08-16 15:20:09 +02:00
parent 9aa64498f4
commit 6c580fd71b
2 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/help/helpviewer.cpp
View File

@@ -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)

4
src/plugins/help/helpviewer_qwv.cpp
View File

@@ -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();