diff options
author | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2021-05-18 16:59:05 +0200 |
---|---|---|
committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-05-19 16:15:25 +0000 |
commit | 9d7fbfbf5f12b97db8372bf235403903c8c3a595 (patch) | |
tree | 437d7797edf9b09452cff72c2a9b75d93a7581e7 | |
parent | ac41c629fa1be166127d4bce85f6214b9ce987bd (diff) |
Don't call QQml_setParent_noEvent with a nullptr item
Since we check for item being nullptr just before it evidently can be,
in which case QQml_setParent_noEvent would access that nullptr.
Fixes issue raised by code checker in 23fe43ee0a0838e3b680f6dc55cd226e
Change-Id: Ic5306c0c8d89734a606ab90addc6540621696553
Reviewed-by: Oliver Eftevaag <oliver.eftevaag@qt.io>
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
(cherry picked from commit b2f4ee87d888941fd548d9a4009711d1c018073e)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r-- | src/quicktemplates2/qquickmenu.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/quicktemplates2/qquickmenu.cpp b/src/quicktemplates2/qquickmenu.cpp index 61f25d35..c8204b29 100644 --- a/src/quicktemplates2/qquickmenu.cpp +++ b/src/quicktemplates2/qquickmenu.cpp @@ -296,8 +296,8 @@ QQuickItem *QQuickMenuPrivate::beginCreateItem() QQuickItem *item = qobject_cast<QQuickItem *>(object); if (!item) delete object; - - QQml_setParent_noEvent(item, q); + else + QQml_setParent_noEvent(item, q); return item; } |