diff --git a/doc/qtcreator.qdoc b/doc/qtcreator.qdoc index dc9672eb60b..c2129ea57ab 100644 --- a/doc/qtcreator.qdoc +++ b/doc/qtcreator.qdoc @@ -43,21 +43,6 @@ \endlist \endtable - \raw HTML -
- - - - - - - -
- \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 -
- - - - - - - - -
- \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 5aaf78ee9af..89a13358352 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));