summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'x11-libs/qt-webkit/files/qt-webkit-4.5.3-no-javascript-crash.patch')
-rw-r--r--x11-libs/qt-webkit/files/qt-webkit-4.5.3-no-javascript-crash.patch23
1 files changed, 23 insertions, 0 deletions
diff --git a/x11-libs/qt-webkit/files/qt-webkit-4.5.3-no-javascript-crash.patch b/x11-libs/qt-webkit/files/qt-webkit-4.5.3-no-javascript-crash.patch
new file mode 100644
index 000000000000..b5a9b01bf140
--- /dev/null
+++ b/x11-libs/qt-webkit/files/qt-webkit-4.5.3-no-javascript-crash.patch
@@ -0,0 +1,23 @@
+--- a/src/3rdparty/webkit/WebKit/qt/Api/qwebframe.cpp
++++ b/src/3rdparty/webkit/WebKit/qt/Api/qwebframe.cpp
+@@ -317,4 +317,6 @@
+ javaScriptWindowObjectCleared() signal.
+
++ If Javascript is not enabled for this page, then this method does nothing.
++
+ The \a object will never be explicitly deleted by QtWebKit.
+ */
+@@ -339,8 +341,13 @@
+ javaScriptWindowObjectCleared() signal.
+
++ If Javascript is not enabled for this page, then this method does nothing.
++
+ The ownership of \a object is specified using \a own.
+ */
+ void QWebFrame::addToJavaScriptWindowObject(const QString &name, QObject *object, QScriptEngine::ValueOwnership ownership)
+ {
++ if (!page()->settings()->testAttribute(QWebSettings::JavascriptEnabled))
++ return;
++
+ JSC::JSLock lock(false);
+ JSDOMWindow* window = toJSDOMWindow(d->frame);