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

Merge branch 'origin/2.0' (early part)

Browse Source
This commit is contained in:
Erik Verbruggen
2010-06-15 11:30:51 +02:00
parent 0894033f93 512e75a561
commit 05639e4688
21 changed files with 411 additions and 389 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -121,9 +121,14 @@ HelpNetworkAccessManager::HelpNetworkAccessManager(QObject *parent)
{
}
QNetworkReply *HelpNetworkAccessManager::createRequest(Operation /*op*/,
const QNetworkRequest &request, QIODevice* /*outgoingData*/)
QNetworkReply *HelpNetworkAccessManager::createRequest(Operation op,
const QNetworkRequest &request, QIODevice* outgoingData)
{
if (!HelpViewer::isLocalUrl(request.url())
&& request.url().scheme() == QLatin1String("http")) {
return QNetworkAccessManager::createRequest(op, request, outgoingData);
}
QString url = request.url().toString();
const QHelpEngineCore &engine = LocalHelpManager::helpEngine();
// TODO: For some reason the url to load is already wrong (passed from webkit)