diff options
author | Ivan Solovev <ivan.solovev@qt.io> | 2021-10-29 16:46:28 +0200 |
---|---|---|
committer | Lauri Laanmets <lauri.laanmets@eesti.ee> | 2022-02-28 17:11:36 +0200 |
commit | 6cb20a08b65c73b46e0201213869d213e0397791 (patch) | |
tree | 4246b1bedee6577b17bf9760e26ece2729a2d7da | |
parent | d58daaadff5c38790dddcd1f265c1fa91100a76c (diff) | |
download | qtlocation-6cb20a08b65c73b46e0201213869d213e0397791.tar.gz |
Fix appendChildNode() call
The QSGNode::appendChildNode() method checks that its parameter must
not have a parent. Before this patch we always called appendChildNode()
on a node that already had parent, which was always leading to ASSERT
in a debug build.
Seems that the right approach would be to call this method, if the
node *does not* have a parent.
Task-number: QTBUG-96795
Change-Id: I10e17d17eeadec41f8da8939f4a0009176bbbdbb
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Reviewed-by: Lauri Laanmets <lauri.laanmets@eesti.ee>
-rw-r--r-- | src/location/labs/qsg/qgeomapobjectqsgsupport.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/location/labs/qsg/qgeomapobjectqsgsupport.cpp b/src/location/labs/qsg/qgeomapobjectqsgsupport.cpp index 10582877..a76c3f48 100644 --- a/src/location/labs/qsg/qgeomapobjectqsgsupport.cpp +++ b/src/location/labs/qsg/qgeomapobjectqsgsupport.cpp @@ -161,7 +161,7 @@ void QGeoMapObjectQSGSupport::updateMapObjects(QSGNode *root, QQuickWindow *wind if (!root) return; - if (m_mapObjectsRootNode && m_mapObjectsRootNode->parent()) + if (m_mapObjectsRootNode && !m_mapObjectsRootNode->parent()) root->appendChildNode(m_mapObjectsRootNode.get()); if (!m_mapObjectsRootNode) { |