diff options
| author | Ilya Fedin <fedin-ilja2010@ya.ru> | 2023-01-26 18:44:16 +0400 |
|---|---|---|
| committer | Ilya Fedin <fedin-ilja2010@ya.ru> | 2023-04-05 01:27:48 +0400 |
| commit | 447f3ade9a284d52552352e2752c53be2cf0a57e (patch) | |
| tree | b2c7737f9bb0cc359b2b0e0ed937d340ad05ce9d /src/gui/platform/unix/qgenericunixthemes.cpp | |
| parent | 9d031caf09b2c14328268ef0e871efd30e80eab2 (diff) | |
Revert "D-Bus system tray: properly check whether StatusNotifierHost available"
This reverts commit 23e9b57e3d261f66168a8a28ccb8e5c886b4841f.
The original commit was made based on a KDE workaround for
libdbusmenu-qt crash, but Qt is not using libdbusmenu-qt, Qt is not
watching for StatusNotifierHost registration and Qt is not capable
to switch backends on the fly leading to tray support being
not detected on Plasma Wayland sessions and falling back to the poor
legacy protocol on X11.
Task-number: QTBUG-94871
Pick-to: 6.5
Change-Id: Ic3e4a9c2d6db00299ed1f2b14043c4b675fb8ccc
Reviewed-by: Dmitry Shachnev <mitya57@gmail.com>
Reviewed-by: Axel Spoerl <axel.spoerl@qt.io>
Diffstat (limited to 'src/gui/platform/unix/qgenericunixthemes.cpp')
| -rw-r--r-- | src/gui/platform/unix/qgenericunixthemes.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/platform/unix/qgenericunixthemes.cpp b/src/gui/platform/unix/qgenericunixthemes.cpp index d767767893..cdc179ad2f 100644 --- a/src/gui/platform/unix/qgenericunixthemes.cpp +++ b/src/gui/platform/unix/qgenericunixthemes.cpp @@ -77,7 +77,7 @@ static bool isDBusTrayAvailable() { static bool dbusTrayAvailableKnown = false; if (!dbusTrayAvailableKnown) { QDBusMenuConnection conn; - if (conn.isStatusNotifierHostRegistered()) + if (conn.isWatcherRegistered()) dbusTrayAvailable = true; dbusTrayAvailableKnown = true; qCDebug(qLcTray) << "D-Bus tray available:" << dbusTrayAvailable; |