diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2010-01-20 09:02:19 (GMT) |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2010-01-20 09:02:19 (GMT) |
| commit | 2761e6f57ecd00c3435dbb8a6cf5f40653195d5d (patch) | |
| tree | 6817a7001f20cbc9adb31844683122db03ed9fd0 /src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp | |
| parent | b906feddf1593a837785bc41d65e837e64d31284 (diff) | |
| download | Qt-2761e6f57ecd00c3435dbb8a6cf5f40653195d5d.zip Qt-2761e6f57ecd00c3435dbb8a6cf5f40653195d5d.tar.gz Qt-2761e6f57ecd00c3435dbb8a6cf5f40653195d5d.tar.bz2 | |
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( e15bd5454732bab9ffff4e1e5a755f41fd4e2eff )
Changes in WebKit/qt since the last update:
++ b/WebKit/qt/ChangeLog
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):
Diffstat (limited to 'src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp')
| -rw-r--r-- | src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp | 10 |
1 files changed, 8 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; } |