diff options
| author |   Alex Alexander <wired@gentoo.org> | 2010-02-17 21:20:01 +0000 |
|---|---|---|
| committer | Alex Alexander <wired@gentoo.org> | 2010-02-17 21:20:01 +0000 |
| commit | 7ff2df6ddb6023fffdf2232ecb9a57cd01da1c58 (patch) | |
| tree | 5a89b05f40bf4790ab7bc9ca14bf96035b2139c0 /x11-libs/qt-webkit/files | |
| parent | Maintain. (diff) | |
| download | gentoo-2-7ff2df6ddb6023fffdf2232ecb9a57cd01da1c58.tar.gz gentoo-2-7ff2df6ddb6023fffdf2232ecb9a57cd01da1c58.tar.bz2 gentoo-2-7ff2df6ddb6023fffdf2232ecb9a57cd01da1c58.zip | |
[x11-libs/qt-webkit-4.5.3-r2] added patch that fixes arora's no-javascript crash
(Portage version: 2.2_rc62/cvs/Linux x86_64)
Diffstat (limited to 'x11-libs/qt-webkit/files')
| -rw-r--r-- | x11-libs/qt-webkit/files/qt-webkit-4.5.3-no-javascript-crash.patch | 23 |
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); |