diff options
Diffstat (limited to 'src/quicktemplates2')
-rw-r--r-- | src/quicktemplates2/qquickmenubar.cpp | 8 | ||||
-rw-r--r-- | src/quicktemplates2/qquickmenubar_p_p.h | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/quicktemplates2/qquickmenubar.cpp b/src/quicktemplates2/qquickmenubar.cpp index 1761d999..f909193f 100644 --- a/src/quicktemplates2/qquickmenubar.cpp +++ b/src/quicktemplates2/qquickmenubar.cpp @@ -76,7 +76,7 @@ QT_BEGIN_NAMESPACE {Focus Management in Qt Quick Controls} */ -QQuickItem *QQuickMenuBarPrivate::beginCreateItem() +QQuickItem *QQuickMenuBarPrivate::beginCreateItem(QQuickMenu *menu) { Q_Q(QQuickMenuBar); if (!delegate) @@ -96,6 +96,8 @@ QQuickItem *QQuickMenuBarPrivate::beginCreateItem() return nullptr; } + if (QQuickMenuBarItem *menuBarItem = qobject_cast<QQuickMenuBarItem *>(item)) + menuBarItem->setMenu(menu); item->setParentItem(q); QQml_setParent_noEvent(item, q); @@ -112,9 +114,7 @@ void QQuickMenuBarPrivate::completeCreateItem() QQuickItem *QQuickMenuBarPrivate::createItem(QQuickMenu *menu) { - QQuickItem *item = beginCreateItem(); - if (QQuickMenuBarItem *menuBarItem = qobject_cast<QQuickMenuBarItem *>(item)) - menuBarItem->setMenu(menu); + QQuickItem *item = beginCreateItem(menu); completeCreateItem(); return item; } diff --git a/src/quicktemplates2/qquickmenubar_p_p.h b/src/quicktemplates2/qquickmenubar_p_p.h index 75fbed73..c214962b 100644 --- a/src/quicktemplates2/qquickmenubar_p_p.h +++ b/src/quicktemplates2/qquickmenubar_p_p.h @@ -69,7 +69,7 @@ public: QQmlListProperty<QQuickMenu> menus(); QQmlListProperty<QObject> contentData(); - QQuickItem *beginCreateItem(); + QQuickItem *beginCreateItem(QQuickMenu *menu); void completeCreateItem(); QQuickItem *createItem(QQuickMenu *menu); |