diff --git a/src/config.pri b/src/config.pri
index 6c4bc0d025db112bd88ec90f77c9853844820df2..024515b690642ec7695b6b2b2c32a0b4aa855204 100644
--- a/src/config.pri
+++ b/src/config.pri
@@ -54,3 +54,9 @@ disable-xcb {
     message("The disable-xcb option has been deprecated. Please use disable-desktop instead.")
     CONFIG += disable-desktop
 }
+
+# Enables logging of sensitive information, such as key events.
+# Should never be enabled by default.
+# It's defined here rather than virtualkeyboarddebug_p.h
+# so that the plugins can use it.
+sensitive-debug: DEFINES += SENSITIVE_DEBUG
diff --git a/src/virtualkeyboard/3rdparty/openwnn/wnnEngine/composingtext.cpp b/src/virtualkeyboard/3rdparty/openwnn/wnnEngine/composingtext.cpp
index e299c6db067979d3f85e09aeb39eef68974099a8..082d2fc8fe79db0cba339ef5deb5a7fac1dea22c 100644
--- a/src/virtualkeyboard/3rdparty/openwnn/wnnEngine/composingtext.cpp
+++ b/src/virtualkeyboard/3rdparty/openwnn/wnnEngine/composingtext.cpp
@@ -206,6 +206,7 @@ StrSegment ComposingText::getStrSegment(TextLayer layer, int pos) const
 
 void ComposingText::debugout() const
 {
+#ifdef SENSITIVE_DEBUG
     Q_D(const ComposingText);
     for (int i = LAYER0; i < MAX_LAYER; i++) {
         qDebug() << QString("ComposingText[%1]").arg(i);
@@ -217,6 +218,7 @@ void ComposingText::debugout() const
         }
         qDebug() << "  str =" << tmp;
     }
+#endif
 }
 
 QString ComposingText::toString(TextLayer layer, int from, int to) const
diff --git a/src/virtualkeyboard/inputcontext.cpp b/src/virtualkeyboard/inputcontext.cpp
index 394631b55b5b5cfd229a7ce340361ee30e474770..1808b0a2da5483f34a252bae47a88ee606cb5674 100644
--- a/src/virtualkeyboard/inputcontext.cpp
+++ b/src/virtualkeyboard/inputcontext.cpp
@@ -475,7 +475,11 @@ void InputContext::commit()
 void InputContext::commit(const QString &text, int replaceFrom, int replaceLength)
 {
     Q_D(InputContext);
-    VIRTUALKEYBOARD_DEBUG() << "InputContext::commit():" << text << replaceFrom << replaceLength;
+    VIRTUALKEYBOARD_DEBUG() << "InputContext::commit()"
+#ifdef SENSITIVE_DEBUG
+           << text << replaceFrom << replaceLength
+#endif
+        ;
     bool preeditChanged = !d->preeditText.isEmpty();
     d->preeditText.clear();
 
@@ -580,7 +584,11 @@ void InputContext::setFocus(bool enable)
 void InputContext::sendPreedit(const QString &text, const QList<QInputMethodEvent::Attribute> &attributes, int replaceFrom, int replaceLength)
 {
     Q_D(InputContext);
-    VIRTUALKEYBOARD_DEBUG() << "InputContext::sendPreedit():" << text << replaceFrom << replaceLength;
+    VIRTUALKEYBOARD_DEBUG() << "InputContext::sendPreedit()"
+#ifdef SENSITIVE_DEBUG
+           << text << replaceFrom << replaceLength
+#endif
+        ;
 
     bool textChanged = d->preeditText != text;
     bool attributesChanged = d->preeditTextAttributes != attributes;
diff --git a/src/virtualkeyboard/lipiinputmethod.cpp b/src/virtualkeyboard/lipiinputmethod.cpp
index 4f832573616d8835f2bb37ed881ac461c36868e8..0d0c48b5519815b9d299e486fcd645d9cdd04050 100644
--- a/src/virtualkeyboard/lipiinputmethod.cpp
+++ b/src/virtualkeyboard/lipiinputmethod.cpp
@@ -773,7 +773,7 @@ void LipiInputMethod::timerEvent(QTimerEvent *timerEvent)
 
 void LipiInputMethod::resultsAvailable(const QVariantList &resultList)
 {
-#ifdef QT_VIRTUALKEYBOARD_DEBUG
+#ifdef SENSITIVE_DEBUG
     {
         VIRTUALKEYBOARD_DEBUG() << "LipiInputMethod::resultsAvailable():";
         for (int i = 0; i < resultList.size(); i++) {
diff --git a/src/virtualkeyboard/t9writeinputmethod.cpp b/src/virtualkeyboard/t9writeinputmethod.cpp
index a2f45c18738606b9f68a5d32ceeb912689a886e2..3abac7aefe561092cbe112234fbb33b593eb7315 100644
--- a/src/virtualkeyboard/t9writeinputmethod.cpp
+++ b/src/virtualkeyboard/t9writeinputmethod.cpp
@@ -1280,7 +1280,7 @@ void T9WriteInputMethod::dictionaryLoadCompleted(const QString &fileUri, void *d
 
 void T9WriteInputMethod::resultsAvailable(const QVariantList &resultList)
 {
-#ifdef QT_VIRTUALKEYBOARD_DEBUG
+#ifdef SENSITIVE_DEBUG
     {
         VIRTUALKEYBOARD_DEBUG() << "T9WriteInputMethod::resultsAvailable():";
         for (int i = 0; i < resultList.size(); i++) {
diff --git a/src/virtualkeyboard/t9writeworker.cpp b/src/virtualkeyboard/t9writeworker.cpp
index 53422a6cc13ac7769ad7e11784a148a6c77bfe1d..955eb9f77a97ca898d6aaecbb01cb6defde00d3a 100644
--- a/src/virtualkeyboard/t9writeworker.cpp
+++ b/src/virtualkeyboard/t9writeworker.cpp
@@ -138,7 +138,9 @@ T9WriteRecognitionTask::T9WriteRecognitionTask(QSharedPointer<T9WriteRecognition
     stringStart(stringStart),
     stateCancelled(false)
 {
+#ifdef SENSITIVE_DEBUG
     VIRTUALKEYBOARD_DEBUG() << "T9WriteRecognitionTask():" << "boostLevel:" << boostLevel << "stringStart:" << stringStart;
+#endif
 }
 
 void T9WriteRecognitionTask::run()
diff --git a/src/virtualkeyboard/virtualkeyboarddebug.h b/src/virtualkeyboard/virtualkeyboarddebug.h
index 49c3e9329c249faf682b0d37452e1fe72da57ddd..b4a1262f780e6a793087027a92a7d9979359a7ea 100644
--- a/src/virtualkeyboard/virtualkeyboarddebug.h
+++ b/src/virtualkeyboard/virtualkeyboarddebug.h
@@ -24,9 +24,7 @@
 
 #include <QDebug>
 
-// 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 QT_VIRTUALKEYBOARD_DEBUG
 #ifdef QT_VIRTUALKEYBOARD_DEBUG