diff options
author | Giulio Camuffo <giulio.camuffo@jollamobile.com> | 2014-11-07 14:43:24 +0200 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2014-11-15 18:46:38 +0100 |
commit | 4613291e8c1717d8d3316b2c0b1f2c6c96bdc56f (patch) | |
tree | d815d5dc56c46361146b2ee3ce2b6c2a2cc2c6bb /src/compositor/wayland_wrapper/qwlinputpanelsurface.cpp | |
parent | 23ecb57e11bea42c2e90d280b21b6ee448a9afff (diff) | |
parent | 7882407bb6bab6c042fd20592a63a875b74eb581 (diff) |
Merge branch '5.4' into dev
Merge done by Giulio Camuffo
Conflicts:
src/client/client.pro
src/client/qwaylanddisplay.cpp
src/client/qwaylandinputdevice.cpp
src/client/qwaylandinputdevice_p.h
src/client/qwaylandwindow.cpp
src/compositor/compositor_api/qwaylandsurface.cpp
src/compositor/compositor_api/qwaylandsurface_p.h
src/compositor/wayland_wrapper/qwlsurface.cpp
Change-Id: I1df878bb54f49d953c51215a2772869e261ebe81
Diffstat (limited to 'src/compositor/wayland_wrapper/qwlinputpanelsurface.cpp')
-rw-r--r-- | src/compositor/wayland_wrapper/qwlinputpanelsurface.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/compositor/wayland_wrapper/qwlinputpanelsurface.cpp b/src/compositor/wayland_wrapper/qwlinputpanelsurface.cpp index fd258bcb5..138e57032 100644 --- a/src/compositor/wayland_wrapper/qwlinputpanelsurface.cpp +++ b/src/compositor/wayland_wrapper/qwlinputpanelsurface.cpp @@ -48,7 +48,7 @@ QT_BEGIN_NAMESPACE namespace QtWayland { InputPanelSurface::InputPanelSurface(wl_client *client, int id, Surface *surface) - : QtWaylandServer::wl_input_panel_surface(client, id) + : QtWaylandServer::wl_input_panel_surface(client, id, 1) , m_surface(surface) , m_type(Invalid) , m_output(0) |