diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-10-29 11:25:38 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-10-29 11:25:38 +0100 |
| commit | 58ec88e7b33027047a4d5dd82a84fca3a96be40c (patch) | |
| tree | 94eacde092c235d52cbf51015dd94cbb8b6aa2a9 | |
| parent | 8f8816668694c6eeba5ccf017d94c14dad946f02 (diff) | |
| parent | c7a94110987672308ed04b40fd8ed207d1c8d93b (diff) | |
Merge remote-tracking branch 'origin/5.11' into 5.12
Conflicts:
src/virtualkeyboard/qvirtualkeyboardinputcontext.cpp
Change-Id: I153a6470bb291cffc75536eb44e9cf8c0973e6b8
| -rw-r--r-- | src/virtualkeyboard/qvirtualkeyboardinputcontext.cpp | 14 | ||||
| -rw-r--r-- | src/virtualkeyboard/virtualkeyboarddebug_p.h | 5 |
2 files changed, 16 insertions, 3 deletions
diff --git a/src/virtualkeyboard/qvirtualkeyboardinputcontext.cpp b/src/virtualkeyboard/qvirtualkeyboardinputcontext.cpp index 6fc6c1c3..e74f5201 100644 --- a/src/virtualkeyboard/qvirtualkeyboardinputcontext.cpp +++ b/src/virtualkeyboard/qvirtualkeyboardinputcontext.cpp @@ -221,7 +221,12 @@ void QVirtualKeyboardInputContext::sendKeyClick(int key, const QString &text, in if (d->_focus && d->platformInputContext) { QKeyEvent pressEvent(QEvent::KeyPress, key, Qt::KeyboardModifiers(modifiers), text); QKeyEvent releaseEvent(QEvent::KeyRelease, key, Qt::KeyboardModifiers(modifiers), text); - VIRTUALKEYBOARD_DEBUG() << "QVirtualKeyboardInputContext::sendKeyClick():" << key; + VIRTUALKEYBOARD_DEBUG().nospace() << "InputContext::sendKeyClick()" +#ifdef SENSITIVE_DEBUG + << ": " << key +#endif + ; + d->setState(QVirtualKeyboardInputContextPrivate::State::KeyEvent); d->platformInputContext->sendKeyEvent(&pressEvent); @@ -229,8 +234,11 @@ void QVirtualKeyboardInputContext::sendKeyClick(int key, const QString &text, in if (d->activeKeys.isEmpty()) d->clearState(QVirtualKeyboardInputContextPrivate::State::KeyEvent); } else { - qWarning() << "QVirtualKeyboardInputContext::sendKeyClick(): no focus to send key click" << key << text - << "- QGuiApplication::focusWindow() is:" << QGuiApplication::focusWindow(); + 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_p.h b/src/virtualkeyboard/virtualkeyboarddebug_p.h index fe679b4c..0479aa25 100644 --- a/src/virtualkeyboard/virtualkeyboarddebug_p.h +++ b/src/virtualkeyboard/virtualkeyboarddebug_p.h @@ -49,7 +49,12 @@ 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 + #define VIRTUALKEYBOARD_DEBUG() qCDebug(qlcVirtualKeyboard) +#define VIRTUALKEYBOARD_WARN() qCWarning(qlcVirtualKeyboard) } // namespace QtVirtualKeyboard QT_END_NAMESPACE |