diff options
| author | Samuel Rødal <samuel.rodal@nokia.com> | 2011-09-06 10:49:40 +0200 |
|---|---|---|
| committer | Paul Olav Tvete <paul.tvete@nokia.com> | 2011-09-12 15:25:01 +0200 |
| commit | b51bd8cc6e8a00d86b50c1bd118051562711315f (patch) | |
| tree | 6c4cba5618b8e98f11310c95dd9b1cb0ecbe5e8a /src/plugins/platforms/wayland/qwaylandwindow.cpp | |
| parent | f69e3c2ba78ac60cbc74dbded923a2880839c58a (diff) | |
| parent | 151a17761334038181e3f3b36846757560deadf6 (diff) | |
Merge remote branch 'gerrit/master' into HEAD
Conflicts:
src/plugins/platforms/wayland/qwaylandnativeinterface.cpp
src/plugins/platforms/wayland/qwaylandnativeinterface.h
Change-Id: I64cf2cefa532ba87a92f632e3595ce6914183e9b
Diffstat (limited to 'src/plugins/platforms/wayland/qwaylandwindow.cpp')
| -rw-r--r-- | src/plugins/platforms/wayland/qwaylandwindow.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/plugins/platforms/wayland/qwaylandwindow.cpp b/src/plugins/platforms/wayland/qwaylandwindow.cpp index 48da7b537..601162104 100644 --- a/src/plugins/platforms/wayland/qwaylandwindow.cpp +++ b/src/plugins/platforms/wayland/qwaylandwindow.cpp @@ -149,6 +149,9 @@ void QWaylandWindow::newSurfaceCreated() // do not damage the surface here, as this leads to graphical corruptions in the compositor until // the first frame has been rendered } +#ifdef QT_WAYLAND_WINDOWMANAGER_SUPPORT + QWaylandWindowManagerIntegration::instance()->flushPropertyChanges(this); +#endif } void QWaylandWindow::frameCallback(struct wl_surface *surface, void *data, uint32_t time) |