From 42cf36ae020628f5b1ecf68a222f8c2e3317bebe Mon Sep 17 00:00:00 2001 From: Alan Alpert Date: Wed, 23 Oct 2013 13:20:39 -0700 Subject: Clear text node references after sub-tree has been cleaned up. Task-number: QTBUG-34181 Change-Id: I861e192cee2c683efee79e7404a5c9d70b60691f Reviewed-by: Gunnar Sletta --- src/quick/items/qquicktextedit.cpp | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src') diff --git a/src/quick/items/qquicktextedit.cpp b/src/quick/items/qquicktextedit.cpp index 48518f1ba3..be2cd37dee 100644 --- a/src/quick/items/qquicktextedit.cpp +++ b/src/quick/items/qquicktextedit.cpp @@ -1769,6 +1769,9 @@ QSGNode *QQuickTextEdit::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData * d->updateType = QQuickTextEditPrivate::UpdateNone; + if (!oldNode) // If we had any text node references, they were deleted along with the root node + d->textNodeMap.clear(); + RootNode *rootNode = static_cast(oldNode); TextNodeIterator nodeIterator = d->textNodeMap.begin(); while (nodeIterator != d->textNodeMap.end() && !(*nodeIterator)->dirty()) -- cgit v1.2.3