From bf22ffbf9e16ee137e4aa05ec2d10e18f145374c Mon Sep 17 00:00:00 2001 From: nowrep Date: Sat, 5 Nov 2011 22:02:23 +0100 Subject: [PATCH] Setting additional QWebSettings arguments when building w/ QtWebKit 2.2 Namely HyperlinkAuditingEnabled and JavascriptCanCloseWindows. See http://gitorious.org/+qtwebkit- --- src/app/mainapplication.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/app/mainapplication.cpp b/src/app/mainapplication.cpp index d7f4c882d..d5423730b 100644 --- a/src/app/mainapplication.cpp +++ b/src/app/mainapplication.cpp @@ -249,10 +249,15 @@ void MainApplication::loadSettings() m_websettings->setAttribute(QWebSettings::ZoomTextOnly, zoomTextOnly); m_websettings->setAttribute(QWebSettings::PrintElementBackgrounds, printElBg); #ifdef USE_WEBGL - m_websettings->setAttribute(QWebSettings::WebGLEnabled , true); + m_websettings->setAttribute(QWebSettings::WebGLEnabled, true); m_websettings->setAttribute(QWebSettings::AcceleratedCompositingEnabled, true); #endif +#if (QTWEBKIT_VERSION >= QTWEBKIT_VERSION_CHECK(2, 2, 0)) + m_websettings->setAttribute(QWebSettings::HyperlinkAuditingEnabled, true); + m_websettings->setAttribute(QWebSettings::JavascriptCanCloseWindows, true); +#endif + m_websettings->setFontFamily(QWebSettings::StandardFont, settings.value("StandardFont", m_websettings->fontFamily(QWebSettings::StandardFont)).toString()); m_websettings->setFontFamily(QWebSettings::CursiveFont, settings.value("CursiveFont", m_websettings->fontFamily(QWebSettings::CursiveFont)).toString()); m_websettings->setFontFamily(QWebSettings::FantasyFont, settings.value("FantasyFont", m_websettings->fontFamily(QWebSettings::FantasyFont)).toString());