diff options
| author | Shawn Rutledge <shawn.rutledge@digia.com> | 2015-03-25 13:33:39 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-03-30 22:01:16 +0000 |
| commit | 509f77cca28aa3edea5523c5869bae4412ed2ccc (patch) | |
| tree | 0a2c30d7d95e109659b26ca8c305c96e3a7e6722 /src/platformsupport/dbustray | |
| parent | ffc74e6d7031015b18b4b9a695b13e25a325979a (diff) | |
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>
Diffstat (limited to 'src/platformsupport/dbustray')
| -rw-r--r-- | src/platformsupport/dbustray/qdbustrayicon.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/platformsupport/dbustray/qdbustrayicon.cpp b/src/platformsupport/dbustray/qdbustrayicon.cpp index 61849024da..fe58bafedc 100644 --- a/src/platformsupport/dbustray/qdbustrayicon.cpp +++ b/src/platformsupport/dbustray/qdbustrayicon.cpp @@ -191,9 +191,10 @@ void QDBusTrayIcon::updateToolTip(const QString &tooltip) QPlatformMenu *QDBusTrayIcon::createMenu() const { qCDebug(qLcTray); + QDBusPlatformMenu *ret = new QDBusPlatformMenu(); if (!m_menu) - const_cast<QDBusTrayIcon *>(this)->m_menu = new QDBusPlatformMenu(); - return m_menu; + const_cast<QDBusTrayIcon *>(this)->m_menu = ret; + return ret; } void QDBusTrayIcon::updateMenu(QPlatformMenu * menu) |