diff --git a/src/plugins/coreplugin/welcomemode.cpp b/src/plugins/coreplugin/welcomemode.cpp
index 21a25471101f349bb64f09bdbe48f34e9a43e0ac..8510f28934393e9963521d8ad5ab8d8c750ddffe 100644
--- a/src/plugins/coreplugin/welcomemode.cpp
+++ b/src/plugins/coreplugin/welcomemode.cpp
@@ -151,6 +151,8 @@ WelcomeMode::WelcomeMode() :
l->addWidget(m_d->m_webview);
m_d->m_webview->setAcceptDrops(false);
+ m_d->m_webview->settings()->setAttribute(QWebSettings::PluginsEnabled, false);
+ m_d->m_webview->settings()->setAttribute(QWebSettings::JavaEnabled, false);
#else
m_d->m_label->setWordWrap(true);
diff --git a/src/plugins/help/helpplugin.cpp b/src/plugins/help/helpplugin.cpp
index 4d48afd0b20495a2d8f6cfd2cbfce1235aa19c22..8dfb429c4d29dc947373c88da5e9bb56a7691636 100644
--- a/src/plugins/help/helpplugin.cpp
+++ b/src/plugins/help/helpplugin.cpp
@@ -570,8 +570,8 @@ void HelpPlugin::activateContext()
}
if (viewer) {
- viewer->setHtml(tr("<title>No Documentation</title><br><br>"
- "<center><b>%1</b><br><br>No documentation available.").
+ viewer->setHtml(tr("<html><head><title>No Documentation</title></head><body><br/>"
+ "<center><b>%1</b><br/>No documentation available.</center></body></html>").
arg(id));
viewer->setSource(QUrl());
//activateIndex();
@@ -589,8 +589,8 @@ void HelpPlugin::activateContext()
if (viewer) {
viewer->setSource(QUrl());
- viewer->setHtml("<title>No Documentation</title><br><br><center>No"
- " documentation available.");
+ viewer->setHtml("<html><head><title>No Documentation</title></head><body><br/><br/><center>No"
+ " documentation available.</center></body></html>");
//activateIndex();
}
}
diff --git a/src/shared/help/helpviewer.cpp b/src/shared/help/helpviewer.cpp
index b22726da610ca5177d57e6b19f77c964095b6300..b4319e13cb4421897164ea44eafe70361e82d8bf 100644
--- a/src/shared/help/helpviewer.cpp
+++ b/src/shared/help/helpviewer.cpp
@@ -216,6 +216,8 @@ bool HelpPage::acceptNavigationRequest(QWebFrame *,
HelpViewer::HelpViewer(QHelpEngine *engine, CentralWidget *parent)
: QWebView(parent), helpEngine(engine), parentWidget(parent)
{
+ settings()->setAttribute(QWebSettings::PluginsEnabled, false);
+ settings()->setAttribute(QWebSettings::JavaEnabled, false);
setPage(new HelpPage(parent, helpEngine, this));
page()->setNetworkAccessManager(new HelpNetworkAccessManager(engine, this));