aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAlan Alpert <aalpert@blackberry.com>2013-10-23 13:20:39 -0700
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-10-24 18:52:45 +0200
commit42cf36ae020628f5b1ecf68a222f8c2e3317bebe (patch)
tree02f57e21f7427dad9fcd25891e5bc7e90d832e8c /src
parent49f39d9e70d45a1fbdf9f05f59620b9a25a369f5 (diff)
Clear text node references after sub-tree has been cleaned up.
Task-number: QTBUG-34181 Change-Id: I861e192cee2c683efee79e7404a5c9d70b60691f Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
Diffstat (limited to 'src')
-rw-r--r--src/quick/items/qquicktextedit.cpp3
1 files changed, 3 insertions, 0 deletions
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<RootNode *>(oldNode);
TextNodeIterator nodeIterator = d->textNodeMap.begin();
while (nodeIterator != d->textNodeMap.end() && !(*nodeIterator)->dirty())