diff options
| author | Bjørn Erik Nilsen <bjorn.nilsen@nokia.com> | 2010-01-27 10:47:01 (GMT) |
|---|---|---|
| committer | Bjørn Erik Nilsen <bjorn.nilsen@nokia.com> | 2010-01-27 10:47:01 (GMT) |
| commit | dd8a0d85b070c363c8e4575ec967ae0ad8dfebec (patch) | |
| tree | 5901a878931bbd3c4bffed0b0dba332af5e04181 /src/3rdparty/webkit/WebKit/qt | |
| parent | c0160230c4fd6f226d0c5ddabe3762f5fa855768 (diff) | |
| parent | ec90f6ed28ec735ce963c4257ea1095ecbc6c6ba (diff) | |
| download | Qt-dd8a0d85b070c363c8e4575ec967ae0ad8dfebec.zip Qt-dd8a0d85b070c363c8e4575ec967ae0ad8dfebec.tar.gz Qt-dd8a0d85b070c363c8e4575ec967ae0ad8dfebec.tar.bz2 | |
Merge commit 'qt/4.6' into kinetic-declarativeui
Diffstat (limited to 'src/3rdparty/webkit/WebKit/qt')
| -rw-r--r-- | src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp | 10 | ||||
| -rw-r--r-- | src/3rdparty/webkit/WebKit/qt/ChangeLog | 10 |
2 files changed, 18 insertions, 2 deletions
diff --git a/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp b/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp index 6d08c32..a289ec0 100644 --- a/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp +++ b/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp @@ -1708,8 +1708,14 @@ QWebPage::~QWebPage() FrameLoader *loader = d->mainFrame->d->frame->loader(); if (loader) loader->detachFromParent(); - if (d->inspector) - d->inspector->setPage(0); + if (d->inspector) { + // Since we have to delete an internal inspector, + // call setInspector(0) directly to prevent potential crashes + if (d->inspectorIsInternalOnly) + d->setInspector(0); + else + d->inspector->setPage(0); + } delete d; } diff --git a/src/3rdparty/webkit/WebKit/qt/ChangeLog b/src/3rdparty/webkit/WebKit/qt/ChangeLog index cd47982..ee555f3 100644 --- a/src/3rdparty/webkit/WebKit/qt/ChangeLog +++ b/src/3rdparty/webkit/WebKit/qt/ChangeLog @@ -1,3 +1,13 @@ +2009-11-19 Jocelyn Turcotte <jocelyn.turcotte@nokia.com> + + Reviewed by Kenneth Rohde Christiansen. + + [Qt] Fix QWebInspector destruction problem. + https://bugs.webkit.org/show_bug.cgi?id=31664 + + * Api/qwebpage.cpp: + (QWebPage::~QWebPage): + 2010-01-14 Simon Hausmann <simon.hausmann@nokia.com> Reviewed by Kenneth Rohde Christiansen. |