D-Bus tray icon menus: support submenus

In this case GetLayout will be called with the D-Bus menu ID of the
menu item which contains the submenu.

Task-number: QTBUG-45191
Change-Id: Ia8108272910eac10f040db5865ec4e070da80edb
Reviewed-by: Jørgen Lind <jorgen.lind@theqtcompany.com>

1 files changed, 5 insertions, 2 deletions

diff --git a/src/platformsupport/dbusmenu/qdbusplatformmenu_p.h b/src/platformsupport/dbusmenu/qdbusplatformmenu_p.h
index c211a75419..2519533e32 100644
--- a/src/platformsupport/dbusmenu/qdbusplatformmenu_p.h
+++ b/src/platformsupport/dbusmenu/qdbusplatformmenu_p.h
@@ -133,6 +133,8 @@ public:
     void setFont(const QFont &font) Q_DECL_OVERRIDE { Q_UNUSED(font); }
     void setMenuType(MenuType type) Q_DECL_OVERRIDE { Q_UNUSED(type); }
 
+    int dbusID() const { return m_dbusID; }
+
     void showPopup(const QWindow *parentWindow, const QRect &targetRect, const QPlatformMenuItem *item) Q_DECL_OVERRIDE
     {
         Q_UNUSED(parentWindow);
@@ -152,9 +154,9 @@ public:
     bool operator==(const QDBusPlatformMenu& other) { return m_tag == other.m_tag; }
 
     static QDBusPlatformMenu* byId(int id);
-    static QList<QDBusPlatformMenu *> topLevelMenus();
+    static QList<QDBusPlatformMenu *> topLevelMenus() { return m_topLevelMenus; }
 
-    uint revision() { return m_revision; }
+    uint revision() const { return m_revision; }
 
     void emitUpdated();
 
@@ -173,6 +175,7 @@ private:
     uint m_revision;
     QHash<quintptr, QDBusPlatformMenuItem *> m_itemsByTag;
     QList<QDBusPlatformMenuItem *> m_items;
+    static QList<QDBusPlatformMenu *> m_topLevelMenus;
 };
 
 QT_END_NAMESPACE