diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2010-01-25 14:07:14 (GMT) |
|---|---|---|
| committer | Jesper Thomschutz <jesper.thomschutz@nokia.com> | 2010-02-03 12:36:15 (GMT) |
| commit | fda9e20ce8cf7ce5fb6cdbb07823172813440af4 (patch) | |
| tree | db8660db5048ced66c500e24e72ee552ac186c84 | |
| parent | f3f39c48b7fb99a2ba4aba8d64d75fcf843d4ebd (diff) | |
| download | Qt-fda9e20ce8cf7ce5fb6cdbb07823172813440af4.zip Qt-fda9e20ce8cf7ce5fb6cdbb07823172813440af4.tar.gz Qt-fda9e20ce8cf7ce5fb6cdbb07823172813440af4.tar.bz2 | |
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( a54fd11a3abcd6d9c858e8162e85fd1f3aa21db1 )
Changes in WebKit/qt since the last update:
Fix from Girish
(cherry picked from commit df4d9f46e370a35c3178d95cae2a873e8a23ddb5)
| -rw-r--r-- | src/3rdparty/webkit/VERSION | 2 | ||||
| -rw-r--r-- | src/3rdparty/webkit/WebCore/platform/qt/PopupMenuQt.cpp | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/3rdparty/webkit/VERSION b/src/3rdparty/webkit/VERSION index a055668..221c020 100644 --- a/src/3rdparty/webkit/VERSION +++ b/src/3rdparty/webkit/VERSION @@ -8,4 +8,4 @@ The commit imported was from the and has the sha1 checksum - 0bc66e2d86149e0fb6a33428e4f23ebfe83bfde4 + a54fd11a3abcd6d9c858e8162e85fd1f3aa21db1 diff --git a/src/3rdparty/webkit/WebCore/platform/qt/PopupMenuQt.cpp b/src/3rdparty/webkit/WebCore/platform/qt/PopupMenuQt.cpp index 1bd5976..714cac9 100644 --- a/src/3rdparty/webkit/WebCore/platform/qt/PopupMenuQt.cpp +++ b/src/3rdparty/webkit/WebCore/platform/qt/PopupMenuQt.cpp @@ -58,8 +58,10 @@ PopupMenu::PopupMenu(PopupMenuClient* client) PopupMenu::~PopupMenu() { - delete m_popup; - delete m_proxy; + // If we create a proxy, then the deletion of the proxy and the + // combo will be done by the proxy's parent (QGraphicsWebView) + if (!m_proxy) + delete m_popup; } void PopupMenu::clear() |