diff options
-rw-r--r-- | src/client/qwaylandwindow.cpp | 1 | ||||
-rw-r--r-- | src/compositor/extensions/qwaylandxdgshellv6.cpp | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/client/qwaylandwindow.cpp b/src/client/qwaylandwindow.cpp index 0ff3a72e5..760390917 100644 --- a/src/client/qwaylandwindow.cpp +++ b/src/client/qwaylandwindow.cpp @@ -240,6 +240,7 @@ void QWaylandWindow::reset(bool sendDestroyEvent) mSubSurfaceWindow = nullptr; if (isInitialized()) destroy(); + mScreens.clear(); if (mFrameCallback) { wl_callback_destroy(mFrameCallback); diff --git a/src/compositor/extensions/qwaylandxdgshellv6.cpp b/src/compositor/extensions/qwaylandxdgshellv6.cpp index d447ac3c8..648f2a1e1 100644 --- a/src/compositor/extensions/qwaylandxdgshellv6.cpp +++ b/src/compositor/extensions/qwaylandxdgshellv6.cpp @@ -467,7 +467,7 @@ void QWaylandXdgSurfaceV6Private::zxdg_surface_v6_set_window_geometry(QtWaylandS /*! * \class QWaylandXdgSurfaceV6 * \inmodule QtWaylandCompositor - * \since 5.8 + * \since 5.10 * \brief The QWaylandXdgSurfaceV6 class provides desktop-style compositor-specific features to an xdg surface. * * This class is part of the QWaylandXdgShellV6 extension and provides a way to @@ -613,7 +613,7 @@ QWaylandSurface *QWaylandXdgSurfaceV6::surface() const } /*! - * \qmlproperty WaylandSurface QtWaylandCompositor::XdgSurfaceV6::toplevel + * \qmlproperty XdgToplevelV6 QtWaylandCompositor::XdgSurfaceV6::toplevel * * This property holds the properties and methods that are specific to the * toplevel XdgSurfaceV6. @@ -636,7 +636,7 @@ QWaylandXdgToplevelV6 *QWaylandXdgSurfaceV6::toplevel() const } /*! - * \qmlproperty WaylandSurface QtWaylandCompositor::XdgSurfaceV6::popup + * \qmlproperty XdgPopupV6 QtWaylandCompositor::XdgSurfaceV6::popup * * This property holds the properties and methods that are specific to the * popup XdgSurfaceV6. |