aboutsummaryrefslogtreecommitdiffstats
path: root/src/labs/platform/qquicklabsplatformsystemtrayicon.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/labs/platform/qquicklabsplatformsystemtrayicon.cpp')
-rw-r--r--src/labs/platform/qquicklabsplatformsystemtrayicon.cpp9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/labs/platform/qquicklabsplatformsystemtrayicon.cpp b/src/labs/platform/qquicklabsplatformsystemtrayicon.cpp
index fa430a69e6..dee37a50f7 100644
--- a/src/labs/platform/qquicklabsplatformsystemtrayicon.cpp
+++ b/src/labs/platform/qquicklabsplatformsystemtrayicon.cpp
@@ -258,10 +258,15 @@ void QQuickLabsPlatformSystemTrayIcon::setMenu(QQuickLabsPlatformMenu *menu)
if (m_menu)
m_menu->setSystemTrayIcon(nullptr);
- if (menu) {
+
+ if (menu)
menu->setSystemTrayIcon(this);
- if (m_handle && m_complete && menu->create())
+
+ if (m_handle && m_complete) {
+ if (menu && menu->create())
m_handle->updateMenu(menu->handle());
+ else
+ m_handle->updateMenu(nullptr);
}
m_menu = menu;