diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-08-25 03:01:39 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-08-25 03:01:39 +0200 |
| commit | 9a60f0c98c6f01e371071da59b869cd95a8b153a (patch) | |
| tree | 16c7f6ac33beae4ac95865825e5cfe80ad9c5f61 | |
| parent | 51768025a100232743290fa07fc5c46821c16556 (diff) | |
| parent | 334822b742cb15bb27dbc14b45d41e2714eef767 (diff) | |
Merge remote-tracking branch 'origin/5.11' into 5.12
Change-Id: Ib6d23655a5c9ee059a9560e862d38746f508caee
| -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. |