forked from qt-creator/qt-creator
Fix build without webkit.
This commit is contained in:
@@ -41,7 +41,7 @@
|
|||||||
#include <QtGui/QKeyEvent>
|
#include <QtGui/QKeyEvent>
|
||||||
#include <QtGui/QMenu>
|
#include <QtGui/QMenu>
|
||||||
|
|
||||||
#include <QtHelp/QHelpEngineCore>
|
#include <QtHelp/QHelpEngine>
|
||||||
|
|
||||||
using namespace Find;
|
using namespace Find;
|
||||||
using namespace Help;
|
using namespace Help;
|
||||||
@@ -78,7 +78,7 @@ HelpViewer::~HelpViewer()
|
|||||||
|
|
||||||
QFont HelpViewer::viewerFont() const
|
QFont HelpViewer::viewerFont() const
|
||||||
{
|
{
|
||||||
const QHelpEngineCore &engine = HelpManager::helpEngineCore();
|
const QHelpEngineCore &engine = LocalHelpManager::helpEngine();
|
||||||
return qVariantValue<QFont>(engine.customValue(QLatin1String("font"),
|
return qVariantValue<QFont>(engine.customValue(QLatin1String("font"),
|
||||||
qApp->font()));
|
qApp->font()));
|
||||||
}
|
}
|
||||||
@@ -352,7 +352,7 @@ QVariant HelpViewer::loadResource(int type, const QUrl &name)
|
|||||||
{
|
{
|
||||||
QByteArray ba;
|
QByteArray ba;
|
||||||
if (type < 4) {
|
if (type < 4) {
|
||||||
const QHelpEngineCore &engine = HelpManager::instance().helpEngineCore();
|
const QHelpEngineCore &engine = LocalHelpManager::helpEngine();
|
||||||
ba = engine.fileData(name);
|
ba = engine.fileData(name);
|
||||||
if (name.toString().endsWith(QLatin1String(".svg"), Qt::CaseInsensitive)) {
|
if (name.toString().endsWith(QLatin1String(".svg"), Qt::CaseInsensitive)) {
|
||||||
QImage image;
|
QImage image;
|
||||||
|
Reference in New Issue
Block a user