diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-02-23 11:24:04 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-02-23 11:24:07 +0100 |
| commit | d34353a065c443aac20376cbd88323480d769183 (patch) | |
| tree | da5d86b51c2cf7023356551c4c980849b35bab14 /src/plugins/platforms/xcb/qxcbnativeinterface.h | |
| parent | 4e40b1952695f0b1086ef7b88e8514bd18cf96bf (diff) | |
| parent | 571908f7fc8f5e4ef9a4dfd90102566f6f0fcad2 (diff) | |
Merge dev into 5.5
Change-Id: Id6dbbbfc542c214fe695c6795c6aaf23aedc1cd1
Diffstat (limited to 'src/plugins/platforms/xcb/qxcbnativeinterface.h')
| -rw-r--r-- | src/plugins/platforms/xcb/qxcbnativeinterface.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/plugins/platforms/xcb/qxcbnativeinterface.h b/src/plugins/platforms/xcb/qxcbnativeinterface.h index 388d774853..64da388258 100644 --- a/src/plugins/platforms/xcb/qxcbnativeinterface.h +++ b/src/plugins/platforms/xcb/qxcbnativeinterface.h @@ -121,7 +121,6 @@ private: xcb_atom_t m_sysTraySelectionAtom; xcb_visualid_t m_systrayVisualId; - QDBusMenuConnection *m_dbusTrayConnection; static QXcbScreen *qPlatformScreenForWindow(QWindow *window); |