diff options
| author | Michael Brüning <michael.bruning@digia.com> | 2014-06-23 12:17:14 +0200 |
|---|---|---|
| committer | Michael Bruning <michael.bruning@digia.com> | 2014-06-24 14:53:17 +0200 |
| commit | f93fec1adcff7cb2afd1cbe4d3417983d9349257 (patch) | |
| tree | a891378c2fcf1384848ea74f06aad24f035da02e | |
| parent | d393395518e38c686c654c2d9100b8d441645021 (diff) | |
Prevent crashes when the QWebView gets reparented.
Wrap the QWindow pointer in a QPointer so it gets set to NULL
when the QWindow gets deleted without notification.
Task-number: QTBUG-39524
Change-Id: I7c8fbe0f6f1921a7b48c58dc502d6a0a3409d084
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
| -rw-r--r-- | Source/WebKit/qt/WidgetApi/qwebpage_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/WebKit/qt/WidgetApi/qwebpage_p.h b/Source/WebKit/qt/WidgetApi/qwebpage_p.h index 8ba6c4c40..604c0a540 100644 --- a/Source/WebKit/qt/WidgetApi/qwebpage_p.h +++ b/Source/WebKit/qt/WidgetApi/qwebpage_p.h @@ -199,7 +199,7 @@ public: QAction *actions[QWebPage::WebActionCount]; - QWindow* window; + QPointer <QWindow> window; QWidget* inspectorFrontend; QWebInspector* inspector; bool inspectorIsInternalOnly; // True if created through the Inspect context menu action |