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/qtkey-extension.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/qtkey-extension.xml')
| -rw-r--r-- | src/extensions/qtkey-extension.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/extensions/qtkey-extension.xml b/src/extensions/qtkey-extension.xml index fc4d14da..1d0db59d 100644 --- a/src/extensions/qtkey-extension.xml +++ b/src/extensions/qtkey-extension.xml @@ -1,4 +1,4 @@ -<protocol name="key_extension"> +<protocol name="qtkey_extension"> <copyright> Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). @@ -38,7 +38,7 @@ $QT_END_LICENSE$ </copyright> - <interface name="wl_qtkey_extension" version="1"> + <interface name="qt_key_extension" version="1"> <event name="qtkey"> <description summary="qtkey event"> Serialized QKeyEvent |