aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@qt.io>2017-03-22 15:42:53 +0100
committerJ-P Nurmi <jpnurmi@qt.io>2017-03-22 16:29:09 +0000
commit4354efee0f009833947fb0e129da0933deb555fb (patch)
tree9742db1849241998509e96d5ece7b6e024b6d64b /src
parentd9cada5368801d1fd7af8e70cafad33a80156591 (diff)
QQuickPopup: reset the popup item pointer on destruction
To ensure null instead of dangling pointer if the popup item gets accessed by QQuickAttachedObject during the popup's destruction. Change-Id: I55d04133f11f5a10a395c104d9db5db8db8f842f Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src')
-rw-r--r--src/quicktemplates2/qquickpopup.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/quicktemplates2/qquickpopup.cpp b/src/quicktemplates2/qquickpopup.cpp
index ace82553..4dd07b07 100644
--- a/src/quicktemplates2/qquickpopup.cpp
+++ b/src/quicktemplates2/qquickpopup.cpp
@@ -509,6 +509,7 @@ QQuickPopup::~QQuickPopup()
setParentItem(nullptr);
d->popupItem->ungrabShortcut();
delete d->popupItem;
+ d->popupItem = nullptr;
}
/*!