diff options
| author | Dmitry Shachnev <mitya57@gmail.com> | 2016-02-06 14:42:39 +0300 |
|---|---|---|
| committer | Dmitry Shachnev <mitya57@gmail.com> | 2016-02-09 07:22:21 +0000 |
| commit | a4fac65938fdee74c07d34727920fb74087f82c6 (patch) | |
| tree | 6c524c5a19f4b4838bc20fb1f124eac650825f1d /src/platformsupport/dbustray/qdbustrayicon.cpp | |
| parent | 7ad930987da7bb1d9aed17f25a1d99eeb5574a42 (diff) | |
dbustray: Support late registering of tray icon menu
If a menu is added to the tray icon after the icon itself has been registered,
we need to register the menu properly.
Change-Id: I19a6d78848142d66c2cd882746d8d55c0b9a2818
Reviewed-by: Błażej Szczygieł <spaz16@wp.pl>
Reviewed-by: Shawn Rutledge <shawn.rutledge@theqtcompany.com>
Diffstat (limited to 'src/platformsupport/dbustray/qdbustrayicon.cpp')
| -rw-r--r-- | src/platformsupport/dbustray/qdbustrayicon.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/platformsupport/dbustray/qdbustrayicon.cpp b/src/platformsupport/dbustray/qdbustrayicon.cpp index 82df669d9c..87083c8a55 100644 --- a/src/platformsupport/dbustray/qdbustrayicon.cpp +++ b/src/platformsupport/dbustray/qdbustrayicon.cpp @@ -190,6 +190,7 @@ QPlatformMenu *QDBusTrayIcon::createMenu() const void QDBusTrayIcon::updateMenu(QPlatformMenu * menu) { qCDebug(qLcTray) << menu; + bool needsRegistering = !m_menu; if (!m_menu) m_menu = qobject_cast<QDBusPlatformMenu *>(menu); if (!m_menuAdaptor) { @@ -201,6 +202,8 @@ void QDBusTrayIcon::updateMenu(QPlatformMenu * menu) m_menuAdaptor, SIGNAL(LayoutUpdated(uint,int))); } m_menu->emitUpdated(); + if (needsRegistering) + dBusConnection()->registerTrayIconMenu(this); } void QDBusTrayIcon::showMessage(const QString &title, const QString &msg, const QIcon &icon, |