File qtvirtualkeyboard-be-more-restrictive-logging.p... of Package libqt5-qtvirtualkeyboard.10032

Overview Repositories Revisions Requests Users Attributes Meta

File qtvirtualkeyboard-be-more-restrictive-logging.patch of Package libqt5-qtvirtualkeyboard.10032

From 61780a113f02b3c62fb14516fe8ea47d91f9ed9a Mon Sep 17 00:00:00 2001
From: Mitch Curtis <mitch.curtis@qt.io>
Date: Wed, 24 Oct 2018 13:28:30 +0200
Subject: [PATCH] Be more restrictive about which information is included in
 logging

- Introduce SENSITIVE_DEBUG flag that should be explicitly enabled
in order to have certain information included in logging output.
- Replace qWarning() with qCWarning() where appropriate.

Change-Id: I6386f9cb3ce375101f3c42f407d4af380f1ff75e
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Jarkko Koivikko <jarkko.koivikko@code-q.fi>
(cherry picked from commit c7a94110987672308ed04b40fd8ed207d1c8d93b)
Reviewed-by: Kari Oikarinen <kari.oikarinen@qt.io>
---
 src/virtualkeyboard/inputcontext.cpp       | 12 ++++++++++--
 src/virtualkeyboard/virtualkeyboarddebug.h |  5 +++++
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/virtualkeyboard/inputcontext.cpp b/src/virtualkeyboard/inputcontext.cpp
index 6d36ae5..ccc29bb 100644
--- a/src/virtualkeyboard/inputcontext.cpp
+++ b/src/virtualkeyboard/inputcontext.cpp
@@ -449,7 +449,11 @@ void InputContext::sendKeyClick(int key, const QString &text, int modifiers)
     if (d->focus && d->inputContext) {
         QKeyEvent pressEvent(QEvent::KeyPress, key, Qt::KeyboardModifiers(modifiers), text);
         QKeyEvent releaseEvent(QEvent::KeyRelease, key, Qt::KeyboardModifiers(modifiers), text);
-        VIRTUALKEYBOARD_DEBUG() << "InputContext::::sendKeyClick():" << key;
+        VIRTUALKEYBOARD_DEBUG().nospace() << "InputContext::sendKeyClick()"
+#ifdef SENSITIVE_DEBUG
+            << ": " << key
+#endif
+        ;
 
         d->stateFlags |= InputContextPrivate::KeyEventState;
         d->inputContext->sendKeyEvent(&pressEvent);
@@ -457,7 +461,11 @@ void InputContext::sendKeyClick(int key, const QString &text, int modifiers)
         if (d->activeKeys.isEmpty())
             d->stateFlags &= ~InputContextPrivate::KeyEventState;
     } else {
-        qWarning() << "InputContext::::sendKeyClick():" << key << "no focus";
+        VIRTUALKEYBOARD_WARN() << "InputContext::sendKeyClick(): no focus to send key click"
+#ifdef SENSITIVE_DEBUG
+            << key << text
+#endif
+            << "- QGuiApplication::focusWindow() is:" << QGuiApplication::focusWindow();
     }
 }
 
diff --git a/src/virtualkeyboard/virtualkeyboarddebug.h b/src/virtualkeyboard/virtualkeyboarddebug.h
index 17e53bd..6dee637 100644
--- a/src/virtualkeyboard/virtualkeyboarddebug.h
+++ b/src/virtualkeyboard/virtualkeyboarddebug.h
@@ -35,6 +35,11 @@
 
 Q_DECLARE_LOGGING_CATEGORY(qlcVirtualKeyboard)
 
+// Enables logging of sensitive information, such as key events.
+// Should never be enabled by default.
+//#define SENSITIVE_DEBUG
+
 #define VIRTUALKEYBOARD_DEBUG() qCDebug(qlcVirtualKeyboard)
+#define VIRTUALKEYBOARD_WARN() qCWarning(qlcVirtualKeyboard)
 
 #endif // VIRTUALKEYBOARDDEBUG_H
-- 
2.16.4

Places

File qtvirtualkeyboard-be-more-restrictive-logging.patch of Package libqt5-qtvirtualkeyboard.10032

Places