summaryrefslogtreecommitdiffstats
path: root/src/platformsupport/dbustray/qdbustrayicon_p.h
diff options
context:
space:
mode:
authorShawn Rutledge <shawn.rutledge@digia.com>2015-03-30 15:28:26 +0200
committerShawn Rutledge <shawn.rutledge@digia.com>2015-03-31 06:14:53 +0000
commitbe242ed09479616c0f47aa76cc6329cfc5d52b37 (patch)
tree82cf2d192d76c4e2eb49412e224243342a08ad2b /src/platformsupport/dbustray/qdbustrayicon_p.h
parent0e55d8dfad40adfc1e2d9c6246b1f680ef4f2285 (diff)
D-Bus system tray: emit activated on middle and right click
The ActivationReason provides the type of click. If the icon has a D-Bus menu, then QStatusNotifierItemAdaptor::ContextMenu will not be called: the tray is responsible for opening the context menu. But an application can alternatively do something different with a right-click by not providing a menu, and instead handling the QSystemTrayIcon::activated signal with the Context reason. Simplified the code by emitting the signal directly in QStatusNotifierItemAdaptor. Task-number: QTBUG-44929 Change-Id: Ia062a9a2fd99554418d58a1ff6ecd4e862035198 Reviewed-by: Jørgen Lind <jorgen.lind@theqtcompany.com>
Diffstat (limited to 'src/platformsupport/dbustray/qdbustrayicon_p.h')
-rw-r--r--src/platformsupport/dbustray/qdbustrayicon_p.h4
1 files changed, 0 insertions, 4 deletions
diff --git a/src/platformsupport/dbustray/qdbustrayicon_p.h b/src/platformsupport/dbustray/qdbustrayicon_p.h
index 78dfae7c02..34a89c9018 100644
--- a/src/platformsupport/dbustray/qdbustrayicon_p.h
+++ b/src/platformsupport/dbustray/qdbustrayicon_p.h
@@ -113,10 +113,6 @@ public:
QDBusPlatformMenu *menu() { return m_menu; }
-public Q_SLOTS:
- void activate(int x, int y);
- void contextMenu(int x, int y);
-
signals:
void categoryChanged();
void statusChanged(QString arg);