path: root/src/plugins/platforms/xcb/qxcbsystemtraytracker.cpp
diff options
authorGatis Paeglis <>2017-02-23 16:44:22 +0100
committerGatis Paeglis <>2017-03-10 10:24:48 +0000
commitd55e3bdced8efa69287c968a34fa37148a853f45 (patch)
treea164546d215e2e439fec122e441fcaccc4d3a43d /src/plugins/platforms/xcb/qxcbsystemtraytracker.cpp
parent1567a7c0f41452e9dea5132435e13a6b71a06357 (diff)
xcb: remove code and macros related to Q_XCB_DEBUG
... early spring-cleaning, leaving one block of virtual root debug code that was inappropriately conditioned on Q_XCB_DEBUG; it now gets its own define. Removed Q_XCB_CALL: 1) I don't know anyone who actually uses it. 2) Enabling this feature (via Q_XCB_DEBUG) fails to build (and has been like that for about 1 year). 3) There are better ways to debug X11 client message exchange (see xtrace for example). 4) Using Q_XCB_CALL is a very fragile approach. Grep for example for xcb_change_property and you will see that half of the calls are not wrapped with the Q_XCB_CALL macro. This patch also removes the Q_XCB_NOOP macro. It's unclear what its purpose was. There was a TODO comment in qxcbeglcontext.h suggesting removal of this macro as well. Its evaluation of its parameter, even without Q_XCB_DEBUG, had no side-effects, so its removal should be harmless. Change-Id: I9fa48af454061d8b38f69f308131647cd18f85f4 Reviewed-by: Edward Welbourne <> Reviewed-by: Alexander Volkov <> Reviewed-by: Shawn Rutledge <>
Diffstat (limited to 'src/plugins/platforms/xcb/qxcbsystemtraytracker.cpp')
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/platforms/xcb/qxcbsystemtraytracker.cpp b/src/plugins/platforms/xcb/qxcbsystemtraytracker.cpp
index 3939fc9005..c98879c7df 100644
--- a/src/plugins/platforms/xcb/qxcbsystemtraytracker.cpp
+++ b/src/plugins/platforms/xcb/qxcbsystemtraytracker.cpp
@@ -116,7 +116,7 @@ xcb_window_t QXcbSystemTrayTracker::trayWindow()
m_connection->addWindowEventListener(m_trayWindow, this);
const quint32 mask = XCB_CW_EVENT_MASK;
const quint32 value = XCB_EVENT_MASK_STRUCTURE_NOTIFY;
- Q_XCB_CALL2(xcb_change_window_attributes(m_connection->xcb_connection(), m_trayWindow, mask, &value), m_connection);
+ xcb_change_window_attributes(m_connection->xcb_connection(), m_trayWindow, mask, &value);
return m_trayWindow;