Commit 77715321 authored by kh1's avatar kh1
Browse files

Remove some more webkit defines.

Font stuff is now handled completely inside the help viewer class.

Reviewed-by: ck
parent 29e8e70b
...@@ -80,12 +80,6 @@ ...@@ -80,12 +80,6 @@
#include <QtHelp/QHelpEngine> #include <QtHelp/QHelpEngine>
#include <QtHelp/QHelpEngineCore> #include <QtHelp/QHelpEngineCore>
#if defined(QT_NO_WEBKIT)
# include <QtGui/QApplication>
#else
# include <QtWebKit/QWebSettings>
#endif
using namespace Core::Constants; using namespace Core::Constants;
using namespace Help; using namespace Help;
using namespace Help::Internal; using namespace Help::Internal;
...@@ -518,11 +512,6 @@ void HelpPlugin::createRightPaneContextViewer() ...@@ -518,11 +512,6 @@ void HelpPlugin::createRightPaneContextViewer()
m_core->addContextObject(new Core::BaseContext(m_helpViewerForSideBar, QList<int>() m_core->addContextObject(new Core::BaseContext(m_helpViewerForSideBar, QList<int>()
<< m_core->uniqueIDManager()->uniqueIdentifier(Constants::C_HELP_SIDEBAR), this)); << 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); QAction *copy = new QAction(this);
Core::Command *cmd = m_core->actionManager()->registerAction(copy, Core::Constants::COPY, Core::Command *cmd = m_core->actionManager()->registerAction(copy, Core::Constants::COPY,
QList<int>() << m_core->uniqueIDManager()->uniqueIdentifier(Constants::C_HELP_SIDEBAR)); QList<int>() << m_core->uniqueIDManager()->uniqueIdentifier(Constants::C_HELP_SIDEBAR));
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment