summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@theqtcompany.com>2015-11-11 11:15:02 +0100
committerFriedemann Kleint <Friedemann.Kleint@theqtcompany.com>2015-11-27 12:05:44 +0000
commit38fb5d03b6b5ab305479df530092f8a669b37e72 (patch)
tree09d9bc4f9225b1f5c75ba678de528e9013037f89 /src
parent812f5779855d94cbe779f77003cc14935e02ef63 (diff)
downloadqtquickcontrols-38fb5d03b6b5ab305479df530092f8a669b37e72.tar.gz
QQuickMenuPopupWindow: Guard m_logicalParentWindow by QPointer.
Fixes a crash in the menubar test. Task-number: QTBUG-49354 Change-Id: I628af74780ed9a47813a3e6fb951ad1dd8e7829a Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
Diffstat (limited to 'src')
-rw-r--r--src/controls/qquickmenupopupwindow_p.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/controls/qquickmenupopupwindow_p.h b/src/controls/qquickmenupopupwindow_p.h
index 8c10f255..deb867b3 100644
--- a/src/controls/qquickmenupopupwindow_p.h
+++ b/src/controls/qquickmenupopupwindow_p.h
@@ -75,7 +75,7 @@ private:
QQuickItem *m_itemAt;
QPointF m_oldItemPos;
QPointF m_initialPos;
- QQuickWindow *m_logicalParentWindow;
+ QPointer<QQuickWindow> m_logicalParentWindow;
QQuickMenu *m_menu;
private: