diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-06-11 19:07:55 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-06-11 19:07:55 +0200 |
| commit | 83f748ade15c0d85b87c6bde732d847cab826985 (patch) | |
| tree | ea1cf4fc7f8f2070ca9a7059c437dad599b9e6c8 /examples | |
| parent | 3821f3bb85534a74b33689a48ec639616b65cb6b (diff) | |
| parent | 06e8770129d5c49bfb518b02b3ece6d529e0e4c3 (diff) | |
Merge remote-tracking branch 'origin/5.7' into dev
Conflicts:
src/compositor/wayland_wrapper/qwldatadevice.cpp
Change-Id: I2f555f969ec36b3e9b4123d758ae4176c5c90164
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/wayland/qwindow-compositor/windowcompositor.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/examples/wayland/qwindow-compositor/windowcompositor.cpp b/examples/wayland/qwindow-compositor/windowcompositor.cpp index 2ff5f75aa..ebbb5e470 100644 --- a/examples/wayland/qwindow-compositor/windowcompositor.cpp +++ b/examples/wayland/qwindow-compositor/windowcompositor.cpp @@ -291,6 +291,7 @@ void WindowCompositor::onXdgStartResize(QWaylandInputDevice *inputDevice, void WindowCompositor::onSetTransient(QWaylandSurface *parent, const QPoint &relativeToParent, QWaylandWlShellSurface::FocusPolicy focusPolicy) { + Q_UNUSED(focusPolicy); QWaylandWlShellSurface *wlShellSurface = qobject_cast<QWaylandWlShellSurface*>(sender()); WindowCompositorView *view = findView(wlShellSurface->surface()); |