summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@theqtcompany.com>2015-05-18 12:46:53 +0200
committerAllan Sandfeld Jensen <allan.jensen@theqtcompany.com>2015-05-18 10:52:12 +0000
commitbc2b1642ca2f70d5df570fc1bc416a18dd5a4713 (patch)
treeef256fc6fd2b7779edd867df1c500c278b5c39bd
parent0f68b45974d9da98af22a5d33269bd31c8726221 (diff)
downloadqtwebkit-bc2b1642ca2f70d5df570fc1bc416a18dd5a4713.tar.gz
Fix potential crash on exit
If we close a browser with a combobox open it may crash on exit due to double deferred deletion. This patch avoids that by using a smarter pointer. Change-Id: I3f1c561b0eb70cf1a51054de51b1027b52cd41b6 Reviewed-by: Michael BrĂ¼ning <michael.bruning@theqtcompany.com>
-rw-r--r--Source/WebKit/qt/WidgetSupport/QtFallbackWebPopup.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/WebKit/qt/WidgetSupport/QtFallbackWebPopup.h b/Source/WebKit/qt/WidgetSupport/QtFallbackWebPopup.h
index 69b49bdbf..975fa4025 100644
--- a/Source/WebKit/qt/WidgetSupport/QtFallbackWebPopup.h
+++ b/Source/WebKit/qt/WidgetSupport/QtFallbackWebPopup.h
@@ -22,6 +22,7 @@
#include "qwebkitplatformplugin.h"
#include <wtf/Platform.h>
+#include <QtCore/QPointer>
#ifndef QT_NO_COMBOBOX
@@ -56,7 +57,7 @@ private Q_SLOTS:
void deleteComboBox();
private:
- QtWebComboBox* m_combo;
+ QPointer<QtWebComboBox> m_combo;
const QWebPageAdapter* m_page;
QRect m_geometry;
QFont m_font;