From 814b36f2ff3ba833ee684b21de9f4697a8419b4e Mon Sep 17 00:00:00 2001
From: con <qtc-committer@nokia.com>
Date: Thu, 9 Apr 2009 12:44:12 +0200
Subject: Sorry, still can't embed videos, crashes too often.

---
 doc/qtcreator.qdoc             | 32 --------------------------------
 src/shared/help/helpviewer.cpp |  5 ++---
 2 files changed, 2 insertions(+), 35 deletions(-)

diff --git a/doc/qtcreator.qdoc b/doc/qtcreator.qdoc
index dc9672eb60..c2129ea57a 100644
--- a/doc/qtcreator.qdoc
+++ b/doc/qtcreator.qdoc
@@ -43,21 +43,6 @@
     \endlist
     \endtable
 
-    \raw HTML
-    <center>
-    <object width="425" height="344">
-    <param name="movie"
-    value="http://www.youtube.com/v/U7yje3D1UM4&hl=en&fs=1"></param>
-    <param name="allowFullScreen" value="true"></param>
-    <param name="allowscriptaccess" value="always"></param>
-    <embed src="http://www.youtube.com/v/U7yje3D1UM4&hl=en&fs=1"
-    type="application/x-shockwave-flash" allowscriptaccess="always"
-    allowfullscreen="true" width="425" height="344">
-    </embed>
-    </object>
-    </center>
-    \endraw
-
     To learn more about the Qt Creator, click on one of the links below:
 
     \list
@@ -1395,23 +1380,6 @@
 
     \title Keyboard Shortcuts
 
-    \raw HTML
-    <center>
-    <object width="480" height="295">
-    <param name="movie"
-    value="http://www.youtube.com/v/6WGCxLIjRNg&hl=en&fs=1">
-    </param>
-    <param name="allowFullScreen" value="true"></param>
-    <param name="allowscriptaccess" value="always"></param>
-    <embed src="http://www.youtube.com/v/6WGCxLIjRNg&hl=en&fs=1"
-    type="application/x-shockwave-flash" allowscriptaccess="always"
-    allowfullscreen="true" width="480" height="295">
-    </embed>
-    </object>
-    </center>
-    \endraw
-
-
     Qt Creator provides various keyboard shortcuts to aid in the development
     process. These shortcuts are listed in the table below:
 
diff --git a/src/shared/help/helpviewer.cpp b/src/shared/help/helpviewer.cpp
index 5aaf78ee9a..89a1335835 100644
--- a/src/shared/help/helpviewer.cpp
+++ b/src/shared/help/helpviewer.cpp
@@ -213,9 +213,8 @@ HelpViewer::HelpViewer(QHelpEngine *engine, CentralWidget *parent)
     : QWebView(parent), helpEngine(engine), parentWidget(parent)
 {    
     setPage(new HelpPage(parent, helpEngine, this));
-    // Enable JavaScript and Plugins for embedded videos
-    settings()->setAttribute(QWebSettings::PluginsEnabled, true);
-    settings()->setAttribute(QWebSettings::JavaEnabled, true);
+    settings()->setAttribute(QWebSettings::PluginsEnabled, false);
+    settings()->setAttribute(QWebSettings::JavaEnabled, false);
 
     page()->setNetworkAccessManager(new HelpNetworkAccessManager(engine, this));
 
-- 
cgit v1.2.3