diff options
| author | Samuel Rødal <samuel.rodal@nokia.com> | 2011-02-10 14:28:35 (GMT) |
|---|---|---|
| committer | Samuel Rødal <samuel.rodal@nokia.com> | 2011-02-10 14:30:08 (GMT) |
| commit | 51b657a032cb0b9b3c4c7dbfab52c148cf9253af (patch) | |
| tree | e2aad748bb7bed400758cd94ec2d7eb8bf9f679d /src/plugins/platforms/xcb/qxcbconnection.h | |
| parent | e279d2ae598c7b05dff843e021fc8a08199c36de (diff) | |
| download | Qt-51b657a032cb0b9b3c4c7dbfab52c148cf9253af.zip Qt-51b657a032cb0b9b3c4c7dbfab52c148cf9253af.tar.gz Qt-51b657a032cb0b9b3c4c7dbfab52c148cf9253af.tar.bz2 | |
Added GL support to XCB backend.
We need to use a Xlib / XCB hybrid approach, as GLX depends on Xlib, and
there's no replacement for XCB.
Diffstat (limited to 'src/plugins/platforms/xcb/qxcbconnection.h')
| -rw-r--r-- | src/plugins/platforms/xcb/qxcbconnection.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/plugins/platforms/xcb/qxcbconnection.h b/src/plugins/platforms/xcb/qxcbconnection.h index 97f9ba5..8a225c2 100644 --- a/src/plugins/platforms/xcb/qxcbconnection.h +++ b/src/plugins/platforms/xcb/qxcbconnection.h @@ -232,6 +232,10 @@ public: QXcbKeyboard *keyboard() const { return m_keyboard; } +#ifdef XCB_USE_XLIB_FOR_GLX + void *xlib_display() const { return m_xlib_display; } +#endif + private slots: void eventDispatcher(); @@ -249,6 +253,12 @@ private: QByteArray m_displayName; QXcbKeyboard *m_keyboard; + +#ifdef XCB_USE_XLIB_FOR_GLX + void *m_xlib_display; +#endif }; +#define DISPLAY_FROM_XCB(object) ((Display *)(object->connection()->xlib_display())) + #endif |