Menu: Fix 'selectedIndex' update on item trigger

This demanded some code refactoring, and the introduction
of the parent menu property. Updated auto-tests too.

Change-Id: I3d9070b0a1a76d6c174ccf13965d30413f23aadd
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
Reviewed-by: Caroline Chao <caroline.chao@digia.com>

1 files changed, 6 insertions, 3 deletions

diff --git a/src/controls/qtmenuitem_p.h b/src/controls/qtmenuitem_p.h
index 2cdb9cf8..9bf0e1fe 100644
--- a/src/controls/qtmenuitem_p.h
+++ b/src/controls/qtmenuitem_p.h
@@ -66,8 +66,10 @@ public:
     QtMenuBase(QObject *parent = 0);
     ~QtMenuBase();
 
-    inline QPlatformMenuItem *platformItem() { return m_platformItem; }
+    QtMenu *parentMenu() const;
+    virtual void setParentMenu(QtMenu *parentMenu);
 
+    inline QPlatformMenuItem *platformItem() { return m_platformItem; }
     void syncWithPlatformMenu();
 
     QQuickItem *visualItem() const;
@@ -77,6 +79,7 @@ protected:
     virtual bool isNative() { return m_platformItem != 0; }
 
 private:
+    QtMenu *m_parentMenu;
     QPlatformMenuItem *m_platformItem;
     QPointer<QQuickItem> m_visualItem;
 };
@@ -107,11 +110,11 @@ public:
     QtMenuItem(QObject *parent = 0);
     ~QtMenuItem();
 
+    void setParentMenu(QtMenu *parentMenu);
+
     QtAction *action();
     void setAction(QtAction *a);
 
-    QtMenu *parentMenu() const;
-
     QString text() const;
     void setText(const QString &text);