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

Change-Id: If8bf45af1625de901e589bb8e1c119a02d5e35d6

15 files changed, 291 insertions, 1342 deletions

diff --git a/dist/changes-5.12.0 b/dist/changes-5.12.0
new file mode 100644
index 00000000..7670684f
--- /dev/null
+++ b/dist/changes-5.12.0
@@ -0,0 +1,101 @@
+Qt 5.12 introduces many new features and improvements as well as bugfixes
+over the 5.11.x series. For more details, refer to the online documentation
+included in this distribution. The documentation is also available online:
+
+https://doc.qt.io/qt-5/index.html
+
+The Qt version 5.12 series is binary compatible with the 5.11.x series.
+Applications compiled for 5.11 will continue to run with 5.12.
+
+Some of the changes listed in this file include issue tracking numbers
+corresponding to tasks in the Qt Bug Tracker:
+
+https://bugreports.qt.io/
+
+Each of these identifiers can be entered in the bug tracker to obtain more
+information about a particular change.
+
+****************************************************************************
+*                        Important Behavior Changes                        *
+****************************************************************************
+
+ - [QTBUG-57602] Introduce an extension interface for the virtual keyboard.
+   All the current input methods and some special keyboard layouts (e.g.
+   Hunspell, OpenWnn, etc.) have been moved to extensions. The extension
+   interface allows third party to create a new input method without having
+   to modify or rebuild the virtual keyboard. In addition, this change
+   makes it possible to add features and languages independently by copying
+   the desired extension to the system.
+ - [QTBUG-57602] Introduce a virtualkeyboard module, which can be linked
+   against an extension plugin. This module provides the C++ API necessary
+   for creating an input method.
+ - [QTBUG-57602] Wrap the entire virtual keyboard API into Qt namespace
+   (e.g. QT_BEGIN_NAMESPACE/QT_END_NAMESPACE).
+
+****************************************************************************
+*                               InputContext                               *
+****************************************************************************
+
+ - Deprecated shift and capsLock properties in favor of shiftActive and
+   capsLockActive.
+
+****************************************************************************
+*                                  Trace                                   *
+****************************************************************************
+
+ - Added opacity property.
+
+****************************************************************************
+*                                 MyScript                                 *
+****************************************************************************
+
+ - Added support for MyScript handwriting.
+
+****************************************************************************
+*                                 Hunspell                                 *
+****************************************************************************
+
+ - Added user dictionary and learning for Hunspell
+
+****************************************************************************
+*                                 T9 Write                                 *
+****************************************************************************
+
+ - Added Vietnamese handwriting recognition.
+ - Added Thai handwriting recognition.
+
+****************************************************************************
+*                                 Layouts                                  *
+****************************************************************************
+
+ -  Added Albanian keyboard layout
+ -  Added English US keyboard layout
+ -  Added French Canadian keyboard layout
+ -  Added Indonesian keyboard layout
+ -  Added Malay keyboard layout
+ -  Added Portuguese Brazil keyboard layout
+ -  Added Slovak keyboard layout
+ -  Added Slovenian keyboard layout
+ -  Added Spanish Mexican keyboard layout
+ -  Added Thai keyboard layout
+ -  Added Turkish keyboard layout
+ -  Added Ukrainian keyboard layout
+ -  Added Vietnamese keyboard layout
+ -  Fixed incorrect input mode (Latin) in Russian handwriting layout
+ - [QTBUG-67756]  Added latin extra layout for Russian.
+
+****************************************************************************
+*                                 General                                  *
+****************************************************************************
+
+ - [QTBUG-66198]  The pinyin dictionary is now bundled in the plugin by
+   default.
+ - [QTBUG-66198]  The tcime dictionary is now bundled in the plugin by
+   default.
+ - Added build time option to exclude all styles from the plugin.
+ - Removed QtVirtualKeyboard namespace from the public C++ API and
+   prefixed class names with QVirtualKeyboard. The new class names are
+   QVirtualKeyboardAbstractInputMethod, QVirtualKeyboardInputContext,
+   QVirtualKeyboardInputEngine, QVirtualKeyboardSelectionListModel and
+   QVirtualKeyboardTrace.
+ - [QTBUG-67595]  Fixed possible crash in PlatformInputContext::update.
diff --git a/src/config.pri b/src/config.pri
index 81e05763..435ae5e1 100644
--- a/src/config.pri
+++ b/src/config.pri
@@ -115,3 +115,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/import/plugins.qmltypes b/src/import/plugins.qmltypes
index 8e6c3c02..6614d9c4 100644
--- a/src/import/plugins.qmltypes
+++ b/src/import/plugins.qmltypes
@@ -189,7 +189,8 @@ Module {
                 "Hebrew": 13,
                 "ChineseHandwriting": 14,
                 "JapaneseHandwriting": 15,
-                "KoreanHandwriting": 16
+                "KoreanHandwriting": 16,
+                "Thai": 17
             }
         }
         Enum {
@@ -620,8 +621,8 @@ Module {
     }
     Component {
         prototype: "QQuickItem"
-        name: "QtQuick.VirtualKeyboard/BaseKey 1.0"
-        exports: ["QtQuick.VirtualKeyboard/BaseKey 1.0"]
+        name: "QtQuick.VirtualKeyboard/BaseKey 2.0"
+        exports: ["QtQuick.VirtualKeyboard/BaseKey 2.0"]
         exportMetaObjectRevisions: [0]
         isComposite: true
         defaultProperty: "data"
@@ -649,8 +650,8 @@ Module {
     }
     Component {
         prototype: "QQuickItem"
-        name: "QtQuick.VirtualKeyboard/BaseKey 2.0"
-        exports: ["QtQuick.VirtualKeyboard/BaseKey 2.0"]
+        name: "QtQuick.VirtualKeyboard/BaseKey 1.0"
+        exports: ["QtQuick.VirtualKeyboard/BaseKey 1.0"]
         exportMetaObjectRevisions: [0]
         isComposite: true
         defaultProperty: "data"
@@ -758,8 +759,8 @@ Module {
     }
     Component {
         prototype: "QQuickItem"
-        name: "QtQuick.VirtualKeyboard/EnterKey 2.0"
-        exports: ["QtQuick.VirtualKeyboard/EnterKey 2.0"]
+        name: "QtQuick.VirtualKeyboard/EnterKey 1.0"
+        exports: ["QtQuick.VirtualKeyboard/EnterKey 1.0"]
         exportMetaObjectRevisions: [0]
         isComposite: true
         defaultProperty: "data"
@@ -788,8 +789,8 @@ Module {
     }
     Component {
         prototype: "QQuickItem"
-        name: "QtQuick.VirtualKeyboard/EnterKey 1.0"
-        exports: ["QtQuick.VirtualKeyboard/EnterKey 1.0"]
+        name: "QtQuick.VirtualKeyboard/EnterKey 2.0"
+        exports: ["QtQuick.VirtualKeyboard/EnterKey 2.0"]
         exportMetaObjectRevisions: [0]
         isComposite: true
         defaultProperty: "data"
@@ -916,8 +917,8 @@ Module {
     }
     Component {
         prototype: "QQuickItem"
-        name: "QtQuick.VirtualKeyboard/HideKeyboardKey 1.0"
-        exports: ["QtQuick.VirtualKeyboard/HideKeyboardKey 1.0"]
+        name: "QtQuick.VirtualKeyboard/HideKeyboardKey 2.0"
+        exports: ["QtQuick.VirtualKeyboard/HideKeyboardKey 2.0"]
         exportMetaObjectRevisions: [0]
         isComposite: true
         defaultProperty: "data"
@@ -945,8 +946,8 @@ Module {
     }
     Component {
         prototype: "QQuickItem"
-        name: "QtQuick.VirtualKeyboard/HideKeyboardKey 2.0"
-        exports: ["QtQuick.VirtualKeyboard/HideKeyboardKey 2.0"]
+        name: "QtQuick.VirtualKeyboard/HideKeyboardKey 1.0"
+        exports: ["QtQuick.VirtualKeyboard/HideKeyboardKey 1.0"]
         exportMetaObjectRevisions: [0]
         isComposite: true
         defaultProperty: "data"
@@ -1018,9 +1019,9 @@ Module {
     }
     Component {
         prototype: "QQuickItem"
-        name: "QtQuick.VirtualKeyboard/InputPanel 2.3"
-        exports: ["QtQuick.VirtualKeyboard/InputPanel 2.3"]
-        exportMetaObjectRevisions: [3]
+        name: "QtQuick.VirtualKeyboard/InputPanel 1.2"
+        exports: ["QtQuick.VirtualKeyboard/InputPanel 1.2"]
+        exportMetaObjectRevisions: [2]
         isComposite: true
         defaultProperty: "data"
         Property { name: "externalLanguageSwitchEnabled"; type: "bool" }
@@ -1035,9 +1036,9 @@ Module {
     }
     Component {
         prototype: "QQuickItem"
-        name: "QtQuick.VirtualKeyboard/InputPanel 1.2"
-        exports: ["QtQuick.VirtualKeyboard/InputPanel 1.2"]
-        exportMetaObjectRevisions: [2]
+        name: "QtQuick.VirtualKeyboard/InputPanel 1.3"
+        exports: ["QtQuick.VirtualKeyboard/InputPanel 1.3"]
+        exportMetaObjectRevisions: [3]
         isComposite: true
         defaultProperty: "data"
         Property { name: "externalLanguageSwitchEnabled"; type: "bool" }
@@ -1052,9 +1053,9 @@ Module {
     }
     Component {
         prototype: "QQuickItem"
-        name: "QtQuick.VirtualKeyboard/InputPanel 2.1"
-        exports: ["QtQuick.VirtualKeyboard/InputPanel 2.1"]
-        exportMetaObjectRevisions: [1]
+        name: "QtQuick.VirtualKeyboard/InputPanel 2.4"
+        exports: ["QtQuick.VirtualKeyboard/InputPanel 2.4"]
+        exportMetaObjectRevisions: [4]
         isComposite: true
         defaultProperty: "data"
         Property { name: "externalLanguageSwitchEnabled"; type: "bool" }
@@ -1069,9 +1070,9 @@ Module {
     }
     Component {
         prototype: "QQuickItem"
-        name: "QtQuick.VirtualKeyboard/InputPanel 2.4"
-        exports: ["QtQuick.VirtualKeyboard/InputPanel 2.4"]
-        exportMetaObjectRevisions: [4]
+        name: "QtQuick.VirtualKeyboard/InputPanel 2.2"
+        exports: ["QtQuick.VirtualKeyboard/InputPanel 2.2"]
+        exportMetaObjectRevisions: [2]
         isComposite: true
         defaultProperty: "data"
         Property { name: "externalLanguageSwitchEnabled"; type: "bool" }
@@ -1086,9 +1087,9 @@ Module {
     }
     Component {
         prototype: "QQuickItem"
-        name: "QtQuick.VirtualKeyboard/InputPanel 1.3"
-        exports: ["QtQuick.VirtualKeyboard/InputPanel 1.3"]
-        exportMetaObjectRevisions: [3]
+        name: "QtQuick.VirtualKeyboard/InputPanel 2.0"
+        exports: ["QtQuick.VirtualKeyboard/InputPanel 2.0"]
+        exportMetaObjectRevisions: [0]
         isComposite: true
         defaultProperty: "data"
         Property { name: "externalLanguageSwitchEnabled"; type: "bool" }
@@ -1103,9 +1104,9 @@ Module {
     }
     Component {
         prototype: "QQuickItem"
-        name: "QtQuick.VirtualKeyboard/InputPanel 2.2"
-        exports: ["QtQuick.VirtualKeyboard/InputPanel 2.2"]
-        exportMetaObjectRevisions: [2]
+        name: "QtQuick.VirtualKeyboard/InputPanel 1.0"
+        exports: ["QtQuick.VirtualKeyboard/InputPanel 1.0"]
+        exportMetaObjectRevisions: [0]
         isComposite: true
         defaultProperty: "data"
         Property { name: "externalLanguageSwitchEnabled"; type: "bool" }
@@ -1120,9 +1121,9 @@ Module {
     }
     Component {
         prototype: "QQuickItem"
-        name: "QtQuick.VirtualKeyboard/InputPanel 1.0"
-        exports: ["QtQuick.VirtualKeyboard/InputPanel 1.0"]
-        exportMetaObjectRevisions: [0]
+        name: "QtQuick.VirtualKeyboard/InputPanel 2.1"
+        exports: ["QtQuick.VirtualKeyboard/InputPanel 2.1"]
+        exportMetaObjectRevisions: [1]
         isComposite: true
         defaultProperty: "data"
         Property { name: "externalLanguageSwitchEnabled"; type: "bool" }
@@ -1137,9 +1138,9 @@ Module {
     }
     Component {
         prototype: "QQuickItem"
-        name: "QtQuick.VirtualKeyboard/InputPanel 2.0"
-        exports: ["QtQuick.VirtualKeyboard/InputPanel 2.0"]
-        exportMetaObjectRevisions: [0]
+        name: "QtQuick.VirtualKeyboard/InputPanel 2.3"
+        exports: ["QtQuick.VirtualKeyboard/InputPanel 2.3"]
+        exportMetaObjectRevisions: [3]
         isComposite: true
         defaultProperty: "data"
         Property { name: "externalLanguageSwitchEnabled"; type: "bool" }
@@ -1212,8 +1213,8 @@ Module {
     }
     Component {
         prototype: "QQuickItem"
-        name: "QtQuick.VirtualKeyboard/Keyboard 1.0"
-        exports: ["QtQuick.VirtualKeyboard/Keyboard 1.0"]
+        name: "QtQuick.VirtualKeyboard/Keyboard 2.0"
+        exports: ["QtQuick.VirtualKeyboard/Keyboard 2.0"]
         exportMetaObjectRevisions: [0]
         isComposite: true
         defaultProperty: "data"
@@ -1341,8 +1342,8 @@ Module {
     }
     Component {
         prototype: "QQuickItem"
-        name: "QtQuick.VirtualKeyboard/Keyboard 2.0"
-        exports: ["QtQuick.VirtualKeyboard/Keyboard 2.0"]
+        name: "QtQuick.VirtualKeyboard/Keyboard 1.0"
+        exports: ["QtQuick.VirtualKeyboard/Keyboard 1.0"]
         exportMetaObjectRevisions: [0]
         isComposite: true
         defaultProperty: "data"
@@ -1470,8 +1471,8 @@ Module {
     }
     Component {
         prototype: "QQuickColumnLayout"
-        name: "QtQuick.VirtualKeyboard/KeyboardColumn 2.0"
-        exports: ["QtQuick.VirtualKeyboard/KeyboardColumn 2.0"]
+        name: "QtQuick.VirtualKeyboard/KeyboardColumn 1.0"
+        exports: ["QtQuick.VirtualKeyboard/KeyboardColumn 1.0"]
         exportMetaObjectRevisions: [0]
         isComposite: true
         defaultProperty: "data"
@@ -1480,8 +1481,8 @@ Module {
     }
     Component {
         prototype: "QQuickColumnLayout"
-        name: "QtQuick.VirtualKeyboard/KeyboardColumn 1.0"
-        exports: ["QtQuick.VirtualKeyboard/KeyboardColumn 1.0"]
+        name: "QtQuick.VirtualKeyboard/KeyboardColumn 2.0"
+        exports: ["QtQuick.VirtualKeyboard/KeyboardColumn 2.0"]
         exportMetaObjectRevisions: [0]
         isComposite: true
         defaultProperty: "data"
@@ -1490,8 +1491,8 @@ Module {
     }
     Component {
         prototype: "QQuickColumnLayout"
-        name: "QtQuick.VirtualKeyboard/KeyboardLayout 1.0"
-        exports: ["QtQuick.VirtualKeyboard/KeyboardLayout 1.0"]
+        name: "QtQuick.VirtualKeyboard/KeyboardLayout 2.0"
+        exports: ["QtQuick.VirtualKeyboard/KeyboardLayout 2.0"]
         exportMetaObjectRevisions: [0]
         isComposite: true
         defaultProperty: "data"
@@ -1504,8 +1505,8 @@ Module {
     }
     Component {
         prototype: "QQuickColumnLayout"
-        name: "QtQuick.VirtualKeyboard/KeyboardLayout 2.0"
-        exports: ["QtQuick.VirtualKeyboard/KeyboardLayout 2.0"]
+        name: "QtQuick.VirtualKeyboard/KeyboardLayout 1.0"
+        exports: ["QtQuick.VirtualKeyboard/KeyboardLayout 1.0"]
         exportMetaObjectRevisions: [0]
         isComposite: true
         defaultProperty: "data"
@@ -1518,9 +1519,9 @@ Module {
     }
     Component {
         prototype: "QQuickLoader"
-        name: "QtQuick.VirtualKeyboard/KeyboardLayoutLoader 1.1"
-        exports: ["QtQuick.VirtualKeyboard/KeyboardLayoutLoader 1.1"]
-        exportMetaObjectRevisions: [1]
+        name: "QtQuick.VirtualKeyboard/KeyboardLayoutLoader 2.0"
+        exports: ["QtQuick.VirtualKeyboard/KeyboardLayoutLoader 2.0"]
+        exportMetaObjectRevisions: [0]
         isComposite: true
         defaultProperty: "data"
         Property { name: "inputMethod"; type: "QVariant" }
@@ -1531,9 +1532,9 @@ Module {
     }
     Component {
         prototype: "QQuickLoader"
-        name: "QtQuick.VirtualKeyboard/KeyboardLayoutLoader 2.0"
-        exports: ["QtQuick.VirtualKeyboard/KeyboardLayoutLoader 2.0"]
-        exportMetaObjectRevisions: [0]
+        name: "QtQuick.VirtualKeyboard/KeyboardLayoutLoader 1.1"
+        exports: ["QtQuick.VirtualKeyboard/KeyboardLayoutLoader 1.1"]
+        exportMetaObjectRevisions: [1]
         isComposite: true
         defaultProperty: "data"
         Property { name: "inputMethod"; type: "QVariant" }
@@ -1593,9 +1594,45 @@ Module {
         Signal { name: "clicked" }
     }
     Component {
+        prototype: "QQuickItem"
+        name: "QtQuick.VirtualKeyboard/MultiSoundEffect 2.0"
+        exports: ["QtQuick.VirtualKeyboard/MultiSoundEffect 2.0"]
+        exportMetaObjectRevisions: [0]
+        isComposite: true
+        defaultProperty: "data"
+        Property { name: "source"; type: "QUrl" }
+        Property { name: "maxInstances"; type: "int" }
+        Property { name: "__cachedInstances"; type: "QVariant" }
+        Property { name: "__currentIndex"; type: "int" }
+        Signal {
+            name: "playingChanged"
+            Parameter { name: "source"; type: "QUrl" }
+            Parameter { name: "playing"; type: "bool" }
+        }
+        Method { name: "play"; type: "QVariant" }
+    }
+    Component {
+        prototype: "QQuickItem"
+        name: "QtQuick.VirtualKeyboard/MultiSoundEffect 1.1"
+        exports: ["QtQuick.VirtualKeyboard/MultiSoundEffect 1.1"]
+        exportMetaObjectRevisions: [1]
+        isComposite: true
+        defaultProperty: "data"
+        Property { name: "source"; type: "QUrl" }
+        Property { name: "maxInstances"; type: "int" }
+        Property { name: "__cachedInstances"; type: "QVariant" }
+        Property { name: "__currentIndex"; type: "int" }
+        Signal {
+            name: "playingChanged"
+            Parameter { name: "source"; type: "QUrl" }
+            Parameter { name: "playing"; type: "bool" }
+        }
+        Method { name: "play"; type: "QVariant" }
+    }
+    Component {
         prototype: "QVirtualKeyboardAbstractInputMethod"
-        name: "QtQuick.VirtualKeyboard/MultitapInputMethod 1.0"
-        exports: ["QtQuick.VirtualKeyboard/MultitapInputMethod 1.0"]
+        name: "QtQuick.VirtualKeyboard/MultitapInputMethod 2.0"
+        exports: ["QtQuick.VirtualKeyboard/MultitapInputMethod 2.0"]
         exportMetaObjectRevisions: [0]
         isComposite: true
         Property { name: "multitapSequence"; type: "string" }
@@ -1660,8 +1697,8 @@ Module {
     }
     Component {
         prototype: "QVirtualKeyboardAbstractInputMethod"
-        name: "QtQuick.VirtualKeyboard/MultitapInputMethod 2.0"
-        exports: ["QtQuick.VirtualKeyboard/MultitapInputMethod 2.0"]
+        name: "QtQuick.VirtualKeyboard/MultitapInputMethod 1.0"
+        exports: ["QtQuick.VirtualKeyboard/MultitapInputMethod 1.0"]
         exportMetaObjectRevisions: [0]
         isComposite: true
         Property { name: "multitapSequence"; type: "string" }
@@ -1865,8 +1902,8 @@ Module {
     }
     Component {
         prototype: "QQuickItem"
-        name: "QtQuick.VirtualKeyboard/SpaceKey 1.0"
-        exports: ["QtQuick.VirtualKeyboard/SpaceKey 1.0"]
+        name: "QtQuick.VirtualKeyboard/SpaceKey 2.0"
+        exports: ["QtQuick.VirtualKeyboard/SpaceKey 2.0"]
         exportMetaObjectRevisions: [0]
         isComposite: true
         defaultProperty: "data"
@@ -1894,8 +1931,8 @@ Module {
     }
     Component {
         prototype: "QQuickItem"
-        name: "QtQuick.VirtualKeyboard/SpaceKey 2.0"
-        exports: ["QtQuick.VirtualKeyboard/SpaceKey 2.0"]
+        name: "QtQuick.VirtualKeyboard/SpaceKey 1.0"
+        exports: ["QtQuick.VirtualKeyboard/SpaceKey 1.0"]
         exportMetaObjectRevisions: [0]
         isComposite: true
         defaultProperty: "data"
@@ -1923,8 +1960,8 @@ Module {
     }
     Component {
         prototype: "QQuickItem"
-        name: "QtQuick.VirtualKeyboard/SymbolModeKey 1.0"
-        exports: ["QtQuick.VirtualKeyboard/SymbolModeKey 1.0"]
+        name: "QtQuick.VirtualKeyboard/SymbolModeKey 2.0"
+        exports: ["QtQuick.VirtualKeyboard/SymbolModeKey 2.0"]
         exportMetaObjectRevisions: [0]
         isComposite: true
         defaultProperty: "data"
@@ -1952,8 +1989,8 @@ Module {
     }
     Component {
         prototype: "QQuickItem"
-        name: "QtQuick.VirtualKeyboard/SymbolModeKey 2.0"
-        exports: ["QtQuick.VirtualKeyboard/SymbolModeKey 2.0"]
+        name: "QtQuick.VirtualKeyboard/SymbolModeKey 1.0"
+        exports: ["QtQuick.VirtualKeyboard/SymbolModeKey 1.0"]
         exportMetaObjectRevisions: [0]
         isComposite: true
         defaultProperty: "data"
diff --git a/src/plugins/lipi-toolkit/plugin/lipiinputmethod.cpp b/src/plugins/lipi-toolkit/plugin/lipiinputmethod.cpp
index ca23c491..829692c8 100644
--- a/src/plugins/lipi-toolkit/plugin/lipiinputmethod.cpp
+++ b/src/plugins/lipi-toolkit/plugin/lipiinputmethod.cpp
@@ -621,6 +621,7 @@ void LipiInputMethod::timerEvent(QTimerEvent *timerEvent)
 
 void LipiInputMethod::resultsAvailable(const QVariantList &resultList)
 {
+#ifdef SENSITIVE_DEBUG
     if (lcLipi().isDebugEnabled()) {
         qCDebug(lcLipi) << "LipiInputMethod::resultsAvailable():";
         for (int i = 0; i < resultList.size(); i++) {
@@ -631,6 +632,7 @@ void LipiInputMethod::resultsAvailable(const QVariantList &resultList)
                                .arg(unicode).arg(confidence).toUtf8().constData();
         }
     }
+#endif
     Q_D(LipiInputMethod);
     d->resultsAvailable(resultList);
 }
diff --git a/src/plugins/myscript/plugin/myscriptinputmethod.cpp b/src/plugins/myscript/plugin/myscriptinputmethod.cpp
index aaa4d62e..2a87bdbb 100644
--- a/src/plugins/myscript/plugin/myscriptinputmethod.cpp
+++ b/src/plugins/myscript/plugin/myscriptinputmethod.cpp
@@ -890,7 +890,9 @@ public:
             return;
 
         qCDebug(qlcVKMyScript) << Q_FUNC_INFO;
+#ifdef SENSITIVE_DEBUG
         qCDebug(qlcVKMyScript) << "preeditText:" << ic->preeditText();
+#endif
 
         bool isItemChanged = false;
         int lastPosition = 0;
@@ -1299,8 +1301,10 @@ void MyScriptRecognizeWorker::manageRecognitionResult(voimEngine *engine, voimRe
                     char *temp = bytes.data();
 
                     voim_getItemCandidateLabel(engine, result, itemIndex, candidateIndex, temp, length, "UTF-8");
+#ifdef SENSITIVE_DEBUG
                     float score = voim_getItemCandidateScore(engine, result, itemIndex, candidateIndex);
                     qCDebug(qlcVKMyScript) << "      - candidate #" << candidateIndex << " of " << candidateCount << " :" << temp << "(" << score << ")";
+#endif
 
                     QString label = QString::fromUtf8(temp);
 
diff --git a/src/plugins/openwnn/3rdparty/openwnn/wnnEngine/composingtext.cpp b/src/plugins/openwnn/3rdparty/openwnn/wnnEngine/composingtext.cpp
index f891ff6c..27070805 100644
--- a/src/plugins/openwnn/3rdparty/openwnn/wnnEngine/composingtext.cpp
+++ b/src/plugins/openwnn/3rdparty/openwnn/wnnEngine/composingtext.cpp
@@ -208,6 +208,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++) {
         qCDebug(lcOpenWnn).noquote() << QStringLiteral("ComposingText[%1]").arg(i);
@@ -219,6 +220,7 @@ void ComposingText::debugout() const
         }
         qCDebug(lcOpenWnn).noquote() << "  str =" << tmp;
     }
+#endif
 }
 
 QString ComposingText::toString(TextLayer layer, int from, int to) const
diff --git a/src/plugins/t9write/plugin/t9writeinputmethod.cpp b/src/plugins/t9write/plugin/t9writeinputmethod.cpp
index 9e62e836..1626a199 100644
--- a/src/plugins/t9write/plugin/t9writeinputmethod.cpp
+++ b/src/plugins/t9write/plugin/t9writeinputmethod.cpp
@@ -2127,6 +2127,7 @@ void T9WriteInputMethod::dictionaryLoadCompleted(QSharedPointer<T9WriteDictionar
 
 void T9WriteInputMethod::resultsAvailable(const QVariantList &resultList)
 {
+#ifdef SENSITIVE_DEBUG
     if (lcT9Write().isDebugEnabled()) {
         qCDebug(lcT9Write) << "T9WriteInputMethod::resultsAvailable():";
         for (int i = 0; i < resultList.size(); i++) {
@@ -2147,6 +2148,7 @@ void T9WriteInputMethod::resultsAvailable(const QVariantList &resultList)
             qCDebug(lcT9Write) << resultPrint.toUtf8().constData();
         }
     }
+#endif
     Q_D(T9WriteInputMethod);
     QMutexLocker resultListGuard(&d->resultListLock);
     d->resultList = resultList;
diff --git a/src/plugins/t9write/plugin/t9writeworker.cpp b/src/plugins/t9write/plugin/t9writeworker.cpp
index be9b4d9e..3dd0a6a2 100644
--- a/src/plugins/t9write/plugin/t9writeworker.cpp
+++ b/src/plugins/t9write/plugin/t9writeworker.cpp
@@ -173,7 +173,9 @@ T9WriteRecognitionTask::T9WriteRecognitionTask(QSharedPointer<T9WriteRecognition
     stringStart(stringStart),
     stateCancelled(false)
 {
+#ifdef SENSITIVE_DEBUG
     qCDebug(lcT9Write) << "T9WriteRecognitionTask():" << "boostLevel:" << boostLevel << "stringStart:" << stringStart;
+#endif
 }
 
 void T9WriteRecognitionTask::run()
diff --git a/src/settings/dependencies.json b/src/settings/dependencies.json
new file mode 100644
index 00000000..0d4f101c
--- /dev/null
+++ b/src/settings/dependencies.json
@@ -0,0 +1,2 @@
+[
+]
diff --git a/src/settings/plugins.qmltypes b/src/settings/plugins.qmltypes
index 4ad5e4ae..2278e05c 100644
--- a/src/settings/plugins.qmltypes
+++ b/src/settings/plugins.qmltypes
@@ -4,7 +4,7 @@ import QtQuick.tooling 1.2
 // It is used for QML tooling purposes only.
 //
 // This file was auto-generated by:
-// 'qmlplugindump -nonrelocatable QtQuick.VirtualKeyboard.Settings 2.2'
+// 'qmlplugindump -nonrelocatable -dependencies dependencies.json QtQuick.VirtualKeyboard.Settings 2.2'
 
 Module {
     dependencies: []
diff --git a/src/styles/plugins.qmltypes b/src/styles/plugins.qmltypes
index 37266bb0..04aa6867 100644
--- a/src/styles/plugins.qmltypes
+++ b/src/styles/plugins.qmltypes
@@ -7,321 +7,29 @@ import QtQuick.tooling 1.2
 // 'qmlplugindump -nonrelocatable QtQuick.VirtualKeyboard.Styles 2.2'
 
 Module {
-    dependencies: []
+    dependencies: ["QtQuick 2.0"]
     Component {
-        prototype: "QObject"
-        name: "QtQuick.VirtualKeyboard.Styles/KeyIcon 2.0"
-        exports: ["QtQuick.VirtualKeyboard.Styles/KeyIcon 2.0"]
+        prototype: "QQuickItem"
+        name: "QtQuick.VirtualKeyboard.Styles/KeyIcon 1.0"
+        exports: ["QtQuick.VirtualKeyboard.Styles/KeyIcon 1.0"]
         exportMetaObjectRevisions: [0]
         isComposite: true
         defaultProperty: "data"
         Property { name: "color"; type: "QColor" }
         Property { name: "source"; type: "QUrl" }
-        Property { name: "parent"; type: "QQuickItem"; isPointer: true }
-        Property { name: "data"; type: "QObject"; isList: true; isReadonly: true }
-        Property { name: "resources"; type: "QObject"; isList: true; isReadonly: true }
-        Property { name: "children"; type: "QQuickItem"; isList: true; isReadonly: true }
-        Property { name: "x"; type: "double" }
-        Property { name: "y"; type: "double" }
-        Property { name: "z"; type: "double" }
-        Property { name: "width"; type: "double" }
-        Property { name: "height"; type: "double" }
-        Property { name: "opacity"; type: "double" }
-        Property { name: "enabled"; type: "bool" }
-        Property { name: "visible"; type: "bool" }
-        Property { name: "visibleChildren"; type: "QQuickItem"; isList: true; isReadonly: true }
-        Property { name: "states"; type: "QQuickState"; isList: true; isReadonly: true }
-        Property { name: "transitions"; type: "QQuickTransition"; isList: true; isReadonly: true }
-        Property { name: "state"; type: "string" }
-        Property { name: "childrenRect"; type: "QRectF"; isReadonly: true }
-        Property { name: "anchors"; type: "QQuickAnchors"; isReadonly: true; isPointer: true }
-        Property { name: "left"; type: "QQuickAnchorLine"; isReadonly: true }
-        Property { name: "right"; type: "QQuickAnchorLine"; isReadonly: true }
-        Property { name: "horizontalCenter"; type: "QQuickAnchorLine"; isReadonly: true }
-        Property { name: "top"; type: "QQuickAnchorLine"; isReadonly: true }
-        Property { name: "bottom"; type: "QQuickAnchorLine"; isReadonly: true }
-        Property { name: "verticalCenter"; type: "QQuickAnchorLine"; isReadonly: true }
-        Property { name: "baseline"; type: "QQuickAnchorLine"; isReadonly: true }
-        Property { name: "baselineOffset"; type: "double" }
-        Property { name: "clip"; type: "bool" }
-        Property { name: "focus"; type: "bool" }
-        Property { name: "activeFocus"; type: "bool"; isReadonly: true }
-        Property { name: "activeFocusOnTab"; revision: 1; type: "bool" }
-        Property { name: "rotation"; type: "double" }
-        Property { name: "scale"; type: "double" }
-        Property { name: "transformOrigin"; type: "TransformOrigin" }
-        Property { name: "transformOriginPoint"; type: "QPointF"; isReadonly: true }
-        Property { name: "transform"; type: "QQuickTransform"; isList: true; isReadonly: true }
-        Property { name: "smooth"; type: "bool" }
-        Property { name: "antialiasing"; type: "bool" }
-        Property { name: "implicitWidth"; type: "double" }
-        Property { name: "implicitHeight"; type: "double" }
-        Property { name: "containmentMask"; revision: 11; type: "QObject"; isPointer: true }
-        Property { name: "layer"; type: "QQuickItemLayer"; isReadonly: true; isPointer: true }
-        Signal {
-            name: "childrenRectChanged"
-            Parameter { type: "QRectF" }
-        }
-        Signal {
-            name: "baselineOffsetChanged"
-            Parameter { type: "double" }
-        }
-        Signal {
-            name: "stateChanged"
-            Parameter { type: "string" }
-        }
-        Signal {
-            name: "focusChanged"
-            Parameter { type: "bool" }
-        }
-        Signal {
-            name: "activeFocusChanged"
-            Parameter { type: "bool" }
-        }
-        Signal {
-            name: "activeFocusOnTabChanged"
-            revision: 1
-            Parameter { type: "bool" }
-        }
-        Signal {
-            name: "parentChanged"
-            Parameter { type: "QQuickItem"; isPointer: true }
-        }
-        Signal {
-            name: "transformOriginChanged"
-            Parameter { type: "TransformOrigin" }
-        }
-        Signal {
-            name: "smoothChanged"
-            Parameter { type: "bool" }
-        }
-        Signal {
-            name: "antialiasingChanged"
-            Parameter { type: "bool" }
-        }
-        Signal {
-            name: "clipChanged"
-            Parameter { type: "bool" }
-        }
-        Signal {
-            name: "windowChanged"
-            revision: 1
-            Parameter { name: "window"; type: "QQuickWindow"; isPointer: true }
-        }
-        Method { name: "update" }
-        Method {
-            name: "grabToImage"
-            revision: 2
-            type: "bool"
-            Parameter { name: "callback"; type: "QJSValue" }
-            Parameter { name: "targetSize"; type: "QSize" }
-        }
-        Method {
-            name: "grabToImage"
-            revision: 2
-            type: "bool"
-            Parameter { name: "callback"; type: "QJSValue" }
-        }
-        Method {
-            name: "contains"
-            type: "bool"
-            Parameter { name: "point"; type: "QPointF" }
-        }
-        Method {
-            name: "mapFromItem"
-            Parameter { type: "QQmlV4Function"; isPointer: true }
-        }
-        Method {
-            name: "mapToItem"
-            Parameter { type: "QQmlV4Function"; isPointer: true }
-        }
-        Method {
-            name: "mapFromGlobal"
-            revision: 7
-            Parameter { type: "QQmlV4Function"; isPointer: true }
-        }
-        Method {
-            name: "mapToGlobal"
-            revision: 7
-            Parameter { type: "QQmlV4Function"; isPointer: true }
-        }
-        Method { name: "forceActiveFocus" }
-        Method {
-            name: "forceActiveFocus"
-            Parameter { name: "reason"; type: "Qt::FocusReason" }
-        }
-        Method {
-            name: "nextItemInFocusChain"
-            revision: 1
-            type: "QQuickItem*"
-            Parameter { name: "forward"; type: "bool" }
-        }
-        Method { name: "nextItemInFocusChain"; revision: 1; type: "QQuickItem*" }
-        Method {
-            name: "childAt"
-            type: "QQuickItem*"
-            Parameter { name: "x"; type: "double" }
-            Parameter { name: "y"; type: "double" }
-        }
     }
     Component {
-        prototype: "QObject"
-        name: "QtQuick.VirtualKeyboard.Styles/KeyIcon 1.0"
-        exports: ["QtQuick.VirtualKeyboard.Styles/KeyIcon 1.0"]
+        prototype: "QQuickItem"
+        name: "QtQuick.VirtualKeyboard.Styles/KeyIcon 2.0"
+        exports: ["QtQuick.VirtualKeyboard.Styles/KeyIcon 2.0"]
         exportMetaObjectRevisions: [0]
         isComposite: true
         defaultProperty: "data"
         Property { name: "color"; type: "QColor" }
         Property { name: "source"; type: "QUrl" }
-        Property { name: "parent"; type: "QQuickItem"; isPointer: true }
-        Property { name: "data"; type: "QObject"; isList: true; isReadonly: true }
-        Property { name: "resources"; type: "QObject"; isList: true; isReadonly: true }
-        Property { name: "children"; type: "QQuickItem"; isList: true; isReadonly: true }
-        Property { name: "x"; type: "double" }
-        Property { name: "y"; type: "double" }
-        Property { name: "z"; type: "double" }
-        Property { name: "width"; type: "double" }
-        Property { name: "height"; type: "double" }
-        Property { name: "opacity"; type: "double" }
-        Property { name: "enabled"; type: "bool" }
-        Property { name: "visible"; type: "bool" }
-        Property { name: "visibleChildren"; type: "QQuickItem"; isList: true; isReadonly: true }
-        Property { name: "states"; type: "QQuickState"; isList: true; isReadonly: true }
-        Property { name: "transitions"; type: "QQuickTransition"; isList: true; isReadonly: true }
-        Property { name: "state"; type: "string" }
-        Property { name: "childrenRect"; type: "QRectF"; isReadonly: true }
-        Property { name: "anchors"; type: "QQuickAnchors"; isReadonly: true; isPointer: true }
-        Property { name: "left"; type: "QQuickAnchorLine"; isReadonly: true }
-        Property { name: "right"; type: "QQuickAnchorLine"; isReadonly: true }
-        Property { name: "horizontalCenter"; type: "QQuickAnchorLine"; isReadonly: true }
-        Property { name: "top"; type: "QQuickAnchorLine"; isReadonly: true }
-        Property { name: "bottom"; type: "QQuickAnchorLine"; isReadonly: true }
-        Property { name: "verticalCenter"; type: "QQuickAnchorLine"; isReadonly: true }
-        Property { name: "baseline"; type: "QQuickAnchorLine"; isReadonly: true }
-        Property { name: "baselineOffset"; type: "double" }
-        Property { name: "clip"; type: "bool" }
-        Property { name: "focus"; type: "bool" }
-        Property { name: "activeFocus"; type: "bool"; isReadonly: true }
-        Property { name: "activeFocusOnTab"; revision: 1; type: "bool" }
-        Property { name: "rotation"; type: "double" }
-        Property { name: "scale"; type: "double" }
-        Property { name: "transformOrigin"; type: "TransformOrigin" }
-        Property { name: "transformOriginPoint"; type: "QPointF"; isReadonly: true }
-        Property { name: "transform"; type: "QQuickTransform"; isList: true; isReadonly: true }
-        Property { name: "smooth"; type: "bool" }
-        Property { name: "antialiasing"; type: "bool" }
-        Property { name: "implicitWidth"; type: "double" }
-        Property { name: "implicitHeight"; type: "double" }
-        Property { name: "containmentMask"; revision: 11; type: "QObject"; isPointer: true }
-        Property { name: "layer"; type: "QQuickItemLayer"; isReadonly: true; isPointer: true }
-        Signal {
-            name: "childrenRectChanged"
-            Parameter { type: "QRectF" }
-        }
-        Signal {
-            name: "baselineOffsetChanged"
-            Parameter { type: "double" }
-        }
-        Signal {
-            name: "stateChanged"
-            Parameter { type: "string" }
-        }
-        Signal {
-            name: "focusChanged"
-            Parameter { type: "bool" }
-        }
-        Signal {
-            name: "activeFocusChanged"
-            Parameter { type: "bool" }
-        }
-        Signal {
-            name: "activeFocusOnTabChanged"
-            revision: 1
-            Parameter { type: "bool" }
-        }
-        Signal {
-            name: "parentChanged"
-            Parameter { type: "QQuickItem"; isPointer: true }
-        }
-        Signal {
-            name: "transformOriginChanged"
-            Parameter { type: "TransformOrigin" }
-        }
-        Signal {
-            name: "smoothChanged"
-            Parameter { type: "bool" }
-        }
-        Signal {
-            name: "antialiasingChanged"
-            Parameter { type: "bool" }
-        }
-        Signal {
-            name: "clipChanged"
-            Parameter { type: "bool" }
-        }
-        Signal {
-            name: "windowChanged"
-            revision: 1
-            Parameter { name: "window"; type: "QQuickWindow"; isPointer: true }
-        }
-        Method { name: "update" }
-        Method {
-            name: "grabToImage"
-            revision: 2
-            type: "bool"
-            Parameter { name: "callback"; type: "QJSValue" }
-            Parameter { name: "targetSize"; type: "QSize" }
-        }
-        Method {
-            name: "grabToImage"
-            revision: 2
-            type: "bool"
-            Parameter { name: "callback"; type: "QJSValue" }
-        }
-        Method {
-            name: "contains"
-            type: "bool"
-            Parameter { name: "point"; type: "QPointF" }
-        }
-        Method {
-            name: "mapFromItem"
-            Parameter { type: "QQmlV4Function"; isPointer: true }
-        }
-        Method {
-            name: "mapToItem"
-            Parameter { type: "QQmlV4Function"; isPointer: true }
-        }
-        Method {
-            name: "mapFromGlobal"
-            revision: 7
-            Parameter { type: "QQmlV4Function"; isPointer: true }
-        }
-        Method {
-            name: "mapToGlobal"
-            revision: 7
-            Parameter { type: "QQmlV4Function"; isPointer: true }
-        }
-        Method { name: "forceActiveFocus" }
-        Method {
-            name: "forceActiveFocus"
-            Parameter { name: "reason"; type: "Qt::FocusReason" }
-        }
-        Method {
-            name: "nextItemInFocusChain"
-            revision: 1
-            type: "QQuickItem*"
-            Parameter { name: "forward"; type: "bool" }
-        }
-        Method { name: "nextItemInFocusChain"; revision: 1; type: "QQuickItem*" }
-        Method {
-            name: "childAt"
-            type: "QQuickItem*"
-            Parameter { name: "x"; type: "double" }
-            Parameter { name: "y"; type: "double" }
-        }
     }
     Component {
-        prototype: "QObject"
+        prototype: "QQuickItem"
         name: "QtQuick.VirtualKeyboard.Styles/KeyPanel 2.0"
         exports: ["QtQuick.VirtualKeyboard.Styles/KeyPanel 2.0"]
         exportMetaObjectRevisions: [0]
@@ -329,155 +37,9 @@ Module {
         defaultProperty: "data"
         Property { name: "control"; type: "QQuickItem"; isPointer: true }
         Property { name: "soundEffect"; type: "QUrl" }
-        Property { name: "parent"; type: "QQuickItem"; isPointer: true }
-        Property { name: "data"; type: "QObject"; isList: true; isReadonly: true }
-        Property { name: "resources"; type: "QObject"; isList: true; isReadonly: true }
-        Property { name: "children"; type: "QQuickItem"; isList: true; isReadonly: true }
-        Property { name: "x"; type: "double" }
-        Property { name: "y"; type: "double" }
-        Property { name: "z"; type: "double" }
-        Property { name: "width"; type: "double" }
-        Property { name: "height"; type: "double" }
-        Property { name: "opacity"; type: "double" }
-        Property { name: "enabled"; type: "bool" }
-        Property { name: "visible"; type: "bool" }
-        Property { name: "visibleChildren"; type: "QQuickItem"; isList: true; isReadonly: true }
-        Property { name: "states"; type: "QQuickState"; isList: true; isReadonly: true }
-        Property { name: "transitions"; type: "QQuickTransition"; isList: true; isReadonly: true }
-        Property { name: "state"; type: "string" }
-        Property { name: "childrenRect"; type: "QRectF"; isReadonly: true }
-        Property { name: "anchors"; type: "QQuickAnchors"; isReadonly: true; isPointer: true }
-        Property { name: "left"; type: "QQuickAnchorLine"; isReadonly: true }
-        Property { name: "right"; type: "QQuickAnchorLine"; isReadonly: true }
-        Property { name: "horizontalCenter"; type: "QQuickAnchorLine"; isReadonly: true }
-        Property { name: "top"; type: "QQuickAnchorLine"; isReadonly: true }
-        Property { name: "bottom"; type: "QQuickAnchorLine"; isReadonly: true }
-        Property { name: "verticalCenter"; type: "QQuickAnchorLine"; isReadonly: true }
-        Property { name: "baseline"; type: "QQuickAnchorLine"; isReadonly: true }
-        Property { name: "baselineOffset"; type: "double" }
-        Property { name: "clip"; type: "bool" }
-        Property { name: "focus"; type: "bool" }
-        Property { name: "activeFocus"; type: "bool"; isReadonly: true }
-        Property { name: "activeFocusOnTab"; revision: 1; type: "bool" }
-        Property { name: "rotation"; type: "double" }
-        Property { name: "scale"; type: "double" }
-        Property { name: "transformOrigin"; type: "TransformOrigin" }
-        Property { name: "transformOriginPoint"; type: "QPointF"; isReadonly: true }
-        Property { name: "transform"; type: "QQuickTransform"; isList: true; isReadonly: true }
-        Property { name: "smooth"; type: "bool" }
-        Property { name: "antialiasing"; type: "bool" }
-        Property { name: "implicitWidth"; type: "double" }
-        Property { name: "implicitHeight"; type: "double" }
-        Property { name: "containmentMask"; revision: 11; type: "QObject"; isPointer: true }
-        Property { name: "layer"; type: "QQuickItemLayer"; isReadonly: true; isPointer: true }
-        Signal {
-            name: "childrenRectChanged"
-            Parameter { type: "QRectF" }
-        }
-        Signal {
-            name: "baselineOffsetChanged"
-            Parameter { type: "double" }
-        }
-        Signal {
-            name: "stateChanged"
-            Parameter { type: "string" }
-        }
-        Signal {
-            name: "focusChanged"
-            Parameter { type: "bool" }
-        }
-        Signal {
-            name: "activeFocusChanged"
-            Parameter { type: "bool" }
-        }
-        Signal {
-            name: "activeFocusOnTabChanged"
-            revision: 1
-            Parameter { type: "bool" }
-        }
-        Signal {
-            name: "parentChanged"
-            Parameter { type: "QQuickItem"; isPointer: true }
-        }
-        Signal {
-            name: "transformOriginChanged"
-            Parameter { type: "TransformOrigin" }
-        }
-        Signal {
-            name: "smoothChanged"
-            Parameter { type: "bool" }
-        }
-        Signal {
-            name: "antialiasingChanged"
-            Parameter { type: "bool" }
-        }
-        Signal {
-            name: "clipChanged"
-            Parameter { type: "bool" }
-        }
-        Signal {
-            name: "windowChanged"
-            revision: 1
-            Parameter { name: "window"; type: "QQuickWindow"; isPointer: true }
-        }
-        Method { name: "update" }
-        Method {
-            name: "grabToImage"
-            revision: 2
-            type: "bool"
-            Parameter { name: "callback"; type: "QJSValue" }
-            Parameter { name: "targetSize"; type: "QSize" }
-        }
-        Method {
-            name: "grabToImage"
-            revision: 2
-            type: "bool"
-            Parameter { name: "callback"; type: "QJSValue" }
-        }
-        Method {
-            name: "contains"
-            type: "bool"
-            Parameter { name: "point"; type: "QPointF" }
-        }
-        Method {
-            name: "mapFromItem"
-            Parameter { type: "QQmlV4Function"; isPointer: true }
-        }
-        Method {
-            name: "mapToItem"
-            Parameter { type: "QQmlV4Function"; isPointer: true }
-        }
-        Method {
-            name: "mapFromGlobal"
-            revision: 7
-            Parameter { type: "QQmlV4Function"; isPointer: true }
-        }
-        Method {
-            name: "mapToGlobal"
-            revision: 7
-            Parameter { type: "QQmlV4Function"; isPointer: true }
-        }
-        Method { name: "forceActiveFocus" }
-        Method {
-            name: "forceActiveFocus"
-            Parameter { name: "reason"; type: "Qt::FocusReason" }
-        }
-        Method {
-            name: "nextItemInFocusChain"
-            revision: 1
-            type: "QQuickItem*"
-            Parameter { name: "forward"; type: "bool" }
-        }
-        Method { name: "nextItemInFocusChain"; revision: 1; type: "QQuickItem*" }
-        Method {
-            name: "childAt"
-            type: "QQuickItem*"
-            Parameter { name: "x"; type: "double" }
-            Parameter { name: "y"; type: "double" }
-        }
     }
     Component {
-        prototype: "QObject"
+        prototype: "QQuickItem"
         name: "QtQuick.VirtualKeyboard.Styles/KeyPanel 1.0"
         exports: ["QtQuick.VirtualKeyboard.Styles/KeyPanel 1.0"]
         exportMetaObjectRevisions: [0]
@@ -485,158 +47,12 @@ Module {
         defaultProperty: "data"
         Property { name: "control"; type: "QQuickItem"; isPointer: true }
         Property { name: "soundEffect"; type: "QUrl" }
-        Property { name: "parent"; type: "QQuickItem"; isPointer: true }
-        Property { name: "data"; type: "QObject"; isList: true; isReadonly: true }
-        Property { name: "resources"; type: "QObject"; isList: true; isReadonly: true }
-        Property { name: "children"; type: "QQuickItem"; isList: true; isReadonly: true }
-        Property { name: "x"; type: "double" }
-        Property { name: "y"; type: "double" }
-        Property { name: "z"; type: "double" }
-        Property { name: "width"; type: "double" }
-        Property { name: "height"; type: "double" }
-        Property { name: "opacity"; type: "double" }
-        Property { name: "enabled"; type: "bool" }
-        Property { name: "visible"; type: "bool" }
-        Property { name: "visibleChildren"; type: "QQuickItem"; isList: true; isReadonly: true }
-        Property { name: "states"; type: "QQuickState"; isList: true; isReadonly: true }
-        Property { name: "transitions"; type: "QQuickTransition"; isList: true; isReadonly: true }
-        Property { name: "state"; type: "string" }
-        Property { name: "childrenRect"; type: "QRectF"; isReadonly: true }
-        Property { name: "anchors"; type: "QQuickAnchors"; isReadonly: true; isPointer: true }
-        Property { name: "left"; type: "QQuickAnchorLine"; isReadonly: true }
-        Property { name: "right"; type: "QQuickAnchorLine"; isReadonly: true }
-        Property { name: "horizontalCenter"; type: "QQuickAnchorLine"; isReadonly: true }
-        Property { name: "top"; type: "QQuickAnchorLine"; isReadonly: true }
-        Property { name: "bottom"; type: "QQuickAnchorLine"; isReadonly: true }
-        Property { name: "verticalCenter"; type: "QQuickAnchorLine"; isReadonly: true }
-        Property { name: "baseline"; type: "QQuickAnchorLine"; isReadonly: true }
-        Property { name: "baselineOffset"; type: "double" }
-        Property { name: "clip"; type: "bool" }
-        Property { name: "focus"; type: "bool" }
-        Property { name: "activeFocus"; type: "bool"; isReadonly: true }
-        Property { name: "activeFocusOnTab"; revision: 1; type: "bool" }
-        Property { name: "rotation"; type: "double" }
-        Property { name: "scale"; type: "double" }
-        Property { name: "transformOrigin"; type: "TransformOrigin" }
-        Property { name: "transformOriginPoint"; type: "QPointF"; isReadonly: true }
-        Property { name: "transform"; type: "QQuickTransform"; isList: true; isReadonly: true }
-        Property { name: "smooth"; type: "bool" }
-        Property { name: "antialiasing"; type: "bool" }
-        Property { name: "implicitWidth"; type: "double" }
-        Property { name: "implicitHeight"; type: "double" }
-        Property { name: "containmentMask"; revision: 11; type: "QObject"; isPointer: true }
-        Property { name: "layer"; type: "QQuickItemLayer"; isReadonly: true; isPointer: true }
-        Signal {
-            name: "childrenRectChanged"
-            Parameter { type: "QRectF" }
-        }
-        Signal {
-            name: "baselineOffsetChanged"
-            Parameter { type: "double" }
-        }
-        Signal {
-            name: "stateChanged"
-            Parameter { type: "string" }
-        }
-        Signal {
-            name: "focusChanged"
-            Parameter { type: "bool" }
-        }
-        Signal {
-            name: "activeFocusChanged"
-            Parameter { type: "bool" }
-        }
-        Signal {
-            name: "activeFocusOnTabChanged"
-            revision: 1
-            Parameter { type: "bool" }
-        }
-        Signal {
-            name: "parentChanged"
-            Parameter { type: "QQuickItem"; isPointer: true }
-        }
-        Signal {
-            name: "transformOriginChanged"
-            Parameter { type: "TransformOrigin" }
-        }
-        Signal {
-            name: "smoothChanged"
-            Parameter { type: "bool" }
-        }
-        Signal {
-            name: "antialiasingChanged"
-            Parameter { type: "bool" }
-        }
-        Signal {
-            name: "clipChanged"
-            Parameter { type: "bool" }
-        }
-        Signal {
-            name: "windowChanged"
-            revision: 1
-            Parameter { name: "window"; type: "QQuickWindow"; isPointer: true }
-        }
-        Method { name: "update" }
-        Method {
-            name: "grabToImage"
-            revision: 2
-            type: "bool"
-            Parameter { name: "callback"; type: "QJSValue" }
-            Parameter { name: "targetSize"; type: "QSize" }
-        }
-        Method {
-            name: "grabToImage"
-            revision: 2
-            type: "bool"
-            Parameter { name: "callback"; type: "QJSValue" }
-        }
-        Method {
-            name: "contains"
-            type: "bool"
-            Parameter { name: "point"; type: "QPointF" }
-        }
-        Method {
-            name: "mapFromItem"
-            Parameter { type: "QQmlV4Function"; isPointer: true }
-        }
-        Method {
-            name: "mapToItem"
-            Parameter { type: "QQmlV4Function"; isPointer: true }
-        }
-        Method {
-            name: "mapFromGlobal"
-            revision: 7
-            Parameter { type: "QQmlV4Function"; isPointer: true }
-        }
-        Method {
-            name: "mapToGlobal"
-            revision: 7
-            Parameter { type: "QQmlV4Function"; isPointer: true }
-        }
-        Method { name: "forceActiveFocus" }
-        Method {
-            name: "forceActiveFocus"
-            Parameter { name: "reason"; type: "Qt::FocusReason" }
-        }
-        Method {
-            name: "nextItemInFocusChain"
-            revision: 1
-            type: "QQuickItem*"
-            Parameter { name: "forward"; type: "bool" }
-        }
-        Method { name: "nextItemInFocusChain"; revision: 1; type: "QQuickItem*" }
-        Method {
-            name: "childAt"
-            type: "QQuickItem*"
-            Parameter { name: "x"; type: "double" }
-            Parameter { name: "y"; type: "double" }
-        }
     }
     Component {
         prototype: "QObject"
-        name: "QtQuick.VirtualKeyboard.Styles/KeyboardStyle 2.0"
-        exports: ["QtQuick.VirtualKeyboard.Styles/KeyboardStyle 2.0"]
-        exportMetaObjectRevisions: [0]
+        name: "QtQuick.VirtualKeyboard.Styles/KeyboardStyle 2.2"
+        exports: ["QtQuick.VirtualKeyboard.Styles/KeyboardStyle 2.2"]
+        exportMetaObjectRevisions: [2]
         isComposite: true
         Property { name: "keyboardHeight"; type: "double" }
         Property { name: "keyboardDesignWidth"; type: "double" }
@@ -702,9 +118,9 @@ Module {
     }
     Component {
         prototype: "QObject"
-        name: "QtQuick.VirtualKeyboard.Styles/KeyboardStyle 2.2"
-        exports: ["QtQuick.VirtualKeyboard.Styles/KeyboardStyle 2.2"]
-        exportMetaObjectRevisions: [2]
+        name: "QtQuick.VirtualKeyboard.Styles/KeyboardStyle 1.1"
+        exports: ["QtQuick.VirtualKeyboard.Styles/KeyboardStyle 1.1"]
+        exportMetaObjectRevisions: [1]
         isComposite: true
         Property { name: "keyboardHeight"; type: "double" }
         Property { name: "keyboardDesignWidth"; type: "double" }
@@ -838,9 +254,9 @@ Module {
     }
     Component {
         prototype: "QObject"
-        name: "QtQuick.VirtualKeyboard.Styles/KeyboardStyle 1.1"
-        exports: ["QtQuick.VirtualKeyboard.Styles/KeyboardStyle 1.1"]
-        exportMetaObjectRevisions: [1]
+        name: "QtQuick.VirtualKeyboard.Styles/KeyboardStyle 2.0"
+        exports: ["QtQuick.VirtualKeyboard.Styles/KeyboardStyle 2.0"]
+        exportMetaObjectRevisions: [0]
         isComposite: true
         Property { name: "keyboardHeight"; type: "double" }
         Property { name: "keyboardDesignWidth"; type: "double" }
@@ -906,9 +322,9 @@ Module {
     }
     Component {
         prototype: "QObject"
-        name: "QtQuick.VirtualKeyboard.Styles/KeyboardStyle 1.0"
-        exports: ["QtQuick.VirtualKeyboard.Styles/KeyboardStyle 1.0"]
-        exportMetaObjectRevisions: [0]
+        name: "QtQuick.VirtualKeyboard.Styles/KeyboardStyle 1.3"
+        exports: ["QtQuick.VirtualKeyboard.Styles/KeyboardStyle 1.3"]
+        exportMetaObjectRevisions: [3]
         isComposite: true
         Property { name: "keyboardHeight"; type: "double" }
         Property { name: "keyboardDesignWidth"; type: "double" }
@@ -974,9 +390,9 @@ Module {
     }
     Component {
         prototype: "QObject"
-        name: "QtQuick.VirtualKeyboard.Styles/KeyboardStyle 1.3"
-        exports: ["QtQuick.VirtualKeyboard.Styles/KeyboardStyle 1.3"]
-        exportMetaObjectRevisions: [3]
+        name: "QtQuick.VirtualKeyboard.Styles/KeyboardStyle 1.2"
+        exports: ["QtQuick.VirtualKeyboard.Styles/KeyboardStyle 1.2"]
+        exportMetaObjectRevisions: [2]
         isComposite: true
         Property { name: "keyboardHeight"; type: "double" }
         Property { name: "keyboardDesignWidth"; type: "double" }
@@ -1042,9 +458,9 @@ Module {
     }
     Component {
         prototype: "QObject"
-        name: "QtQuick.VirtualKeyboard.Styles/KeyboardStyle 1.2"
-        exports: ["QtQuick.VirtualKeyboard.Styles/KeyboardStyle 1.2"]
-        exportMetaObjectRevisions: [2]
+        name: "QtQuick.VirtualKeyboard.Styles/KeyboardStyle 1.0"
+        exports: ["QtQuick.VirtualKeyboard.Styles/KeyboardStyle 1.0"]
+        exportMetaObjectRevisions: [0]
         isComposite: true
         Property { name: "keyboardHeight"; type: "double" }
         Property { name: "keyboardDesignWidth"; type: "double" }
@@ -1109,317 +525,25 @@ Module {
         Property { name: "fullScreenInputSelectedTextColor"; type: "QColor" }
     }
     Component {
-        prototype: "QObject"
+        prototype: "QQuickItem"
         name: "QtQuick.VirtualKeyboard.Styles/SelectionListItem 1.0"
         exports: ["QtQuick.VirtualKeyboard.Styles/SelectionListItem 1.0"]
         exportMetaObjectRevisions: [0]
         isComposite: true
         defaultProperty: "data"
         Property { name: "soundEffect"; type: "QUrl" }
-        Property { name: "parent"; type: "QQuickItem"; isPointer: true }
-        Property { name: "data"; type: "QObject"; isList: true; isReadonly: true }
-        Property { name: "resources"; type: "QObject"; isList: true; isReadonly: true }
-        Property { name: "children"; type: "QQuickItem"; isList: true; isReadonly: true }
-        Property { name: "x"; type: "double" }
-        Property { name: "y"; type: "double" }
-        Property { name: "z"; type: "double" }
-        Property { name: "width"; type: "double" }
-        Property { name: "height"; type: "double" }
-        Property { name: "opacity"; type: "double" }
-        Property { name: "enabled"; type: "bool" }
-        Property { name: "visible"; type: "bool" }
-        Property { name: "visibleChildren"; type: "QQuickItem"; isList: true; isReadonly: true }
-        Property { name: "states"; type: "QQuickState"; isList: true; isReadonly: true }
-        Property { name: "transitions"; type: "QQuickTransition"; isList: true; isReadonly: true }
-        Property { name: "state"; type: "string" }
-        Property { name: "childrenRect"; type: "QRectF"; isReadonly: true }
-        Property { name: "anchors"; type: "QQuickAnchors"; isReadonly: true; isPointer: true }
-        Property { name: "left"; type: "QQuickAnchorLine"; isReadonly: true }
-        Property { name: "right"; type: "QQuickAnchorLine"; isReadonly: true }
-        Property { name: "horizontalCenter"; type: "QQuickAnchorLine"; isReadonly: true }
-        Property { name: "top"; type: "QQuickAnchorLine"; isReadonly: true }
-        Property { name: "bottom"; type: "QQuickAnchorLine"; isReadonly: true }
-        Property { name: "verticalCenter"; type: "QQuickAnchorLine"; isReadonly: true }
-        Property { name: "baseline"; type: "QQuickAnchorLine"; isReadonly: true }
-        Property { name: "baselineOffset"; type: "double" }
-        Property { name: "clip"; type: "bool" }
-        Property { name: "focus"; type: "bool" }
-        Property { name: "activeFocus"; type: "bool"; isReadonly: true }
-        Property { name: "activeFocusOnTab"; revision: 1; type: "bool" }
-        Property { name: "rotation"; type: "double" }
-        Property { name: "scale"; type: "double" }
-        Property { name: "transformOrigin"; type: "TransformOrigin" }
-        Property { name: "transformOriginPoint"; type: "QPointF"; isReadonly: true }
-        Property { name: "transform"; type: "QQuickTransform"; isList: true; isReadonly: true }
-        Property { name: "smooth"; type: "bool" }
-        Property { name: "antialiasing"; type: "bool" }
-        Property { name: "implicitWidth"; type: "double" }
-        Property { name: "implicitHeight"; type: "double" }
-        Property { name: "containmentMask"; revision: 11; type: "QObject"; isPointer: true }
-        Property { name: "layer"; type: "QQuickItemLayer"; isReadonly: true; isPointer: true }
-        Signal {
-            name: "childrenRectChanged"
-            Parameter { type: "QRectF" }
-        }
-        Signal {
-            name: "baselineOffsetChanged"
-            Parameter { type: "double" }
-        }
-        Signal {
-            name: "stateChanged"
-            Parameter { type: "string" }
-        }
-        Signal {
-            name: "focusChanged"
-            Parameter { type: "bool" }
-        }
-        Signal {
-            name: "activeFocusChanged"
-            Parameter { type: "bool" }
-        }
-        Signal {
-            name: "activeFocusOnTabChanged"
-            revision: 1
-            Parameter { type: "bool" }
-        }
-        Signal {
-            name: "parentChanged"
-            Parameter { type: "QQuickItem"; isPointer: true }
-        }
-        Signal {
-            name: "transformOriginChanged"
-            Parameter { type: "TransformOrigin" }
-        }
-        Signal {
-            name: "smoothChanged"
-            Parameter { type: "bool" }
-        }
-        Signal {
-            name: "antialiasingChanged"
-            Parameter { type: "bool" }
-        }
-        Signal {
-            name: "clipChanged"
-            Parameter { type: "bool" }
-        }
-        Signal {
-            name: "windowChanged"
-            revision: 1
-            Parameter { name: "window"; type: "QQuickWindow"; isPointer: true }
-        }
-        Method { name: "update" }
-        Method {
-            name: "grabToImage"
-            revision: 2
-            type: "bool"
-            Parameter { name: "callback"; type: "QJSValue" }
-            Parameter { name: "targetSize"; type: "QSize" }
-        }
-        Method {
-            name: "grabToImage"
-            revision: 2
-            type: "bool"
-            Parameter { name: "callback"; type: "QJSValue" }
-        }
-        Method {
-            name: "contains"
-            type: "bool"
-            Parameter { name: "point"; type: "QPointF" }
-        }
-        Method {
-            name: "mapFromItem"
-            Parameter { type: "QQmlV4Function"; isPointer: true }
-        }
-        Method {
-            name: "mapToItem"
-            Parameter { type: "QQmlV4Function"; isPointer: true }
-        }
-        Method {
-            name: "mapFromGlobal"
-            revision: 7
-            Parameter { type: "QQmlV4Function"; isPointer: true }
-        }
-        Method {
-            name: "mapToGlobal"
-            revision: 7
-            Parameter { type: "QQmlV4Function"; isPointer: true }
-        }
-        Method { name: "forceActiveFocus" }
-        Method {
-            name: "forceActiveFocus"
-            Parameter { name: "reason"; type: "Qt::FocusReason" }
-        }
-        Method {
-            name: "nextItemInFocusChain"
-            revision: 1
-            type: "QQuickItem*"
-            Parameter { name: "forward"; type: "bool" }
-        }
-        Method { name: "nextItemInFocusChain"; revision: 1; type: "QQuickItem*" }
-        Method {
-            name: "childAt"
-            type: "QQuickItem*"
-            Parameter { name: "x"; type: "double" }
-            Parameter { name: "y"; type: "double" }
-        }
     }
     Component {
-        prototype: "QObject"
+        prototype: "QQuickItem"
         name: "QtQuick.VirtualKeyboard.Styles/SelectionListItem 2.0"
         exports: ["QtQuick.VirtualKeyboard.Styles/SelectionListItem 2.0"]
         exportMetaObjectRevisions: [0]
         isComposite: true
         defaultProperty: "data"
         Property { name: "soundEffect"; type: "QUrl" }
-        Property { name: "parent"; type: "QQuickItem"; isPointer: true }
-        Property { name: "data"; type: "QObject"; isList: true; isReadonly: true }
-        Property { name: "resources"; type: "QObject"; isList: true; isReadonly: true }
-        Property { name: "children"; type: "QQuickItem"; isList: true; isReadonly: true }
-        Property { name: "x"; type: "double" }
-        Property { name: "y"; type: "double" }
-        Property { name: "z"; type: "double" }
-        Property { name: "width"; type: "double" }
-        Property { name: "height"; type: "double" }
-        Property { name: "opacity"; type: "double" }
-        Property { name: "enabled"; type: "bool" }
-        Property { name: "visible"; type: "bool" }
-        Property { name: "visibleChildren"; type: "QQuickItem"; isList: true; isReadonly: true }
-        Property { name: "states"; type: "QQuickState"; isList: true; isReadonly: true }
-        Property { name: "transitions"; type: "QQuickTransition"; isList: true; isReadonly: true }
-        Property { name: "state"; type: "string" }
-        Property { name: "childrenRect"; type: "QRectF"; isReadonly: true }
-        Property { name: "anchors"; type: "QQuickAnchors"; isReadonly: true; isPointer: true }
-        Property { name: "left"; type: "QQuickAnchorLine"; isReadonly: true }
-        Property { name: "right"; type: "QQuickAnchorLine"; isReadonly: true }
-        Property { name: "horizontalCenter"; type: "QQuickAnchorLine"; isReadonly: true }
-        Property { name: "top"; type: "QQuickAnchorLine"; isReadonly: true }
-        Property { name: "bottom"; type: "QQuickAnchorLine"; isReadonly: true }
-        Property { name: "verticalCenter"; type: "QQuickAnchorLine"; isReadonly: true }
-        Property { name: "baseline"; type: "QQuickAnchorLine"; isReadonly: true }
-        Property { name: "baselineOffset"; type: "double" }
-        Property { name: "clip"; type: "bool" }
-        Property { name: "focus"; type: "bool" }
-        Property { name: "activeFocus"; type: "bool"; isReadonly: true }
-        Property { name: "activeFocusOnTab"; revision: 1; type: "bool" }
-        Property { name: "rotation"; type: "double" }
-        Property { name: "scale"; type: "double" }
-        Property { name: "transformOrigin"; type: "TransformOrigin" }
-        Property { name: "transformOriginPoint"; type: "QPointF"; isReadonly: true }
-        Property { name: "transform"; type: "QQuickTransform"; isList: true; isReadonly: true }
-        Property { name: "smooth"; type: "bool" }
-        Property { name: "antialiasing"; type: "bool" }
-        Property { name: "implicitWidth"; type: "double" }
-        Property { name: "implicitHeight"; type: "double" }
-        Property { name: "containmentMask"; revision: 11; type: "QObject"; isPointer: true }
-        Property { name: "layer"; type: "QQuickItemLayer"; isReadonly: true; isPointer: true }
-        Signal {
-            name: "childrenRectChanged"
-            Parameter { type: "QRectF" }
-        }
-        Signal {
-            name: "baselineOffsetChanged"
-            Parameter { type: "double" }
-        }
-        Signal {
-            name: "stateChanged"
-            Parameter { type: "string" }
-        }
-        Signal {
-            name: "focusChanged"
-            Parameter { type: "bool" }
-        }
-        Signal {
-            name: "activeFocusChanged"
-            Parameter { type: "bool" }
-        }
-        Signal {
-            name: "activeFocusOnTabChanged"
-            revision: 1
-            Parameter { type: "bool" }
-        }
-        Signal {
-            name: "parentChanged"
-            Parameter { type: "QQuickItem"; isPointer: true }
-        }
-        Signal {
-            name: "transformOriginChanged"
-            Parameter { type: "TransformOrigin" }
-        }
-        Signal {
-            name: "smoothChanged"
-            Parameter { type: "bool" }
-        }
-        Signal {
-            name: "antialiasingChanged"
-            Parameter { type: "bool" }
-        }
-        Signal {
-            name: "clipChanged"
-            Parameter { type: "bool" }
-        }
-        Signal {
-            name: "windowChanged"
-            revision: 1
-            Parameter { name: "window"; type: "QQuickWindow"; isPointer: true }
-        }
-        Method { name: "update" }
-        Method {
-            name: "grabToImage"
-            revision: 2
-            type: "bool"
-            Parameter { name: "callback"; type: "QJSValue" }
-            Parameter { name: "targetSize"; type: "QSize" }
-        }
-        Method {
-            name: "grabToImage"
-            revision: 2
-            type: "bool"
-            Parameter { name: "callback"; type: "QJSValue" }
-        }
-        Method {
-            name: "contains"
-            type: "bool"
-            Parameter { name: "point"; type: "QPointF" }
-        }
-        Method {
-            name: "mapFromItem"
-            Parameter { type: "QQmlV4Function"; isPointer: true }
-        }
-        Method {
-            name: "mapToItem"
-            Parameter { type: "QQmlV4Function"; isPointer: true }
-        }
-        Method {
-            name: "mapFromGlobal"
-            revision: 7
-            Parameter { type: "QQmlV4Function"; isPointer: true }
-        }
-        Method {
-            name: "mapToGlobal"
-            revision: 7
-            Parameter { type: "QQmlV4Function"; isPointer: true }
-        }
-        Method { name: "forceActiveFocus" }
-        Method {
-            name: "forceActiveFocus"
-            Parameter { name: "reason"; type: "Qt::FocusReason" }
-        }
-        Method {
-            name: "nextItemInFocusChain"
-            revision: 1
-            type: "QQuickItem*"
-            Parameter { name: "forward"; type: "bool" }
-        }
-        Method { name: "nextItemInFocusChain"; revision: 1; type: "QQuickItem*" }
-        Method {
-            name: "childAt"
-            type: "QQuickItem*"
-            Parameter { name: "x"; type: "double" }
-            Parameter { name: "y"; type: "double" }
-        }
     }
     Component {
-        prototype: "QObject"
+        prototype: "QQuickCanvasItem"
         name: "QtQuick.VirtualKeyboard.Styles/TraceCanvas 2.0"
         exports: ["QtQuick.VirtualKeyboard.Styles/TraceCanvas 2.0"]
         exportMetaObjectRevisions: [0]
@@ -1432,221 +556,9 @@ Module {
         Property { name: "__renderPos"; type: "int" }
         Property { name: "__renderingEnabled"; type: "bool" }
         Method { name: "renderSmoothedLine"; type: "QVariant" }
-        Property { name: "available"; type: "bool"; isReadonly: true }
-        Property { name: "contextType"; type: "string" }
-        Property { name: "context"; type: "QQmlV4Handle"; isReadonly: true }
-        Property { name: "canvasSize"; type: "QSizeF" }
-        Property { name: "tileSize"; type: "QSize" }
-        Property { name: "canvasWindow"; type: "QRectF" }
-        Property { name: "renderTarget"; type: "RenderTarget" }
-        Property { name: "renderStrategy"; type: "RenderStrategy" }
-        Signal {
-            name: "paint"
-            Parameter { name: "region"; type: "QRect" }
-        }
-        Signal { name: "painted" }
-        Signal { name: "imageLoaded" }
-        Method {
-            name: "loadImage"
-            Parameter { name: "url"; type: "QUrl" }
-        }
-        Method {
-            name: "unloadImage"
-            Parameter { name: "url"; type: "QUrl" }
-        }
-        Method {
-            name: "isImageLoaded"
-            type: "bool"
-            Parameter { name: "url"; type: "QUrl" }
-        }
-        Method {
-            name: "isImageLoading"
-            type: "bool"
-            Parameter { name: "url"; type: "QUrl" }
-        }
-        Method {
-            name: "isImageError"
-            type: "bool"
-            Parameter { name: "url"; type: "QUrl" }
-        }
-        Method {
-            name: "getContext"
-            Parameter { name: "args"; type: "QQmlV4Function"; isPointer: true }
-        }
-        Method {
-            name: "requestAnimationFrame"
-            Parameter { name: "args"; type: "QQmlV4Function"; isPointer: true }
-        }
-        Method {
-            name: "cancelRequestAnimationFrame"
-            Parameter { name: "args"; type: "QQmlV4Function"; isPointer: true }
-        }
-        Method { name: "requestPaint" }
-        Method {
-            name: "markDirty"
-            Parameter { name: "dirtyRect"; type: "QRectF" }
-        }
-        Method { name: "markDirty" }
-        Method {
-            name: "save"
-            type: "bool"
-            Parameter { name: "filename"; type: "string" }
-        }
-        Method {
-            name: "toDataURL"
-            type: "string"
-            Parameter { name: "type"; type: "string" }
-        }
-        Method { name: "toDataURL"; type: "string" }
-        Property { name: "parent"; type: "QQuickItem"; isPointer: true }
-        Property { name: "data"; type: "QObject"; isList: true; isReadonly: true }
-        Property { name: "resources"; type: "QObject"; isList: true; isReadonly: true }
-        Property { name: "children"; type: "QQuickItem"; isList: true; isReadonly: true }
-        Property { name: "x"; type: "double" }
-        Property { name: "y"; type: "double" }
-        Property { name: "z"; type: "double" }
-        Property { name: "width"; type: "double" }
-        Property { name: "height"; type: "double" }
-        Property { name: "opacity"; type: "double" }
-        Property { name: "enabled"; type: "bool" }
-        Property { name: "visible"; type: "bool" }
-        Property { name: "visibleChildren"; type: "QQuickItem"; isList: true; isReadonly: true }
-        Property { name: "states"; type: "QQuickState"; isList: true; isReadonly: true }
-        Property { name: "transitions"; type: "QQuickTransition"; isList: true; isReadonly: true }
-        Property { name: "state"; type: "string" }
-        Property { name: "childrenRect"; type: "QRectF"; isReadonly: true }
-        Property { name: "anchors"; type: "QQuickAnchors"; isReadonly: true; isPointer: true }
-        Property { name: "left"; type: "QQuickAnchorLine"; isReadonly: true }
-        Property { name: "right"; type: "QQuickAnchorLine"; isReadonly: true }
-        Property { name: "horizontalCenter"; type: "QQuickAnchorLine"; isReadonly: true }
-        Property { name: "top"; type: "QQuickAnchorLine"; isReadonly: true }
-        Property { name: "bottom"; type: "QQuickAnchorLine"; isReadonly: true }
-        Property { name: "verticalCenter"; type: "QQuickAnchorLine"; isReadonly: true }
-        Property { name: "baseline"; type: "QQuickAnchorLine"; isReadonly: true }
-        Property { name: "baselineOffset"; type: "double" }
-        Property { name: "clip"; type: "bool" }
-        Property { name: "focus"; type: "bool" }
-        Property { name: "activeFocus"; type: "bool"; isReadonly: true }
-        Property { name: "activeFocusOnTab"; revision: 1; type: "bool" }
-        Property { name: "rotation"; type: "double" }
-        Property { name: "scale"; type: "double" }
-        Property { name: "transformOrigin"; type: "TransformOrigin" }
-        Property { name: "transformOriginPoint"; type: "QPointF"; isReadonly: true }
-        Property { name: "transform"; type: "QQuickTransform"; isList: true; isReadonly: true }
-        Property { name: "smooth"; type: "bool" }
-        Property { name: "antialiasing"; type: "bool" }
-        Property { name: "implicitWidth"; type: "double" }
-        Property { name: "implicitHeight"; type: "double" }
-        Property { name: "containmentMask"; revision: 11; type: "QObject"; isPointer: true }
-        Property { name: "layer"; type: "QQuickItemLayer"; isReadonly: true; isPointer: true }
-        Signal {
-            name: "childrenRectChanged"
-            Parameter { type: "QRectF" }
-        }
-        Signal {
-            name: "baselineOffsetChanged"
-            Parameter { type: "double" }
-        }
-        Signal {
-            name: "stateChanged"
-            Parameter { type: "string" }
-        }
-        Signal {
-            name: "focusChanged"
-            Parameter { type: "bool" }
-        }
-        Signal {
-            name: "activeFocusChanged"
-            Parameter { type: "bool" }
-        }
-        Signal {
-            name: "activeFocusOnTabChanged"
-            revision: 1
-            Parameter { type: "bool" }
-        }
-        Signal {
-            name: "parentChanged"
-            Parameter { type: "QQuickItem"; isPointer: true }
-        }
-        Signal {
-            name: "transformOriginChanged"
-            Parameter { type: "TransformOrigin" }
-        }
-        Signal {
-            name: "smoothChanged"
-            Parameter { type: "bool" }
-        }
-        Signal {
-            name: "antialiasingChanged"
-            Parameter { type: "bool" }
-        }
-        Signal {
-            name: "clipChanged"
-            Parameter { type: "bool" }
-        }
-        Signal {
-            name: "windowChanged"
-            revision: 1
-            Parameter { name: "window"; type: "QQuickWindow"; isPointer: true }
-        }
-        Method { name: "update" }
-        Method {
-            name: "grabToImage"
-            revision: 2
-            type: "bool"
-            Parameter { name: "callback"; type: "QJSValue" }
-            Parameter { name: "targetSize"; type: "QSize" }
-        }
-        Method {
-            name: "grabToImage"
-            revision: 2
-            type: "bool"
-            Parameter { name: "callback"; type: "QJSValue" }
-        }
-        Method {
-            name: "contains"
-            type: "bool"
-            Parameter { name: "point"; type: "QPointF" }
-        }
-        Method {
-            name: "mapFromItem"
-            Parameter { type: "QQmlV4Function"; isPointer: true }
-        }
-        Method {
-            name: "mapToItem"
-            Parameter { type: "QQmlV4Function"; isPointer: true }
-        }
-        Method {
-            name: "mapFromGlobal"
-            revision: 7
-            Parameter { type: "QQmlV4Function"; isPointer: true }
-        }
-        Method {
-            name: "mapToGlobal"
-            revision: 7
-            Parameter { type: "QQmlV4Function"; isPointer: true }
-        }
-        Method { name: "forceActiveFocus" }
-        Method {
-            name: "forceActiveFocus"
-            Parameter { name: "reason"; type: "Qt::FocusReason" }
-        }
-        Method {
-            name: "nextItemInFocusChain"
-            revision: 1
-            type: "QQuickItem*"
-            Parameter { name: "forward"; type: "bool" }
-        }
-        Method { name: "nextItemInFocusChain"; revision: 1; type: "QQuickItem*" }
-        Method {
-            name: "childAt"
-            type: "QQuickItem*"
-            Parameter { name: "x"; type: "double" }
-            Parameter { name: "y"; type: "double" }
-        }
     }
     Component {
-        prototype: "QObject"
+        prototype: "QQuickItem"
         name: "QtQuick.VirtualKeyboard.Styles/TraceInputKeyPanel 2.0"
         exports: ["QtQuick.VirtualKeyboard.Styles/TraceInputKeyPanel 2.0"]
         exportMetaObjectRevisions: [0]
@@ -1654,151 +566,5 @@ Module {
         defaultProperty: "data"
         Property { name: "control"; type: "QQuickItem"; isPointer: true }
         Property { name: "traceMargins"; type: "double" }
-        Property { name: "parent"; type: "QQuickItem"; isPointer: true }
-        Property { name: "data"; type: "QObject"; isList: true; isReadonly: true }
-        Property { name: "resources"; type: "QObject"; isList: true; isReadonly: true }
-        Property { name: "children"; type: "QQuickItem"; isList: true; isReadonly: true }
-        Property { name: "x"; type: "double" }
-        Property { name: "y"; type: "double" }
-        Property { name: "z"; type: "double" }
-        Property { name: "width"; type: "double" }
-        Property { name: "height"; type: "double" }
-        Property { name: "opacity"; type: "double" }
-        Property { name: "enabled"; type: "bool" }
-        Property { name: "visible"; type: "bool" }
-        Property { name: "visibleChildren"; type: "QQuickItem"; isList: true; isReadonly: true }
-        Property { name: "states"; type: "QQuickState"; isList: true; isReadonly: true }
-        Property { name: "transitions"; type: "QQuickTransition"; isList: true; isReadonly: true }
-        Property { name: "state"; type: "string" }
-        Property { name: "childrenRect"; type: "QRectF"; isReadonly: true }
-        Property { name: "anchors"; type: "QQuickAnchors"; isReadonly: true; isPointer: true }
-        Property { name: "left"; type: "QQuickAnchorLine"; isReadonly: true }
-        Property { name: "right"; type: "QQuickAnchorLine"; isReadonly: true }
-        Property { name: "horizontalCenter"; type: "QQuickAnchorLine"; isReadonly: true }
-        Property { name: "top"; type: "QQuickAnchorLine"; isReadonly: true }
-        Property { name: "bottom"; type: "QQuickAnchorLine"; isReadonly: true }
-        Property { name: "verticalCenter"; type: "QQuickAnchorLine"; isReadonly: true }
-        Property { name: "baseline"; type: "QQuickAnchorLine"; isReadonly: true }
-        Property { name: "baselineOffset"; type: "double" }
-        Property { name: "clip"; type: "bool" }
-        Property { name: "focus"; type: "bool" }
-        Property { name: "activeFocus"; type: "bool"; isReadonly: true }
-        Property { name: "activeFocusOnTab"; revision: 1; type: "bool" }
-        Property { name: "rotation"; type: "double" }
-        Property { name: "scale"; type: "double" }
-        Property { name: "transformOrigin"; type: "TransformOrigin" }
-        Property { name: "transformOriginPoint"; type: "QPointF"; isReadonly: true }
-        Property { name: "transform"; type: "QQuickTransform"; isList: true; isReadonly: true }
-        Property { name: "smooth"; type: "bool" }
-        Property { name: "antialiasing"; type: "bool" }
-        Property { name: "implicitWidth"; type: "double" }
-        Property { name: "implicitHeight"; type: "double" }
-        Property { name: "containmentMask"; revision: 11; type: "QObject"; isPointer: true }
-        Property { name: "layer"; type: "QQuickItemLayer"; isReadonly: true; isPointer: true }
-        Signal {
-            name: "childrenRectChanged"
-            Parameter { type: "QRectF" }
-        }
-        Signal {
-            name: "baselineOffsetChanged"
-            Parameter { type: "double" }
-        }
-        Signal {
-            name: "stateChanged"
-            Parameter { type: "string" }
-        }
-        Signal {
-            name: "focusChanged"
-            Parameter { type: "bool" }
-        }
-        Signal {
-            name: "activeFocusChanged"
-            Parameter { type: "bool" }
-        }
-        Signal {
-            name: "activeFocusOnTabChanged"
-            revision: 1
-            Parameter { type: "bool" }
-        }
-        Signal {
-            name: "parentChanged"
-            Parameter { type: "QQuickItem"; isPointer: true }
-        }
-        Signal {
-            name: "transformOriginChanged"
-            Parameter { type: "TransformOrigin" }
-        }
-        Signal {
-            name: "smoothChanged"
-            Parameter { type: "bool" }
-        }
-        Signal {
-            name: "antialiasingChanged"
-            Parameter { type: "bool" }
-        }
-        Signal {
-            name: "clipChanged"
-            Parameter { type: "bool" }
-        }
-        Signal {
-            name: "windowChanged"
-            revision: 1
-            Parameter { name: "window"; type: "QQuickWindow"; isPointer: true }
-        }
-        Method { name: "update" }
-        Method {
-            name: "grabToImage"
-            revision: 2
-            type: "bool"
-            Parameter { name: "callback"; type: "QJSValue" }
-            Parameter { name: "targetSize"; type: "QSize" }
-        }
-        Method {
-            name: "grabToImage"
-            revision: 2
-            type: "bool"
-            Parameter { name: "callback"; type: "QJSValue" }
-        }
-        Method {
-            name: "contains"
-            type: "bool"
-            Parameter { name: "point"; type: "QPointF" }
-        }
-        Method {
-            name: "mapFromItem"
-            Parameter { type: "QQmlV4Function"; isPointer: true }
-        }
-        Method {
-            name: "mapToItem"
-            Parameter { type: "QQmlV4Function"; isPointer: true }
-        }
-        Method {
-            name: "mapFromGlobal"
-            revision: 7
-            Parameter { type: "QQmlV4Function"; isPointer: true }
-        }
-        Method {
-            name: "mapToGlobal"
-            revision: 7
-            Parameter { type: "QQmlV4Function"; isPointer: true }
-        }
-        Method { name: "forceActiveFocus" }
-        Method {
-            name: "forceActiveFocus"
-            Parameter { name: "reason"; type: "Qt::FocusReason" }
-        }
-        Method {
-            name: "nextItemInFocusChain"
-            revision: 1
-            type: "QQuickItem*"
-            Parameter { name: "forward"; type: "bool" }
-        }
-        Method { name: "nextItemInFocusChain"; revision: 1; type: "QQuickItem*" }
-        Method {
-            name: "childAt"
-            type: "QQuickItem*"
-            Parameter { name: "x"; type: "double" }
-            Parameter { name: "y"; type: "double" }
-        }
     }
 }
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)