diff options
author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2022-05-19 07:05:18 +0300 |
---|---|---|
committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2022-05-19 07:05:18 +0300 |
commit | a970e15d7281d2d13485a486c6debadf46ed7950 (patch) | |
tree | 449e0526a803758301861c8a8ce9f4ed96385981 /src/quicktemplates2/qquickmenu.cpp | |
parent | 69c1a1e86b9774fbee6958021055c899151e1955 (diff) | |
parent | f3377bd4d790fb07bdcac06ac9f803856fee07d9 (diff) |
Merge remote-tracking branch 'origin/tqtc/lts-5.15.5' into tqtc/lts-5.15-opensourcev5.15.5-lts-lgpl
Change-Id: Iec31024aafdb1785574ba6450ca754f4660c05ee
Diffstat (limited to 'src/quicktemplates2/qquickmenu.cpp')
-rw-r--r-- | src/quicktemplates2/qquickmenu.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/quicktemplates2/qquickmenu.cpp b/src/quicktemplates2/qquickmenu.cpp index 9fd63587..a934fa8a 100644 --- a/src/quicktemplates2/qquickmenu.cpp +++ b/src/quicktemplates2/qquickmenu.cpp @@ -222,6 +222,7 @@ QQuickMenuPrivate::QQuickMenuPrivate() void QQuickMenuPrivate::init() { Q_Q(QQuickMenu); + QQuickPopupPrivate::init(); contentModel = new QQmlObjectModel(q); } @@ -295,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; } |