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

Introduce QML-based welcome screen using desktop components

Browse Source 
Implements new XML-based format for examples, demos & tutorials

Done-with: Primrose Mbanefo <ext-primrose.mbanefo@nokia.com>
Change-Id: I42c0afdb419cffe5637cd4f298e828d09e0fb15a
Reviewed-on: http://codereview.qt.nokia.com/840
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
This commit is contained in:
Daniel Molkentin
2010-11-11 16:49:17 +01:00
committed by Eike Ziller
parent b23aa10890
commit 497dd323ea
150 changed files with 10887 additions and 1761 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -49,10 +49,11 @@
#include <QtHelp/QHelpEngine>
#include <QtNetwork/QNetworkAccessManager>
#include <QtNetwork/QNetworkReply>
#include <QtNetwork/QNetworkRequest>
#include <coreplugin/networkaccessmanager.h>
using namespace Find;
using namespace Help;
using namespace Help::Internal;
@@ -106,7 +107,7 @@ qint64 HelpNetworkReply::readData(char *buffer, qint64 maxlen)
// -- HelpNetworkAccessManager
class HelpNetworkAccessManager : public QNetworkAccessManager
class HelpNetworkAccessManager : public Core::NetworkAccessManager
{
public:
HelpNetworkAccessManager(QObject *parent);
@@ -117,7 +118,7 @@ protected:
};
HelpNetworkAccessManager::HelpNetworkAccessManager(QObject *parent)
: QNetworkAccessManager(parent)
: Core::NetworkAccessManager(parent)
{
}
@@ -125,7 +126,7 @@ QNetworkReply *HelpNetworkAccessManager::createRequest(Operation op,
const QNetworkRequest &request, QIODevice* outgoingData)
{
if (!HelpViewer::isLocalUrl(request.url()))
return QNetworkAccessManager::createRequest(op, request, outgoingData);
return Core::NetworkAccessManager::createRequest(op, request, outgoingData);
QString url = request.url().toString();
const QHelpEngineCore &engine = LocalHelpManager::helpEngine();