diff options
Diffstat (limited to 'Source/WebKit/qt/Api/qwebsettings.cpp')
| -rw-r--r-- | Source/WebKit/qt/Api/qwebsettings.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/Source/WebKit/qt/Api/qwebsettings.cpp b/Source/WebKit/qt/Api/qwebsettings.cpp index ddd617a67..ddb8f75fe 100644 --- a/Source/WebKit/qt/Api/qwebsettings.cpp +++ b/Source/WebKit/qt/Api/qwebsettings.cpp @@ -272,6 +272,11 @@ void QWebSettingsPrivate::apply() global->attributes.value(QWebSettings::LocalContentCanAccessFileUrls)); settings->setAllowFileAccessFromFileURLs(value); + value = attributes.value(QWebSettings::AllowRunningInsecureContent, + global->attributes.value(QWebSettings::AllowRunningInsecureContent)); + settings->setAllowDisplayOfInsecureContent(value); + settings->setAllowRunningOfInsecureContent(value); + value = attributes.value(QWebSettings::XSSAuditingEnabled, global->attributes.value(QWebSettings::XSSAuditingEnabled)); settings->setXSSAuditorEnabled(value); @@ -309,6 +314,9 @@ void QWebSettingsPrivate::apply() settings->setFullScreenEnabled(value); #endif + value = attributes.value(QWebSettings::ImagesEnabled, global->attributes.value(QWebSettings::ImagesEnabled)); + settings->setImagesEnabled(value); + settings->setUsesPageCache(WebCore::PageCache::singleton().maxSize()); } else { QList<QWebSettingsPrivate*> settings = *::allSettings(); @@ -588,6 +596,8 @@ QWebSettings::QWebSettings() d->attributes.insert(QWebSettings::Accelerated2dCanvasEnabled, false); d->attributes.insert(QWebSettings::WebSecurityEnabled, true); d->attributes.insert(QWebSettings::FullScreenSupportEnabled, true); + d->attributes.insert(QWebSettings::ImagesEnabled, true); + d->attributes.insert(QWebSettings::AllowRunningInsecureContent, false); d->offlineStorageDefaultQuota = 5 * 1024 * 1024; d->defaultTextEncoding = QLatin1String("iso-8859-1"); d->thirdPartyCookiePolicy = AlwaysAllowThirdPartyCookies; |