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

Fix build without webkit.

Browse Source
This commit is contained in:
kh1
2010-06-14 16:57:26 +02:00
parent 27daa542d3
commit 3cf8d21115
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/help/helpviewer_qtb.cpp
View File

@@ -41,7 +41,7 @@
#include <QtGui/QKeyEvent>
#include <QtGui/QMenu>
#include <QtHelp/QHelpEngineCore>
#include <QtHelp/QHelpEngine>
using namespace Find;
using namespace Help;
@@ -78,7 +78,7 @@ HelpViewer::~HelpViewer()
QFont HelpViewer::viewerFont() const
{
const QHelpEngineCore &engine = HelpManager::helpEngineCore();
const QHelpEngineCore &engine = LocalHelpManager::helpEngine();
return qVariantValue<QFont>(engine.customValue(QLatin1String("font"),
qApp->font()));
}
@@ -352,7 +352,7 @@ QVariant HelpViewer::loadResource(int type, const QUrl &name)
{
QByteArray ba;
if (type < 4) {
const QHelpEngineCore &engine = HelpManager::instance().helpEngineCore();
const QHelpEngineCore &engine = LocalHelpManager::helpEngine();
ba = engine.fileData(name);
if (name.toString().endsWith(QLatin1String(".svg"), Qt::CaseInsensitive)) {
QImage image;