2 files changed, 1 insertions, 14 deletions
diff --git a/src/compositor/extensions/qwaylandquickwlshellsurfaceitem.cpp b/src/compositor/extensions/qwaylandquickwlshellsurfaceitem.cpp
index fc6d856d8..a385e5e4e 100644
--- a/src/compositor/extensions/qwaylandquickwlshellsurfaceitem.cpp
+++ b/src/compositor/extensions/qwaylandquickwlshellsurfaceitem.cpp
@@ -110,6 +110,7 @@ void QWaylandQuickWlShellSurfaceItem::setShellSurface(QWaylandWlShellSurface *sh
         connect(d->shellSurface, &QWaylandWlShellSurface::startMove, this, &QWaylandQuickWlShellSurfaceItem::handleStartMove);
         connect(d->shellSurface, &QWaylandWlShellSurface::startResize, this, &QWaylandQuickWlShellSurfaceItem::handleStartResize);
     }
+    setSurface(shellSurface ? shellSurface->surface() : nullptr);
     emit shellSurfaceChanged();
 }
 
@@ -226,16 +227,4 @@ void QWaylandQuickWlShellSurfaceItem::surfaceChangedEvent(QWaylandSurface *newSu
         connect(newSurface, &QWaylandSurface::offsetForNextFrame, this, &QWaylandQuickWlShellSurfaceItem::adjustOffsetForNextFrame);
 }
 
-/*!
- * \internal
- */
-void QWaylandQuickWlShellSurfaceItem::componentComplete()
-{
-    Q_D(QWaylandQuickWlShellSurfaceItem);
-    if (!d->shellSurface)
-        setShellSurface(new QWaylandWlShellSurface());
-
-    QWaylandQuickItem::componentComplete();
-}
-
 QT_END_NAMESPACE
diff --git a/src/compositor/extensions/qwaylandquickwlshellsurfaceitem.h b/src/compositor/extensions/qwaylandquickwlshellsurfaceitem.h
index 626926f85..7f32c9f39 100644
--- a/src/compositor/extensions/qwaylandquickwlshellsurfaceitem.h
+++ b/src/compositor/extensions/qwaylandquickwlshellsurfaceitem.h
@@ -77,8 +77,6 @@ protected:
     void mouseReleaseEvent(QMouseEvent *event) Q_DECL_OVERRIDE;
 
     void surfaceChangedEvent(QWaylandSurface *newSurface, QWaylandSurface *oldSurface) Q_DECL_OVERRIDE;
-
-    void componentComplete() Q_DECL_OVERRIDE;
 };
 
 QT_END_NAMESPACE