summaryrefslogtreecommitdiffstats
path: root/src/plugins/platforms/xlib/qxlibwindow.h
diff options
context:
space:
mode:
authorOlivier Goffart <olivier.goffart@nokia.com>2011-06-24 09:12:15 (GMT)
committerOlivier Goffart <olivier.goffart@nokia.com>2011-06-24 09:12:15 (GMT)
commit11cc0f661911628fb51c92d30c684eb1cea01145 (patch)
tree3f89e82669b12ea49e0586d3ff14c0d01594301e /src/plugins/platforms/xlib/qxlibwindow.h
parent9d5b0e31f287ce502eaf9a2c0876d900424c80ab (diff)
parent164728f711136356a6c3482f762321b01c9d82dd (diff)
downloadQt-11cc0f661911628fb51c92d30c684eb1cea01145.zip
Qt-11cc0f661911628fb51c92d30c684eb1cea01145.tar.gz
Qt-11cc0f661911628fb51c92d30c684eb1cea01145.tar.bz2
Merge remote-tracking branch 'origin/4.8'
Diffstat (limited to 'src/plugins/platforms/xlib/qxlibwindow.h')
-rw-r--r--src/plugins/platforms/xlib/qxlibwindow.h8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/plugins/platforms/xlib/qxlibwindow.h b/src/plugins/platforms/xlib/qxlibwindow.h
index adc2f85..da29efb 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;