summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Olav Tvete <paul.tvete@theqtcompany.com>2016-01-11 14:28:24 +0100
committerPaul Olav Tvete <paul.tvete@theqtcompany.com>2016-01-11 15:45:38 +0000
commitbaec8be7294a176620253dbbc1b2938cf96c8360 (patch)
tree7c5a5da110a13e65ae64ceb3278ccf3c2df86ea1
parentb0d02b3cfd39f6a8815cc07848ca865257cd2c9f (diff)
Don't create wl_surface for desktop widgetsv5.6.0-rc1
Change-Id: I3ebcb49a4acf230b9515c0317aab2307dcb9270b Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
-rw-r--r--src/client/qwaylandwindow.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/client/qwaylandwindow.cpp b/src/client/qwaylandwindow.cpp
index ed7b656d..fe0d6bb9 100644
--- a/src/client/qwaylandwindow.cpp
+++ b/src/client/qwaylandwindow.cpp
@@ -88,8 +88,8 @@ QWaylandWindow::QWaylandWindow(QWindow *window)
{
static WId id = 1;
mWindowId = id++;
-
- initWindow();
+ if (window->type() != Qt::Desktop)
+ initWindow();
}
QWaylandWindow::~QWaylandWindow()