From 8c070031df143b2e28195c0833d012d4995a7ff5 Mon Sep 17 00:00:00 2001
From: kh1 <qt-info@nokia.com>
Date: Thu, 26 Aug 2010 11:57:19 +0200
Subject: [PATCH] Fix build without webkit.
---
src/plugins/help/helpplugin.cpp | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/src/plugins/help/helpplugin.cpp b/src/plugins/help/helpplugin.cpp
index 6ef4451a061..c774fdab7df 100644
--- a/src/plugins/help/helpplugin.cpp
+++ b/src/plugins/help/helpplugin.cpp
@@ -1061,6 +1061,7 @@ void HelpPlugin::handleHelpRequest(const QUrl &url)
void HelpPlugin::slotAboutToShowBackMenu()
{
+#if !defined(QT_NO_WEBKIT)
m_backMenu->clear();
if (QWebHistory *history = viewerForContextMode()->history()) {
const int currentItemIndex = history->currentItemIndex();
@@ -1072,10 +1073,12 @@ void HelpPlugin::slotAboutToShowBackMenu()
m_backMenu->addAction(action);
}
}
+#endif
}
void HelpPlugin::slotAboutToShowNextMenu()
{
+#if !defined(QT_NO_WEBKIT)
m_nextMenu->clear();
if (QWebHistory *history = viewerForContextMode()->history()) {
const int count = history->count();
@@ -1087,10 +1090,12 @@ void HelpPlugin::slotAboutToShowNextMenu()
m_nextMenu->addAction(action);
}
}
+#endif
}
void HelpPlugin::slotOpenActionUrl(QAction *action)
{
+#if !defined(QT_NO_WEBKIT)
if (HelpViewer* viewer = viewerForContextMode()) {
const int offset = action->data().toInt();
QWebHistory *history = viewer->history();
@@ -1101,6 +1106,9 @@ void HelpPlugin::slotOpenActionUrl(QAction *action)
history->goToItem(history->backItems(-1 * offset).first()); // back
}
}
+#else
+ Q_UNUSED(action)
+#endif
}
void HelpPlugin::doSetupIfNeeded()
--
GitLab