Merge remote-tracking branch 'origin/5.12.0' into 5.12

Change-Id: If8bf45af1625de901e589bb8e1c119a02d5e35d6

4 files changed, 34 insertions, 9 deletions

diff --git a/src/virtualkeyboard/qvirtualkeyboardinputcontext.cpp b/src/virtualkeyboard/qvirtualkeyboardinputcontext.cpp
index 4100aa0b..069dfcee 100644
--- a/src/virtualkeyboard/qvirtualkeyboardinputcontext.cpp
+++ b/src/virtualkeyboard/qvirtualkeyboardinputcontext.cpp
@@ -271,7 +271,12 @@ void QVirtualKeyboardInputContext::commit()
 void QVirtualKeyboardInputContext::commit(const QString &text, int replaceFrom, int replaceLength)
 {
     Q_D(QVirtualKeyboardInputContext);
-    VIRTUALKEYBOARD_DEBUG() << "QVirtualKeyboardInputContext::commit():" << text << replaceFrom << replaceLength;
+
+    VIRTUALKEYBOARD_DEBUG() << "QVirtualKeyboardInputContext::commit()"
+#ifdef SENSITIVE_DEBUG
+           << text << replaceFrom << replaceLength
+#endif
+        ;
     bool preeditChanged = !d->preeditText.isEmpty();
 
     if (d->platformInputContext) {
diff --git a/src/virtualkeyboard/qvirtualkeyboardinputcontext_p.cpp b/src/virtualkeyboard/qvirtualkeyboardinputcontext_p.cpp
index d2308b04..1233de99 100644
--- a/src/virtualkeyboard/qvirtualkeyboardinputcontext_p.cpp
+++ b/src/virtualkeyboard/qvirtualkeyboardinputcontext_p.cpp
@@ -267,7 +267,11 @@ void QVirtualKeyboardInputContextPrivate::onInputItemChanged()
 
 void QVirtualKeyboardInputContextPrivate::sendPreedit(const QString &text, const QList<QInputMethodEvent::Attribute> &attributes, int replaceFrom, int replaceLength)
 {
-    VIRTUALKEYBOARD_DEBUG() << "QVirtualKeyboardInputContextPrivate::sendPreedit():" << text << replaceFrom << replaceLength;
+    VIRTUALKEYBOARD_DEBUG() << "QVirtualKeyboardInputContextPrivate::sendPreedit()"
+#ifdef SENSITIVE_DEBUG
+           << text << replaceFrom << replaceLength
+#endif
+        ;
 
     bool textChanged = preeditText != text;
     bool attributesChanged = preeditTextAttributes != attributes;
@@ -289,7 +293,11 @@ void QVirtualKeyboardInputContextPrivate::sendPreedit(const QString &text, const
             // input may be out of sync.
             if (_shadow.inputItem() && !replace && !text.isEmpty() &&
                     !textChanged && attributesChanged) {
-                VIRTUALKEYBOARD_DEBUG() << "QVirtualKeyboardInputContextPrivate::sendPreedit(shadow):" << text << replaceFrom << replaceLength;
+                VIRTUALKEYBOARD_DEBUG() << "QVirtualKeyboardInputContextPrivate::sendPreedit(shadow)"
+#ifdef SENSITIVE_DEBUG
+                       << text << replaceFrom << replaceLength
+#endif
+                    ;
                 event.setAccepted(true);
                 QGuiApplication::sendEvent(_shadow.inputItem(), &event);
             }
diff --git a/src/virtualkeyboard/qvirtualkeyboardinputengine.cpp b/src/virtualkeyboard/qvirtualkeyboardinputengine.cpp
index f6fc03ec..45058b41 100644
--- a/src/virtualkeyboard/qvirtualkeyboardinputengine.cpp
+++ b/src/virtualkeyboard/qvirtualkeyboardinputengine.cpp
@@ -214,7 +214,12 @@ QVirtualKeyboardInputEngine::~QVirtualKeyboardInputEngine()
 bool QVirtualKeyboardInputEngine::virtualKeyPress(Qt::Key key, const QString &text, Qt::KeyboardModifiers modifiers, bool repeat)
 {
     Q_D(QVirtualKeyboardInputEngine);
-    VIRTUALKEYBOARD_DEBUG() << "QVirtualKeyboardInputEngine::virtualKeyPress():" << key << text << modifiers << repeat;
+    VIRTUALKEYBOARD_DEBUG() << "QVirtualKeyboardInputEngine::virtualKeyPress()"
+#ifdef SENSITIVE_DEBUG
+           << key << text << modifiers << repeat
+#endif
+        ;
+
     bool accept = false;
     if (d->activeKey == Qt::Key_unknown || d->activeKey == key) {
         d->activeKey = key;
@@ -281,7 +286,12 @@ void QVirtualKeyboardInputEngine::virtualKeyCancel()
 bool QVirtualKeyboardInputEngine::virtualKeyRelease(Qt::Key key, const QString &text, Qt::KeyboardModifiers modifiers)
 {
     Q_D(QVirtualKeyboardInputEngine);
-    VIRTUALKEYBOARD_DEBUG() << "QVirtualKeyboardInputEngine::virtualKeyRelease():" << key << text << modifiers;
+    VIRTUALKEYBOARD_DEBUG() << "QVirtualKeyboardInputEngine::virtualKeyRelease()"
+#ifdef SENSITIVE_DEBUG
+           << key << text << modifiers
+#endif
+        ;
+
     bool accept = false;
     if (d->activeKey == key) {
         if (!d->repeatCount) {
@@ -321,7 +331,11 @@ bool QVirtualKeyboardInputEngine::virtualKeyRelease(Qt::Key key, const QString &
 bool QVirtualKeyboardInputEngine::virtualKeyClick(Qt::Key key, const QString &text, Qt::KeyboardModifiers modifiers)
 {
     Q_D(QVirtualKeyboardInputEngine);
-    VIRTUALKEYBOARD_DEBUG() << "QVirtualKeyboardInputEngine::virtualKeyClick():" << key << text << modifiers;
+    VIRTUALKEYBOARD_DEBUG() << "QVirtualKeyboardInputEngine::virtualKeyClick()"
+#ifdef SENSITIVE_DEBUG
+           << key << text << modifiers
+#endif
+        ;
     return d->virtualKeyClick(key, text, modifiers, false);
 }
 
diff --git a/src/virtualkeyboard/virtualkeyboarddebug_p.h b/src/virtualkeyboard/virtualkeyboarddebug_p.h
index 0479aa25..02374663 100644
--- a/src/virtualkeyboard/virtualkeyboarddebug_p.h
+++ b/src/virtualkeyboard/virtualkeyboarddebug_p.h
@@ -49,9 +49,7 @@ namespace QtVirtualKeyboard {
 
 Q_DECLARE_LOGGING_CATEGORY(qlcVirtualKeyboard)
 
-// Enables logging of sensitive information, such as key events.
-// Should never be enabled by default.
-//#define SENSITIVE_DEBUG
+// See config.pri for SENSITIVE_DEBUG.
 
 #define VIRTUALKEYBOARD_DEBUG() qCDebug(qlcVirtualKeyboard)
 #define VIRTUALKEYBOARD_WARN() qCWarning(qlcVirtualKeyboard)