summaryrefslogtreecommitdiff
path: root/Source/WebKit/qt/WidgetApi/qwebpage.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'Source/WebKit/qt/WidgetApi/qwebpage.cpp')
-rw-r--r--Source/WebKit/qt/WidgetApi/qwebpage.cpp12
1 files changed, 1 insertions, 11 deletions
diff --git a/Source/WebKit/qt/WidgetApi/qwebpage.cpp b/Source/WebKit/qt/WidgetApi/qwebpage.cpp
index f8d8c0abc..261e032fd 100644
--- a/Source/WebKit/qt/WidgetApi/qwebpage.cpp
+++ b/Source/WebKit/qt/WidgetApi/qwebpage.cpp
@@ -663,16 +663,6 @@ void QWebPagePrivate::createWebInspector(QObject** inspectorView, QWebPageAdapte
QWebPage* page = new WebKit::InspectorClientWebPage;
*inspectorView = page->view();
*inspectorPage = page->d;
-
- // FIXME: Find out what's going on with Settings
- page->settings()->setAttribute(QWebSettings::AcceleratedCompositingEnabled, false);
-
- // We treat "qrc:" scheme as local, but by default local content is not allowed to use
- // LocalStorage which is required for Inspector to work.
- // See https://bugs.webkit.org/show_bug.cgi?id=155265
- // Alternatively we can make "qrc:" scheme non-local like GTK port does:
- // https://bugs.webkit.org/show_bug.cgi?id=155497
- page->settings()->setAttribute(QWebSettings::LocalContentCanAccessRemoteUrls, true);
}
#ifndef QT_NO_MENU
@@ -3219,7 +3209,7 @@ bool QWebPage::supportsExtension(Extension extension) const
if (extension == ChooseMultipleFilesExtension)
return true;
#endif
- return extension == ErrorPageExtension;
+ return extension == ErrorPageExtension && d->settings->testAttribute(QWebSettings::ErrorPageEnabled);
}
/*!