From 777153215a3c642a417f4ed05900b6294fe20d1e Mon Sep 17 00:00:00 2001
From: kh1 <qt-info@nokia.com>
Date: Tue, 6 Apr 2010 11:38:04 +0200
Subject: [PATCH] Remove some more webkit defines.
Font stuff is now handled completely inside the help viewer class.
Reviewed-by: ck
---
src/plugins/help/helpplugin.cpp | 11 -----------
1 file changed, 11 deletions(-)
diff --git a/src/plugins/help/helpplugin.cpp b/src/plugins/help/helpplugin.cpp
index d43bc8f674b..fa495888989 100644
--- a/src/plugins/help/helpplugin.cpp
+++ b/src/plugins/help/helpplugin.cpp
@@ -80,12 +80,6 @@
#include <QtHelp/QHelpEngine>
#include <QtHelp/QHelpEngineCore>
-#if defined(QT_NO_WEBKIT)
-# include <QtGui/QApplication>
-#else
-# include <QtWebKit/QWebSettings>
-#endif
-
using namespace Core::Constants;
using namespace Help;
using namespace Help::Internal;
@@ -518,11 +512,6 @@ void HelpPlugin::createRightPaneContextViewer()
m_core->addContextObject(new Core::BaseContext(m_helpViewerForSideBar, QList<int>()
<< m_core->uniqueIDManager()->uniqueIdentifier(Constants::C_HELP_SIDEBAR), this));
-#if defined(QT_NO_WEBKIT)
- m_helpViewerForSideBar->setFont(qVariantValue<QFont>(m_helpManager->helpEngineCore()
- .customValue(QLatin1String("font"), QApplication::font())));
-#endif
-
QAction *copy = new QAction(this);
Core::Command *cmd = m_core->actionManager()->registerAction(copy, Core::Constants::COPY,
QList<int>() << m_core->uniqueIDManager()->uniqueIdentifier(Constants::C_HELP_SIDEBAR));
--
GitLab