diff options
| author | Andy Nichols <andy.nichols@digia.com> | 2013-06-03 17:46:41 +0200 |
|---|---|---|
| committer | Andy Nichols <andy.nichols@digia.com> | 2013-06-03 17:46:41 +0200 |
| commit | d20ef80bb54685466dd9d7beae5ddccc46a437fd (patch) | |
| tree | b77c709cbb28810055301fa088062af7de6fc165 /src/extensions/windowmanager.xml | |
| parent | 894adf8a447865119be7c6c4d01577d8032f4177 (diff) | |
| parent | 63482addec06d2bbab0330271cb7d21869156760 (diff) | |
| download | qtwayland-d20ef80bb54685466dd9d7beae5ddccc46a437fd.tar.gz | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
qtwayland.pro
src/plugins/platforms/wayland_common/qwaylandshellsurface.cpp
src/plugins/platforms/wayland_common/qwaylandwindow.cpp
src/plugins/platforms/wayland_common/qwaylandwindow.h
Change-Id: I6f9e8fb0536212b7b072aec3c8152390fb9f2922
Diffstat (limited to 'src/extensions/windowmanager.xml')
| -rw-r--r-- | src/extensions/windowmanager.xml | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/extensions/windowmanager.xml b/src/extensions/windowmanager.xml index 71fb2723..e03bc3ad 100644 --- a/src/extensions/windowmanager.xml +++ b/src/extensions/windowmanager.xml @@ -1,4 +1,4 @@ -<protocol name="wayland_windowmanager"> +<protocol name="windowmanager"> <copyright> Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). @@ -38,13 +38,7 @@ $QT_END_LICENSE$ </copyright> - <interface name="wl_windowmanager" version="1"> - <request name="map_client_to_process"> - <arg name="processid" type="uint" /> - </request> - <request name="authenticate_with_token"> - <arg name="processid" type="string" /> - </request> + <interface name="qt_windowmanager" version="1"> <request name="open_url"> <description summary="client requests a url to be opened"> If remaining is not 0 this is a multipart request, and |