diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-26 03:07:24 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-26 03:07:24 +0200 |
| commit | 9898744e2ea17e805da559faeb677c9f5bbe080f (patch) | |
| tree | 36cb67cd6fa0e60d8bf9044ddd4623c5539b0baa /src/quicktemplates2/qquickmenubar.cpp | |
| parent | f5211d76cb92254af4a14d56599e5817f2368de8 (diff) | |
| parent | b395f94ec3032b11eed5708acf4e72244ea728c2 (diff) | |
Merge remote-tracking branch 'origin/5.13' into 5.14
Change-Id: I5da24592eb292ef4f430d734fec234166ce6e1e3
Diffstat (limited to 'src/quicktemplates2/qquickmenubar.cpp')
| -rw-r--r-- | src/quicktemplates2/qquickmenubar.cpp | 8 |
1 files changed, 4 insertions, 4 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; } |