diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-20 03:08:34 +1000 |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-20 03:08:34 +1000 |
commit | 3a88b3c9e65f544f2ef5a415b86b25607c858aeb (patch) | |
tree | 900019bf7f21e832a83f9b9987004da7ad420482 /src/plugins/platforms/xlib/qxlibwindow.h | |
parent | f60b3e90e6fd28a543300365b7ad349215a6f849 (diff) | |
parent | 3d34c9b78ee96b20c5b99358fa574ce057e9ef47 (diff) |
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
Full translucent background support in xcb and xlib backend.
Lighthouse xcb and xlib: Add support for transparency of GLX windows.
Lighthouse minimal: Add support for transparency
Compile fixes for Xlib plugin.
Diffstat (limited to 'src/plugins/platforms/xlib/qxlibwindow.h')
-rw-r--r-- | src/plugins/platforms/xlib/qxlibwindow.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/plugins/platforms/xlib/qxlibwindow.h b/src/plugins/platforms/xlib/qxlibwindow.h index 08694a5026..2d11224c23 100644 --- a/src/plugins/platforms/xlib/qxlibwindow.h +++ b/src/plugins/platforms/xlib/qxlibwindow.h @@ -122,6 +122,10 @@ public: Window xWindow() const; GC graphicsContext() const; + inline uint depth() const { return mDepth; } + QImage::Format format() const { return mFormat; } + Visual* visual() const { return mVisual; } + protected: QVector<Atom> getNetWmState() const; void setMWMHints(const QXlibMWMHints &mwmhints); @@ -135,6 +139,10 @@ private: Window x_window; GC gc; + uint mDepth; + QImage::Format mFormat; + Visual* mVisual; + GC createGC(); QPlatformGLContext *mGLContext; |