diff options
author | Paul Olav Tvete <paul.tvete@qt.io> | 2018-09-14 10:19:18 +0200 |
---|---|---|
committer | Paul Olav Tvete <paul.tvete@qt.io> | 2018-09-20 08:28:41 +0000 |
commit | 236ad5469a6d52622ab89e49408b53847cf5848e (patch) | |
tree | 2886f42124edbca69f9a2a95f3db2eee522dc338 | |
parent | 54113bb70ccc2df74c55d881b543d13fd4eb9550 (diff) | |
download | qtwayland-236ad5469a6d52622ab89e49408b53847cf5848e.tar.gz |
Change compositor categorized logging namespace
[ChangeLog][Compositor] Add new categorized logging namespace
"qt.waylandcompositor" and rename "qt.compositor.input.methods"
to "qt.waylandcompositor.inputmethods"
Change-Id: Id861e527e3eb8582fdc96f8497fad0cba0766847
Reviewed-by: Johan Helsing <johan.helsing@qt.io>
-rw-r--r-- | src/compositor/compositor_api/qwaylandcompositor.cpp | 3 | ||||
-rw-r--r-- | src/compositor/compositor_api/qwaylandcompositor.h | 3 | ||||
-rw-r--r-- | src/compositor/extensions/qwaylandtextinput.cpp | 8 |
3 files changed, 8 insertions, 6 deletions
diff --git a/src/compositor/compositor_api/qwaylandcompositor.cpp b/src/compositor/compositor_api/qwaylandcompositor.cpp index 8d902bce..cd6ff1f5 100644 --- a/src/compositor/compositor_api/qwaylandcompositor.cpp +++ b/src/compositor/compositor_api/qwaylandcompositor.cpp @@ -96,7 +96,8 @@ QT_BEGIN_NAMESPACE -Q_LOGGING_CATEGORY(qLcCompositorInputMethods, "qt.compositor.input.methods") +Q_LOGGING_CATEGORY(qLcWaylandCompositor, "qt.waylandcompositor") +Q_LOGGING_CATEGORY(qLcWaylandCompositorInputMethods, "qt.waylandcompositor.inputmethods") namespace QtWayland { diff --git a/src/compositor/compositor_api/qwaylandcompositor.h b/src/compositor/compositor_api/qwaylandcompositor.h index 78684bc3..5c203d30 100644 --- a/src/compositor/compositor_api/qwaylandcompositor.h +++ b/src/compositor/compositor_api/qwaylandcompositor.h @@ -70,7 +70,8 @@ class QWaylandTouch; class QWaylandSurfaceGrabber; class QWaylandBufferRef; -Q_DECLARE_LOGGING_CATEGORY(qLcCompositorInputMethods) +Q_WAYLAND_COMPOSITOR_EXPORT Q_DECLARE_LOGGING_CATEGORY(qLcWaylandCompositor) +Q_DECLARE_LOGGING_CATEGORY(qLcWaylandCompositorInputMethods) class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandCompositor : public QWaylandObject { diff --git a/src/compositor/extensions/qwaylandtextinput.cpp b/src/compositor/extensions/qwaylandtextinput.cpp index b832bb73..6cf33d18 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); } |