diff options
author | Jesse Barnes <jbarnes@virtuousgeek.org> | 2010-10-27 21:49:16 (GMT) |
---|---|---|
committer | Jørgen Lind <jorgen.lind@nokia.com> | 2011-01-25 18:00:30 (GMT) |
commit | cbe7ab5f5da9c14fb6acef3f6d29b319ec2dcc4a (patch) | |
tree | 0ed987bd40da72d4ae502a45d7915c27d862f2b9 /src/plugins/platforms | |
parent | 81e5d2db862cfaf58eb6394c9fe1968547926c78 (diff) | |
download | Qt-cbe7ab5f5da9c14fb6acef3f6d29b319ec2dcc4a.zip Qt-cbe7ab5f5da9c14fb6acef3f6d29b319ec2dcc4a.tar.gz Qt-cbe7ab5f5da9c14fb6acef3f6d29b319ec2dcc4a.tar.bz2 |
Wayland: set parent window pointer in setParent()
We'll need this to handle GL widgets.
Diffstat (limited to 'src/plugins/platforms')
-rw-r--r-- | src/plugins/platforms/wayland/qwaylandintegration.cpp | 3 | ||||
-rw-r--r-- | src/plugins/platforms/wayland/qwaylandintegration.h | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/plugins/platforms/wayland/qwaylandintegration.cpp b/src/plugins/platforms/wayland/qwaylandintegration.cpp index 866a197..29cd0ee 100644 --- a/src/plugins/platforms/wayland/qwaylandintegration.cpp +++ b/src/plugins/platforms/wayland/qwaylandintegration.cpp @@ -460,8 +460,7 @@ void QWaylandWindow::setParent(const QPlatformWindow *parent) { QWaylandWindow *wParent = (QWaylandWindow *)parent; - mSurface = wParent->surface(); - wParent->attach(mBuffer); + mParentWindow = wParent; } void QWaylandWindow::setVisible(bool visible) diff --git a/src/plugins/platforms/wayland/qwaylandintegration.h b/src/plugins/platforms/wayland/qwaylandintegration.h index e26f9e3..e65c141 100644 --- a/src/plugins/platforms/wayland/qwaylandintegration.h +++ b/src/plugins/platforms/wayland/qwaylandintegration.h @@ -158,6 +158,7 @@ public: QPlatformGLContext *glContext() const; void attach(QWaylandBuffer *buffer); QWaylandBuffer *getBuffer(void) { return mBuffer; } + QWaylandWindow *getParentWindow(void) { return mParentWindow; } private: struct wl_surface *mSurface; @@ -166,6 +167,7 @@ private: WId mWindowId; QWaylandBuffer *mBuffer; + QWaylandWindow *mParentWindow; }; class QWaylandIntegration : public QPlatformIntegration |