Sync the QQuickPlatformMenu so it has a handle ready when its a sub menu

When dynamically creating a menu, it will be parented after it has
created the handle the first time around. Therefore it loses the original
handle and does not get a new one when needed. So by calling sync()
before it is set as the sub menu then it can get a handle created if
necessary in time.

Change-Id: Ia39f49f99758802dd19ff1df478b05ac5e403ea8
Pick-to: 5.15
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>

1 files changed, 7 insertions, 2 deletions

diff --git a/src/imports/platform/qquickplatformmenuitem.cpp b/src/imports/platform/qquickplatformmenuitem.cpp
index 45e6ba2d..3a717047 100644
--- a/src/imports/platform/qquickplatformmenuitem.cpp
+++ b/src/imports/platform/qquickplatformmenuitem.cpp
@@ -166,8 +166,13 @@ void QQuickPlatformMenuItem::sync()
     m_handle->setText(m_text);
     m_handle->setFont(m_font);
     m_handle->setHasExclusiveGroup(m_group && m_group->isExclusive());
-    if (m_subMenu && m_subMenu->handle())
-        m_handle->setMenu(m_subMenu->handle());
+    if (m_subMenu) {
+        // Sync first as dynamically created menus may need to get the
+        // handle recreated
+        m_subMenu->sync();
+        if (m_subMenu->handle())
+            m_handle->setMenu(m_subMenu->handle());
+    }
 
 #if QT_CONFIG(shortcut)
     QKeySequence sequence;