feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge commit 'origin/1.0.0'

Browse Source
This commit is contained in:
con
2009-02-11 18:36:39 +01:00
parent 3170057843 bcc2a195a3
commit bf4a890e67
3 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/coreplugin/welcomemode.cpp
View File

@@ -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);

8
src/plugins/help/helpplugin.cpp
View File

@@ -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();
}
}

2
src/shared/help/helpviewer.cpp
View File

@@ -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));