From 4a3b4acbedbd8a4c66365e7e79dac2a2499b72b2 Mon Sep 17 00:00:00 2001
From: con <qtc-committer@nokia.com>
Date: Wed, 11 Feb 2009 18:11:20 +0100
Subject: [PATCH] Fixes:    - Don't use web plugins or java in QtCreator

RevBy:    - dt
---
 src/plugins/coreplugin/welcomemode.cpp | 2 ++
 src/shared/help/helpviewer.cpp         | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/src/plugins/coreplugin/welcomemode.cpp b/src/plugins/coreplugin/welcomemode.cpp
index 21a25471101..8510f289343 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/shared/help/helpviewer.cpp b/src/shared/help/helpviewer.cpp
index b22726da610..b4319e13cb4 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));