diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-09-25 03:00:56 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-09-25 03:00:56 +0200 |
| commit | 0fbc2f68c87e0057ed7df3ad500c7dfe5c61d9d8 (patch) | |
| tree | c8cc693badfce0fdabfec8feb328d8251615820c /src/compositor/extensions | |
| parent | aede513e7c592dd189754898a38d1aac432d55ed (diff) | |
| parent | 582af70640e411d8f423f1bc0528d5a5fce08e3a (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Change-Id: I66c91dfde14a7c252a02777cfcf0396b1d05e854
Diffstat (limited to 'src/compositor/extensions')
| -rw-r--r-- | src/compositor/extensions/pregenerated/3rdparty/qwayland-server-xdg-shell-unstable-v5_p.h | 6 | ||||
| -rw-r--r-- | src/compositor/extensions/qwaylandtextinput.cpp | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/compositor/extensions/pregenerated/3rdparty/qwayland-server-xdg-shell-unstable-v5_p.h b/src/compositor/extensions/pregenerated/3rdparty/qwayland-server-xdg-shell-unstable-v5_p.h index dfd42535e..63817a5e3 100644 --- a/src/compositor/extensions/pregenerated/3rdparty/qwayland-server-xdg-shell-unstable-v5_p.h +++ b/src/compositor/extensions/pregenerated/3rdparty/qwayland-server-xdg-shell-unstable-v5_p.h @@ -73,7 +73,7 @@ namespace QtWaylandServer { xdg_shell_v5 *xdg_shell_object; struct ::wl_resource *handle; - struct ::wl_client *client() const { return handle->client; } + struct ::wl_client *client() const { return wl_resource_get_client(handle); } int version() const { return wl_resource_get_version(handle); } static Resource *fromResource(struct ::wl_resource *resource); @@ -193,7 +193,7 @@ namespace QtWaylandServer { xdg_surface_v5 *xdg_surface_object; struct ::wl_resource *handle; - struct ::wl_client *client() const { return handle->client; } + struct ::wl_client *client() const { return wl_resource_get_client(handle); } int version() const { return wl_resource_get_version(handle); } static Resource *fromResource(struct ::wl_resource *resource); @@ -366,7 +366,7 @@ namespace QtWaylandServer { xdg_popup_v5 *xdg_popup_object; struct ::wl_resource *handle; - struct ::wl_client *client() const { return handle->client; } + struct ::wl_client *client() const { return wl_resource_get_client(handle); } int version() const { return wl_resource_get_version(handle); } static Resource *fromResource(struct ::wl_resource *resource); diff --git a/src/compositor/extensions/qwaylandtextinput.cpp b/src/compositor/extensions/qwaylandtextinput.cpp index b832bb737..6cf33d18d 100644 --- a/src/compositor/extensions/qwaylandtextinput.cpp +++ b/src/compositor/extensions/qwaylandtextinput.cpp @@ -190,7 +190,7 @@ void QWaylandTextInputPrivate::sendInputMethodEvent(QInputMethodEvent *event) currentState->anchorPosition = afterCommit.anchorPosition; if (queries) { - qCDebug(qLcCompositorInputMethods) << "QInputMethod::update() after QInputMethodEvent" << queries; + qCDebug(qLcWaylandCompositorInputMethods) << "QInputMethod::update() after QInputMethodEvent" << queries; emit q->updateInputMethod(queries); } @@ -377,13 +377,13 @@ void QWaylandTextInputPrivate::zwp_text_input_v2_update_state(Resource *resource { Q_Q(QWaylandTextInput); - qCDebug(qLcCompositorInputMethods) << "update_state" << serial << flags; + qCDebug(qLcWaylandCompositorInputMethods) << "update_state" << serial << flags; if (resource != focusResource) return; if (flags == update_state_reset || flags == update_state_enter) { - qCDebug(qLcCompositorInputMethods) << "QInputMethod::reset()"; + qCDebug(qLcWaylandCompositorInputMethods) << "QInputMethod::reset()"; qApp->inputMethod()->reset(); } @@ -400,7 +400,7 @@ void QWaylandTextInputPrivate::zwp_text_input_v2_update_state(Resource *resource pendingState.reset(new QWaylandTextInputClientState); if (queries) { - qCDebug(qLcCompositorInputMethods) << "QInputMethod::update()" << queries; + qCDebug(qLcWaylandCompositorInputMethods) << "QInputMethod::update()" << queries; emit q->updateInputMethod(queries); } |