Port qtvirtualkeyboard to declarative type registration

- Port settings plugin to declarative type registration
- Port styles plugin to declarative type registration
- Dissect Components QML module from QtQuick.VirtualKeyboard

Previously the QML components included in this module were located in
the resources of virtualkeyboard Qt module and registered via manual
type registration.

Since migrating away from manual type registration, it is time to move
these components out of the QtQuick.VirtualKeyboard namespace where they
did not belong in the first place. They are implementation detail of the
VirtualKeyboard and the VirtualKeyboard layouts. There is no use for
them outside of this scope.

- Add QtQuick.VirtualKeyboard.Plugins QML module
- Port hangul to declarative type registrations
- Port openwnn to declarative type registrations
- Port tcime to declarative type registrations
- Port thai to declarative type registrations
- Port hunspell to declarative type registrations
- Port pinyin to declarative type registrations
- Port cerence to declarative type registrations
- Port myscript to declarative type registrations
- Add VirtualKeyboardFeatures namespace for feature detection
- Remove QVirtualKeyboardInputContextPrivate::inputMethods property

This is no longer needed (and cannot be supported) because of the new
QML module based extensions model.

Runtime feature detection is happens on the VirtualKeyboardFeatures
namespace.

- Remove Q_VKB_IMPORT_PLUGIN
- Remove extensionloader (replaced with QML modules)

This is no longer needed as all the extensions have been ported to QML
modules.

- Remove QML dependency from platforminputcontext plugin

Since all the extra functionality (extensions, qml types registrations)
have been moved out of this plugin, we can remove the dependency to QML
module too.

- Move keyboard layouts to Layouts plugin (but keep them as resources)

Previously the keyboard layouts were located in the resources of the
QtQuick.VirtualKeyboard plugin. This change moves them to new
QtQuick.VirtualKeyboard.Layouts QML module. This module is loaded by
explicit (qmldir) import at QtQuick.VirtualKeyboard plugin.

We cannot make the layouts as compiled qml, because it will prevent
from using resource path overload currently used by vendor plugins to
override keyboard layouts.

- Move builtin styles to new module QtQuick.VirtualKeyboard.Styles.Builtin

No changes to style loading mechanism - the styles are still loaded
using Loader. The internal resource path for builtin styles changed from

    :/QtQuick/VirtualKeyboard/content/styles

to

    :/QtQuick/VirtualKeyboard/Styles/Builtin

This has no impact on external users, because it can already specify
custom style path using settings API.

[ChangeLog] Virtual Keyboard extension mechanism was replaced with QML modules.
Previously the virtual keyboard was using plugin mechanism with custom
interface to load extensions. With the introduction of declarative type
registration, this interface became obsolete. All of the existing virtual
keyboard extensions are now registered as standard QML modules, loaded
implicitly by the QtQuick.VirtualKeyboard module. This change does not impact
the users of the virtual keyboard public API.

Task-number: QTBUG-100783
Fixes: QTBUG-92212
Fixes: QTBUG-100705
Fixes: QTBUG-95680
Fixes: QTBUG-95660
Change-Id: Id2f87670d2678fa0b18bae56ee172bf206d99d3a
Reviewed-by: Jarkko Koivikko <jarkko.koivikko@code-q.fi>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>

503 files changed, 1750 insertions, 7179 deletions

diff --git a/cmake/QtVirtualKeyboardSetup.cmake b/cmake/QtVirtualKeyboardSetup.cmake
index 3d0fe493..741897fd 100644
--- a/cmake/QtVirtualKeyboardSetup.cmake
+++ b/cmake/QtVirtualKeyboardSetup.cmake
@@ -1,3 +1,6 @@
+get_filename_component(VKB_LAYOUTS_BASE "${CMAKE_CURRENT_LIST_DIR}/../src/layouts" REALPATH CACHE)
+set(VKB_LAYOUTS_PREFIX "/qt-project.org/imports/QtQuick/VirtualKeyboard/Layouts" CACHE STRING "" FORCE)
+
 set(valid_languages
     ar_AR
     bg_BG
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 2e4862cc..9cf6cac3 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,7 +1,8 @@
 # Generated from src.pro.
 
 add_subdirectory(virtualkeyboard)
-add_subdirectory(import)
+add_subdirectory(components)
+add_subdirectory(layouts)
 add_subdirectory(settings)
 add_subdirectory(styles)
 add_subdirectory(plugin)
diff --git a/src/virtualkeyboard/content/components/AlternativeKeys.qml b/src/components/AlternativeKeys.qml
index 951b3c8d..951b3c8d 100644
--- a/src/virtualkeyboard/content/components/AlternativeKeys.qml
+++ b/src/components/AlternativeKeys.qml
diff --git a/src/virtualkeyboard/content/components/BackspaceKey.qml b/src/components/BackspaceKey.qml
index 998e9181..998e9181 100644
--- a/src/virtualkeyboard/content/components/BackspaceKey.qml
+++ b/src/components/BackspaceKey.qml
diff --git a/src/virtualkeyboard/content/components/BaseKey.qml b/src/components/BaseKey.qml
index 945e8a70..945e8a70 100644
--- a/src/virtualkeyboard/content/components/BaseKey.qml
+++ b/src/components/BaseKey.qml
diff --git a/src/components/CMakeLists.txt b/src/components/CMakeLists.txt
new file mode 100644
index 00000000..746dce26
--- /dev/null
+++ b/src/components/CMakeLists.txt
@@ -0,0 +1,55 @@
+#####################################################################
+## VirtualKeyboard.Components Module:
+#####################################################################
+
+set(qml_files
+    AlternativeKeys.qml
+    BackspaceKey.qml
+    BaseKey.qml
+    ChangeLanguageKey.qml
+    CharacterPreviewBubble.qml
+    EnterKey.qml
+    FillerKey.qml
+    FlickKey.qml
+    FunctionPopupList.qml
+    HandwritingModeKey.qml
+    HideKeyboardKey.qml
+    InputModeKey.qml
+    Key.qml
+    Keyboard.qml
+    KeyboardColumn.qml
+    KeyboardLayout.qml
+    KeyboardLayoutLoader.qml
+    KeyboardRow.qml
+    ModeKey.qml
+    MultiSoundEffect.qml
+    MultitapInputMethod.qml
+    NumberKey.qml
+    PopupList.qml
+    SelectionControl.qml
+    ShadowInputControl.qml
+    ShiftKey.qml
+    SpaceKey.qml
+    SymbolModeKey.qml
+    TraceInputArea.qml
+    TraceInputKey.qml
+    WordCandidatePopupList.qml
+)
+
+qt_internal_add_qml_module(qtvkbcomponentsplugin
+    URI "QtQuick.VirtualKeyboard.Components"
+    VERSION "${PROJECT_VERSION}"
+    PAST_MAJOR_VERSIONS 2 1
+    PLUGIN_TARGET qtvkbcomponentsplugin
+    DEPENDENCIES
+        QtQuick/auto
+        QtQuick.Layouts/auto
+        QtQuick.VirtualKeyboard.Settings/auto
+    QML_FILES
+        ${qml_files}
+    LIBRARIES
+        Qt::Core
+        Qt::Gui
+        Qt::Qml
+        Qt::Quick
+)
diff --git a/src/virtualkeyboard/content/components/ChangeLanguageKey.qml b/src/components/ChangeLanguageKey.qml
index 022a2838..0d3ec969 100644
--- a/src/virtualkeyboard/content/components/ChangeLanguageKey.qml
+++ b/src/components/ChangeLanguageKey.qml
@@ -29,7 +29,6 @@
 
 import QtQuick
 import QtQuick.VirtualKeyboard
-import QtQuick.VirtualKeyboard.Styles
 
 /*!
     \qmltype ChangeLanguageKey
diff --git a/src/virtualkeyboard/content/components/CharacterPreviewBubble.qml b/src/components/CharacterPreviewBubble.qml
index ad0cef5a..ad0cef5a 100644
--- a/src/virtualkeyboard/content/components/CharacterPreviewBubble.qml
+++ b/src/components/CharacterPreviewBubble.qml
diff --git a/src/virtualkeyboard/content/components/EnterKey.qml b/src/components/EnterKey.qml
index f3ade36e..f3ade36e 100644
--- a/src/virtualkeyboard/content/components/EnterKey.qml
+++ b/src/components/EnterKey.qml
diff --git a/src/virtualkeyboard/content/components/FillerKey.qml b/src/components/FillerKey.qml
index a6c2a402..a6c2a402 100644
--- a/src/virtualkeyboard/content/components/FillerKey.qml
+++ b/src/components/FillerKey.qml
diff --git a/src/virtualkeyboard/content/components/FlickKey.qml b/src/components/FlickKey.qml
index 48108f00..48108f00 100644
--- a/src/virtualkeyboard/content/components/FlickKey.qml
+++ b/src/components/FlickKey.qml
diff --git a/src/virtualkeyboard/content/components/FunctionPopupList.qml b/src/components/FunctionPopupList.qml
index c3799f02..c3799f02 100644
--- a/src/virtualkeyboard/content/components/FunctionPopupList.qml
+++ b/src/components/FunctionPopupList.qml
diff --git a/src/virtualkeyboard/content/components/HandwritingModeKey.qml b/src/components/HandwritingModeKey.qml
index 946b9502..946b9502 100644
--- a/src/virtualkeyboard/content/components/HandwritingModeKey.qml
+++ b/src/components/HandwritingModeKey.qml
diff --git a/src/virtualkeyboard/content/components/HideKeyboardKey.qml b/src/components/HideKeyboardKey.qml
index 504fbc3a..504fbc3a 100644
--- a/src/virtualkeyboard/content/components/HideKeyboardKey.qml
+++ b/src/components/HideKeyboardKey.qml
diff --git a/src/virtualkeyboard/content/components/InputModeKey.qml b/src/components/InputModeKey.qml
index 142c8866..142c8866 100644
--- a/src/virtualkeyboard/content/components/InputModeKey.qml
+++ b/src/components/InputModeKey.qml
diff --git a/src/virtualkeyboard/content/components/Key.qml b/src/components/Key.qml
index a1666f3a..a1666f3a 100644
--- a/src/virtualkeyboard/content/components/Key.qml
+++ b/src/components/Key.qml
diff --git a/src/virtualkeyboard/content/components/Keyboard.qml b/src/components/Keyboard.qml
index 56015d77..2c03f28e 100644
--- a/src/virtualkeyboard/content/components/Keyboard.qml
+++ b/src/components/Keyboard.qml
@@ -1767,7 +1767,7 @@ Item {
     function isHandwritingAvailable() {
         if (VirtualKeyboardSettings.handwritingModeDisabled)
             return false
-        return InputContext.priv.inputMethods.indexOf("HandwritingInputMethod") !== -1 && layoutExists(locale, "handwriting")
+        return VirtualKeyboardFeatures.Handwriting && layoutExists(locale, "handwriting")
     }
 
     function setHandwritingMode(enabled, resetInputMode) {
diff --git a/src/virtualkeyboard/content/components/KeyboardColumn.qml b/src/components/KeyboardColumn.qml
index 15c2e315..15c2e315 100644
--- a/src/virtualkeyboard/content/components/KeyboardColumn.qml
+++ b/src/components/KeyboardColumn.qml
diff --git a/src/virtualkeyboard/content/components/KeyboardLayout.qml b/src/components/KeyboardLayout.qml
index 14e5e8eb..14e5e8eb 100644
--- a/src/virtualkeyboard/content/components/KeyboardLayout.qml
+++ b/src/components/KeyboardLayout.qml
diff --git a/src/virtualkeyboard/content/components/KeyboardLayoutLoader.qml b/src/components/KeyboardLayoutLoader.qml
index f67a72e8..f67a72e8 100644
--- a/src/virtualkeyboard/content/components/KeyboardLayoutLoader.qml
+++ b/src/components/KeyboardLayoutLoader.qml
diff --git a/src/virtualkeyboard/content/components/KeyboardRow.qml b/src/components/KeyboardRow.qml
index d08f8411..d08f8411 100644
--- a/src/virtualkeyboard/content/components/KeyboardRow.qml
+++ b/src/components/KeyboardRow.qml
diff --git a/src/virtualkeyboard/content/components/ModeKey.qml b/src/components/ModeKey.qml
index 165d0f95..165d0f95 100644
--- a/src/virtualkeyboard/content/components/ModeKey.qml
+++ b/src/components/ModeKey.qml
diff --git a/src/virtualkeyboard/content/components/MultiSoundEffect.qml b/src/components/MultiSoundEffect.qml
index 80080682..80080682 100644
--- a/src/virtualkeyboard/content/components/MultiSoundEffect.qml
+++ b/src/components/MultiSoundEffect.qml
diff --git a/src/virtualkeyboard/content/components/MultitapInputMethod.qml b/src/components/MultitapInputMethod.qml
index ee664e86..ee664e86 100644
--- a/src/virtualkeyboard/content/components/MultitapInputMethod.qml
+++ b/src/components/MultitapInputMethod.qml
diff --git a/src/virtualkeyboard/content/components/NumberKey.qml b/src/components/NumberKey.qml
index 61df72aa..61df72aa 100644
--- a/src/virtualkeyboard/content/components/NumberKey.qml
+++ b/src/components/NumberKey.qml
diff --git a/src/virtualkeyboard/content/components/PopupList.qml b/src/components/PopupList.qml
index 9deb79de..9deb79de 100644
--- a/src/virtualkeyboard/content/components/PopupList.qml
+++ b/src/components/PopupList.qml
diff --git a/src/virtualkeyboard/content/components/SelectionControl.qml b/src/components/SelectionControl.qml
index f571d292..f571d292 100644
--- a/src/virtualkeyboard/content/components/SelectionControl.qml
+++ b/src/components/SelectionControl.qml
diff --git a/src/virtualkeyboard/content/components/ShadowInputControl.qml b/src/components/ShadowInputControl.qml
index 1667f24a..1667f24a 100644
--- a/src/virtualkeyboard/content/components/ShadowInputControl.qml
+++ b/src/components/ShadowInputControl.qml
diff --git a/src/virtualkeyboard/content/components/ShiftKey.qml b/src/components/ShiftKey.qml
index 1b256c66..1b256c66 100644
--- a/src/virtualkeyboard/content/components/ShiftKey.qml
+++ b/src/components/ShiftKey.qml
diff --git a/src/virtualkeyboard/content/components/SpaceKey.qml b/src/components/SpaceKey.qml
index 0a06ad29..0a06ad29 100644
--- a/src/virtualkeyboard/content/components/SpaceKey.qml
+++ b/src/components/SpaceKey.qml
diff --git a/src/virtualkeyboard/content/components/SymbolModeKey.qml b/src/components/SymbolModeKey.qml
index d58402cb..d58402cb 100644
--- a/src/virtualkeyboard/content/components/SymbolModeKey.qml
+++ b/src/components/SymbolModeKey.qml
diff --git a/src/virtualkeyboard/content/components/TraceInputArea.qml b/src/components/TraceInputArea.qml
index cbbfc598..cbbfc598 100644
--- a/src/virtualkeyboard/content/components/TraceInputArea.qml
+++ b/src/components/TraceInputArea.qml
diff --git a/src/virtualkeyboard/content/components/TraceInputKey.qml b/src/components/TraceInputKey.qml
index a12a0a20..a12a0a20 100644
--- a/src/virtualkeyboard/content/components/TraceInputKey.qml
+++ b/src/components/TraceInputKey.qml
diff --git a/src/virtualkeyboard/content/components/WordCandidatePopupList.qml b/src/components/WordCandidatePopupList.qml
index df47b639..df47b639 100644
--- a/src/virtualkeyboard/content/components/WordCandidatePopupList.qml
+++ b/src/components/WordCandidatePopupList.qml
diff --git a/src/import/CMakeLists.txt b/src/import/CMakeLists.txt
deleted file mode 100644
index c609748e..00000000
--- a/src/import/CMakeLists.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-#####################################################################
-## qtquickvirtualkeyboardplugin Plugin:
-#####################################################################
-
-qt_internal_add_qml_module(qtquickvirtualkeyboardplugin
-    URI "QtQuick.VirtualKeyboard"
-    VERSION "2.${PROJECT_VERSION_MINOR}"
-    CLASS_NAME QtQuickVirtualKeyboardPlugin
-    PLUGIN_TARGET qtquickvirtualkeyboardplugin
-    NO_GENERATE_PLUGIN_SOURCE
-    NO_PLUGIN_OPTIONAL
-    NO_GENERATE_QMLTYPES
-    INSTALL_SOURCE_QMLTYPES "plugins.qmltypes"
-    DEPENDENCIES
-        QtQuick/2.0
-        QtQuick.Window/2.2
-        QtQuick.Layouts/1.0
-        Qt.labs.folderlistmodel/2.1
-        QtQuick.VirtualKeyboard.Settings/2.2
-        QtQuick.VirtualKeyboard.Styles/2.2
-    SOURCES
-        qtquickvirtualkeyboardplugin.cpp qtquickvirtualkeyboardplugin.h
-    LIBRARIES
-        Qt::Core
-        Qt::Gui
-        Qt::Qml
-        Qt::Quick
-        Qt::VirtualKeyboardPrivate
-)
-
-## Scopes:
-#####################################################################
-
-#### Keys ignored in scope 2:.:.:import.pro:WIN32:
-# QMAKE_TARGET_DESCRIPTION = "Virtual Keyboard for Qt."
-# QMAKE_TARGET_PRODUCT = "Qt Virtual Keyboard (Qt $$QT_VERSION)"
diff --git a/src/import/dependencies.json b/src/import/dependencies.json
deleted file mode 100644
index f5bc2b31..00000000
--- a/src/import/dependencies.json
+++ /dev/null
@@ -1,22 +0,0 @@
-[
-    {
-        "name": "QtQuick",
-        "type": "module",
-        "version": "2.0"
-    },
-    {
-        "name": "QtQuick.Window",
-        "type": "module",
-        "version": "2.2"
-    },
-    {
-        "name": "QtQuick.Layouts",
-        "type": "module",
-        "version": "1.0"
-    },
-    {
-        "name": "Qt.labs.folderlistmodel",
-        "type": "module",
-        "version": "2.1"
-    }
-]
diff --git a/src/import/plugins.qmltypes b/src/import/plugins.qmltypes
deleted file mode 100644
index 9bdb3bd5..00000000
--- a/src/import/plugins.qmltypes
+++ /dev/null
@@ -1,2444 +0,0 @@
-import QtQuick.tooling 1.2
-
-// This file describes the plugin-supplied types contained in the library.
-// It is used for QML tooling purposes only.
-//
-// This file was auto-generated by:
-// 'qmlplugindump -defaultplatform -nonrelocatable -dependencies dependencies.json QtQuick.VirtualKeyboard 2.14'
-
-Module {
-    dependencies: [
-        "Qt.labs.folderlistmodel 2.1",
-        "QtQuick 2.0",
-        "QtQuick.Layouts 1.0",
-        "QtQuick.Window 2.2"
-    ]
-    Component {
-        name: "QAbstractItemModel"
-        prototype: "QObject"
-        Enum {
-            name: "LayoutChangeHint"
-            values: {
-                "NoLayoutChangeHint": 0,
-                "VerticalSortHint": 1,
-                "HorizontalSortHint": 2
-            }
-        }
-        Enum {
-            name: "CheckIndexOption"
-            values: {
-                "NoOption": 0,
-                "IndexIsValid": 1,
-                "DoNotUseParent": 2,
-                "ParentIsInvalid": 4
-            }
-        }
-        Signal {
-            name: "dataChanged"
-            Parameter { name: "topLeft"; type: "QModelIndex" }
-            Parameter { name: "bottomRight"; type: "QModelIndex" }
-            Parameter { name: "roles"; type: "QList<int>" }
-        }
-        Signal {
-            name: "dataChanged"
-            Parameter { name: "topLeft"; type: "QModelIndex" }
-            Parameter { name: "bottomRight"; type: "QModelIndex" }
-        }
-        Signal {
-            name: "headerDataChanged"
-            Parameter { name: "orientation"; type: "Qt::Orientation" }
-            Parameter { name: "first"; type: "int" }
-            Parameter { name: "last"; type: "int" }
-        }
-        Signal {
-            name: "layoutChanged"
-            Parameter { name: "parents"; type: "QList<QPersistentModelIndex>" }
-            Parameter { name: "hint"; type: "QAbstractItemModel::LayoutChangeHint" }
-        }
-        Signal {
-            name: "layoutChanged"
-            Parameter { name: "parents"; type: "QList<QPersistentModelIndex>" }
-        }
-        Signal { name: "layoutChanged" }
-        Signal {
-            name: "layoutAboutToBeChanged"
-            Parameter { name: "parents"; type: "QList<QPersistentModelIndex>" }
-            Parameter { name: "hint"; type: "QAbstractItemModel::LayoutChangeHint" }
-        }
-        Signal {
-            name: "layoutAboutToBeChanged"
-            Parameter { name: "parents"; type: "QList<QPersistentModelIndex>" }
-        }
-        Signal { name: "layoutAboutToBeChanged" }
-        Signal {
-            name: "rowsAboutToBeInserted"
-            Parameter { name: "parent"; type: "QModelIndex" }
-            Parameter { name: "first"; type: "int" }
-            Parameter { name: "last"; type: "int" }
-        }
-        Signal {
-            name: "rowsInserted"
-            Parameter { name: "parent"; type: "QModelIndex" }
-            Parameter { name: "first"; type: "int" }
-            Parameter { name: "last"; type: "int" }
-        }
-        Signal {
-            name: "rowsAboutToBeRemoved"
-            Parameter { name: "parent"; type: "QModelIndex" }
-            Parameter { name: "first"; type: "int" }
-            Parameter { name: "last"; type: "int" }
-        }
-        Signal {
-            name: "rowsRemoved"
-            Parameter { name: "parent"; type: "QModelIndex" }
-            Parameter { name: "first"; type: "int" }
-            Parameter { name: "last"; type: "int" }
-        }
-        Signal {
-            name: "columnsAboutToBeInserted"
-            Parameter { name: "parent"; type: "QModelIndex" }
-            Parameter { name: "first"; type: "int" }
-            Parameter { name: "last"; type: "int" }
-        }
-        Signal {
-            name: "columnsInserted"
-            Parameter { name: "parent"; type: "QModelIndex" }
-            Parameter { name: "first"; type: "int" }
-            Parameter { name: "last"; type: "int" }
-        }
-        Signal {
-            name: "columnsAboutToBeRemoved"
-            Parameter { name: "parent"; type: "QModelIndex" }
-            Parameter { name: "first"; type: "int" }
-            Parameter { name: "last"; type: "int" }
-        }
-        Signal {
-            name: "columnsRemoved"
-            Parameter { name: "parent"; type: "QModelIndex" }
-            Parameter { name: "first"; type: "int" }
-            Parameter { name: "last"; type: "int" }
-        }
-        Signal { name: "modelAboutToBeReset" }
-        Signal { name: "modelReset" }
-        Signal {
-            name: "rowsAboutToBeMoved"
-            Parameter { name: "sourceParent"; type: "QModelIndex" }
-            Parameter { name: "sourceStart"; type: "int" }
-            Parameter { name: "sourceEnd"; type: "int" }
-            Parameter { name: "destinationParent"; type: "QModelIndex" }
-            Parameter { name: "destinationRow"; type: "int" }
-        }
-        Signal {
-            name: "rowsMoved"
-            Parameter { name: "parent"; type: "QModelIndex" }
-            Parameter { name: "start"; type: "int" }
-            Parameter { name: "end"; type: "int" }
-            Parameter { name: "destination"; type: "QModelIndex" }
-            Parameter { name: "row"; type: "int" }
-        }
-        Signal {
-            name: "columnsAboutToBeMoved"
-            Parameter { name: "sourceParent"; type: "QModelIndex" }
-            Parameter { name: "sourceStart"; type: "int" }
-            Parameter { name: "sourceEnd"; type: "int" }
-            Parameter { name: "destinationParent"; type: "QModelIndex" }
-            Parameter { name: "destinationColumn"; type: "int" }
-        }
-        Signal {
-            name: "columnsMoved"
-            Parameter { name: "parent"; type: "QModelIndex" }
-            Parameter { name: "start"; type: "int" }
-            Parameter { name: "end"; type: "int" }
-            Parameter { name: "destination"; type: "QModelIndex" }
-            Parameter { name: "column"; type: "int" }
-        }
-        Method { name: "submit"; type: "bool" }
-        Method { name: "revert" }
-        Method {
-            name: "hasIndex"
-            type: "bool"
-            Parameter { name: "row"; type: "int" }
-            Parameter { name: "column"; type: "int" }
-            Parameter { name: "parent"; type: "QModelIndex" }
-        }
-        Method {
-            name: "hasIndex"
-            type: "bool"
-            Parameter { name: "row"; type: "int" }
-            Parameter { name: "column"; type: "int" }
-        }
-        Method {
-            name: "index"
-            type: "QModelIndex"
-            Parameter { name: "row"; type: "int" }
-            Parameter { name: "column"; type: "int" }
-            Parameter { name: "parent"; type: "QModelIndex" }
-        }
-        Method {
-            name: "index"
-            type: "QModelIndex"
-            Parameter { name: "row"; type: "int" }
-            Parameter { name: "column"; type: "int" }
-        }
-        Method {
-            name: "parent"
-            type: "QModelIndex"
-            Parameter { name: "child"; type: "QModelIndex" }
-        }
-        Method {
-            name: "sibling"
-            type: "QModelIndex"
-            Parameter { name: "row"; type: "int" }
-            Parameter { name: "column"; type: "int" }
-            Parameter { name: "idx"; type: "QModelIndex" }
-        }
-        Method {
-            name: "rowCount"
-            type: "int"
-            Parameter { name: "parent"; type: "QModelIndex" }
-        }
-        Method { name: "rowCount"; type: "int" }
-        Method {
-            name: "columnCount"
-            type: "int"
-            Parameter { name: "parent"; type: "QModelIndex" }
-        }
-        Method { name: "columnCount"; type: "int" }
-        Method {
-            name: "hasChildren"
-            type: "bool"
-            Parameter { name: "parent"; type: "QModelIndex" }
-        }
-        Method { name: "hasChildren"; type: "bool" }
-        Method {
-            name: "data"
-            type: "QVariant"
-            Parameter { name: "index"; type: "QModelIndex" }
-            Parameter { name: "role"; type: "int" }
-        }
-        Method {
-            name: "data"
-            type: "QVariant"
-            Parameter { name: "index"; type: "QModelIndex" }
-        }
-        Method {
-            name: "setData"
-            type: "bool"
-            Parameter { name: "index"; type: "QModelIndex" }
-            Parameter { name: "value"; type: "QVariant" }
-            Parameter { name: "role"; type: "int" }
-        }
-        Method {
-            name: "setData"
-            type: "bool"
-            Parameter { name: "index"; type: "QModelIndex" }
-            Parameter { name: "value"; type: "QVariant" }
-        }
-        Method {
-            name: "headerData"
-            type: "QVariant"
-            Parameter { name: "section"; type: "int" }
-            Parameter { name: "orientation"; type: "Qt::Orientation" }
-            Parameter { name: "role"; type: "int" }
-        }
-        Method {
-            name: "headerData"
-            type: "QVariant"
-            Parameter { name: "section"; type: "int" }
-            Parameter { name: "orientation"; type: "Qt::Orientation" }
-        }
-        Method {
-            name: "fetchMore"
-            Parameter { name: "parent"; type: "QModelIndex" }
-        }
-        Method {
-            name: "canFetchMore"
-            type: "bool"
-            Parameter { name: "parent"; type: "QModelIndex" }
-        }
-        Method {
-            name: "flags"
-            type: "Qt::ItemFlags"
-            Parameter { name: "index"; type: "QModelIndex" }
-        }
-        Method {
-            name: "match"
-            type: "QModelIndexList"
-            Parameter { name: "start"; type: "QModelIndex" }
-            Parameter { name: "role"; type: "int" }
-            Parameter { name: "value"; type: "QVariant" }
-            Parameter { name: "hits"; type: "int" }
-            Parameter { name: "flags"; type: "Qt::MatchFlags" }
-        }
-        Method {
-            name: "match"
-            type: "QModelIndexList"
-            Parameter { name: "start"; type: "QModelIndex" }
-            Parameter { name: "role"; type: "int" }
-            Parameter { name: "value"; type: "QVariant" }
-            Parameter { name: "hits"; type: "int" }
-        }
-        Method {
-            name: "match"
-            type: "QModelIndexList"
-            Parameter { name: "start"; type: "QModelIndex" }
-            Parameter { name: "role"; type: "int" }
-            Parameter { name: "value"; type: "QVariant" }
-        }
-    }
-    Component { name: "QAbstractListModel"; prototype: "QAbstractItemModel" }
-    Component {
-        name: "QVirtualKeyboardAbstractInputMethod"
-        prototype: "QObject"
-        exports: [
-            "QtQuick.VirtualKeyboard/AbstractInputMethod 1.0",
-            "QtQuick.VirtualKeyboard/AbstractInputMethod 2.0"
-        ]
-        isCreatable: false
-        exportMetaObjectRevisions: [0, 0]
-        Signal {
-            name: "selectionListChanged"
-            Parameter { name: "type"; type: "QVirtualKeyboardSelectionListModel::Type" }
-        }
-        Signal {
-            name: "selectionListActiveItemChanged"
-            Parameter { name: "type"; type: "QVirtualKeyboardSelectionListModel::Type" }
-            Parameter { name: "index"; type: "int" }
-        }
-        Signal { name: "selectionListsChanged" }
-        Method { name: "reset" }
-        Method { name: "update" }
-    }
-    Component {
-        name: "QVirtualKeyboardInputContext"
-        prototype: "QObject"
-        exports: [
-            "QtQuick.VirtualKeyboard/InputContext 1.0",
-            "QtQuick.VirtualKeyboard/InputContext 2.0"
-        ]
-        isCreatable: false
-        isSingleton: true
-        exportMetaObjectRevisions: [0, 0]
-        Property { name: "shift"; type: "bool"; isReadonly: true }
-        Property { name: "shiftActive"; revision: 4; type: "bool"; isReadonly: true }
-        Property { name: "capsLock"; type: "bool"; isReadonly: true }
-        Property { name: "capsLockActive"; revision: 4; type: "bool"; isReadonly: true }
-        Property { name: "uppercase"; type: "bool"; isReadonly: true }
-        Property { name: "anchorPosition"; type: "int"; isReadonly: true }
-        Property { name: "cursorPosition"; type: "int"; isReadonly: true }
-        Property { name: "inputMethodHints"; type: "Qt::InputMethodHints"; isReadonly: true }
-        Property { name: "preeditText"; type: "string" }
-        Property { name: "surroundingText"; type: "string"; isReadonly: true }
-        Property { name: "selectedText"; type: "string"; isReadonly: true }
-        Property { name: "anchorRectangle"; type: "QRectF"; isReadonly: true }
-        Property { name: "cursorRectangle"; type: "QRectF"; isReadonly: true }
-        Property { name: "animating"; type: "bool" }
-        Property { name: "locale"; type: "string"; isReadonly: true }
-        Property { name: "inputItem"; type: "QObject"; isReadonly: true; isPointer: true }
-        Property {
-            name: "inputEngine"
-            type: "QVirtualKeyboardInputEngine"
-            isReadonly: true
-            isPointer: true
-        }
-        Property { name: "selectionControlVisible"; type: "bool"; isReadonly: true }
-        Property { name: "anchorRectIntersectsClipRect"; type: "bool"; isReadonly: true }
-        Property { name: "cursorRectIntersectsClipRect"; type: "bool"; isReadonly: true }
-        Property {
-            name: "priv"
-            type: "QVirtualKeyboardInputContextPrivate"
-            isReadonly: true
-            isPointer: true
-        }
-        Method {
-            name: "sendKeyClick"
-            Parameter { name: "key"; type: "int" }
-            Parameter { name: "text"; type: "string" }
-            Parameter { name: "modifiers"; type: "int" }
-        }
-        Method {
-            name: "sendKeyClick"
-            Parameter { name: "key"; type: "int" }
-            Parameter { name: "text"; type: "string" }
-        }
-        Method { name: "commit" }
-        Method {
-            name: "commit"
-            Parameter { name: "text"; type: "string" }
-            Parameter { name: "replaceFrom"; type: "int" }
-            Parameter { name: "replaceLength"; type: "int" }
-        }
-        Method {
-            name: "commit"
-            Parameter { name: "text"; type: "string" }
-            Parameter { name: "replaceFrom"; type: "int" }
-        }
-        Method {
-            name: "commit"
-            Parameter { name: "text"; type: "string" }
-        }
-        Method { name: "clear" }
-        Method {
-            name: "setSelectionOnFocusObject"
-            Parameter { name: "anchorPos"; type: "QPointF" }
-            Parameter { name: "cursorPos"; type: "QPointF" }
-        }
-    }
-    Component {
-        name: "QVirtualKeyboardInputContextPrivate"
-        prototype: "QObject"
-        exports: ["QtQuick.VirtualKeyboard/InputContextPrivate 1.0"]
-        isCreatable: false
-        exportMetaObjectRevisions: [0]
-        Enum {
-            name: "State"
-            values: {
-                "Reselect": 1,
-                "InputMethodEvent": 2,
-                "KeyEvent": 4,
-                "InputMethodClick": 8,
-                "SyncShadowInput": 16
-            }
-        }
-        Property { name: "focus"; type: "bool" }
-        Property { name: "keyboardRectangle"; type: "QRectF" }
-        Property { name: "previewRectangle"; type: "QRectF" }
-        Property { name: "previewVisible"; type: "bool" }
-        Property { name: "locale"; type: "string" }
-        Property { name: "inputItem"; type: "QObject"; isReadonly: true; isPointer: true }
-        Property {
-            name: "shiftHandler"
-            type: "QtVirtualKeyboard::ShiftHandler"
-            isReadonly: true
-            isPointer: true
-        }
-        Property {
-            name: "shadow"
-            type: "QtVirtualKeyboard::ShadowInputContext"
-            isReadonly: true
-            isPointer: true
-        }
-        Property { name: "inputMethods"; type: "QStringList"; isReadonly: true }
-        Signal {
-            name: "navigationKeyPressed"
-            Parameter { name: "key"; type: "int" }
-            Parameter { name: "isAutoRepeat"; type: "bool" }
-        }
-        Signal {
-            name: "navigationKeyReleased"
-            Parameter { name: "key"; type: "int" }
-            Parameter { name: "isAutoRepeat"; type: "bool" }
-        }
-        Method { name: "hideInputPanel" }
-        Method {
-            name: "updateAvailableLocales"
-            Parameter { name: "availableLocales"; type: "QStringList" }
-        }
-        Method {
-            name: "forceCursorPosition"
-            Parameter { name: "anchorPosition"; type: "int" }
-            Parameter { name: "cursorPosition"; type: "int" }
-        }
-        Method {
-            name: "fileExists"
-            type: "bool"
-            Parameter { name: "fileUrl"; type: "QUrl" }
-        }
-        Method {
-            name: "hasEnterKeyAction"
-            type: "bool"
-            Parameter { name: "item"; type: "QObject"; isPointer: true }
-        }
-    }
-    Component {
-        name: "QVirtualKeyboardInputEngine"
-        prototype: "QObject"
-        exports: [
-            "QtQuick.VirtualKeyboard/InputEngine 1.0",
-            "QtQuick.VirtualKeyboard/InputEngine 2.0"
-        ]
-        isCreatable: false
-        exportMetaObjectRevisions: [0, 0]
-        Enum {
-            name: "TextCase"
-            values: {
-                "Lower": 0,
-                "Upper": 1
-            }
-        }
-        Enum {
-            name: "InputMode"
-            values: {
-                "Latin": 0,
-                "Numeric": 1,
-                "Dialable": 2,
-                "Pinyin": 3,
-                "Cangjie": 4,
-                "Zhuyin": 5,
-                "Hangul": 6,
-                "Hiragana": 7,
-                "Katakana": 8,
-                "FullwidthLatin": 9,
-                "Greek": 10,
-                "Cyrillic": 11,
-                "Arabic": 12,
-                "Hebrew": 13,
-                "ChineseHandwriting": 14,
-                "JapaneseHandwriting": 15,
-                "KoreanHandwriting": 16,
-                "Thai": 17
-            }
-        }
-        Enum {
-            name: "PatternRecognitionMode"
-            values: {
-                "None": 0,
-                "PatternRecognitionDisabled": 0,
-                "Handwriting": 1,
-                "HandwritingRecoginition": 1
-            }
-        }
-        Enum {
-            name: "ReselectFlag"
-            values: {
-                "WordBeforeCursor": 1,
-                "WordAfterCursor": 2,
-                "WordAtCursor": 3
-            }
-        }
-        Property { name: "activeKey"; type: "Qt::Key"; isReadonly: true }
-        Property { name: "previousKey"; type: "Qt::Key"; isReadonly: true }
-        Property { name: "inputMethod"; type: "QVirtualKeyboardAbstractInputMethod"; isPointer: true }
-        Property { name: "inputModes"; type: "QList<int>"; isReadonly: true }
-        Property { name: "inputMode"; type: "InputMode" }
-        Property { name: "patternRecognitionModes"; type: "QList<int>"; isReadonly: true }
-        Property {
-            name: "wordCandidateListModel"
-            type: "QVirtualKeyboardSelectionListModel"
-            isReadonly: true
-            isPointer: true
-        }
-        Property { name: "wordCandidateListVisibleHint"; type: "bool"; isReadonly: true }
-        Signal {
-            name: "virtualKeyClicked"
-            Parameter { name: "key"; type: "Qt::Key" }
-            Parameter { name: "text"; type: "string" }
-            Parameter { name: "modifiers"; type: "Qt::KeyboardModifiers" }
-            Parameter { name: "isAutoRepeat"; type: "bool" }
-        }
-        Signal {
-            name: "activeKeyChanged"
-            Parameter { name: "key"; type: "Qt::Key" }
-        }
-        Signal {
-            name: "previousKeyChanged"
-            Parameter { name: "key"; type: "Qt::Key" }
-        }
-        Signal { name: "inputMethodReset" }
-        Signal { name: "inputMethodUpdate" }
-        Method {
-            name: "virtualKeyPress"
-            type: "bool"
-            Parameter { name: "key"; type: "Qt::Key" }
-            Parameter { name: "text"; type: "string" }
-            Parameter { name: "modifiers"; type: "Qt::KeyboardModifiers" }
-            Parameter { name: "repeat"; type: "bool" }
-        }
-        Method { name: "virtualKeyCancel" }
-        Method {
-            name: "virtualKeyRelease"
-            type: "bool"
-            Parameter { name: "key"; type: "Qt::Key" }
-            Parameter { name: "text"; type: "string" }
-            Parameter { name: "modifiers"; type: "Qt::KeyboardModifiers" }
-        }
-        Method {
-            name: "virtualKeyClick"
-            type: "bool"
-            Parameter { name: "key"; type: "Qt::Key" }
-            Parameter { name: "text"; type: "string" }
-            Parameter { name: "modifiers"; type: "Qt::KeyboardModifiers" }
-        }
-        Method {
-            name: "traceBegin"
-            type: "QVirtualKeyboardTrace*"
-            Parameter { name: "traceId"; type: "int" }
-            Parameter { name: "patternRecognitionMode"; type: "PatternRecognitionMode" }
-            Parameter { name: "traceCaptureDeviceInfo"; type: "QVariantMap" }
-            Parameter { name: "traceScreenInfo"; type: "QVariantMap" }
-        }
-        Method {
-            name: "traceEnd"
-            type: "bool"
-            Parameter { name: "trace"; type: "QVirtualKeyboardTrace"; isPointer: true }
-        }
-        Method {
-            name: "reselect"
-            type: "bool"
-            Parameter { name: "cursorPosition"; type: "int" }
-            Parameter { name: "reselectFlags"; type: "ReselectFlags" }
-        }
-    }
-    Component {
-        name: "QVirtualKeyboardSelectionListModel"
-        prototype: "QAbstractListModel"
-        exports: [
-            "QtQuick.VirtualKeyboard/SelectionListModel 1.0",
-            "QtQuick.VirtualKeyboard/SelectionListModel 2.0"
-        ]
-        isCreatable: false
-        exportMetaObjectRevisions: [0, 0]
-        Enum {
-            name: "Type"
-            values: {
-                "WordCandidateList": 0
-            }
-        }
-        Enum {
-            name: "Role"
-            values: {
-                "Display": 0,
-                "DisplayRole": 0,
-                "WordCompletionLength": 257,
-                "WordCompletionLengthRole": 257,
-                "Dictionary": 258,
-                "CanRemoveSuggestion": 259
-            }
-        }
-        Enum {
-            name: "DictionaryType"
-            values: {
-                "Default": 0,
-                "User": 1
-            }
-        }
-        Property { name: "count"; type: "int"; isReadonly: true }
-        Signal {
-            name: "activeItemChanged"
-            Parameter { name: "index"; type: "int" }
-        }
-        Signal {
-            name: "itemSelected"
-            Parameter { name: "index"; type: "int" }
-        }
-        Method {
-            name: "selectItem"
-            Parameter { name: "index"; type: "int" }
-        }
-        Method {
-            name: "removeItem"
-            Parameter { name: "index"; type: "int" }
-        }
-        Method {
-            name: "dataAt"
-            type: "QVariant"
-            Parameter { name: "index"; type: "int" }
-            Parameter { name: "role"; type: "Role" }
-        }
-        Method {
-            name: "dataAt"
-            type: "QVariant"
-            Parameter { name: "index"; type: "int" }
-        }
-    }
-    Component {
-        name: "QVirtualKeyboardTrace"
-        prototype: "QObject"
-        exports: [
-            "QtQuick.VirtualKeyboard/Trace 2.0",
-            "QtQuick.VirtualKeyboard/Trace 2.4"
-        ]
-        exportMetaObjectRevisions: [0, 0]
-        Property { name: "traceId"; type: "int" }
-        Property { name: "channels"; type: "QStringList" }
-        Property { name: "length"; type: "int"; isReadonly: true }
-        Property { name: "final"; type: "bool" }
-        Property { name: "canceled"; type: "bool" }
-        Property { name: "opacity"; type: "double" }
-        Signal {
-            name: "traceIdChanged"
-            Parameter { name: "traceId"; type: "int" }
-        }
-        Signal {
-            name: "lengthChanged"
-            Parameter { name: "length"; type: "int" }
-        }
-        Signal {
-            name: "finalChanged"
-            Parameter { name: "isFinal"; type: "bool" }
-        }
-        Signal {
-            name: "canceledChanged"
-            Parameter { name: "isCanceled"; type: "bool" }
-        }
-        Signal {
-            name: "opacityChanged"
-            Parameter { name: "opacity"; type: "double" }
-        }
-        Method {
-            name: "points"
-            type: "QVariantList"
-            Parameter { name: "pos"; type: "int" }
-            Parameter { name: "count"; type: "int" }
-        }
-        Method {
-            name: "points"
-            type: "QVariantList"
-            Parameter { name: "pos"; type: "int" }
-        }
-        Method { name: "points"; type: "QVariantList" }
-        Method {
-            name: "addPoint"
-            type: "int"
-            Parameter { name: "point"; type: "QPointF" }
-        }
-        Method {
-            name: "setChannelData"
-            Parameter { name: "channel"; type: "string" }
-            Parameter { name: "index"; type: "int" }
-            Parameter { name: "data"; type: "QVariant" }
-        }
-        Method {
-            name: "channelData"
-            type: "QVariantList"
-            Parameter { name: "channel"; type: "string" }
-            Parameter { name: "pos"; type: "int" }
-            Parameter { name: "count"; type: "int" }
-        }
-        Method {
-            name: "channelData"
-            type: "QVariantList"
-            Parameter { name: "channel"; type: "string" }
-            Parameter { name: "pos"; type: "int" }
-        }
-        Method {
-            name: "channelData"
-            type: "QVariantList"
-            Parameter { name: "channel"; type: "string" }
-        }
-    }
-    Component {
-        name: "QtVirtualKeyboard::EnterKeyAction"
-        prototype: "QObject"
-        exports: [
-            "QtQuick.VirtualKeyboard/EnterKeyAction 1.0",
-            "QtQuick.VirtualKeyboard/EnterKeyAction 2.0"
-        ]
-        exportMetaObjectRevisions: [0, 0]
-        attachedType: "QtVirtualKeyboard::EnterKeyActionAttachedType"
-        Enum {
-            name: "Id"
-            values: {
-                "None": 0,
-                "Go": 1,
-                "Search": 2,
-                "Send": 3,
-                "Next": 4,
-                "Done": 5
-            }
-        }
-    }
-    Component {
-        name: "QtVirtualKeyboard::EnterKeyActionAttachedType"
-        prototype: "QObject"
-        Property { name: "actionId"; type: "int" }
-        Property { name: "label"; type: "string" }
-        Property { name: "enabled"; type: "bool" }
-    }
-    Component {
-        name: "QtVirtualKeyboard::HangulInputMethod"
-        prototype: "QVirtualKeyboardAbstractInputMethod"
-        exports: [
-            "QtQuick.VirtualKeyboard.Plugins/HangulInputMethod 1.3",
-            "QtQuick.VirtualKeyboard.Plugins/HangulInputMethod 2.0"
-        ]
-        exportMetaObjectRevisions: [0, 0]
-    }
-    Component {
-        name: "QtVirtualKeyboard::InputMethod"
-        prototype: "QVirtualKeyboardAbstractInputMethod"
-        exports: [
-            "QtQuick.VirtualKeyboard/InputMethod 1.0",
-            "QtQuick.VirtualKeyboard/InputMethod 2.0"
-        ]
-        exportMetaObjectRevisions: [0, 0]
-        Property {
-            name: "inputContext"
-            type: "QVirtualKeyboardInputContext"
-            isReadonly: true
-            isPointer: true
-        }
-        Property {
-            name: "inputEngine"
-            type: "QVirtualKeyboardInputEngine"
-            isReadonly: true
-            isPointer: true
-        }
-    }
-    Component {
-        name: "QtVirtualKeyboard::OpenWnnInputMethod"
-        prototype: "QVirtualKeyboardAbstractInputMethod"
-        exports: [
-            "QtQuick.VirtualKeyboard.Plugins/JapaneseInputMethod 1.3",
-            "QtQuick.VirtualKeyboard.Plugins/JapaneseInputMethod 2.0"
-        ]
-        exportMetaObjectRevisions: [0, 0]
-    }
-    Component {
-        name: "QtVirtualKeyboard::PinyinInputMethod"
-        prototype: "QVirtualKeyboardAbstractInputMethod"
-        exports: [
-            "QtQuick.VirtualKeyboard.Plugins/PinyinInputMethod 1.1",
-            "QtQuick.VirtualKeyboard.Plugins/PinyinInputMethod 2.0"
-        ]
-        exportMetaObjectRevisions: [0, 0]
-    }
-    Component {
-        name: "QtVirtualKeyboard::PlainInputMethod"
-        prototype: "QVirtualKeyboardAbstractInputMethod"
-        exports: [
-            "QtQuick.VirtualKeyboard.Plugins/PlainInputMethod 1.0",
-            "QtQuick.VirtualKeyboard.Plugins/PlainInputMethod 2.0",
-            "QtQuick.VirtualKeyboard.Plugins/PlainInputMethod 2.3"
-        ]
-        exportMetaObjectRevisions: [0, 0, 0]
-    }
-    Component {
-        name: "QtVirtualKeyboard::ShadowInputContext"
-        prototype: "QObject"
-        exports: ["QtQuick.VirtualKeyboard/ShadowInputContext 2.2"]
-        isCreatable: false
-        exportMetaObjectRevisions: [0]
-        Property { name: "inputItem"; type: "QObject"; isPointer: true }
-        Property { name: "anchorRectangle"; type: "QRectF"; isReadonly: true }
-        Property { name: "cursorRectangle"; type: "QRectF"; isReadonly: true }
-        Property { name: "anchorRectIntersectsClipRect"; type: "bool"; isReadonly: true }
-        Property { name: "cursorRectIntersectsClipRect"; type: "bool"; isReadonly: true }
-        Property { name: "selectionControlVisible"; type: "bool"; isReadonly: true }
-        Method {
-            name: "setSelectionOnFocusObject"
-            Parameter { name: "anchorPos"; type: "QPointF" }
-            Parameter { name: "cursorPos"; type: "QPointF" }
-        }
-        Method { name: "updateSelectionProperties" }
-    }
-    Component {
-        name: "QtVirtualKeyboard::ShiftHandler"
-        prototype: "QObject"
-        exports: [
-            "QtQuick.VirtualKeyboard/ShiftHandler 1.0",
-            "QtQuick.VirtualKeyboard/ShiftHandler 2.0"
-        ]
-        isCreatable: false
-        exportMetaObjectRevisions: [0, 0]
-        Property { name: "sentenceEndingCharacters"; type: "string" }
-        Property { name: "autoCapitalizationEnabled"; type: "bool"; isReadonly: true }
-        Property { name: "toggleShiftEnabled"; type: "bool"; isReadonly: true }
-        Property { name: "shiftActive"; type: "bool" }
-        Property { name: "capsLockActive"; type: "bool" }
-        Property { name: "uppercase"; type: "bool"; isReadonly: true }
-        Method { name: "toggleShift" }
-        Method { name: "clearToggleShiftTimer" }
-    }
-    Component {
-        name: "QtVirtualKeyboard::TCInputMethod"
-        prototype: "QVirtualKeyboardAbstractInputMethod"
-        exports: ["QtQuick.VirtualKeyboard.Plugins/TCInputMethod 2.0"]
-        exportMetaObjectRevisions: [0]
-        Property { name: "simplified"; type: "bool" }
-    }
-    Component {
-        name: "QtVirtualKeyboard::ThaiInputMethod"
-        prototype: "QVirtualKeyboardAbstractInputMethod"
-        exports: ["QtQuick.VirtualKeyboard.Plugins/ThaiInputMethod 2.3"]
-        exportMetaObjectRevisions: [0]
-    }
-    Component {
-        prototype: "QQuickItem"
-        name: "QtQuick.VirtualKeyboard/AlternativeKeys 1.0"
-        exports: ["QtQuick.VirtualKeyboard/AlternativeKeys 1.0"]
-        exportMetaObjectRevisions: [0]
-        isComposite: true
-        defaultProperty: "data"
-        Property { name: "active"; type: "bool" }
-        Property { name: "highlightIndex"; type: "int" }
-        Property { name: "keyCode"; type: "int" }
-        Property { name: "origin"; type: "QPointF" }
-        Property { name: "listView"; type: "QQuickListView"; isReadonly: true; isPointer: true }
-        Signal { name: "clicked" }
-        Method {
-            name: "open"
-            type: "QVariant"
-            Parameter { name: "key"; type: "QVariant" }
-            Parameter { name: "originX"; type: "QVariant" }
-            Parameter { name: "originY"; type: "QVariant" }
-        }
-        Method {
-            name: "move"
-            type: "QVariant"
-            Parameter { name: "mouseX"; type: "QVariant" }
-        }
-        Method { name: "close"; type: "QVariant" }
-    }
-    Component {
-        prototype: "QQuickItem"
-        name: "QtQuick.VirtualKeyboard/AlternativeKeys 2.0"
-        exports: ["QtQuick.VirtualKeyboard/AlternativeKeys 2.0"]
-        exportMetaObjectRevisions: [0]
-        isComposite: true
-        defaultProperty: "data"
-        Property { name: "active"; type: "bool" }
-        Property { name: "highlightIndex"; type: "int" }
-        Property { name: "keyCode"; type: "int" }
-        Property { name: "origin"; type: "QPointF" }
-        Property { name: "listView"; type: "QQuickListView"; isReadonly: true; isPointer: true }
-        Signal { name: "clicked" }
-        Method {
-            name: "open"
-            type: "QVariant"
-            Parameter { name: "key"; type: "QVariant" }
-            Parameter { name: "originX"; type: "QVariant" }
-            Parameter { name: "originY"; type: "QVariant" }
-        }
-        Method {
-            name: "move"
-            type: "QVariant"
-            Parameter { name: "mouseX"; type: "QVariant" }
-        }
-        Method { name: "close"; type: "QVariant" }
-    }
-    Component {
-        prototype: "QQuickItem"
-        name: "QtQuick.VirtualKeyboard/BackspaceKey 1.0"
-        exports: ["QtQuick.VirtualKeyboard/BackspaceKey 1.0"]
-        exportMetaObjectRevisions: [0]
-        isComposite: true
-        defaultProperty: "data"
-        Property { name: "weight"; type: "double" }
-        Property { name: "text"; type: "string" }
-        Property { name: "displayText"; type: "string" }
-        Property { name: "smallText"; type: "string" }
-        Property { name: "smallTextVisible"; type: "bool" }
-        Property { name: "alternativeKeys"; type: "QVariant" }
-        Property { name: "effectiveAlternativeKeys"; type: "QVariant"; isReadonly: true }
-        Property { name: "effectiveAlternativeKeysHighlightIndex"; type: "int"; isReadonly: true }
-        Property { name: "key"; type: "int" }
-        Property { name: "noKeyEvent"; type: "bool" }
-        Property { name: "active"; type: "bool" }
-        Property { name: "noModifier"; type: "bool" }
-        Property { name: "repeat"; type: "bool" }
-        Property { name: "highlighted"; type: "bool" }
-        Property { name: "functionKey"; type: "bool" }
-        Property { name: "showPreview"; type: "bool" }
-        Property { name: "pressed"; type: "bool" }
-        Property { name: "uppercased"; type: "bool" }
-        Property { name: "soundEffect"; type: "QUrl"; isReadonly: true }
-        Property { name: "keyPanelDelegate"; type: "QQmlComponent"; isPointer: true }
-        Signal { name: "clicked" }
-    }
-    Component {
-        prototype: "QQuickItem"
-        name: "QtQuick.VirtualKeyboard/BackspaceKey 2.0"
-        exports: ["QtQuick.VirtualKeyboard/BackspaceKey 2.0"]
-        exportMetaObjectRevisions: [0]
-        isComposite: true
-        defaultProperty: "data"
-        Property { name: "weight"; type: "double" }
-        Property { name: "text"; type: "string" }
-        Property { name: "displayText"; type: "string" }
-        Property { name: "smallText"; type: "string" }
-        Property { name: "smallTextVisible"; type: "bool" }
-        Property { name: "alternativeKeys"; type: "QVariant" }
-        Property { name: "effectiveAlternativeKeys"; type: "QVariant"; isReadonly: true }
-        Property { name: "effectiveAlternativeKeysHighlightIndex"; type: "int"; isReadonly: true }
-        Property { name: "key"; type: "int" }
-        Property { name: "noKeyEvent"; type: "bool" }
-        Property { name: "active"; type: "bool" }
-        Property { name: "noModifier"; type: "bool" }
-        Property { name: "repeat"; type: "bool" }
-        Property { name: "highlighted"; type: "bool" }
-        Property { name: "functionKey"; type: "bool" }
-        Property { name: "showPreview"; type: "bool" }
-        Property { name: "pressed"; type: "bool" }
-        Property { name: "uppercased"; type: "bool" }
-        Property { name: "soundEffect"; type: "QUrl"; isReadonly: true }
-        Property { name: "keyPanelDelegate"; type: "QQmlComponent"; isPointer: true }
-        Signal { name: "clicked" }
-    }
-    Component {
-        prototype: "QQuickItem"
-        name: "QtQuick.VirtualKeyboard/BaseKey 1.0"
-        exports: ["QtQuick.VirtualKeyboard/BaseKey 1.0"]
-        exportMetaObjectRevisions: [0]
-        isComposite: true
-        defaultProperty: "data"
-        Property { name: "weight"; type: "double" }
-        Property { name: "text"; type: "string" }
-        Property { name: "displayText"; type: "string" }
-        Property { name: "smallText"; type: "string" }
-        Property { name: "smallTextVisible"; type: "bool" }
-        Property { name: "alternativeKeys"; type: "QVariant" }
-        Property { name: "effectiveAlternativeKeys"; type: "QVariant"; isReadonly: true }
-        Property { name: "effectiveAlternativeKeysHighlightIndex"; type: "int"; isReadonly: true }
-        Property { name: "key"; type: "int" }
-        Property { name: "noKeyEvent"; type: "bool" }
-        Property { name: "active"; type: "bool" }
-        Property { name: "noModifier"; type: "bool" }
-        Property { name: "repeat"; type: "bool" }
-        Property { name: "highlighted"; type: "bool" }
-        Property { name: "functionKey"; type: "bool" }
-        Property { name: "showPreview"; type: "bool" }
-        Property { name: "pressed"; type: "bool" }
-        Property { name: "uppercased"; type: "bool" }
-        Property { name: "soundEffect"; type: "QUrl"; isReadonly: true }
-        Property { name: "keyPanelDelegate"; type: "QQmlComponent"; isPointer: true }
-        Signal { name: "clicked" }
-    }
-    Component {
-        prototype: "QQuickItem"
-        name: "QtQuick.VirtualKeyboard/BaseKey 2.0"
-        exports: ["QtQuick.VirtualKeyboard/BaseKey 2.0"]
-        exportMetaObjectRevisions: [0]
-        isComposite: true
-        defaultProperty: "data"
-        Property { name: "weight"; type: "double" }
-        Property { name: "text"; type: "string" }
-        Property { name: "displayText"; type: "string" }
-        Property { name: "smallText"; type: "string" }
-        Property { name: "smallTextVisible"; type: "bool" }
-        Property { name: "alternativeKeys"; type: "QVariant" }
-        Property { name: "effectiveAlternativeKeys"; type: "QVariant"; isReadonly: true }
-        Property { name: "effectiveAlternativeKeysHighlightIndex"; type: "int"; isReadonly: true }
-        Property { name: "key"; type: "int" }
-        Property { name: "noKeyEvent"; type: "bool" }
-        Property { name: "active"; type: "bool" }
-        Property { name: "noModifier"; type: "bool" }
-        Property { name: "repeat"; type: "bool" }
-        Property { name: "highlighted"; type: "bool" }
-        Property { name: "functionKey"; type: "bool" }
-        Property { name: "showPreview"; type: "bool" }
-        Property { name: "pressed"; type: "bool" }
-        Property { name: "uppercased"; type: "bool" }
-        Property { name: "soundEffect"; type: "QUrl"; isReadonly: true }
-        Property { name: "keyPanelDelegate"; type: "QQmlComponent"; isPointer: true }
-        Signal { name: "clicked" }
-    }
-    Component {
-        prototype: "QQuickItem"
-        name: "QtQuick.VirtualKeyboard/ChangeLanguageKey 1.0"
-        exports: ["QtQuick.VirtualKeyboard/ChangeLanguageKey 1.0"]
-        exportMetaObjectRevisions: [0]
-        isComposite: true
-        defaultProperty: "data"
-        Property { name: "customLayoutsOnly"; type: "bool" }
-        Property { name: "weight"; type: "double" }
-        Property { name: "text"; type: "string" }
-        Property { name: "displayText"; type: "string" }
-        Property { name: "smallText"; type: "string" }
-        Property { name: "smallTextVisible"; type: "bool" }
-        Property { name: "alternativeKeys"; type: "QVariant" }
-        Property { name: "effectiveAlternativeKeys"; type: "QVariant"; isReadonly: true }
-        Property { name: "effectiveAlternativeKeysHighlightIndex"; type: "int"; isReadonly: true }
-        Property { name: "key"; type: "int" }
-        Property { name: "noKeyEvent"; type: "bool" }
-        Property { name: "active"; type: "bool" }
-        Property { name: "noModifier"; type: "bool" }
-        Property { name: "repeat"; type: "bool" }
-        Property { name: "highlighted"; type: "bool" }
-        Property { name: "functionKey"; type: "bool" }
-        Property { name: "showPreview"; type: "bool" }
-        Property { name: "pressed"; type: "bool" }
-        Property { name: "uppercased"; type: "bool" }
-        Property { name: "soundEffect"; type: "QUrl"; isReadonly: true }
-        Property { name: "keyPanelDelegate"; type: "QQmlComponent"; isPointer: true }
-        Signal { name: "clicked" }
-    }
-    Component {
-        prototype: "QQuickItem"
-        name: "QtQuick.VirtualKeyboard/ChangeLanguageKey 2.0"
-        exports: ["QtQuick.VirtualKeyboard/ChangeLanguageKey 2.0"]
-        exportMetaObjectRevisions: [0]
-        isComposite: true
-        defaultProperty: "data"
-        Property { name: "customLayoutsOnly"; type: "bool" }
-        Property { name: "weight"; type: "double" }
-        Property { name: "text"; type: "string" }
-        Property { name: "displayText"; type: "string" }
-        Property { name: "smallText"; type: "string" }
-        Property { name: "smallTextVisible"; type: "bool" }
-        Property { name: "alternativeKeys"; type: "QVariant" }
-        Property { name: "effectiveAlternativeKeys"; type: "QVariant"; isReadonly: true }
-        Property { name: "effectiveAlternativeKeysHighlightIndex"; type: "int"; isReadonly: true }
-        Property { name: "key"; type: "int" }
-        Property { name: "noKeyEvent"; type: "bool" }
-        Property { name: "active"; type: "bool" }
-        Property { name: "noModifier"; type: "bool" }
-        Property { name: "repeat"; type: "bool" }
-        Property { name: "highlighted"; type: "bool" }
-        Property { name: "functionKey"; type: "bool" }
-        Property { name: "showPreview"; type: "bool" }
-        Property { name: "pressed"; type: "bool" }
-        Property { name: "uppercased"; type: "bool" }
-        Property { name: "soundEffect"; type: "QUrl"; isReadonly: true }
-        Property { name: "keyPanelDelegate"; type: "QQmlComponent"; isPointer: true }
-        Signal { name: "clicked" }
-    }
-    Component {
-        prototype: "QQuickItem"
-        name: "QtQuick.VirtualKeyboard/CharacterPreviewBubble 1.0"
-        exports: ["QtQuick.VirtualKeyboard/CharacterPreviewBubble 1.0"]
-        exportMetaObjectRevisions: [0]
-        isComposite: true
-        defaultProperty: "data"
-        Property { name: "active"; type: "bool" }
-        Property { name: "activeKey"; type: "QVariant" }
-    }
-    Component {
-        prototype: "QQuickItem"
-        name: "QtQuick.VirtualKeyboard/CharacterPreviewBubble 2.0"
-        exports: ["QtQuick.VirtualKeyboard/CharacterPreviewBubble 2.0"]
-        exportMetaObjectRevisions: [0]
-        isComposite: true
-        defaultProperty: "data"
-        Property { name: "active"; type: "bool" }
-        Property { name: "activeKey"; type: "QVariant" }
-    }
-    Component {
-        prototype: "QQuickItem"
-        name: "QtQuick.VirtualKeyboard/EnterKey 1.0"
-        exports: ["QtQuick.VirtualKeyboard/EnterKey 1.0"]
-        exportMetaObjectRevisions: [0]
-        isComposite: true
-        defaultProperty: "data"
-        Property { name: "actionId"; type: "int"; isReadonly: true }
-        Property { name: "weight"; type: "double" }
-        Property { name: "text"; type: "string" }
-        Property { name: "displayText"; type: "string" }
-        Property { name: "smallText"; type: "string" }
-        Property { name: "smallTextVisible"; type: "bool" }
-        Property { name: "alternativeKeys"; type: "QVariant" }
-        Property { name: "effectiveAlternativeKeys"; type: "QVariant"; isReadonly: true }
-        Property { name: "effectiveAlternativeKeysHighlightIndex"; type: "int"; isReadonly: true }
-        Property { name: "key"; type: "int" }
-        Property { name: "noKeyEvent"; type: "bool" }
-        Property { name: "active"; type: "bool" }
-        Property { name: "noModifier"; type: "bool" }
-        Property { name: "repeat"; type: "bool" }
-        Property { name: "highlighted"; type: "bool" }
-        Property { name: "functionKey"; type: "bool" }
-        Property { name: "showPreview"; type: "bool" }
-        Property { name: "pressed"; type: "bool" }
-        Property { name: "uppercased"; type: "bool" }
-        Property { name: "soundEffect"; type: "QUrl"; isReadonly: true }
-        Property { name: "keyPanelDelegate"; type: "QQmlComponent"; isPointer: true }
-        Signal { name: "clicked" }
-    }
-    Component {
-        prototype: "QQuickItem"
-        name: "QtQuick.VirtualKeyboard/EnterKey 2.0"
-        exports: ["QtQuick.VirtualKeyboard/EnterKey 2.0"]
-        exportMetaObjectRevisions: [0]
-        isComposite: true
-        defaultProperty: "data"
-        Property { name: "actionId"; type: "int"; isReadonly: true }
-        Property { name: "weight"; type: "double" }
-        Property { name: "text"; type: "string" }
-        Property { name: "displayText"; type: "string" }
-        Property { name: "smallText"; type: "string" }
-        Property { name: "smallTextVisible"; type: "bool" }
-        Property { name: "alternativeKeys"; type: "QVariant" }
-        Property { name: "effectiveAlternativeKeys"; type: "QVariant"; isReadonly: true }
-        Property { name: "effectiveAlternativeKeysHighlightIndex"; type: "int"; isReadonly: true }
-        Property { name: "key"; type: "int" }
-        Property { name: "noKeyEvent"; type: "bool" }
-        Property { name: "active"; type: "bool" }
-        Property { name: "noModifier"; type: "bool" }
-        Property { name: "repeat"; type: "bool" }
-        Property { name: "highlighted"; type: "bool" }
-        Property { name: "functionKey"; type: "bool" }
-        Property { name: "showPreview"; type: "bool" }
-        Property { name: "pressed"; type: "bool" }
-        Property { name: "uppercased"; type: "bool" }
-        Property { name: "soundEffect"; type: "QUrl"; isReadonly: true }
-        Property { name: "keyPanelDelegate"; type: "QQmlComponent"; isPointer: true }
-        Signal { name: "clicked" }
-    }
-    Component {
-        prototype: "QQuickItem"
-        name: "QtQuick.VirtualKeyboard/FillerKey 1.0"
-        exports: ["QtQuick.VirtualKeyboard/FillerKey 1.0"]
-        exportMetaObjectRevisions: [0]
-        isComposite: true
-        defaultProperty: "data"
-        Property { name: "weight"; type: "double" }
-        Property { name: "text"; type: "string" }
-        Property { name: "displayText"; type: "string" }
-        Property { name: "smallText"; type: "string" }
-        Property { name: "smallTextVisible"; type: "bool" }
-        Property { name: "alternativeKeys"; type: "QVariant" }
-        Property { name: "effectiveAlternativeKeys"; type: "QVariant"; isReadonly: true }
-        Property { name: "effectiveAlternativeKeysHighlightIndex"; type: "int"; isReadonly: true }
-        Property { name: "key"; type: "int" }
-        Property { name: "noKeyEvent"; type: "bool" }
-        Property { name: "active"; type: "bool" }
-        Property { name: "noModifier"; type: "bool" }
-        Property { name: "repeat"; type: "bool" }
-        Property { name: "highlighted"; type: "bool" }
-        Property { name: "functionKey"; type: "bool" }
-        Property { name: "showPreview"; type: "bool" }
-        Property { name: "pressed"; type: "bool" }
-        Property { name: "uppercased"; type: "bool" }
-        Property { name: "soundEffect"; type: "QUrl"; isReadonly: true }
-        Property { name: "keyPanelDelegate"; type: "QQmlComponent"; isPointer: true }
-        Signal { name: "clicked" }
-    }
-    Component {
-        prototype: "QQuickItem"
-        name: "QtQuick.VirtualKeyboard/FillerKey 2.0"
-        exports: ["QtQuick.VirtualKeyboard/FillerKey 2.0"]
-        exportMetaObjectRevisions: [0]
-        isComposite: true
-        defaultProperty: "data"
-        Property { name: "weight"; type: "double" }
-        Property { name: "text"; type: "string" }
-        Property { name: "displayText"; type: "string" }
-        Property { name: "smallText"; type: "string" }
-        Property { name: "smallTextVisible"; type: "bool" }
-        Property { name: "alternativeKeys"; type: "QVariant" }
-        Property { name: "effectiveAlternativeKeys"; type: "QVariant"; isReadonly: true }
-        Property { name: "effectiveAlternativeKeysHighlightIndex"; type: "int"; isReadonly: true }
-        Property { name: "key"; type: "int" }
-        Property { name: "noKeyEvent"; type: "bool" }
-        Property { name: "active"; type: "bool" }
-        Property { name: "noModifier"; type: "bool" }
-        Property { name: "repeat"; type: "bool" }
-        Property { name: "highlighted"; type: "bool" }
-        Property { name: "functionKey"; type: "bool" }
-        Property { name: "showPreview"; type: "bool" }
-        Property { name: "pressed"; type: "bool" }
-        Property { name: "uppercased"; type: "bool" }
-        Property { name: "soundEffect"; type: "QUrl"; isReadonly: true }
-        Property { name: "keyPanelDelegate"; type: "QQmlComponent"; isPointer: true }
-        Signal { name: "clicked" }
-    }
-    Component {
-        prototype: "QQuickItem"
-        name: "QtQuick.VirtualKeyboard/HandwritingInputPanel 2.0"
-        exports: ["QtQuick.VirtualKeyboard/HandwritingInputPanel 2.0"]
-        exportMetaObjectRevisions: [0]
-        isComposite: true
-        defaultProperty: "data"
-        Property { name: "inputPanel"; type: "QVariant" }
-        Property { name: "available"; type: "bool" }
-        Property { name: "active"; type: "bool" }
-    }
-    Component {
-        prototype: "QQuickItem"
-        name: "QtQuick.VirtualKeyboard/HandwritingModeKey 2.0"
-        exports: ["QtQuick.VirtualKeyboard/HandwritingModeKey 2.0"]
-        exportMetaObjectRevisions: [0]
-        isComposite: true
-        defaultProperty: "data"
-        Property { name: "weight"; type: "double" }
-        Property { name: "text"; type: "string" }
-        Property { name: "displayText"; type: "string" }
-        Property { name: "smallText"; type: "string" }
-        Property { name: "smallTextVisible"; type: "bool" }
-        Property { name: "alternativeKeys"; type: "QVariant" }
-        Property { name: "effectiveAlternativeKeys"; type: "QVariant"; isReadonly: true }
-        Property { name: "effectiveAlternativeKeysHighlightIndex"; type: "int"; isReadonly: true }
-        Property { name: "key"; type: "int" }
-        Property { name: "noKeyEvent"; type: "bool" }
-        Property { name: "active"; type: "bool" }
-        Property { name: "noModifier"; type: "bool" }
-        Property { name: "repeat"; type: "bool" }
-        Property { name: "highlighted"; type: "bool" }
-        Property { name: "functionKey"; type: "bool" }
-        Property { name: "showPreview"; type: "bool" }
-        Property { name: "pressed"; type: "bool" }
-        Property { name: "uppercased"; type: "bool" }
-        Property { name: "soundEffect"; type: "QUrl"; isReadonly: true }
-        Property { name: "keyPanelDelegate"; type: "QQmlComponent"; isPointer: true }
-        Signal { name: "clicked" }
-    }
-    Component {
-        prototype: "QQuickItem"
-        name: "QtQuick.VirtualKeyboard/HideKeyboardKey 1.0"
-        exports: ["QtQuick.VirtualKeyboard/HideKeyboardKey 1.0"]
-        exportMetaObjectRevisions: [0]
-        isComposite: true
-        defaultProperty: "data"
-        Property { name: "weight"; type: "double" }
-        Property { name: "text"; type: "string" }
-        Property { name: "displayText"; type: "string" }
-        Property { name: "smallText"; type: "string" }
-        Property { name: "smallTextVisible"; type: "bool" }
-        Property { name: "alternativeKeys"; type: "QVariant" }
-        Property { name: "effectiveAlternativeKeys"; type: "QVariant"; isReadonly: true }
-        Property { name: "effectiveAlternativeKeysHighlightIndex"; type: "int"; isReadonly: true }
-        Property { name: "key"; type: "int" }
-        Property { name: "noKeyEvent"; type: "bool" }
-        Property { name: "active"; type: "bool" }
-        Property { name: "noModifier"; type: "bool" }
-        Property { name: "repeat"; type: "bool" }
-        Property { name: "highlighted"; type: "bool" }
-        Property { name: "functionKey"; type: "bool" }
-        Property { name: "showPreview"; type: "bool" }
-        Property { name: "pressed"; type: "bool" }
-        Property { name: "uppercased"; type: "bool" }
-        Property { name: "soundEffect"; type: "QUrl"; isReadonly: true }
-        Property { name: "keyPanelDelegate"; type: "QQmlComponent"; isPointer: true }
-        Signal { name: "clicked" }
-    }
-    Component {
-        prototype: "QQuickItem"
-        name: "QtQuick.VirtualKeyboard/HideKeyboardKey 2.0"
-        exports: ["QtQuick.VirtualKeyboard/HideKeyboardKey 2.0"]
-        exportMetaObjectRevisions: [0]
-        isComposite: true
-        defaultProperty: "data"
-        Property { name: "weight"; type: "double" }
-        Property { name: "text"; type: "string" }
-        Property { name: "displayText"; type: "string" }
-        Property { name: "smallText"; type: "string" }
-        Property { name: "smallTextVisible"; type: "bool" }
-        Property { name: "alternativeKeys"; type: "QVariant" }
-        Property { name: "effectiveAlternativeKeys"; type: "QVariant"; isReadonly: true }
-        Property { name: "effectiveAlternativeKeysHighlightIndex"; type: "int"; isReadonly: true }
-        Property { name: "key"; type: "int" }
-        Property { name: "noKeyEvent"; type: "bool" }
-        Property { name: "active"; type: "bool" }
-        Property { name: "noModifier"; type: "bool" }
-        Property { name: "repeat"; type: "bool" }
-        Property { name: "highlighted"; type: "bool" }
-        Property { name: "functionKey"; type: "bool" }
-        Property { name: "showPreview"; type: "bool" }
-        Property { name: "pressed"; type: "bool" }
-        Property { name: "uppercased"; type: "bool" }
-        Property { name: "soundEffect"; type: "QUrl"; isReadonly: true }
-        Property { name: "keyPanelDelegate"; type: "QQmlComponent"; isPointer: true }
-        Signal { name: "clicked" }
-    }
-    Component {
-        prototype: "QQuickItem"
-        name: "QtQuick.VirtualKeyboard/InputModeKey 2.3"
-        exports: ["QtQuick.VirtualKeyboard/InputModeKey 2.3"]
-        exportMetaObjectRevisions: [3]
-        isComposite: true
-        defaultProperty: "data"
-        Property { name: "inputModeNameList"; type: "QVariant" }
-        Property { name: "inputModes"; type: "QVariant" }
-        Property { name: "inputModeCount"; type: "int"; isReadonly: true }
-        Property { name: "__inputModes"; type: "QVariant" }
-        Method {
-            name: "__nextInputMode"
-            type: "QVariant"
-            Parameter { name: "inputMode"; type: "QVariant" }
-        }
-        Method {
-            name: "__filterInputModes"
-            type: "QVariant"
-            Parameter { name: "inputModes"; type: "QVariant" }
-            Parameter { name: "filter"; type: "QVariant" }
-        }
-        Property { name: "weight"; type: "double" }
-        Property { name: "text"; type: "string" }
-        Property { name: "displayText"; type: "string" }
-        Property { name: "smallText"; type: "string" }
-        Property { name: "smallTextVisible"; type: "bool" }
-        Property { name: "alternativeKeys"; type: "QVariant" }
-        Property { name: "effectiveAlternativeKeys"; type: "QVariant"; isReadonly: true }
-        Property { name: "effectiveAlternativeKeysHighlightIndex"; type: "int"; isReadonly: true }
-        Property { name: "key"; type: "int" }
-        Property { name: "noKeyEvent"; type: "bool" }
-        Property { name: "active"; type: "bool" }
-        Property { name: "noModifier"; type: "bool" }
-        Property { name: "repeat"; type: "bool" }
-        Property { name: "highlighted"; type: "bool" }
-        Property { name: "functionKey"; type: "bool" }
-        Property { name: "showPreview"; type: "bool" }
-        Property { name: "pressed"; type: "bool" }
-        Property { name: "uppercased"; type: "bool" }
-        Property { name: "soundEffect"; type: "QUrl"; isReadonly: true }
-        Property { name: "keyPanelDelegate"; type: "QQmlComponent"; isPointer: true }
-        Signal { name: "clicked" }
-    }
-    Component {
-        prototype: "QQuickItem"
-        name: "QtQuick.VirtualKeyboard/InputPanel 1.0"
-        exports: ["QtQuick.VirtualKeyboard/InputPanel 1.0"]
-        exportMetaObjectRevisions: [0]
-        isComposite: true
-        defaultProperty: "data"
-        Property { name: "externalLanguageSwitchEnabled"; type: "bool" }
-        Property { name: "desktopPanel"; type: "bool" }
-        Property { name: "active"; type: "bool" }
-        Property { name: "keyboard"; type: "Keyboard_QMLTYPE_22"; isReadonly: true; isPointer: true }
-        Signal {
-            name: "externalLanguageSwitch"
-            Parameter { name: "localeList"; type: "QVariant" }
-            Parameter { name: "currentIndex"; type: "int" }
-        }
-    }
-    Component {
-        prototype: "QQuickItem"
-        name: "QtQuick.VirtualKeyboard/InputPanel 1.2"
-        exports: ["QtQuick.VirtualKeyboard/InputPanel 1.2"]
-        exportMetaObjectRevisions: [2]
-        isComposite: true
-        defaultProperty: "data"
-        Property { name: "externalLanguageSwitchEnabled"; type: "bool" }
-        Property { name: "desktopPanel"; type: "bool" }
-        Property { name: "active"; type: "bool" }
-        Property { name: "keyboard"; type: "Keyboard_QMLTYPE_22"; isReadonly: true; isPointer: true }
-        Signal {
-            name: "externalLanguageSwitch"
-            Parameter { name: "localeList"; type: "QVariant" }
-            Parameter { name: "currentIndex"; type: "int" }
-        }
-    }
-    Component {
-        prototype: "QQuickItem"
-        name: "QtQuick.VirtualKeyboard/InputPanel 1.3"
-        exports: ["QtQuick.VirtualKeyboard/InputPanel 1.3"]
-        exportMetaObjectRevisions: [3]
-        isComposite: true
-        defaultProperty: "data"
-        Property { name: "externalLanguageSwitchEnabled"; type: "bool" }
-        Property { name: "desktopPanel"; type: "bool" }
-        Property { name: "active"; type: "bool" }
-        Property { name: "keyboard"; type: "Keyboard_QMLTYPE_22"; isReadonly: true; isPointer: true }
-        Signal {
-            name: "externalLanguageSwitch"
-            Parameter { name: "localeList"; type: "QVariant" }
-            Parameter { name: "currentIndex"; type: "int" }
-        }
-    }
-    Component {
-        prototype: "QQuickItem"
-        name: "QtQuick.VirtualKeyboard/InputPanel 2.0"
-        exports: ["QtQuick.VirtualKeyboard/InputPanel 2.0"]
-        exportMetaObjectRevisions: [0]
-        isComposite: true
-        defaultProperty: "data"
-        Property { name: "externalLanguageSwitchEnabled"; type: "bool" }
-        Property { name: "desktopPanel"; type: "bool" }
-        Property { name: "active"; type: "bool" }
-        Property { name: "keyboard"; type: "Keyboard_QMLTYPE_22"; isReadonly: true; isPointer: true }
-        Signal {
-            name: "externalLanguageSwitch"
-            Parameter { name: "localeList"; type: "QVariant" }
-            Parameter { name: "currentIndex"; type: "int" }
-        }
-    }
-    Component {
-        prototype: "QQuickItem"
-        name: "QtQuick.VirtualKeyboard/InputPanel 2.1"
-        exports: ["QtQuick.VirtualKeyboard/InputPanel 2.1"]
-        exportMetaObjectRevisions: [1]
-        isComposite: true
-        defaultProperty: "data"
-        Property { name: "externalLanguageSwitchEnabled"; type: "bool" }
-        Property { name: "desktopPanel"; type: "bool" }
-        Property { name: "active"; type: "bool" }
-        Property { name: "keyboard"; type: "Keyboard_QMLTYPE_22"; isReadonly: true; isPointer: true }
-        Signal {
-            name: "externalLanguageSwitch"
-            Parameter { name: "localeList"; type: "QVariant" }
-            Parameter { name: "currentIndex"; type: "int" }
-        }
-    }
-    Component {
-        prototype: "QQuickItem"
-        name: "QtQuick.VirtualKeyboard/InputPanel 2.2"
-        exports: ["QtQuick.VirtualKeyboard/InputPanel 2.2"]
-        exportMetaObjectRevisions: [2]
-        isComposite: true
-        defaultProperty: "data"
-        Property { name: "externalLanguageSwitchEnabled"; type: "bool" }
-        Property { name: "desktopPanel"; type: "bool" }
-        Property { name: "active"; type: "bool" }
-        Property { name: "keyboard"; type: "Keyboard_QMLTYPE_22"; isReadonly: true; isPointer: true }
-        Signal {
-            name: "externalLanguageSwitch"
-            Parameter { name: "localeList"; type: "QVariant" }
-            Parameter { name: "currentIndex"; type: "int" }
-        }
-    }
-    Component {
-        prototype: "QQuickItem"
-        name: "QtQuick.VirtualKeyboard/InputPanel 2.3"
-        exports: ["QtQuick.VirtualKeyboard/InputPanel 2.3"]
-        exportMetaObjectRevisions: [3]
-        isComposite: true
-        defaultProperty: "data"
-        Property { name: "externalLanguageSwitchEnabled"; type: "bool" }
-        Property { name: "desktopPanel"; type: "bool" }
-        Property { name: "active"; type: "bool" }
-        Property { name: "keyboard"; type: "Keyboard_QMLTYPE_22"; isReadonly: true; isPointer: true }
-        Signal {
-            name: "externalLanguageSwitch"
-            Parameter { name: "localeList"; type: "QVariant" }
-            Parameter { name: "currentIndex"; type: "int" }
-        }
-    }
-    Component {
-        prototype: "QQuickItem"
-        name: "QtQuick.VirtualKeyboard/InputPanel 2.4"
-        exports: ["QtQuick.VirtualKeyboard/InputPanel 2.4"]
-        exportMetaObjectRevisions: [4]
-        isComposite: true
-        defaultProperty: "data"
-        Property { name: "externalLanguageSwitchEnabled"; type: "bool" }
-        Property { name: "desktopPanel"; type: "bool" }
-        Property { name: "active"; type: "bool" }
-        Property { name: "keyboard"; type: "Keyboard_QMLTYPE_22"; isReadonly: true; isPointer: true }
-        Signal {
-            name: "externalLanguageSwitch"
-            Parameter { name: "localeList"; type: "QVariant" }
-            Parameter { name: "currentIndex"; type: "int" }
-        }
-    }
-    Component {
-        prototype: "QQuickItem"
-        name: "QtQuick.VirtualKeyboard/Key 1.0"
-        exports: ["QtQuick.VirtualKeyboard/Key 1.0"]
-        exportMetaObjectRevisions: [0]
-        isComposite: true
-        defaultProperty: "data"
-        Property { name: "weight"; type: "double" }
-        Property { name: "text"; type: "string" }
-        Property { name: "displayText"; type: "string" }
-        Property { name: "smallText"; type: "string" }
-        Property { name: "smallTextVisible"; type: "bool" }
-        Property { name: "alternativeKeys"; type: "QVariant" }
-        Property { name: "effectiveAlternativeKeys"; type: "QVariant"; isReadonly: true }
-        Property { name: "effectiveAlternativeKeysHighlightIndex"; type: "int"; isReadonly: true }
-        Property { name: "key"; type: "int" }
-        Property { name: "noKeyEvent"; type: "bool" }
-        Property { name: "active"; type: "bool" }
-        Property { name: "noModifier"; type: "bool" }
-        Property { name: "repeat"; type: "bool" }
-        Property { name: "highlighted"; type: "bool" }
-        Property { name: "functionKey"; type: "bool" }
-        Property { name: "showPreview"; type: "bool" }
-        Property { name: "pressed"; type: "bool" }
-        Property { name: "uppercased"; type: "bool" }
-        Property { name: "soundEffect"; type: "QUrl"; isReadonly: true }
-        Property { name: "keyPanelDelegate"; type: "QQmlComponent"; isPointer: true }
-        Signal { name: "clicked" }
-    }
-    Component {
-        prototype: "QQuickItem"
-        name: "QtQuick.VirtualKeyboard/Key 2.0"
-        exports: ["QtQuick.VirtualKeyboard/Key 2.0"]
-        exportMetaObjectRevisions: [0]
-        isComposite: true
-        defaultProperty: "data"
-        Property { name: "weight"; type: "double" }
-        Property { name: "text"; type: "string" }
-        Property { name: "displayText"; type: "string" }
-        Property { name: "smallText"; type: "string" }
-        Property { name: "smallTextVisible"; type: "bool" }
-        Property { name: "alternativeKeys"; type: "QVariant" }
-        Property { name: "effectiveAlternativeKeys"; type: "QVariant"; isReadonly: true }
-        Property { name: "effectiveAlternativeKeysHighlightIndex"; type: "int"; isReadonly: true }
-        Property { name: "key"; type: "int" }
-        Property { name: "noKeyEvent"; type: "bool" }
-        Property { name: "active"; type: "bool" }
-        Property { name: "noModifier"; type: "bool" }
-        Property { name: "repeat"; type: "bool" }
-        Property { name: "highlighted"; type: "bool" }
-        Property { name: "functionKey"; type: "bool" }
-        Property { name: "showPreview"; type: "bool" }
-        Property { name: "pressed"; type: "bool" }
-        Property { name: "uppercased"; type: "bool" }
-        Property { name: "soundEffect"; type: "QUrl"; isReadonly: true }
-        Property { name: "keyPanelDelegate"; type: "QQmlComponent"; isPointer: true }
-        Signal { name: "clicked" }
-    }
-    Component {
-        prototype: "QQuickItem"
-        name: "QtQuick.VirtualKeyboard/Keyboard 1.0"
-        exports: ["QtQuick.VirtualKeyboard/Keyboard 1.0"]
-        exportMetaObjectRevisions: [0]
-        isComposite: true
-        defaultProperty: "data"
-        Property { name: "activeKey"; type: "QVariant" }
-        Property { name: "activeTouchPoint"; type: "QQuickTouchPoint"; isPointer: true }
-        Property { name: "localeIndex"; type: "int" }
-        Property { name: "availableLocaleIndices"; type: "QVariant" }
-        Property { name: "availableCustomLocaleIndices"; type: "QVariant" }
-        Property { name: "locale"; type: "string" }
-        Property { name: "inputLocale"; type: "string" }
-        Property { name: "defaultLocaleIndex"; type: "int" }
-        Property { name: "latinOnly"; type: "bool"; isReadonly: true }
-        Property { name: "preferNumbers"; type: "bool"; isReadonly: true }
-        Property { name: "dialableCharactersOnly"; type: "bool"; isReadonly: true }
-        Property { name: "formattedNumbersOnly"; type: "bool"; isReadonly: true }
-        Property { name: "digitsOnly"; type: "bool"; isReadonly: true }
-        Property { name: "layout"; type: "string" }
-        Property { name: "layoutType"; type: "string" }
-        Property { name: "active"; type: "bool" }
-        Property { name: "handwritingMode"; type: "bool" }
-        Property { name: "fullScreenHandwritingMode"; type: "bool" }
-        Property { name: "symbolMode"; type: "bool" }
-        Property { name: "fullScreenMode"; type: "bool" }
-        Property { name: "defaultInputMethod"; type: "QVariant" }
-        Property { name: "plainInputMethod"; type: "QVariant" }
-        Property { name: "customInputMethod"; type: "QVariant" }
-        Property { name: "customInputMethodSharedLayouts"; type: "QVariant" }
-        Property { name: "defaultInputMode"; type: "int" }
-        Property { name: "inputMethodNeedsReset"; type: "bool" }
-        Property { name: "inputModeNeedsReset"; type: "bool" }
-        Property { name: "navigationModeActive"; type: "bool" }
-        Property { name: "languagePopupListActive"; type: "bool"; isReadonly: true }
-        Property { name: "style"; type: "QObject"; isReadonly: true; isPointer: true }
-        Property { name: "wordCandidateView"; type: "QQuickListView"; isReadonly: true; isPointer: true }
-        Property {
-            name: "shadowInputControl"
-            type: "ShadowInputControl_QMLTYPE_16"
-            isReadonly: true
-            isPointer: true
-        }
-        Property { name: "soundEffect"; type: "QQuickItem"; isReadonly: true; isPointer: true }
-        Method { name: "initDefaultInputMethod"; type: "QVariant" }
-        Method {
-            name: "showLanguagePopup"
-            type: "QVariant"
-            Parameter { name: "parentItem"; type: "QVariant" }
-            Parameter { name: "customLayoutsOnly"; type: "QVariant" }
-        }
-        Method { name: "hideLanguagePopup"; type: "QVariant" }
-        Method {
-            name: "showWordCandidateContextMenu"
-            type: "QVariant"
-            Parameter { name: "wordCandidateIndex"; type: "QVariant" }
-        }
-        Method { name: "hideWordCandidateContextMenu"; type: "QVariant" }
-        Method { name: "updateInputMethod"; type: "QVariant" }
-        Method { name: "updateLayout"; type: "QVariant" }
-        Method { name: "updateDefaultLocale"; type: "QVariant" }
-        Method {
-            name: "filterLocaleIndices"
-            type: "QVariant"
-            Parameter { name: "filterCb"; type: "QVariant" }
-        }
-        Method { name: "updateAvailableLocaleIndices"; type: "QVariant" }
-        Method {
-            name: "listLocales"
-            type: "QVariant"
-            Parameter { name: "customLayoutsOnly"; type: "QVariant" }
-            Parameter { name: "localeNameOnly"; type: "QVariant" }
-        }
-        Method {
-            name: "nextLocaleIndex"
-            type: "QVariant"
-            Parameter { name: "customLayoutsOnly"; type: "QVariant" }
-        }
-        Method {
-            name: "changeInputLanguage"
-            type: "QVariant"
-            Parameter { name: "customLayoutsOnly"; type: "QVariant" }
-        }
-        Method {
-            name: "canChangeInputLanguage"
-            type: "QVariant"
-            Parameter { name: "customLayoutsOnly"; type: "QVariant" }
-        }
-        Method {
-            name: "findLocale"
-            type: "QVariant"
-            Parameter { name: "localeName"; type: "QVariant" }
-            Parameter { name: "defaultValue"; type: "QVariant" }
-        }
-        Method { name: "findFallbackIndex"; type: "QVariant" }
-        Method {
-            name: "isValidLocale"
-            type: "QVariant"
-            Parameter { name: "localeNameOrIndex"; type: "QVariant" }
-            Parameter { name: "ignoreActiveLocales"; type: "QVariant" }
-        }
-        Method {
-            name: "getLayoutFile"
-            type: "QVariant"
-            Parameter { name: "localeName"; type: "QVariant" }
-            Parameter { name: "layoutType"; type: "QVariant" }
-        }
-        Method {
-            name: "getFallbackFile"
-            type: "QVariant"
-            Parameter { name: "localeName"; type: "QVariant" }
-            Parameter { name: "layoutType"; type: "QVariant" }
-        }
-        Method {
-            name: "layoutExists"
-            type: "QVariant"
-            Parameter { name: "localeName"; type: "QVariant" }
-            Parameter { name: "layoutType"; type: "QVariant" }
-        }
-        Method {
-            name: "findLayout"
-            type: "QVariant"
-            Parameter { name: "localeName"; type: "QVariant" }
-            Parameter { name: "layoutType"; type: "QVariant" }
-        }
-        Method { name: "isHandwritingAvailable"; type: "QVariant" }
-        Method {
-            name: "setHandwritingMode"
-            type: "QVariant"
-            Parameter { name: "enabled"; type: "QVariant" }
-            Parameter { name: "resetInputMode"; type: "QVariant" }
-        }
-    }
-    Component {
-        prototype: "QQuickItem"
-        name: "QtQuick.VirtualKeyboard/Keyboard 2.0"
-        exports: ["QtQuick.VirtualKeyboard/Keyboard 2.0"]
-        exportMetaObjectRevisions: [0]
-        isComposite: true
-        defaultProperty: "data"
-        Property { name: "activeKey"; type: "QVariant" }
-        Property { name: "activeTouchPoint"; type: "QQuickTouchPoint"; isPointer: true }
-        Property { name: "localeIndex"; type: "int" }
-        Property { name: "availableLocaleIndices"; type: "QVariant" }
-        Property { name: "availableCustomLocaleIndices"; type: "QVariant" }
-        Property { name: "locale"; type: "string" }
-        Property { name: "inputLocale"; type: "string" }
-        Property { name: "defaultLocaleIndex"; type: "int" }
-        Property { name: "latinOnly"; type: "bool"; isReadonly: true }
-        Property { name: "preferNumbers"; type: "bool"; isReadonly: true }
-        Property { name: "dialableCharactersOnly"; type: "bool"; isReadonly: true }
-        Property { name: "formattedNumbersOnly"; type: "bool"; isReadonly: true }
-        Property { name: "digitsOnly"; type: "bool"; isReadonly: true }
-        Property { name: "layout"; type: "string" }
-        Property { name: "layoutType"; type: "string" }
-        Property { name: "active"; type: "bool" }
-        Property { name: "handwritingMode"; type: "bool" }
-        Property { name: "fullScreenHandwritingMode"; type: "bool" }
-        Property { name: "symbolMode"; type: "bool" }
-        Property { name: "fullScreenMode"; type: "bool" }
-        Property { name: "defaultInputMethod"; type: "QVariant" }
-        Property { name: "plainInputMethod"; type: "QVariant" }
-        Property { name: "customInputMethod"; type: "QVariant" }
-        Property { name: "customInputMethodSharedLayouts"; type: "QVariant" }
-        Property { name: "defaultInputMode"; type: "int" }
-        Property { name: "inputMethodNeedsReset"; type: "bool" }
-        Property { name: "inputModeNeedsReset"; type: "bool" }
-        Property { name: "navigationModeActive"; type: "bool" }
-        Property { name: "languagePopupListActive"; type: "bool"; isReadonly: true }
-        Property { name: "style"; type: "QObject"; isReadonly: true; isPointer: true }
-        Property { name: "wordCandidateView"; type: "QQuickListView"; isReadonly: true; isPointer: true }
-        Property {
-            name: "shadowInputControl"
-            type: "ShadowInputControl_QMLTYPE_16"
-            isReadonly: true
-            isPointer: true
-        }
-        Property { name: "soundEffect"; type: "QQuickItem"; isReadonly: true; isPointer: true }
-        Method { name: "initDefaultInputMethod"; type: "QVariant" }
-        Method {
-            name: "showLanguagePopup"
-            type: "QVariant"
-            Parameter { name: "parentItem"; type: "QVariant" }
-            Parameter { name: "customLayoutsOnly"; type: "QVariant" }
-        }
-        Method { name: "hideLanguagePopup"; type: "QVariant" }
-        Method {
-            name: "showWordCandidateContextMenu"
-            type: "QVariant"
-            Parameter { name: "wordCandidateIndex"; type: "QVariant" }
-        }
-        Method { name: "hideWordCandidateContextMenu"; type: "QVariant" }
-        Method { name: "updateInputMethod"; type: "QVariant" }
-        Method { name: "updateLayout"; type: "QVariant" }
-        Method { name: "updateDefaultLocale"; type: "QVariant" }
-        Method {
-            name: "filterLocaleIndices"
-            type: "QVariant"
-            Parameter { name: "filterCb"; type: "QVariant" }
-        }
-        Method { name: "updateAvailableLocaleIndices"; type: "QVariant" }
-        Method {
-            name: "listLocales"
-            type: "QVariant"
-            Parameter { name: "customLayoutsOnly"; type: "QVariant" }
-            Parameter { name: "localeNameOnly"; type: "QVariant" }
-        }
-        Method {
-            name: "nextLocaleIndex"
-            type: "QVariant"
-            Parameter { name: "customLayoutsOnly"; type: "QVariant" }
-        }
-        Method {
-            name: "changeInputLanguage"
-            type: "QVariant"
-            Parameter { name: "customLayoutsOnly"; type: "QVariant" }
-        }
-        Method {
-            name: "canChangeInputLanguage"
-            type: "QVariant"
-            Parameter { name: "customLayoutsOnly"; type: "QVariant" }
-        }
-        Method {
-            name: "findLocale"
-            type: "QVariant"
-            Parameter { name: "localeName"; type: "QVariant" }
-            Parameter { name: "defaultValue"; type: "QVariant" }
-        }
-        Method { name: "findFallbackIndex"; type: "QVariant" }
-        Method {
-            name: "isValidLocale"
-            type: "QVariant"
-            Parameter { name: "localeNameOrIndex"; type: "QVariant" }
-            Parameter { name: "ignoreActiveLocales"; type: "QVariant" }
-        }
-        Method {
-            name: "getLayoutFile"
-            type: "QVariant"
-            Parameter { name: "localeName"; type: "QVariant" }
-            Parameter { name: "layoutType"; type: "QVariant" }
-        }
-        Method {
-            name: "getFallbackFile"
-            type: "QVariant"
-            Parameter { name: "localeName"; type: "QVariant" }
-            Parameter { name: "layoutType"; type: "QVariant" }
-        }
-        Method {
-            name: "layoutExists"
-            type: "QVariant"
-            Parameter { name: "localeName"; type: "QVariant" }
-            Parameter { name: "layoutType"; type: "QVariant" }
-        }
-        Method {
-            name: "findLayout"
-            type: "QVariant"
-            Parameter { name: "localeName"; type: "QVariant" }
-            Parameter { name: "layoutType"; type: "QVariant" }
-        }
-        Method { name: "isHandwritingAvailable"; type: "QVariant" }
-        Method {
-            name: "setHandwritingMode"
-            type: "QVariant"
-            Parameter { name: "enabled"; type: "QVariant" }
-            Parameter { name: "resetInputMode"; type: "QVariant" }
-        }
-    }
-    Component {
-        prototype: "QQuickColumnLayout"
-        name: "QtQuick.VirtualKeyboard/KeyboardColumn 1.0"
-        exports: ["QtQuick.VirtualKeyboard/KeyboardColumn 1.0"]
-        exportMetaObjectRevisions: [0]
-        isComposite: true
-        defaultProperty: "data"
-        Property { name: "keyWeight"; type: "double" }
-        Property { name: "smallTextVisible"; type: "bool" }
-    }
-    Component {
-        prototype: "QQuickColumnLayout"
-        name: "QtQuick.VirtualKeyboard/KeyboardColumn 2.0"
-        exports: ["QtQuick.VirtualKeyboard/KeyboardColumn 2.0"]
-        exportMetaObjectRevisions: [0]
-        isComposite: true
-        defaultProperty: "data"
-        Property { name: "keyWeight"; type: "double" }
-        Property { name: "smallTextVisible"; type: "bool" }
-    }
-    Component {
-        prototype: "QQuickColumnLayout"
-        name: "QtQuick.VirtualKeyboard/KeyboardLayout 1.0"
-        exports: ["QtQuick.VirtualKeyboard/KeyboardLayout 1.0"]
-        exportMetaObjectRevisions: [0]
-        isComposite: true
-        defaultProperty: "data"
-        Property { name: "inputMethod"; type: "QVariant" }
-        Property { name: "sharedLayouts"; type: "QVariant" }
-        Property { name: "inputMode"; type: "int" }
-        Property { name: "keyWeight"; type: "double" }
-        Property { name: "smallTextVisible"; type: "bool" }
-        Method { name: "createInputMethod"; type: "QVariant" }
-    }
-    Component {
-        prototype: "QQuickColumnLayout"
-        name: "QtQuick.VirtualKeyboard/KeyboardLayout 2.0"
-        exports: ["QtQuick.VirtualKeyboard/KeyboardLayout 2.0"]
-        exportMetaObjectRevisions: [0]
-        isComposite: true
-        defaultProperty: "data"
-        Property { name: "inputMethod"; type: "QVariant" }
-        Property { name: "sharedLayouts"; type: "QVariant" }
-        Property { name: "inputMode"; type: "int" }
-        Property { name: "keyWeight"; type: "double" }
-        Property { name: "smallTextVisible"; type: "bool" }
-        Method { name: "createInputMethod"; type: "QVariant" }
-    }
-    Component {
-        prototype: "QQuickLoader"
-        name: "QtQuick.VirtualKeyboard/KeyboardLayoutLoader 1.1"
-        exports: ["QtQuick.VirtualKeyboard/KeyboardLayoutLoader 1.1"]
-        exportMetaObjectRevisions: [1]
-        isComposite: true
-        defaultProperty: "data"
-        Property { name: "inputMethod"; type: "QVariant" }
-        Property { name: "sharedLayouts"; type: "QVariant" }
-        Property { name: "inputMode"; type: "int" }
-        Property { name: "__updateCount"; type: "int" }
-        Method { name: "createInputMethod"; type: "QVariant" }
-    }
-    Component {
-        prototype: "QQuickLoader"
-        name: "QtQuick.VirtualKeyboard/KeyboardLayoutLoader 2.0"
-        exports: ["QtQuick.VirtualKeyboard/KeyboardLayoutLoader 2.0"]
-        exportMetaObjectRevisions: [0]
-        isComposite: true
-        defaultProperty: "data"
-        Property { name: "inputMethod"; type: "QVariant" }
-        Property { name: "sharedLayouts"; type: "QVariant" }
-        Property { name: "inputMode"; type: "int" }
-        Property { name: "__updateCount"; type: "int" }
-        Method { name: "createInputMethod"; type: "QVariant" }
-    }
-    Component {
-        prototype: "QQuickRowLayout"
-        name: "QtQuick.VirtualKeyboard/KeyboardRow 1.0"
-        exports: ["QtQuick.VirtualKeyboard/KeyboardRow 1.0"]
-        exportMetaObjectRevisions: [0]
-        isComposite: true
-        defaultProperty: "data"
-        Property { name: "keyWeight"; type: "double" }
-        Property { name: "smallTextVisible"; type: "bool" }
-    }
-    Component {
-        prototype: "QQuickRowLayout"
-        name: "QtQuick.VirtualKeyboard/KeyboardRow 2.0"
-        exports: ["QtQuick.VirtualKeyboard/KeyboardRow 2.0"]
-        exportMetaObjectRevisions: [0]
-        isComposite: true
-        defaultProperty: "data"
-        Property { name: "keyWeight"; type: "double" }
-        Property { name: "smallTextVisible"; type: "bool" }
-    }
-    Component {
-        prototype: "QQuickItem"
-        name: "QtQuick.VirtualKeyboard/ModeKey 2.0"
-        exports: ["QtQuick.VirtualKeyboard/ModeKey 2.0"]
-        exportMetaObjectRevisions: [0]
-        isComposite: true
-        defaultProperty: "data"
-        Property { name: "mode"; type: "bool" }
-        Property { name: "weight"; type: "double" }
-        Property { name: "text"; type: "string" }
-        Property { name: "displayText"; type: "string" }
-        Property { name: "smallText"; type: "string" }
-        Property { name: "smallTextVisible"; type: "bool" }
-        Property { name: "alternativeKeys"; type: "QVariant" }
-        Property { name: "effectiveAlternativeKeys"; type: "QVariant"; isReadonly: true }
-        Property { name: "effectiveAlternativeKeysHighlightIndex"; type: "int"; isReadonly: true }
-        Property { name: "key"; type: "int" }
-        Property { name: "noKeyEvent"; type: "bool" }
-        Property { name: "active"; type: "bool" }
-        Property { name: "noModifier"; type: "bool" }
-        Property { name: "repeat"; type: "bool" }
-        Property { name: "highlighted"; type: "bool" }
-        Property { name: "functionKey"; type: "bool" }
-        Property { name: "showPreview"; type: "bool" }
-        Property { name: "pressed"; type: "bool" }
-        Property { name: "uppercased"; type: "bool" }
-        Property { name: "soundEffect"; type: "QUrl"; isReadonly: true }
-        Property { name: "keyPanelDelegate"; type: "QQmlComponent"; isPointer: true }
-        Signal { name: "clicked" }
-    }
-    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: "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: "QObject"
-        name: "QtQuick.VirtualKeyboard/MultitapInputMethod 1.0"
-        exports: ["QtQuick.VirtualKeyboard/MultitapInputMethod 1.0"]
-        exportMetaObjectRevisions: [0]
-        isComposite: true
-        Property { name: "multitapSequence"; type: "string" }
-        Property { name: "multitapIndex"; type: "int" }
-        Property { name: "multiTapTimer"; type: "QVariant" }
-        Method {
-            name: "inputModes"
-            type: "QVariant"
-            Parameter { name: "locale"; type: "QVariant" }
-        }
-        Method {
-            name: "setInputMode"
-            type: "QVariant"
-            Parameter { name: "locale"; type: "QVariant" }
-            Parameter { name: "inputMode"; type: "QVariant" }
-        }
-        Method {
-            name: "setTextCase"
-            type: "QVariant"
-            Parameter { name: "textCase"; type: "QVariant" }
-        }
-        Method { name: "reset"; type: "QVariant" }
-        Method { name: "update"; type: "QVariant" }
-        Method {
-            name: "keyEvent"
-            type: "QVariant"
-            Parameter { name: "key"; type: "QVariant" }
-            Parameter { name: "text"; type: "QVariant" }
-            Parameter { name: "modifiers"; type: "QVariant" }
-        }
-        Method { name: "selectionLists"; type: "QVariant" }
-        Method {
-            name: "selectionListItemCount"
-            type: "QVariant"
-            Parameter { name: "type"; type: "QVariant" }
-        }
-        Method {
-            name: "selectionListData"
-            type: "QVariant"
-            Parameter { name: "type"; type: "QVariant" }
-            Parameter { name: "index"; type: "QVariant" }
-            Parameter { name: "role"; type: "QVariant" }
-        }
-        Method {
-            name: "selectionListItemSelected"
-            type: "QVariant"
-            Parameter { name: "type"; type: "QVariant" }
-            Parameter { name: "index"; type: "QVariant" }
-        }
-        Property {
-            name: "inputContext"
-            type: "QVirtualKeyboardInputContext"
-            isReadonly: true
-            isPointer: true
-        }
-        Property {
-            name: "inputEngine"
-            type: "QVirtualKeyboardInputEngine"
-            isReadonly: true
-            isPointer: true
-        }
-        Signal {
-            name: "selectionListChanged"
-            Parameter { name: "type"; type: "QVirtualKeyboardSelectionListModel::Type" }
-        }
-        Signal {
-            name: "selectionListActiveItemChanged"
-            Parameter { name: "type"; type: "QVirtualKeyboardSelectionListModel::Type" }
-            Parameter { name: "index"; type: "int" }
-        }
-        Signal { name: "selectionListsChanged" }
-    }
-    Component {
-        prototype: "QObject"
-        name: "QtQuick.VirtualKeyboard/MultitapInputMethod 2.0"
-        exports: ["QtQuick.VirtualKeyboard/MultitapInputMethod 2.0"]
-        exportMetaObjectRevisions: [0]
-        isComposite: true
-        Property { name: "multitapSequence"; type: "string" }
-        Property { name: "multitapIndex"; type: "int" }
-        Property { name: "multiTapTimer"; type: "QVariant" }
-        Method {
-            name: "inputModes"
-            type: "QVariant"
-            Parameter { name: "locale"; type: "QVariant" }
-        }
-        Method {
-            name: "setInputMode"
-            type: "QVariant"
-            Parameter { name: "locale"; type: "QVariant" }
-            Parameter { name: "inputMode"; type: "QVariant" }
-        }
-        Method {
-            name: "setTextCase"
-            type: "QVariant"
-            Parameter { name: "textCase"; type: "QVariant" }
-        }
-        Method { name: "reset"; type: "QVariant" }
-        Method { name: "update"; type: "QVariant" }
-        Method {
-            name: "keyEvent"
-            type: "QVariant"
-            Parameter { name: "key"; type: "QVariant" }
-            Parameter { name: "text"; type: "QVariant" }
-            Parameter { name: "modifiers"; type: "QVariant" }
-        }
-        Method { name: "selectionLists"; type: "QVariant" }
-        Method {
-            name: "selectionListItemCount"
-            type: "QVariant"
-            Parameter { name: "type"; type: "QVariant" }
-        }
-        Method {
-            name: "selectionListData"
-            type: "QVariant"
-            Parameter { name: "type"; type: "QVariant" }
-            Parameter { name: "index"; type: "QVariant" }
-            Parameter { name: "role"; type: "QVariant" }
-        }
-        Method {
-            name: "selectionListItemSelected"
-            type: "QVariant"
-            Parameter { name: "type"; type: "QVariant" }
-            Parameter { name: "index"; type: "QVariant" }
-        }
-        Property {
-            name: "inputContext"
-            type: "QVirtualKeyboardInputContext"
-            isReadonly: true
-            isPointer: true
-        }
-        Property {
-            name: "inputEngine"
-            type: "QVirtualKeyboardInputEngine"
-            isReadonly: true
-            isPointer: true
-        }
-        Signal {
-            name: "selectionListChanged"
-            Parameter { name: "type"; type: "QVirtualKeyboardSelectionListModel::Type" }
-        }
-        Signal {
-            name: "selectionListActiveItemChanged"
-            Parameter { name: "type"; type: "QVirtualKeyboardSelectionListModel::Type" }
-            Parameter { name: "index"; type: "int" }
-        }
-        Signal { name: "selectionListsChanged" }
-    }
-    Component {
-        prototype: "QQuickItem"
-        name: "QtQuick.VirtualKeyboard/NumberKey 1.0"
-        exports: ["QtQuick.VirtualKeyboard/NumberKey 1.0"]
-        exportMetaObjectRevisions: [0]
-        isComposite: true
-        defaultProperty: "data"
-        Property { name: "weight"; type: "double" }
-        Property { name: "text"; type: "string" }
-        Property { name: "displayText"; type: "string" }
-        Property { name: "smallText"; type: "string" }
-        Property { name: "smallTextVisible"; type: "bool" }
-        Property { name: "alternativeKeys"; type: "QVariant" }
-        Property { name: "effectiveAlternativeKeys"; type: "QVariant"; isReadonly: true }
-        Property { name: "effectiveAlternativeKeysHighlightIndex"; type: "int"; isReadonly: true }
-        Property { name: "key"; type: "int" }
-        Property { name: "noKeyEvent"; type: "bool" }
-        Property { name: "active"; type: "bool" }
-        Property { name: "noModifier"; type: "bool" }
-        Property { name: "repeat"; type: "bool" }
-        Property { name: "highlighted"; type: "bool" }
-        Property { name: "functionKey"; type: "bool" }
-        Property { name: "showPreview"; type: "bool" }
-        Property { name: "pressed"; type: "bool" }
-        Property { name: "uppercased"; type: "bool" }
-        Property { name: "soundEffect"; type: "QUrl"; isReadonly: true }
-        Property { name: "keyPanelDelegate"; type: "QQmlComponent"; isPointer: true }
-        Signal { name: "clicked" }
-    }
-    Component {
-        prototype: "QQuickItem"
-        name: "QtQuick.VirtualKeyboard/NumberKey 2.0"
-        exports: ["QtQuick.VirtualKeyboard/NumberKey 2.0"]
-        exportMetaObjectRevisions: [0]
-        isComposite: true
-        defaultProperty: "data"
-        Property { name: "weight"; type: "double" }
-        Property { name: "text"; type: "string" }
-        Property { name: "displayText"; type: "string" }
-        Property { name: "smallText"; type: "string" }
-        Property { name: "smallTextVisible"; type: "bool" }
-        Property { name: "alternativeKeys"; type: "QVariant" }
-        Property { name: "effectiveAlternativeKeys"; type: "QVariant"; isReadonly: true }
-        Property { name: "effectiveAlternativeKeysHighlightIndex"; type: "int"; isReadonly: true }
-        Property { name: "key"; type: "int" }
-        Property { name: "noKeyEvent"; type: "bool" }
-        Property { name: "active"; type: "bool" }
-        Property { name: "noModifier"; type: "bool" }
-        Property { name: "repeat"; type: "bool" }
-        Property { name: "highlighted"; type: "bool" }
-        Property { name: "functionKey"; type: "bool" }
-        Property { name: "showPreview"; type: "bool" }
-        Property { name: "pressed"; type: "bool" }
-        Property { name: "uppercased"; type: "bool" }
-        Property { name: "soundEffect"; type: "QUrl"; isReadonly: true }
-        Property { name: "keyPanelDelegate"; type: "QQmlComponent"; isPointer: true }
-        Signal { name: "clicked" }
-    }
-    Component {
-        prototype: "QQuickListView"
-        name: "QtQuick.VirtualKeyboard/PopupList 2.3"
-        exports: ["QtQuick.VirtualKeyboard/PopupList 2.3"]
-        exportMetaObjectRevisions: [3]
-        isComposite: true
-        defaultProperty: "data"
-        Property { name: "maxVisibleItems"; type: "int" }
-        Property { name: "preferredVisibleItems"; type: "int"; isReadonly: true }
-        Property { name: "contentWidth"; type: "double"; isReadonly: true }
-        Property { name: "background"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "defaultHighlight"; type: "QQmlComponent"; isReadonly: true; isPointer: true }
-    }
-    Component {
-        prototype: "QQuickItem"
-        name: "QtQuick.VirtualKeyboard/SelectionControl 2.1"
-        exports: ["QtQuick.VirtualKeyboard/SelectionControl 2.1"]
-        exportMetaObjectRevisions: [1]
-        isComposite: true
-        defaultProperty: "data"
-        Property { name: "handleIsMoving"; type: "bool" }
-        Property { name: "inputContext"; type: "QVariant" }
-    }
-    Component {
-        prototype: "QQuickItem"
-        name: "QtQuick.VirtualKeyboard/ShiftKey 1.0"
-        exports: ["QtQuick.VirtualKeyboard/ShiftKey 1.0"]
-        exportMetaObjectRevisions: [0]
-        isComposite: true
-        defaultProperty: "data"
-        Property { name: "weight"; type: "double" }
-        Property { name: "text"; type: "string" }
-        Property { name: "displayText"; type: "string" }
-        Property { name: "smallText"; type: "string" }
-        Property { name: "smallTextVisible"; type: "bool" }
-        Property { name: "alternativeKeys"; type: "QVariant" }
-        Property { name: "effectiveAlternativeKeys"; type: "QVariant"; isReadonly: true }
-        Property { name: "effectiveAlternativeKeysHighlightIndex"; type: "int"; isReadonly: true }
-        Property { name: "key"; type: "int" }
-        Property { name: "noKeyEvent"; type: "bool" }
-        Property { name: "active"; type: "bool" }
-        Property { name: "noModifier"; type: "bool" }
-        Property { name: "repeat"; type: "bool" }
-        Property { name: "highlighted"; type: "bool" }
-        Property { name: "functionKey"; type: "bool" }
-        Property { name: "showPreview"; type: "bool" }
-        Property { name: "pressed"; type: "bool" }
-        Property { name: "uppercased"; type: "bool" }
-        Property { name: "soundEffect"; type: "QUrl"; isReadonly: true }
-        Property { name: "keyPanelDelegate"; type: "QQmlComponent"; isPointer: true }
-        Signal { name: "clicked" }
-    }
-    Component {
-        prototype: "QQuickItem"
-        name: "QtQuick.VirtualKeyboard/ShiftKey 2.0"
-        exports: ["QtQuick.VirtualKeyboard/ShiftKey 2.0"]
-        exportMetaObjectRevisions: [0]
-        isComposite: true
-        defaultProperty: "data"
-        Property { name: "weight"; type: "double" }
-        Property { name: "text"; type: "string" }
-        Property { name: "displayText"; type: "string" }
-        Property { name: "smallText"; type: "string" }
-        Property { name: "smallTextVisible"; type: "bool" }
-        Property { name: "alternativeKeys"; type: "QVariant" }
-        Property { name: "effectiveAlternativeKeys"; type: "QVariant"; isReadonly: true }
-        Property { name: "effectiveAlternativeKeysHighlightIndex"; type: "int"; isReadonly: true }
-        Property { name: "key"; type: "int" }
-        Property { name: "noKeyEvent"; type: "bool" }
-        Property { name: "active"; type: "bool" }
-        Property { name: "noModifier"; type: "bool" }
-        Property { name: "repeat"; type: "bool" }
-        Property { name: "highlighted"; type: "bool" }
-        Property { name: "functionKey"; type: "bool" }
-        Property { name: "showPreview"; type: "bool" }
-        Property { name: "pressed"; type: "bool" }
-        Property { name: "uppercased"; type: "bool" }
-        Property { name: "soundEffect"; type: "QUrl"; isReadonly: true }
-        Property { name: "keyPanelDelegate"; type: "QQmlComponent"; isPointer: true }
-        Signal { name: "clicked" }
-    }
-    Component {
-        prototype: "QQuickItem"
-        name: "QtQuick.VirtualKeyboard/SpaceKey 1.0"
-        exports: ["QtQuick.VirtualKeyboard/SpaceKey 1.0"]
-        exportMetaObjectRevisions: [0]
-        isComposite: true
-        defaultProperty: "data"
-        Property { name: "weight"; type: "double" }
-        Property { name: "text"; type: "string" }
-        Property { name: "displayText"; type: "string" }
-        Property { name: "smallText"; type: "string" }
-        Property { name: "smallTextVisible"; type: "bool" }
-        Property { name: "alternativeKeys"; type: "QVariant" }
-        Property { name: "effectiveAlternativeKeys"; type: "QVariant"; isReadonly: true }
-        Property { name: "effectiveAlternativeKeysHighlightIndex"; type: "int"; isReadonly: true }
-        Property { name: "key"; type: "int" }
-        Property { name: "noKeyEvent"; type: "bool" }
-        Property { name: "active"; type: "bool" }
-        Property { name: "noModifier"; type: "bool" }
-        Property { name: "repeat"; type: "bool" }
-        Property { name: "highlighted"; type: "bool" }
-        Property { name: "functionKey"; type: "bool" }
-        Property { name: "showPreview"; type: "bool" }
-        Property { name: "pressed"; type: "bool" }
-        Property { name: "uppercased"; type: "bool" }
-        Property { name: "soundEffect"; type: "QUrl"; isReadonly: true }
-        Property { name: "keyPanelDelegate"; type: "QQmlComponent"; isPointer: true }
-        Signal { name: "clicked" }
-    }
-    Component {
-        prototype: "QQuickItem"
-        name: "QtQuick.VirtualKeyboard/SpaceKey 2.0"
-        exports: ["QtQuick.VirtualKeyboard/SpaceKey 2.0"]
-        exportMetaObjectRevisions: [0]
-        isComposite: true
-        defaultProperty: "data"
-        Property { name: "weight"; type: "double" }
-        Property { name: "text"; type: "string" }
-        Property { name: "displayText"; type: "string" }
-        Property { name: "smallText"; type: "string" }
-        Property { name: "smallTextVisible"; type: "bool" }
-        Property { name: "alternativeKeys"; type: "QVariant" }
-        Property { name: "effectiveAlternativeKeys"; type: "QVariant"; isReadonly: true }
-        Property { name: "effectiveAlternativeKeysHighlightIndex"; type: "int"; isReadonly: true }
-        Property { name: "key"; type: "int" }
-        Property { name: "noKeyEvent"; type: "bool" }
-        Property { name: "active"; type: "bool" }
-        Property { name: "noModifier"; type: "bool" }
-        Property { name: "repeat"; type: "bool" }
-        Property { name: "highlighted"; type: "bool" }
-        Property { name: "functionKey"; type: "bool" }
-        Property { name: "showPreview"; type: "bool" }
-        Property { name: "pressed"; type: "bool" }
-        Property { name: "uppercased"; type: "bool" }
-        Property { name: "soundEffect"; type: "QUrl"; isReadonly: true }
-        Property { name: "keyPanelDelegate"; type: "QQmlComponent"; isPointer: true }
-        Signal { name: "clicked" }
-    }
-    Component {
-        prototype: "QQuickItem"
-        name: "QtQuick.VirtualKeyboard/SymbolModeKey 1.0"
-        exports: ["QtQuick.VirtualKeyboard/SymbolModeKey 1.0"]
-        exportMetaObjectRevisions: [0]
-        isComposite: true
-        defaultProperty: "data"
-        Property { name: "weight"; type: "double" }
-        Property { name: "text"; type: "string" }
-        Property { name: "displayText"; type: "string" }
-        Property { name: "smallText"; type: "string" }
-        Property { name: "smallTextVisible"; type: "bool" }
-        Property { name: "alternativeKeys"; type: "QVariant" }
-        Property { name: "effectiveAlternativeKeys"; type: "QVariant"; isReadonly: true }
-        Property { name: "effectiveAlternativeKeysHighlightIndex"; type: "int"; isReadonly: true }
-        Property { name: "key"; type: "int" }
-        Property { name: "noKeyEvent"; type: "bool" }
-        Property { name: "active"; type: "bool" }
-        Property { name: "noModifier"; type: "bool" }
-        Property { name: "repeat"; type: "bool" }
-        Property { name: "highlighted"; type: "bool" }
-        Property { name: "functionKey"; type: "bool" }
-        Property { name: "showPreview"; type: "bool" }
-        Property { name: "pressed"; type: "bool" }
-        Property { name: "uppercased"; type: "bool" }
-        Property { name: "soundEffect"; type: "QUrl"; isReadonly: true }
-        Property { name: "keyPanelDelegate"; type: "QQmlComponent"; isPointer: true }
-        Signal { name: "clicked" }
-    }
-    Component {
-        prototype: "QQuickItem"
-        name: "QtQuick.VirtualKeyboard/SymbolModeKey 2.0"
-        exports: ["QtQuick.VirtualKeyboard/SymbolModeKey 2.0"]
-        exportMetaObjectRevisions: [0]
-        isComposite: true
-        defaultProperty: "data"
-        Property { name: "weight"; type: "double" }
-        Property { name: "text"; type: "string" }
-        Property { name: "displayText"; type: "string" }
-        Property { name: "smallText"; type: "string" }
-        Property { name: "smallTextVisible"; type: "bool" }
-        Property { name: "alternativeKeys"; type: "QVariant" }
-        Property { name: "effectiveAlternativeKeys"; type: "QVariant"; isReadonly: true }
-        Property { name: "effectiveAlternativeKeysHighlightIndex"; type: "int"; isReadonly: true }
-        Property { name: "key"; type: "int" }
-        Property { name: "noKeyEvent"; type: "bool" }
-        Property { name: "active"; type: "bool" }
-        Property { name: "noModifier"; type: "bool" }
-        Property { name: "repeat"; type: "bool" }
-        Property { name: "highlighted"; type: "bool" }
-        Property { name: "functionKey"; type: "bool" }
-        Property { name: "showPreview"; type: "bool" }
-        Property { name: "pressed"; type: "bool" }
-        Property { name: "uppercased"; type: "bool" }
-        Property { name: "soundEffect"; type: "QUrl"; isReadonly: true }
-        Property { name: "keyPanelDelegate"; type: "QQmlComponent"; isPointer: true }
-        Signal { name: "clicked" }
-    }
-    Component {
-        prototype: "QQuickMultiPointTouchArea"
-        name: "QtQuick.VirtualKeyboard/TraceInputArea 2.0"
-        exports: ["QtQuick.VirtualKeyboard/TraceInputArea 2.0"]
-        exportMetaObjectRevisions: [0]
-        isComposite: true
-        defaultProperty: "data"
-        Property { name: "patternRecognitionMode"; type: "int" }
-        Property { name: "horizontalRulers"; type: "QVariant" }
-        Property { name: "verticalRulers"; type: "QVariant" }
-        Property { name: "boundingBox"; type: "QRectF"; isReadonly: true }
-        Property { name: "canvasType"; type: "string" }
-        Property { name: "__traceCanvasList"; type: "QVariant" }
-        Property { name: "__traceCaptureDeviceInfo"; type: "QVariant" }
-        Property { name: "__traceScreenInfo"; type: "QVariant" }
-        Method {
-            name: "findTraceCanvasById"
-            type: "QVariant"
-            Parameter { name: "traceId"; type: "QVariant" }
-        }
-    }
-    Component {
-        prototype: "QQuickItem"
-        name: "QtQuick.VirtualKeyboard/TraceInputKey 2.0"
-        exports: ["QtQuick.VirtualKeyboard/TraceInputKey 2.0"]
-        exportMetaObjectRevisions: [0]
-        isComposite: true
-        defaultProperty: "data"
-        Property { name: "weight"; type: "double" }
-        Property { name: "patternRecognitionMode"; type: "int" }
-        Property { name: "horizontalRulers"; type: "QVariant" }
-        Property { name: "verticalRulers"; type: "QVariant" }
-        Property { name: "boundingBox"; type: "QRectF"; isReadonly: true }
-        Property { name: "canvasType"; type: "string" }
-    }
-    Component {
-        prototype: "QQuickListView"
-        name: "QtQuick.VirtualKeyboard/WordCandidatePopupList 2.0"
-        exports: ["QtQuick.VirtualKeyboard/WordCandidatePopupList 2.0"]
-        exportMetaObjectRevisions: [0]
-        isComposite: true
-        defaultProperty: "data"
-        Property { name: "preferredVisibleItems"; type: "int"; isReadonly: true }
-        Property { name: "flipVertical"; type: "bool"; isReadonly: true }
-        Property { name: "maxVisibleItems"; type: "int" }
-        Property { name: "contentWidth"; type: "double"; isReadonly: true }
-        Property { name: "background"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "defaultHighlight"; type: "QQmlComponent"; isReadonly: true; isPointer: true }
-    }
-}
diff --git a/src/import/qmldir b/src/import/qmldir
deleted file mode 100644
index e1110f1a..00000000
--- a/src/import/qmldir
+++ /dev/null
@@ -1,10 +0,0 @@
-module QtQuick.VirtualKeyboard
-plugin qtquickvirtualkeyboardplugin
-classname QtQuickVirtualKeyboardPlugin
-typeinfo plugins.qmltypes
-depends QtQuick 2.0
-depends QtQuick.Window 2.2
-depends QtQuick.Layouts 1.0
-depends Qt.labs.folderlistmodel 2.1
-depends QtQuick.VirtualKeyboard.Settings 2.2
-depends QtQuick.VirtualKeyboard.Styles 2.2
diff --git a/src/import/qtquickvirtualkeyboardplugin.cpp b/src/import/qtquickvirtualkeyboardplugin.cpp
deleted file mode 100644
index 13f46856..00000000
--- a/src/import/qtquickvirtualkeyboardplugin.cpp
+++ /dev/null
@@ -1,163 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2018 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 or (at your option) any later version
-** approved by the KDE Free Qt Foundation. The licenses are as published by
-** the Free Software Foundation and appearing in the file LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qtquickvirtualkeyboardplugin.h"
-
-#include <QtVirtualKeyboard/qvirtualkeyboardinputcontext.h>
-#include <QtVirtualKeyboard/qvirtualkeyboardinputengine.h>
-#include <QtVirtualKeyboard/private/qvirtualkeyboardinputcontext_p.h>
-#include <QtVirtualKeyboard/private/shifthandler_p.h>
-#include <QtVirtualKeyboard/private/inputmethod_p.h>
-#include <QtVirtualKeyboard/qvirtualkeyboardselectionlistmodel.h>
-#include <QtVirtualKeyboard/private/enterkeyaction_p.h>
-#include <QtVirtualKeyboard/private/enterkeyactionattachedtype_p.h>
-#include <QtVirtualKeyboard/qvirtualkeyboardtrace.h>
-#include <QtVirtualKeyboard/private/shadowinputcontext_p.h>
-#include <QtVirtualKeyboard/private/qvirtualkeyboard_staticplugin_p.h>
-#include <QtVirtualKeyboard/qvirtualkeyboardobserver.h>
-#include <QtVirtualKeyboard/qvirtualkeyboard_namespace.h>
-#include <QtVirtualKeyboard/private/virtualkeyboard_p.h>
-#include <QtVirtualKeyboard/private/virtualkeyboardattachedtype_p.h>
-
-QT_BEGIN_NAMESPACE
-
-using namespace QtVirtualKeyboard;
-
-static QObject *createInputContextModule(QQmlEngine *engine, QJSEngine *scriptEngine)
-{
-    Q_UNUSED(engine);
-    Q_UNUSED(scriptEngine);
-    return new QVirtualKeyboardInputContext();
-}
-
-void QtQuickVirtualKeyboardPlugin::registerTypes(const char *uri)
-{
-#if defined(QT_STATICPLUGIN)
-    Q_VKB_IMPORT_PLUGIN(QtQuick2Plugin)
-    Q_VKB_IMPORT_PLUGIN(QtQuick_WindowPlugin)
-    Q_VKB_IMPORT_PLUGIN(QtQuickLayoutsPlugin)
-    Q_VKB_IMPORT_PLUGIN(QmlFolderListModelPlugin)
-    Q_VKB_IMPORT_PLUGIN(QtQuickVirtualKeyboardSettingsPlugin)
-    Q_VKB_IMPORT_PLUGIN(QtQuickVirtualKeyboardStylesPlugin)
-#endif
-
-    qmlRegisterSingletonType<QVirtualKeyboardInputContext>(uri, 1, 0, "InputContext", createInputContextModule);
-    qmlRegisterSingletonType<QVirtualKeyboardInputContext>(uri, 2, 0, "InputContext", createInputContextModule);
-    qmlRegisterUncreatableType<QVirtualKeyboardInputContextPrivate>(uri, 1, 0, "InputContextPrivate", QLatin1String("Cannot create input context private"));
-    qmlRegisterUncreatableType<QVirtualKeyboardInputEngine>(uri, 1, 0, "InputEngine", QLatin1String("Cannot create input method engine"));
-    qmlRegisterUncreatableType<QVirtualKeyboardInputEngine>(uri, 2, 0, "InputEngine", QLatin1String("Cannot create input method engine"));
-    qRegisterMetaType<ShiftHandler *>("ShiftHandler*");
-    qmlRegisterUncreatableType<ShiftHandler>(uri, 1, 0, "ShiftHandler", QLatin1String("Cannot create shift handler"));
-    qmlRegisterUncreatableType<ShiftHandler>(uri, 2, 0, "ShiftHandler", QLatin1String("Cannot create shift handler"));
-    qmlRegisterUncreatableType<QVirtualKeyboardSelectionListModel>(uri, 1, 0, "SelectionListModel", QLatin1String("Cannot create selection list model"));
-    qmlRegisterUncreatableType<QVirtualKeyboardSelectionListModel>(uri, 2, 0, "SelectionListModel", QLatin1String("Cannot create selection list model"));
-    qmlRegisterUncreatableType<QVirtualKeyboardAbstractInputMethod>(uri, 1, 0, "AbstractInputMethod", QLatin1String("Cannot create abstract input method"));
-    qmlRegisterUncreatableType<QVirtualKeyboardAbstractInputMethod>(uri, 2, 0, "AbstractInputMethod", QLatin1String("Cannot create abstract input method"));
-    qmlRegisterType<InputMethod>(uri, 1, 0, "InputMethod");
-    qmlRegisterType<InputMethod>(uri, 2, 0, "InputMethod");
-    qmlRegisterAnonymousType<EnterKeyActionAttachedType>(uri, 1);
-    qmlRegisterAnonymousType<EnterKeyActionAttachedType>(uri, 2);
-    qmlRegisterType<EnterKeyAction>(uri, 1, 0, "EnterKeyAction");
-    qmlRegisterType<EnterKeyAction>(uri, 2, 0, "EnterKeyAction");
-    qmlRegisterType<QVirtualKeyboardTrace>(uri, 2, 0, "Trace");
-    qmlRegisterType<QVirtualKeyboardTrace>(uri, 2, 4, "Trace");
-    qRegisterMetaType<ShadowInputContext *>("ShadowInputContext*");
-    qmlRegisterUncreatableType<ShadowInputContext>(uri, 2, 2, "ShadowInputContext", QLatin1String("Cannot create shadow input context"));
-    qmlRegisterType<QVirtualKeyboardObserver>(uri, 6, 1, "KeyboardObserver");
-    qmlRegisterUncreatableMetaObject(QtVirtualKeyboard::staticMetaObject, uri, 6, 1, "QtVirtualKeyboard", "Cannot create namespace");
-    qmlRegisterAnonymousType<VirtualKeyboardAttachedType>(uri, 6);
-    qmlRegisterType<VirtualKeyboard>(uri, 6, 1, "VirtualKeyboard");
-
-    const QString path(QStringLiteral("qrc:///QtQuick/VirtualKeyboard/content/"));
-    qmlRegisterType(QUrl(path + QLatin1String("InputPanel.qml")), uri, 1, 0, "InputPanel");
-    qmlRegisterType(QUrl(path + QLatin1String("InputPanel.qml")), uri, 1, 2, "InputPanel");
-    qmlRegisterType(QUrl(path + QLatin1String("InputPanel.qml")), uri, 1, 3, "InputPanel");
-    qmlRegisterType(QUrl(path + QLatin1String("InputPanel.qml")), uri, 2, 0, "InputPanel");
-    qmlRegisterType(QUrl(path + QLatin1String("InputPanel.qml")), uri, 2, 1, "InputPanel");
-    qmlRegisterType(QUrl(path + QLatin1String("InputPanel.qml")), uri, 2, 2, "InputPanel");
-    qmlRegisterType(QUrl(path + QLatin1String("InputPanel.qml")), uri, 2, 3, "InputPanel");
-    qmlRegisterType(QUrl(path + QLatin1String("InputPanel.qml")), uri, 2, 4, "InputPanel");
-    qmlRegisterType(QUrl(path + QLatin1String("HandwritingInputPanel.qml")), uri, 2, 0, "HandwritingInputPanel");
-    const QString componentsPath = path + QStringLiteral("components/");
-    qmlRegisterType(QUrl(componentsPath + QLatin1String("AlternativeKeys.qml")), uri, 1, 0, "AlternativeKeys");
-    qmlRegisterType(QUrl(componentsPath + QLatin1String("AlternativeKeys.qml")), uri, 2, 0, "AlternativeKeys");
-    qmlRegisterType(QUrl(componentsPath + QLatin1String("BackspaceKey.qml")), uri, 1, 0, "BackspaceKey");
-    qmlRegisterType(QUrl(componentsPath + QLatin1String("BackspaceKey.qml")), uri, 2, 0, "BackspaceKey");
-    qmlRegisterType(QUrl(componentsPath + QLatin1String("BaseKey.qml")), uri, 1, 0, "BaseKey");
-    qmlRegisterType(QUrl(componentsPath + QLatin1String("BaseKey.qml")), uri, 2, 0, "BaseKey");
-    qmlRegisterType(QUrl(componentsPath + QLatin1String("ChangeLanguageKey.qml")), uri, 1, 0, "ChangeLanguageKey");
-    qmlRegisterType(QUrl(componentsPath + QLatin1String("ChangeLanguageKey.qml")), uri, 2, 0, "ChangeLanguageKey");
-    qmlRegisterType(QUrl(componentsPath + QLatin1String("CharacterPreviewBubble.qml")), uri, 1, 0, "CharacterPreviewBubble");
-    qmlRegisterType(QUrl(componentsPath + QLatin1String("CharacterPreviewBubble.qml")), uri, 2, 0, "CharacterPreviewBubble");
-    qmlRegisterType(QUrl(componentsPath + QLatin1String("EnterKey.qml")), uri, 1, 0, "EnterKey");
-    qmlRegisterType(QUrl(componentsPath + QLatin1String("EnterKey.qml")), uri, 2, 0, "EnterKey");
-    qmlRegisterType(QUrl(componentsPath + QLatin1String("FillerKey.qml")), uri, 1, 0, "FillerKey");
-    qmlRegisterType(QUrl(componentsPath + QLatin1String("FillerKey.qml")), uri, 2, 0, "FillerKey");
-    qmlRegisterType(QUrl(componentsPath + QLatin1String("HideKeyboardKey.qml")), uri, 1, 0, "HideKeyboardKey");
-    qmlRegisterType(QUrl(componentsPath + QLatin1String("HideKeyboardKey.qml")), uri, 2, 0, "HideKeyboardKey");
-    qmlRegisterType(QUrl(componentsPath + QLatin1String("KeyboardColumn.qml")), uri, 1, 0, "KeyboardColumn");
-    qmlRegisterType(QUrl(componentsPath + QLatin1String("KeyboardColumn.qml")), uri, 2, 0, "KeyboardColumn");
-    qmlRegisterType(QUrl(componentsPath + QLatin1String("KeyboardLayout.qml")), uri, 1, 0, "KeyboardLayout");
-    qmlRegisterType(QUrl(componentsPath + QLatin1String("KeyboardLayout.qml")), uri, 2, 0, "KeyboardLayout");
-    qmlRegisterType(QUrl(componentsPath + QLatin1String("KeyboardLayoutLoader.qml")), uri, 1, 1, "KeyboardLayoutLoader");
-    qmlRegisterType(QUrl(componentsPath + QLatin1String("KeyboardLayoutLoader.qml")), uri, 2, 0, "KeyboardLayoutLoader");
-    qmlRegisterType(QUrl(componentsPath + QLatin1String("Keyboard.qml")), uri, 1, 0, "Keyboard");
-    qmlRegisterType(QUrl(componentsPath + QLatin1String("Keyboard.qml")), uri, 2, 0, "Keyboard");
-    qmlRegisterType(QUrl(componentsPath + QLatin1String("KeyboardRow.qml")), uri, 1, 0, "KeyboardRow");
-    qmlRegisterType(QUrl(componentsPath + QLatin1String("KeyboardRow.qml")), uri, 2, 0, "KeyboardRow");
-    qmlRegisterType(QUrl(componentsPath + QLatin1String("Key.qml")), uri, 1, 0, "Key");
-    qmlRegisterType(QUrl(componentsPath + QLatin1String("Key.qml")), uri, 2, 0, "Key");
-    qmlRegisterType(QUrl(componentsPath + QLatin1String("ModeKey.qml")), uri, 2, 0, "ModeKey");
-    qmlRegisterType(QUrl(componentsPath + QLatin1String("MultiSoundEffect.qml")), uri, 1, 1, "MultiSoundEffect");
-    qmlRegisterType(QUrl(componentsPath + QLatin1String("MultiSoundEffect.qml")), uri, 2, 0, "MultiSoundEffect");
-    qmlRegisterType(QUrl(componentsPath + QLatin1String("MultitapInputMethod.qml")), uri, 1, 0, "MultitapInputMethod");
-    qmlRegisterType(QUrl(componentsPath + QLatin1String("MultitapInputMethod.qml")), uri, 2, 0, "MultitapInputMethod");
-    qmlRegisterType(QUrl(componentsPath + QLatin1String("NumberKey.qml")), uri, 1, 0, "NumberKey");
-    qmlRegisterType(QUrl(componentsPath + QLatin1String("NumberKey.qml")), uri, 2, 0, "NumberKey");
-    qmlRegisterType(QUrl(componentsPath + QLatin1String("ShiftKey.qml")), uri, 1, 0, "ShiftKey");
-    qmlRegisterType(QUrl(componentsPath + QLatin1String("ShiftKey.qml")), uri, 2, 0, "ShiftKey");
-    qmlRegisterType(QUrl(componentsPath + QLatin1String("SpaceKey.qml")), uri, 1, 0, "SpaceKey");
-    qmlRegisterType(QUrl(componentsPath + QLatin1String("SpaceKey.qml")), uri, 2, 0, "SpaceKey");
-    qmlRegisterType(QUrl(componentsPath + QLatin1String("SymbolModeKey.qml")), uri, 1, 0, "SymbolModeKey");
-    qmlRegisterType(QUrl(componentsPath + QLatin1String("SymbolModeKey.qml")), uri, 2, 0, "SymbolModeKey");
-    qmlRegisterType(QUrl(componentsPath + QLatin1String("HandwritingModeKey.qml")), uri, 2, 0, "HandwritingModeKey");
-    qmlRegisterType(QUrl(componentsPath + QLatin1String("TraceInputArea.qml")), uri, 2, 0, "TraceInputArea");
-    qmlRegisterType(QUrl(componentsPath + QLatin1String("TraceInputKey.qml")), uri, 2, 0, "TraceInputKey");
-    qmlRegisterType(QUrl(componentsPath + QLatin1String("WordCandidatePopupList.qml")), uri, 2, 0, "WordCandidatePopupList");
-    qmlRegisterType(QUrl(componentsPath + QLatin1String("PopupList.qml")), uri, 2, 3, "PopupList");
-    qmlRegisterType(QUrl(componentsPath + QLatin1String("SelectionControl.qml")), uri, 2, 1, "SelectionControl");
-    qmlRegisterType(QUrl(componentsPath + QLatin1String("FlickKey.qml")), uri, 6, 1, "FlickKey");
-    qmlRegisterType(QUrl(componentsPath + QLatin1String("InputModeKey.qml")), uri, 2, 3, "InputModeKey");
-
-    // The minor version used to be the current Qt 5 minor. For compatibility it is the last
-    // Qt 5 release.
-    qmlRegisterModule(uri, 2, 15);
-}
-
-QT_END_NAMESPACE
diff --git a/src/layouts/CMakeLists.txt b/src/layouts/CMakeLists.txt
new file mode 100644
index 00000000..33d1de9a
--- /dev/null
+++ b/src/layouts/CMakeLists.txt
@@ -0,0 +1,357 @@
+qt_internal_add_qml_module(qtvkblayoutsplugin
+    URI "QtQuick.VirtualKeyboard.Layouts"
+    VERSION "${PROJECT_VERSION}"
+    PAST_MAJOR_VERSIONS 2 1
+    PLUGIN_TARGET qtvkblayoutsplugin
+    NO_PLUGIN_OPTIONAL
+)
+
+set(LAYOUT_FILES
+    fallback/dialpad.qml
+    fallback/digits.qml
+    fallback/main.qml
+    fallback/numbers.qml
+    fallback/symbols.qml
+)
+if (FEATURE_vkb_lang_en_GB)
+    list(APPEND LAYOUT_FILES
+        en_GB/dialpad.fallback
+        en_GB/digits.fallback
+        en_GB/main.fallback
+        en_GB/numbers.fallback
+        en_GB/symbols.fallback
+    )
+endif()
+if(FEATURE_vkb_lang_en_US)
+    list(APPEND LAYOUT_FILES
+        en_US/dialpad.fallback
+        en_US/digits.fallback
+        en_US/main.fallback
+        en_US/numbers.fallback
+        en_US/symbols.fallback
+    )
+endif()
+if(FEATURE_vkb_lang_ar_AR)
+    list(APPEND LAYOUT_FILES
+        ar_AR/dialpad.fallback
+        ar_AR/digits.qml
+        ar_AR/main.qml
+        ar_AR/numbers.qml
+        ar_AR/symbols.qml
+    )
+endif()
+if(FEATURE_vkb_lang_bg_BG)
+    list(APPEND LAYOUT_FILES
+        bg_BG/dialpad.fallback
+        bg_BG/digits.fallback
+        bg_BG/main.qml
+        bg_BG/numbers.fallback
+        bg_BG/symbols.fallback
+    )
+endif()
+if(FEATURE_vkb_lang_cs_CZ)
+    list(APPEND LAYOUT_FILES
+        cs_CZ/dialpad.fallback
+        cs_CZ/digits.fallback
+        cs_CZ/main.qml
+        cs_CZ/numbers.fallback
+        cs_CZ/symbols.fallback
+    )
+endif()
+if(FEATURE_vkb_lang_da_DK)
+    list(APPEND LAYOUT_FILES
+        da_DK/dialpad.fallback
+        da_DK/digits.fallback
+        da_DK/main.qml
+        da_DK/numbers.fallback
+        da_DK/symbols.fallback
+    )
+endif()
+if(FEATURE_vkb_lang_de_DE)
+    list(APPEND LAYOUT_FILES
+        de_DE/dialpad.fallback
+        de_DE/digits.fallback
+        de_DE/main.qml
+        de_DE/numbers.fallback
+        de_DE/symbols.fallback
+    )
+endif()
+if(FEATURE_vkb_lang_el_GR)
+    list(APPEND LAYOUT_FILES
+        el_GR/dialpad.fallback
+        el_GR/digits.fallback
+        el_GR/main.qml
+        el_GR/numbers.fallback
+        el_GR/symbols.fallback
+    )
+endif()
+if(FEATURE_vkb_lang_es_ES)
+    list(APPEND LAYOUT_FILES
+        es_ES/dialpad.fallback
+        es_ES/digits.fallback
+        es_ES/main.qml
+        es_ES/numbers.fallback
+        es_ES/symbols.qml
+    )
+endif()
+if(FEATURE_vkb_lang_es_MX)
+    list(APPEND LAYOUT_FILES
+        es_MX/dialpad.fallback
+        es_MX/digits.fallback
+        es_MX/main.qml
+        es_MX/numbers.fallback
+        es_MX/symbols.qml
+    )
+endif()
+if(FEATURE_vkb_lang_et_EE)
+    list(APPEND LAYOUT_FILES
+        et_EE/dialpad.fallback
+        et_EE/digits.fallback
+        et_EE/main.qml
+        et_EE/numbers.fallback
+        et_EE/symbols.fallback
+    )
+endif()
+if(FEATURE_vkb_lang_fa_FA)
+    list(APPEND LAYOUT_FILES
+        fa_FA/dialpad.fallback
+        fa_FA/digits.qml
+        fa_FA/main.qml
+        fa_FA/numbers.qml
+        fa_FA/symbols.qml
+    )
+endif()
+if(FEATURE_vkb_lang_fi_FI)
+    list(APPEND LAYOUT_FILES
+        fi_FI/dialpad.fallback
+        fi_FI/digits.fallback
+        fi_FI/main.qml
+        fi_FI/numbers.fallback
+        fi_FI/symbols.fallback
+    )
+endif()
+if(FEATURE_vkb_lang_fr_CA)
+    list(APPEND LAYOUT_FILES
+        fr_CA/dialpad.fallback
+        fr_CA/digits.fallback
+        fr_CA/main.qml
+        fr_CA/numbers.fallback
+        fr_CA/symbols.fallback
+    )
+endif()
+if(FEATURE_vkb_lang_fr_FR)
+    list(APPEND LAYOUT_FILES
+        fr_FR/dialpad.fallback
+        fr_FR/digits.fallback
+        fr_FR/main.qml
+        fr_FR/numbers.fallback
+        fr_FR/symbols.fallback
+    )
+endif()
+if(FEATURE_vkb_lang_he_IL)
+    list(APPEND LAYOUT_FILES
+        he_IL/dialpad.fallback
+        he_IL/digits.fallback
+        he_IL/main.qml
+        he_IL/numbers.fallback
+        he_IL/symbols.qml
+    )
+endif()
+if(FEATURE_vkb_lang_hi_IN)
+    list(APPEND LAYOUT_FILES
+        hi_IN/dialpad.fallback
+        hi_IN/digits.fallback
+        hi_IN/main.qml
+        hi_IN/numbers.fallback
+        hi_IN/symbols.qml
+    )
+endif()
+if(FEATURE_vkb_lang_hr_HR)
+    list(APPEND LAYOUT_FILES
+        hr_HR/dialpad.fallback
+        hr_HR/digits.fallback
+        hr_HR/main.qml
+        hr_HR/numbers.fallback
+        hr_HR/symbols.fallback
+    )
+endif()
+if(FEATURE_vkb_lang_hu_HU)
+    list(APPEND LAYOUT_FILES
+        hu_HU/dialpad.fallback
+        hu_HU/digits.fallback
+        hu_HU/main.qml
+        hu_HU/numbers.fallback
+        hu_HU/symbols.fallback
+    )
+endif()
+if(FEATURE_vkb_lang_id_ID)
+    list(APPEND LAYOUT_FILES
+        id_ID/dialpad.fallback
+        id_ID/digits.fallback
+        id_ID/main.fallback
+        id_ID/numbers.fallback
+        id_ID/symbols.fallback
+    )
+endif()
+if(FEATURE_vkb_lang_it_IT)
+    list(APPEND LAYOUT_FILES
+        it_IT/dialpad.fallback
+        it_IT/digits.fallback
+        it_IT/main.qml
+        it_IT/numbers.fallback
+        it_IT/symbols.fallback
+    )
+endif()
+if(FEATURE_vkb_lang_nb_NO)
+    list(APPEND LAYOUT_FILES
+        nb_NO/dialpad.fallback
+        nb_NO/digits.fallback
+        nb_NO/main.qml
+        nb_NO/numbers.fallback
+        nb_NO/symbols.fallback
+    )
+endif()
+if(FEATURE_vkb_lang_ms_MY)
+    list(APPEND LAYOUT_FILES
+        ms_MY/dialpad.fallback
+        ms_MY/digits.fallback
+        ms_MY/main.fallback
+        ms_MY/numbers.fallback
+        ms_MY/symbols.fallback
+    )
+endif()
+if(FEATURE_vkb_lang_nl_NL)
+    list(APPEND LAYOUT_FILES
+        nl_NL/dialpad.fallback
+        nl_NL/digits.fallback
+        nl_NL/main.fallback
+        nl_NL/numbers.fallback
+        nl_NL/symbols.fallback
+    )
+endif()
+if(FEATURE_vkb_lang_pl_PL)
+    list(APPEND LAYOUT_FILES
+        pl_PL/dialpad.fallback
+        pl_PL/digits.fallback
+        pl_PL/main.qml
+        pl_PL/numbers.fallback
+        pl_PL/symbols.fallback
+    )
+endif()
+if(FEATURE_vkb_lang_pt_BR)
+    list(APPEND LAYOUT_FILES
+        pt_BR/dialpad.fallback
+        pt_BR/digits.fallback
+        pt_BR/main.qml
+        pt_BR/numbers.fallback
+        pt_BR/symbols.fallback
+    )
+endif()
+if(FEATURE_vkb_lang_pt_PT)
+    list(APPEND LAYOUT_FILES
+        pt_PT/dialpad.fallback
+        pt_PT/digits.fallback
+        pt_PT/main.qml
+        pt_PT/numbers.fallback
+        pt_PT/symbols.fallback
+    )
+endif()
+if(FEATURE_vkb_lang_ro_RO)
+    list(APPEND LAYOUT_FILES
+        ro_RO/dialpad.fallback
+        ro_RO/digits.fallback
+        ro_RO/main.qml
+        ro_RO/numbers.fallback
+        ro_RO/symbols.fallback
+    )
+endif()
+if(FEATURE_vkb_lang_ru_RU)
+    list(APPEND LAYOUT_FILES
+        ru_RU/dialpad.fallback
+        ru_RU/digits.fallback
+        ru_RU/main.qml
+        ru_RU/numbers.fallback
+        ru_RU/symbols.fallback
+    )
+endif()
+if(FEATURE_vkb_lang_sk_SK)
+    list(APPEND LAYOUT_FILES
+        sk_SK/dialpad.fallback
+        sk_SK/digits.fallback
+        sk_SK/main.qml
+        sk_SK/numbers.fallback
+        sk_SK/symbols.fallback
+    )
+endif()
+if(FEATURE_vkb_lang_sl_SI)
+    list(APPEND LAYOUT_FILES
+        sl_SI/dialpad.fallback
+        sl_SI/digits.fallback
+        sl_SI/main.qml
+        sl_SI/numbers.fallback
+        sl_SI/symbols.fallback
+    )
+endif()
+if(FEATURE_vkb_lang_sq_AL)
+    list(APPEND LAYOUT_FILES
+        sq_AL/dialpad.fallback
+        sq_AL/digits.fallback
+        sq_AL/main.qml
+        sq_AL/numbers.fallback
+        sq_AL/symbols.fallback
+    )
+endif()
+if(FEATURE_vkb_lang_sr_SP)
+    list(APPEND LAYOUT_FILES
+        sr_SP/dialpad.fallback
+        sr_SP/digits.fallback
+        sr_SP/main.qml
+        sr_SP/numbers.fallback
+        sr_SP/symbols.fallback
+    )
+endif()
+if(FEATURE_vkb_lang_sv_SE)
+    list(APPEND LAYOUT_FILES
+        sv_SE/dialpad.fallback
+        sv_SE/digits.fallback
+        sv_SE/main.qml
+        sv_SE/numbers.fallback
+        sv_SE/symbols.fallback
+    )
+endif()
+if(FEATURE_vkb_lang_tr_TR)
+    list(APPEND LAYOUT_FILES
+        tr_TR/dialpad.fallback
+        tr_TR/digits.fallback
+        tr_TR/main.qml
+        tr_TR/numbers.fallback
+        tr_TR/symbols.fallback
+    )
+endif()
+if(FEATURE_vkb_lang_uk_UA)
+    list(APPEND LAYOUT_FILES
+        uk_UA/dialpad.fallback
+        uk_UA/digits.fallback
+        uk_UA/main.qml
+        uk_UA/numbers.fallback
+        uk_UA/symbols.fallback
+    )
+endif()
+if(FEATURE_vkb_lang_vi_VN)
+    list(APPEND LAYOUT_FILES
+        vi_VN/dialpad.fallback
+        vi_VN/digits.fallback
+        vi_VN/main.qml
+        vi_VN/numbers.fallback
+        vi_VN/symbols.qml
+    )
+endif()
+
+if(QT_FEATURE_vkb_layouts)
+    qt_internal_add_resource(qtvkblayoutsplugin "qmake_virtualkeyboard_layouts"
+        PREFIX
+            "${VKB_LAYOUTS_PREFIX}"
+        FILES
+            ${LAYOUT_FILES}
+    )
+endif()
diff --git a/src/virtualkeyboard/content/layouts/ar_AR/dialpad.fallback b/src/layouts/ar_AR/dialpad.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/ar_AR/dialpad.fallback
+++ b/src/layouts/ar_AR/dialpad.fallback
diff --git a/src/virtualkeyboard/content/layouts/ar_AR/digits.qml b/src/layouts/ar_AR/digits.qml
index d78060fa..9eb39ac8 100644
--- a/src/virtualkeyboard/content/layouts/ar_AR/digits.qml
+++ b/src/layouts/ar_AR/digits.qml
@@ -30,6 +30,7 @@
 import QtQuick
 import QtQuick.Layouts
 import QtQuick.VirtualKeyboard
+import QtQuick.VirtualKeyboard.Components
 import QtQuick.VirtualKeyboard.Plugins
 
 KeyboardLayout {
diff --git a/src/virtualkeyboard/content/layouts/ar_AR/handwriting.qml b/src/layouts/ar_AR/handwriting.qml
index 500b7b38..8002446b 100644
--- a/src/virtualkeyboard/content/layouts/ar_AR/handwriting.qml
+++ b/src/layouts/ar_AR/handwriting.qml
@@ -30,6 +30,7 @@
 import QtQuick
 import QtQuick.Layouts
 import QtQuick.VirtualKeyboard
+import QtQuick.VirtualKeyboard.Components
 
 KeyboardLayout {
     function createInputMethod() {
diff --git a/src/virtualkeyboard/content/layouts/ar_AR/main.qml b/src/layouts/ar_AR/main.qml
index 4a62e99d..b7da450d 100644
--- a/src/virtualkeyboard/content/layouts/ar_AR/main.qml
+++ b/src/layouts/ar_AR/main.qml
@@ -29,6 +29,7 @@
 
 import QtQuick
 import QtQuick.VirtualKeyboard
+import QtQuick.VirtualKeyboard.Components
 import QtQuick.Layouts
 
 KeyboardLayout {
diff --git a/src/virtualkeyboard/content/layouts/ar_AR/numbers.qml b/src/layouts/ar_AR/numbers.qml
index 3442b249..8cd2c108 100644
--- a/src/virtualkeyboard/content/layouts/ar_AR/numbers.qml
+++ b/src/layouts/ar_AR/numbers.qml
@@ -30,6 +30,7 @@
 import QtQuick
 import QtQuick.Layouts
 import QtQuick.VirtualKeyboard
+import QtQuick.VirtualKeyboard.Components
 import QtQuick.VirtualKeyboard.Plugins
 
 KeyboardLayout {
diff --git a/src/virtualkeyboard/content/layouts/ar_AR/symbols.qml b/src/layouts/ar_AR/symbols.qml
index 7b612dc1..fb424437 100644
--- a/src/virtualkeyboard/content/layouts/ar_AR/symbols.qml
+++ b/src/layouts/ar_AR/symbols.qml
@@ -30,6 +30,7 @@
 import QtQuick
 import QtQuick.Layouts
 import QtQuick.VirtualKeyboard
+import QtQuick.VirtualKeyboard.Components
 
 KeyboardLayoutLoader {
     property bool secondPage
diff --git a/src/virtualkeyboard/content/layouts/bg_BG/dialpad.fallback b/src/layouts/bg_BG/dialpad.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/bg_BG/dialpad.fallback
+++ b/src/layouts/bg_BG/dialpad.fallback
diff --git a/src/virtualkeyboard/content/layouts/bg_BG/digits.fallback b/src/layouts/bg_BG/digits.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/bg_BG/digits.fallback
+++ b/src/layouts/bg_BG/digits.fallback
diff --git a/src/virtualkeyboard/content/layouts/sr_SP/handwriting.qml b/src/layouts/bg_BG/handwriting.qml
index 7df21ab6..092d746e 100644
--- a/src/virtualkeyboard/content/layouts/sr_SP/handwriting.qml
+++ b/src/layouts/bg_BG/handwriting.qml
@@ -30,6 +30,7 @@
 import QtQuick
 import QtQuick.Layouts
 import QtQuick.VirtualKeyboard
+import QtQuick.VirtualKeyboard.Components
 
 KeyboardLayout {
     function createInputMethod() {
diff --git a/src/virtualkeyboard/content/layouts/bg_BG/main.qml b/src/layouts/bg_BG/main.qml
index dd4b3a23..fd392d61 100644
--- a/src/virtualkeyboard/content/layouts/bg_BG/main.qml
+++ b/src/layouts/bg_BG/main.qml
@@ -29,6 +29,7 @@
 
 import QtQuick
 import QtQuick.VirtualKeyboard
+import QtQuick.VirtualKeyboard.Components
 import QtQuick.Layouts
 
 KeyboardLayoutLoader {
diff --git a/src/virtualkeyboard/content/layouts/bg_BG/numbers.fallback b/src/layouts/bg_BG/numbers.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/bg_BG/numbers.fallback
+++ b/src/layouts/bg_BG/numbers.fallback
diff --git a/src/virtualkeyboard/content/layouts/bg_BG/symbols.fallback b/src/layouts/bg_BG/symbols.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/bg_BG/symbols.fallback
+++ b/src/layouts/bg_BG/symbols.fallback
diff --git a/src/virtualkeyboard/content/layouts/cs_CZ/dialpad.fallback b/src/layouts/cs_CZ/dialpad.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/cs_CZ/dialpad.fallback
+++ b/src/layouts/cs_CZ/dialpad.fallback
diff --git a/src/virtualkeyboard/content/layouts/cs_CZ/digits.fallback b/src/layouts/cs_CZ/digits.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/cs_CZ/digits.fallback
+++ b/src/layouts/cs_CZ/digits.fallback
diff --git a/src/virtualkeyboard/content/layouts/cs_CZ/handwriting.qml b/src/layouts/cs_CZ/handwriting.qml
index f1828be7..37b158c3 100644
--- a/src/virtualkeyboard/content/layouts/cs_CZ/handwriting.qml
+++ b/src/layouts/cs_CZ/handwriting.qml
@@ -30,6 +30,7 @@
 import QtQuick
 import QtQuick.Layouts
 import QtQuick.VirtualKeyboard
+import QtQuick.VirtualKeyboard.Components
 
 KeyboardLayout {
     function createInputMethod() {
diff --git a/src/virtualkeyboard/content/layouts/cs_CZ/main.qml b/src/layouts/cs_CZ/main.qml
index a0033ce9..989dc792 100644
--- a/src/virtualkeyboard/content/layouts/cs_CZ/main.qml
+++ b/src/layouts/cs_CZ/main.qml
@@ -29,6 +29,7 @@
 
 import QtQuick
 import QtQuick.VirtualKeyboard
+import QtQuick.VirtualKeyboard.Components
 import QtQuick.Layouts
 
 KeyboardLayout {
diff --git a/src/virtualkeyboard/content/layouts/cs_CZ/numbers.fallback b/src/layouts/cs_CZ/numbers.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/cs_CZ/numbers.fallback
+++ b/src/layouts/cs_CZ/numbers.fallback
diff --git a/src/virtualkeyboard/content/layouts/cs_CZ/symbols.fallback b/src/layouts/cs_CZ/symbols.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/cs_CZ/symbols.fallback
+++ b/src/layouts/cs_CZ/symbols.fallback
diff --git a/src/virtualkeyboard/content/layouts/da_DK/dialpad.fallback b/src/layouts/da_DK/dialpad.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/da_DK/dialpad.fallback
+++ b/src/layouts/da_DK/dialpad.fallback
diff --git a/src/virtualkeyboard/content/layouts/da_DK/digits.fallback b/src/layouts/da_DK/digits.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/da_DK/digits.fallback
+++ b/src/layouts/da_DK/digits.fallback
diff --git a/src/virtualkeyboard/content/layouts/da_DK/handwriting.fallback b/src/layouts/da_DK/handwriting.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/da_DK/handwriting.fallback
+++ b/src/layouts/da_DK/handwriting.fallback
diff --git a/src/virtualkeyboard/content/layouts/da_DK/main.qml b/src/layouts/da_DK/main.qml
index 1f37d5c1..5d8a717d 100644
--- a/src/virtualkeyboard/content/layouts/da_DK/main.qml
+++ b/src/layouts/da_DK/main.qml
@@ -29,6 +29,7 @@
 
 import QtQuick
 import QtQuick.VirtualKeyboard
+import QtQuick.VirtualKeyboard.Components
 import QtQuick.Layouts
 
 KeyboardLayout {
diff --git a/src/virtualkeyboard/content/layouts/da_DK/numbers.fallback b/src/layouts/da_DK/numbers.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/da_DK/numbers.fallback
+++ b/src/layouts/da_DK/numbers.fallback
diff --git a/src/virtualkeyboard/content/layouts/da_DK/symbols.fallback b/src/layouts/da_DK/symbols.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/da_DK/symbols.fallback
+++ b/src/layouts/da_DK/symbols.fallback
diff --git a/src/virtualkeyboard/content/layouts/de_DE/dialpad.fallback b/src/layouts/de_DE/dialpad.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/de_DE/dialpad.fallback
+++ b/src/layouts/de_DE/dialpad.fallback
diff --git a/src/virtualkeyboard/content/layouts/de_DE/digits.fallback b/src/layouts/de_DE/digits.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/de_DE/digits.fallback
+++ b/src/layouts/de_DE/digits.fallback
diff --git a/src/virtualkeyboard/content/layouts/de_DE/handwriting.fallback b/src/layouts/de_DE/handwriting.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/de_DE/handwriting.fallback
+++ b/src/layouts/de_DE/handwriting.fallback
diff --git a/src/virtualkeyboard/content/layouts/de_DE/main.qml b/src/layouts/de_DE/main.qml
index e744f243..2e594fea 100644
--- a/src/virtualkeyboard/content/layouts/de_DE/main.qml
+++ b/src/layouts/de_DE/main.qml
@@ -29,6 +29,7 @@
 
 import QtQuick
 import QtQuick.VirtualKeyboard
+import QtQuick.VirtualKeyboard.Components
 import QtQuick.Layouts
 
 KeyboardLayout {
diff --git a/src/virtualkeyboard/content/layouts/de_DE/numbers.fallback b/src/layouts/de_DE/numbers.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/de_DE/numbers.fallback
+++ b/src/layouts/de_DE/numbers.fallback
diff --git a/src/virtualkeyboard/content/layouts/de_DE/symbols.fallback b/src/layouts/de_DE/symbols.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/de_DE/symbols.fallback
+++ b/src/layouts/de_DE/symbols.fallback
diff --git a/src/virtualkeyboard/content/layouts/el_GR/dialpad.fallback b/src/layouts/el_GR/dialpad.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/el_GR/dialpad.fallback
+++ b/src/layouts/el_GR/dialpad.fallback
diff --git a/src/virtualkeyboard/content/layouts/el_GR/digits.fallback b/src/layouts/el_GR/digits.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/el_GR/digits.fallback
+++ b/src/layouts/el_GR/digits.fallback
diff --git a/src/virtualkeyboard/content/layouts/el_GR/handwriting.qml b/src/layouts/el_GR/handwriting.qml
index 0a3f747a..bdc065ff 100644
--- a/src/virtualkeyboard/content/layouts/el_GR/handwriting.qml
+++ b/src/layouts/el_GR/handwriting.qml
@@ -30,6 +30,7 @@
 import QtQuick
 import QtQuick.Layouts
 import QtQuick.VirtualKeyboard
+import QtQuick.VirtualKeyboard.Components
 
 KeyboardLayout {
     function createInputMethod() {
diff --git a/src/virtualkeyboard/content/layouts/el_GR/main.qml b/src/layouts/el_GR/main.qml
index 6e477997..32f2a717 100644
--- a/src/virtualkeyboard/content/layouts/el_GR/main.qml
+++ b/src/layouts/el_GR/main.qml
@@ -29,6 +29,7 @@
 
 import QtQuick
 import QtQuick.VirtualKeyboard
+import QtQuick.VirtualKeyboard.Components
 import QtQuick.Layouts
 
 KeyboardLayoutLoader {
diff --git a/src/virtualkeyboard/content/layouts/el_GR/numbers.fallback b/src/layouts/el_GR/numbers.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/el_GR/numbers.fallback
+++ b/src/layouts/el_GR/numbers.fallback
diff --git a/src/virtualkeyboard/content/layouts/el_GR/symbols.fallback b/src/layouts/el_GR/symbols.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/el_GR/symbols.fallback
+++ b/src/layouts/el_GR/symbols.fallback
diff --git a/src/virtualkeyboard/content/layouts/en_GB/dialpad.fallback b/src/layouts/en_GB/dialpad.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/en_GB/dialpad.fallback
+++ b/src/layouts/en_GB/dialpad.fallback
diff --git a/src/virtualkeyboard/content/layouts/en_GB/digits.fallback b/src/layouts/en_GB/digits.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/en_GB/digits.fallback
+++ b/src/layouts/en_GB/digits.fallback
diff --git a/src/virtualkeyboard/content/layouts/en_GB/handwriting.fallback b/src/layouts/en_GB/handwriting.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/en_GB/handwriting.fallback
+++ b/src/layouts/en_GB/handwriting.fallback
diff --git a/src/virtualkeyboard/content/layouts/en_GB/main.fallback b/src/layouts/en_GB/main.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/en_GB/main.fallback
+++ b/src/layouts/en_GB/main.fallback
diff --git a/src/virtualkeyboard/content/layouts/en_GB/numbers.fallback b/src/layouts/en_GB/numbers.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/en_GB/numbers.fallback
+++ b/src/layouts/en_GB/numbers.fallback
diff --git a/src/virtualkeyboard/content/layouts/en_GB/symbols.fallback b/src/layouts/en_GB/symbols.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/en_GB/symbols.fallback
+++ b/src/layouts/en_GB/symbols.fallback
diff --git a/src/virtualkeyboard/content/layouts/en_US/dialpad.fallback b/src/layouts/en_US/dialpad.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/en_US/dialpad.fallback
+++ b/src/layouts/en_US/dialpad.fallback
diff --git a/src/virtualkeyboard/content/layouts/en_US/digits.fallback b/src/layouts/en_US/digits.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/en_US/digits.fallback
+++ b/src/layouts/en_US/digits.fallback
diff --git a/src/virtualkeyboard/content/layouts/en_US/handwriting.fallback b/src/layouts/en_US/handwriting.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/en_US/handwriting.fallback
+++ b/src/layouts/en_US/handwriting.fallback
diff --git a/src/virtualkeyboard/content/layouts/en_US/main.fallback b/src/layouts/en_US/main.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/en_US/main.fallback
+++ b/src/layouts/en_US/main.fallback
diff --git a/src/virtualkeyboard/content/layouts/en_US/numbers.fallback b/src/layouts/en_US/numbers.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/en_US/numbers.fallback
+++ b/src/layouts/en_US/numbers.fallback
diff --git a/src/virtualkeyboard/content/layouts/en_US/symbols.fallback b/src/layouts/en_US/symbols.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/en_US/symbols.fallback
+++ b/src/layouts/en_US/symbols.fallback
diff --git a/src/virtualkeyboard/content/layouts/es_ES/dialpad.fallback b/src/layouts/es_ES/dialpad.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/es_ES/dialpad.fallback
+++ b/src/layouts/es_ES/dialpad.fallback
diff --git a/src/virtualkeyboard/content/layouts/es_ES/digits.fallback b/src/layouts/es_ES/digits.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/es_ES/digits.fallback
+++ b/src/layouts/es_ES/digits.fallback
diff --git a/src/virtualkeyboard/content/layouts/es_ES/handwriting.qml b/src/layouts/es_ES/handwriting.qml
index ad74471e..4f212a18 100644
--- a/src/virtualkeyboard/content/layouts/es_ES/handwriting.qml
+++ b/src/layouts/es_ES/handwriting.qml
@@ -30,6 +30,7 @@
 import QtQuick
 import QtQuick.Layouts
 import QtQuick.VirtualKeyboard
+import QtQuick.VirtualKeyboard.Components
 
 KeyboardLayout {
     function createInputMethod() {
diff --git a/src/virtualkeyboard/content/layouts/es_MX/main.qml b/src/layouts/es_ES/main.qml
index 07a856b9..858f57fd 100644
--- a/src/virtualkeyboard/content/layouts/es_MX/main.qml
+++ b/src/layouts/es_ES/main.qml
@@ -29,6 +29,7 @@
 
 import QtQuick
 import QtQuick.VirtualKeyboard
+import QtQuick.VirtualKeyboard.Components
 import QtQuick.Layouts
 
 KeyboardLayout {
diff --git a/src/virtualkeyboard/content/layouts/es_ES/numbers.fallback b/src/layouts/es_ES/numbers.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/es_ES/numbers.fallback
+++ b/src/layouts/es_ES/numbers.fallback
diff --git a/src/virtualkeyboard/content/layouts/es_ES/symbols.qml b/src/layouts/es_ES/symbols.qml
index 9c1e9212..0f13dc0e 100644
--- a/src/virtualkeyboard/content/layouts/es_ES/symbols.qml
+++ b/src/layouts/es_ES/symbols.qml
@@ -30,6 +30,7 @@
 import QtQuick
 import QtQuick.Layouts
 import QtQuick.VirtualKeyboard
+import QtQuick.VirtualKeyboard.Components
 
 KeyboardLayoutLoader {
     property bool secondPage
diff --git a/src/virtualkeyboard/content/layouts/es_MX/dialpad.fallback b/src/layouts/es_MX/dialpad.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/es_MX/dialpad.fallback
+++ b/src/layouts/es_MX/dialpad.fallback
diff --git a/src/virtualkeyboard/content/layouts/es_MX/digits.fallback b/src/layouts/es_MX/digits.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/es_MX/digits.fallback
+++ b/src/layouts/es_MX/digits.fallback
diff --git a/src/virtualkeyboard/content/layouts/es_MX/handwriting.qml b/src/layouts/es_MX/handwriting.qml
index ad74471e..4f212a18 100644
--- a/src/virtualkeyboard/content/layouts/es_MX/handwriting.qml
+++ b/src/layouts/es_MX/handwriting.qml
@@ -30,6 +30,7 @@
 import QtQuick
 import QtQuick.Layouts
 import QtQuick.VirtualKeyboard
+import QtQuick.VirtualKeyboard.Components
 
 KeyboardLayout {
     function createInputMethod() {
diff --git a/src/virtualkeyboard/content/layouts/es_ES/main.qml b/src/layouts/es_MX/main.qml
index 07a856b9..858f57fd 100644
--- a/src/virtualkeyboard/content/layouts/es_ES/main.qml
+++ b/src/layouts/es_MX/main.qml
@@ -29,6 +29,7 @@
 
 import QtQuick
 import QtQuick.VirtualKeyboard
+import QtQuick.VirtualKeyboard.Components
 import QtQuick.Layouts
 
 KeyboardLayout {
diff --git a/src/virtualkeyboard/content/layouts/es_MX/numbers.fallback b/src/layouts/es_MX/numbers.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/es_MX/numbers.fallback
+++ b/src/layouts/es_MX/numbers.fallback
diff --git a/src/virtualkeyboard/content/layouts/es_MX/symbols.qml b/src/layouts/es_MX/symbols.qml
index 28a2cb7e..b261242b 100644
--- a/src/virtualkeyboard/content/layouts/es_MX/symbols.qml
+++ b/src/layouts/es_MX/symbols.qml
@@ -30,6 +30,7 @@
 import QtQuick
 import QtQuick.Layouts
 import QtQuick.VirtualKeyboard
+import QtQuick.VirtualKeyboard.Components
 
 KeyboardLayoutLoader {
     property bool secondPage
diff --git a/src/virtualkeyboard/content/layouts/et_EE/dialpad.fallback b/src/layouts/et_EE/dialpad.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/et_EE/dialpad.fallback
+++ b/src/layouts/et_EE/dialpad.fallback
diff --git a/src/virtualkeyboard/content/layouts/et_EE/digits.fallback b/src/layouts/et_EE/digits.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/et_EE/digits.fallback
+++ b/src/layouts/et_EE/digits.fallback
diff --git a/src/virtualkeyboard/content/layouts/et_EE/handwriting.fallback b/src/layouts/et_EE/handwriting.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/et_EE/handwriting.fallback
+++ b/src/layouts/et_EE/handwriting.fallback
diff --git a/src/virtualkeyboard/content/layouts/et_EE/main.qml b/src/layouts/et_EE/main.qml
index 456ca323..6d4f2822 100644
--- a/src/virtualkeyboard/content/layouts/et_EE/main.qml
+++ b/src/layouts/et_EE/main.qml
@@ -29,6 +29,7 @@
 
 import QtQuick
 import QtQuick.VirtualKeyboard
+import QtQuick.VirtualKeyboard.Components
 import QtQuick.Layouts
 
 KeyboardLayout {
diff --git a/src/virtualkeyboard/content/layouts/et_EE/numbers.fallback b/src/layouts/et_EE/numbers.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/et_EE/numbers.fallback
+++ b/src/layouts/et_EE/numbers.fallback
diff --git a/src/virtualkeyboard/content/layouts/et_EE/symbols.fallback b/src/layouts/et_EE/symbols.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/et_EE/symbols.fallback
+++ b/src/layouts/et_EE/symbols.fallback
diff --git a/src/virtualkeyboard/content/layouts/fa_FA/dialpad.fallback b/src/layouts/fa_FA/dialpad.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/fa_FA/dialpad.fallback
+++ b/src/layouts/fa_FA/dialpad.fallback
diff --git a/src/virtualkeyboard/content/layouts/fa_FA/digits.qml b/src/layouts/fa_FA/digits.qml
index 3132d8f4..8d0940c0 100644
--- a/src/virtualkeyboard/content/layouts/fa_FA/digits.qml
+++ b/src/layouts/fa_FA/digits.qml
@@ -30,6 +30,7 @@
 import QtQuick
 import QtQuick.Layouts
 import QtQuick.VirtualKeyboard
+import QtQuick.VirtualKeyboard.Components
 import QtQuick.VirtualKeyboard.Plugins
 
 KeyboardLayout {
diff --git a/src/virtualkeyboard/content/layouts/fa_FA/handwriting.qml b/src/layouts/fa_FA/handwriting.qml
index 8daa3bf3..650a65a7 100644
--- a/src/virtualkeyboard/content/layouts/fa_FA/handwriting.qml
+++ b/src/layouts/fa_FA/handwriting.qml
@@ -30,6 +30,7 @@
 import QtQuick
 import QtQuick.Layouts
 import QtQuick.VirtualKeyboard
+import QtQuick.VirtualKeyboard.Components
 
 KeyboardLayout {
     function createInputMethod() {
diff --git a/src/virtualkeyboard/content/layouts/fa_FA/main.qml b/src/layouts/fa_FA/main.qml
index fd813e40..b33da21b 100644
--- a/src/virtualkeyboard/content/layouts/fa_FA/main.qml
+++ b/src/layouts/fa_FA/main.qml
@@ -29,6 +29,7 @@
 
 import QtQuick
 import QtQuick.VirtualKeyboard
+import QtQuick.VirtualKeyboard.Components
 import QtQuick.Layouts
 
 KeyboardLayout {
diff --git a/src/virtualkeyboard/content/layouts/fa_FA/numbers.qml b/src/layouts/fa_FA/numbers.qml
index 46e11957..6b4d00ad 100644
--- a/src/virtualkeyboard/content/layouts/fa_FA/numbers.qml
+++ b/src/layouts/fa_FA/numbers.qml
@@ -30,6 +30,7 @@
 import QtQuick
 import QtQuick.Layouts
 import QtQuick.VirtualKeyboard
+import QtQuick.VirtualKeyboard.Components
 import QtQuick.VirtualKeyboard.Plugins
 
 KeyboardLayout {
diff --git a/src/virtualkeyboard/content/layouts/fa_FA/symbols.qml b/src/layouts/fa_FA/symbols.qml
index d47726de..13fab8fa 100644
--- a/src/virtualkeyboard/content/layouts/fa_FA/symbols.qml
+++ b/src/layouts/fa_FA/symbols.qml
@@ -30,6 +30,7 @@
 import QtQuick
 import QtQuick.Layouts
 import QtQuick.VirtualKeyboard
+import QtQuick.VirtualKeyboard.Components
 
 KeyboardLayoutLoader {
     property bool secondPage
diff --git a/src/virtualkeyboard/content/layouts/fallback/dialpad.qml b/src/layouts/fallback/dialpad.qml
index c13f5e6c..c7eb8384 100644
--- a/src/virtualkeyboard/content/layouts/fallback/dialpad.qml
+++ b/src/layouts/fallback/dialpad.qml
@@ -30,6 +30,7 @@
 import QtQuick
 import QtQuick.Layouts
 import QtQuick.VirtualKeyboard
+import QtQuick.VirtualKeyboard.Components
 import QtQuick.VirtualKeyboard.Plugins
 
 KeyboardLayout {
diff --git a/src/virtualkeyboard/content/layouts/fallback/digits.qml b/src/layouts/fallback/digits.qml
index 24cfa68c..1c87f7f7 100644
--- a/src/virtualkeyboard/content/layouts/fallback/digits.qml
+++ b/src/layouts/fallback/digits.qml
@@ -30,6 +30,7 @@
 import QtQuick
 import QtQuick.Layouts
 import QtQuick.VirtualKeyboard
+import QtQuick.VirtualKeyboard.Components
 import QtQuick.VirtualKeyboard.Plugins
 
 KeyboardLayout {
diff --git a/src/virtualkeyboard/content/layouts/hi_IN/handwriting.qml b/src/layouts/fallback/handwriting.qml
index 7e4b9297..660b40bc 100644
--- a/src/virtualkeyboard/content/layouts/hi_IN/handwriting.qml
+++ b/src/layouts/fallback/handwriting.qml
@@ -30,6 +30,7 @@
 import QtQuick
 import QtQuick.Layouts
 import QtQuick.VirtualKeyboard
+import QtQuick.VirtualKeyboard.Components
 
 KeyboardLayout {
     function createInputMethod() {
diff --git a/src/virtualkeyboard/content/layouts/fallback/main.qml b/src/layouts/fallback/main.qml
index 239d5d99..36e708b6 100644
--- a/src/virtualkeyboard/content/layouts/fallback/main.qml
+++ b/src/layouts/fallback/main.qml
@@ -29,6 +29,7 @@
 
 import QtQuick
 import QtQuick.VirtualKeyboard
+import QtQuick.VirtualKeyboard.Components
 import QtQuick.Layouts
 
 KeyboardLayout {
diff --git a/src/virtualkeyboard/content/layouts/fallback/numbers.qml b/src/layouts/fallback/numbers.qml
index 19cfb5e8..fddecb63 100644
--- a/src/virtualkeyboard/content/layouts/fallback/numbers.qml
+++ b/src/layouts/fallback/numbers.qml
@@ -30,6 +30,7 @@
 import QtQuick
 import QtQuick.Layouts
 import QtQuick.VirtualKeyboard
+import QtQuick.VirtualKeyboard.Components
 import QtQuick.VirtualKeyboard.Plugins
 
 KeyboardLayout {
diff --git a/src/virtualkeyboard/content/layouts/fallback/symbols.qml b/src/layouts/fallback/symbols.qml
index 700a364d..41facf47 100644
--- a/src/virtualkeyboard/content/layouts/fallback/symbols.qml
+++ b/src/layouts/fallback/symbols.qml
@@ -30,6 +30,7 @@
 import QtQuick
 import QtQuick.Layouts
 import QtQuick.VirtualKeyboard
+import QtQuick.VirtualKeyboard.Components
 
 KeyboardLayoutLoader {
     property bool secondPage
diff --git a/src/virtualkeyboard/content/layouts/fi_FI/dialpad.fallback b/src/layouts/fi_FI/dialpad.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/fi_FI/dialpad.fallback
+++ b/src/layouts/fi_FI/dialpad.fallback
diff --git a/src/virtualkeyboard/content/layouts/fi_FI/digits.fallback b/src/layouts/fi_FI/digits.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/fi_FI/digits.fallback
+++ b/src/layouts/fi_FI/digits.fallback
diff --git a/src/virtualkeyboard/content/layouts/fi_FI/handwriting.fallback b/src/layouts/fi_FI/handwriting.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/fi_FI/handwriting.fallback
+++ b/src/layouts/fi_FI/handwriting.fallback
diff --git a/src/virtualkeyboard/content/layouts/fi_FI/main.qml b/src/layouts/fi_FI/main.qml
index d0ff7713..8d02cffb 100644
--- a/src/virtualkeyboard/content/layouts/fi_FI/main.qml
+++ b/src/layouts/fi_FI/main.qml
@@ -29,6 +29,7 @@
 
 import QtQuick
 import QtQuick.VirtualKeyboard
+import QtQuick.VirtualKeyboard.Components
 import QtQuick.Layouts
 
 KeyboardLayout {
diff --git a/src/virtualkeyboard/content/layouts/fi_FI/numbers.fallback b/src/layouts/fi_FI/numbers.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/fi_FI/numbers.fallback
+++ b/src/layouts/fi_FI/numbers.fallback
diff --git a/src/virtualkeyboard/content/layouts/fi_FI/symbols.fallback b/src/layouts/fi_FI/symbols.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/fi_FI/symbols.fallback
+++ b/src/layouts/fi_FI/symbols.fallback
diff --git a/src/virtualkeyboard/content/layouts/fr_CA/dialpad.fallback b/src/layouts/fr_CA/dialpad.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/fr_CA/dialpad.fallback
+++ b/src/layouts/fr_CA/dialpad.fallback
diff --git a/src/virtualkeyboard/content/layouts/fr_CA/digits.fallback b/src/layouts/fr_CA/digits.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/fr_CA/digits.fallback
+++ b/src/layouts/fr_CA/digits.fallback
diff --git a/src/virtualkeyboard/content/layouts/fr_CA/handwriting.fallback b/src/layouts/fr_CA/handwriting.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/fr_CA/handwriting.fallback
+++ b/src/layouts/fr_CA/handwriting.fallback
diff --git a/src/virtualkeyboard/content/layouts/fr_CA/main.qml b/src/layouts/fr_CA/main.qml
index 81ee08ea..0f29a8d9 100644
--- a/src/virtualkeyboard/content/layouts/fr_CA/main.qml
+++ b/src/layouts/fr_CA/main.qml
@@ -29,6 +29,7 @@
 
 import QtQuick
 import QtQuick.VirtualKeyboard
+import QtQuick.VirtualKeyboard.Components
 import QtQuick.Layouts
 
 KeyboardLayout {
diff --git a/src/virtualkeyboard/content/layouts/fr_CA/numbers.fallback b/src/layouts/fr_CA/numbers.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/fr_CA/numbers.fallback
+++ b/src/layouts/fr_CA/numbers.fallback
diff --git a/src/virtualkeyboard/content/layouts/fr_CA/symbols.fallback b/src/layouts/fr_CA/symbols.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/fr_CA/symbols.fallback
+++ b/src/layouts/fr_CA/symbols.fallback
diff --git a/src/virtualkeyboard/content/layouts/fr_FR/dialpad.fallback b/src/layouts/fr_FR/dialpad.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/fr_FR/dialpad.fallback
+++ b/src/layouts/fr_FR/dialpad.fallback
diff --git a/src/virtualkeyboard/content/layouts/fr_FR/digits.fallback b/src/layouts/fr_FR/digits.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/fr_FR/digits.fallback
+++ b/src/layouts/fr_FR/digits.fallback
diff --git a/src/virtualkeyboard/content/layouts/fr_FR/handwriting.fallback b/src/layouts/fr_FR/handwriting.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/fr_FR/handwriting.fallback
+++ b/src/layouts/fr_FR/handwriting.fallback
diff --git a/src/virtualkeyboard/content/layouts/fr_FR/main.qml b/src/layouts/fr_FR/main.qml
index 811a626f..e3fd8a7f 100644
--- a/src/virtualkeyboard/content/layouts/fr_FR/main.qml
+++ b/src/layouts/fr_FR/main.qml
@@ -29,6 +29,7 @@
 
 import QtQuick
 import QtQuick.VirtualKeyboard
+import QtQuick.VirtualKeyboard.Components
 import QtQuick.Layouts
 
 KeyboardLayout {
diff --git a/src/virtualkeyboard/content/layouts/fr_FR/numbers.fallback b/src/layouts/fr_FR/numbers.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/fr_FR/numbers.fallback
+++ b/src/layouts/fr_FR/numbers.fallback
diff --git a/src/virtualkeyboard/content/layouts/fr_FR/symbols.fallback b/src/layouts/fr_FR/symbols.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/fr_FR/symbols.fallback
+++ b/src/layouts/fr_FR/symbols.fallback
diff --git a/src/virtualkeyboard/content/layouts/he_IL/dialpad.fallback b/src/layouts/he_IL/dialpad.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/he_IL/dialpad.fallback
+++ b/src/layouts/he_IL/dialpad.fallback
diff --git a/src/virtualkeyboard/content/layouts/he_IL/digits.fallback b/src/layouts/he_IL/digits.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/he_IL/digits.fallback
+++ b/src/layouts/he_IL/digits.fallback
diff --git a/src/virtualkeyboard/content/layouts/he_IL/handwriting.qml b/src/layouts/he_IL/handwriting.qml
index db27fe01..aba7d6cb 100644
--- a/src/virtualkeyboard/content/layouts/he_IL/handwriting.qml
+++ b/src/layouts/he_IL/handwriting.qml
@@ -30,6 +30,7 @@
 import QtQuick
 import QtQuick.Layouts
 import QtQuick.VirtualKeyboard
+import QtQuick.VirtualKeyboard.Components
 
 KeyboardLayout {
     function createInputMethod() {
diff --git a/src/virtualkeyboard/content/layouts/he_IL/main.qml b/src/layouts/he_IL/main.qml
index 3878a99c..8950a2ad 100644
--- a/src/virtualkeyboard/content/layouts/he_IL/main.qml
+++ b/src/layouts/he_IL/main.qml
@@ -29,6 +29,7 @@
 
 import QtQuick
 import QtQuick.VirtualKeyboard
+import QtQuick.VirtualKeyboard.Components
 import QtQuick.Layouts
 
 KeyboardLayoutLoader {
diff --git a/src/virtualkeyboard/content/layouts/he_IL/numbers.fallback b/src/layouts/he_IL/numbers.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/he_IL/numbers.fallback
+++ b/src/layouts/he_IL/numbers.fallback
diff --git a/src/virtualkeyboard/content/layouts/he_IL/symbols.qml b/src/layouts/he_IL/symbols.qml
index d10dd355..a7c25afc 100644
--- a/src/virtualkeyboard/content/layouts/he_IL/symbols.qml
+++ b/src/layouts/he_IL/symbols.qml
@@ -30,6 +30,7 @@
 import QtQuick
 import QtQuick.Layouts
 import QtQuick.VirtualKeyboard
+import QtQuick.VirtualKeyboard.Components
 
 KeyboardLayoutLoader {
     property bool secondPage
diff --git a/src/virtualkeyboard/content/layouts/hi_IN/dialpad.fallback b/src/layouts/hi_IN/dialpad.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/hi_IN/dialpad.fallback
+++ b/src/layouts/hi_IN/dialpad.fallback
diff --git a/src/virtualkeyboard/content/layouts/hi_IN/digits.fallback b/src/layouts/hi_IN/digits.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/hi_IN/digits.fallback
+++ b/src/layouts/hi_IN/digits.fallback
diff --git a/src/virtualkeyboard/content/layouts/fallback/handwriting.qml b/src/layouts/hi_IN/handwriting.qml
index 7e4b9297..660b40bc 100644
--- a/src/virtualkeyboard/content/layouts/fallback/handwriting.qml
+++ b/src/layouts/hi_IN/handwriting.qml
@@ -30,6 +30,7 @@
 import QtQuick
 import QtQuick.Layouts
 import QtQuick.VirtualKeyboard
+import QtQuick.VirtualKeyboard.Components
 
 KeyboardLayout {
     function createInputMethod() {
diff --git a/src/virtualkeyboard/content/layouts/hi_IN/main.qml b/src/layouts/hi_IN/main.qml
index d54dd82b..9d125b0a 100644
--- a/src/virtualkeyboard/content/layouts/hi_IN/main.qml
+++ b/src/layouts/hi_IN/main.qml
@@ -29,6 +29,7 @@
 
 import QtQuick
 import QtQuick.VirtualKeyboard
+import QtQuick.VirtualKeyboard.Components
 import QtQuick.Layouts
 
 KeyboardLayout {
diff --git a/src/virtualkeyboard/content/layouts/hi_IN/numbers.fallback b/src/layouts/hi_IN/numbers.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/hi_IN/numbers.fallback
+++ b/src/layouts/hi_IN/numbers.fallback
diff --git a/src/virtualkeyboard/content/layouts/hi_IN/symbols.qml b/src/layouts/hi_IN/symbols.qml
index 95e22275..7ca595a7 100644
--- a/src/virtualkeyboard/content/layouts/hi_IN/symbols.qml
+++ b/src/layouts/hi_IN/symbols.qml
@@ -30,6 +30,7 @@
 import QtQuick
 import QtQuick.Layouts
 import QtQuick.VirtualKeyboard
+import QtQuick.VirtualKeyboard.Components
 
 KeyboardLayoutLoader {
     property bool secondPage
diff --git a/src/virtualkeyboard/content/layouts/hr_HR/dialpad.fallback b/src/layouts/hr_HR/dialpad.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/hr_HR/dialpad.fallback
+++ b/src/layouts/hr_HR/dialpad.fallback
diff --git a/src/virtualkeyboard/content/layouts/hr_HR/digits.fallback b/src/layouts/hr_HR/digits.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/hr_HR/digits.fallback
+++ b/src/layouts/hr_HR/digits.fallback
diff --git a/src/virtualkeyboard/content/layouts/hu_HU/handwriting.qml b/src/layouts/hr_HR/handwriting.qml
index 078888a0..80b6d45f 100644
--- a/src/virtualkeyboard/content/layouts/hu_HU/handwriting.qml
+++ b/src/layouts/hr_HR/handwriting.qml
@@ -30,6 +30,7 @@
 import QtQuick
 import QtQuick.Layouts
 import QtQuick.VirtualKeyboard
+import QtQuick.VirtualKeyboard.Components
 
 KeyboardLayout {
     function createInputMethod() {
diff --git a/src/virtualkeyboard/content/layouts/hr_HR/main.qml b/src/layouts/hr_HR/main.qml
index d29c8e8e..6f52ed21 100644
--- a/src/virtualkeyboard/content/layouts/hr_HR/main.qml
+++ b/src/layouts/hr_HR/main.qml
@@ -29,6 +29,7 @@
 
 import QtQuick
 import QtQuick.VirtualKeyboard
+import QtQuick.VirtualKeyboard.Components
 import QtQuick.Layouts
 
 KeyboardLayout {
diff --git a/src/virtualkeyboard/content/layouts/hr_HR/numbers.fallback b/src/layouts/hr_HR/numbers.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/hr_HR/numbers.fallback
+++ b/src/layouts/hr_HR/numbers.fallback
diff --git a/src/virtualkeyboard/content/layouts/hr_HR/symbols.fallback b/src/layouts/hr_HR/symbols.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/hr_HR/symbols.fallback
+++ b/src/layouts/hr_HR/symbols.fallback
diff --git a/src/virtualkeyboard/content/layouts/hu_HU/dialpad.fallback b/src/layouts/hu_HU/dialpad.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/hu_HU/dialpad.fallback
+++ b/src/layouts/hu_HU/dialpad.fallback
diff --git a/src/virtualkeyboard/content/layouts/hu_HU/digits.fallback b/src/layouts/hu_HU/digits.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/hu_HU/digits.fallback
+++ b/src/layouts/hu_HU/digits.fallback
diff --git a/src/virtualkeyboard/content/layouts/hr_HR/handwriting.qml b/src/layouts/hu_HU/handwriting.qml
index 078888a0..80b6d45f 100644
--- a/src/virtualkeyboard/content/layouts/hr_HR/handwriting.qml
+++ b/src/layouts/hu_HU/handwriting.qml
@@ -30,6 +30,7 @@
 import QtQuick
 import QtQuick.Layouts
 import QtQuick.VirtualKeyboard
+import QtQuick.VirtualKeyboard.Components
 
 KeyboardLayout {
     function createInputMethod() {
diff --git a/src/virtualkeyboard/content/layouts/hu_HU/main.qml b/src/layouts/hu_HU/main.qml
index b2b3dd82..cc3d2d6e 100644
--- a/src/virtualkeyboard/content/layouts/hu_HU/main.qml
+++ b/src/layouts/hu_HU/main.qml
@@ -29,6 +29,7 @@
 
 import QtQuick
 import QtQuick.VirtualKeyboard
+import QtQuick.VirtualKeyboard.Components
 import QtQuick.Layouts
 
 KeyboardLayout {
diff --git a/src/virtualkeyboard/content/layouts/hu_HU/numbers.fallback b/src/layouts/hu_HU/numbers.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/hu_HU/numbers.fallback
+++ b/src/layouts/hu_HU/numbers.fallback
diff --git a/src/virtualkeyboard/content/layouts/hu_HU/symbols.fallback b/src/layouts/hu_HU/symbols.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/hu_HU/symbols.fallback
+++ b/src/layouts/hu_HU/symbols.fallback
diff --git a/src/virtualkeyboard/content/layouts/id_ID/dialpad.fallback b/src/layouts/id_ID/dialpad.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/id_ID/dialpad.fallback
+++ b/src/layouts/id_ID/dialpad.fallback
diff --git a/src/virtualkeyboard/content/layouts/id_ID/digits.fallback b/src/layouts/id_ID/digits.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/id_ID/digits.fallback
+++ b/src/layouts/id_ID/digits.fallback
diff --git a/src/virtualkeyboard/content/layouts/id_ID/handwriting.fallback b/src/layouts/id_ID/handwriting.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/id_ID/handwriting.fallback
+++ b/src/layouts/id_ID/handwriting.fallback
diff --git a/src/virtualkeyboard/content/layouts/id_ID/main.fallback b/src/layouts/id_ID/main.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/id_ID/main.fallback
+++ b/src/layouts/id_ID/main.fallback
diff --git a/src/virtualkeyboard/content/layouts/id_ID/numbers.fallback b/src/layouts/id_ID/numbers.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/id_ID/numbers.fallback
+++ b/src/layouts/id_ID/numbers.fallback
diff --git a/src/virtualkeyboard/content/layouts/id_ID/symbols.fallback b/src/layouts/id_ID/symbols.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/id_ID/symbols.fallback
+++ b/src/layouts/id_ID/symbols.fallback
diff --git a/src/virtualkeyboard/content/layouts/it_IT/dialpad.fallback b/src/layouts/it_IT/dialpad.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/it_IT/dialpad.fallback
+++ b/src/layouts/it_IT/dialpad.fallback
diff --git a/src/virtualkeyboard/content/layouts/it_IT/digits.fallback b/src/layouts/it_IT/digits.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/it_IT/digits.fallback
+++ b/src/layouts/it_IT/digits.fallback
diff --git a/src/virtualkeyboard/content/layouts/it_IT/handwriting.fallback b/src/layouts/it_IT/handwriting.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/it_IT/handwriting.fallback
+++ b/src/layouts/it_IT/handwriting.fallback
diff --git a/src/virtualkeyboard/content/layouts/it_IT/main.qml b/src/layouts/it_IT/main.qml
index 12f7a652..97717da4 100644
--- a/src/virtualkeyboard/content/layouts/it_IT/main.qml
+++ b/src/layouts/it_IT/main.qml
@@ -29,6 +29,7 @@
 
 import QtQuick
 import QtQuick.VirtualKeyboard
+import QtQuick.VirtualKeyboard.Components
 import QtQuick.Layouts
 
 KeyboardLayout {
diff --git a/src/virtualkeyboard/content/layouts/it_IT/numbers.fallback b/src/layouts/it_IT/numbers.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/it_IT/numbers.fallback
+++ b/src/layouts/it_IT/numbers.fallback
diff --git a/src/virtualkeyboard/content/layouts/it_IT/symbols.fallback b/src/layouts/it_IT/symbols.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/it_IT/symbols.fallback
+++ b/src/layouts/it_IT/symbols.fallback
diff --git a/src/virtualkeyboard/content/layouts/ja_JP/dialpad.fallback b/src/layouts/ja_JP/dialpad.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/ja_JP/dialpad.fallback
+++ b/src/layouts/ja_JP/dialpad.fallback
diff --git a/src/virtualkeyboard/content/layouts/ja_JP/digits.fallback b/src/layouts/ja_JP/digits.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/ja_JP/digits.fallback
+++ b/src/layouts/ja_JP/digits.fallback
diff --git a/src/virtualkeyboard/content/layouts/ja_JP/handwriting.qml b/src/layouts/ja_JP/handwriting.qml
index 17052e18..0b193435 100644
--- a/src/virtualkeyboard/content/layouts/ja_JP/handwriting.qml
+++ b/src/layouts/ja_JP/handwriting.qml
@@ -30,6 +30,7 @@
 import QtQuick
 import QtQuick.Layouts
 import QtQuick.VirtualKeyboard
+import QtQuick.VirtualKeyboard.Components
 
 KeyboardLayout {
     function createInputMethod() {
diff --git a/src/virtualkeyboard/content/layouts/ja_JP/main.qml b/src/layouts/ja_JP/main.qml
index 091d6af9..577fd2cd 100644
--- a/src/virtualkeyboard/content/layouts/ja_JP/main.qml
+++ b/src/layouts/ja_JP/main.qml
@@ -29,6 +29,7 @@
 
 import QtQuick
 import QtQuick.VirtualKeyboard
+import QtQuick.VirtualKeyboard.Components
 import QtQuick.Layouts
 
 KeyboardLayoutLoader {
diff --git a/src/virtualkeyboard/content/layouts/ja_JP/numbers.fallback b/src/layouts/ja_JP/numbers.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/ja_JP/numbers.fallback
+++ b/src/layouts/ja_JP/numbers.fallback
diff --git a/src/virtualkeyboard/content/layouts/ja_JP/symbols.qml b/src/layouts/ja_JP/symbols.qml
index cd80dde2..96f1f001 100644
--- a/src/virtualkeyboard/content/layouts/ja_JP/symbols.qml
+++ b/src/layouts/ja_JP/symbols.qml
@@ -30,6 +30,7 @@
 import QtQuick
 import QtQuick.Layouts
 import QtQuick.VirtualKeyboard
+import QtQuick.VirtualKeyboard.Components
 
 KeyboardLayoutLoader {
     function createInputMethod() {
diff --git a/src/virtualkeyboard/content/layouts/ko_KR/dialpad.fallback b/src/layouts/ko_KR/dialpad.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/ko_KR/dialpad.fallback
+++ b/src/layouts/ko_KR/dialpad.fallback
diff --git a/src/virtualkeyboard/content/layouts/ko_KR/digits.fallback b/src/layouts/ko_KR/digits.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/ko_KR/digits.fallback
+++ b/src/layouts/ko_KR/digits.fallback
diff --git a/src/virtualkeyboard/content/layouts/ko_KR/handwriting.qml b/src/layouts/ko_KR/handwriting.qml
index 9486c076..2af59703 100644
--- a/src/virtualkeyboard/content/layouts/ko_KR/handwriting.qml
+++ b/src/layouts/ko_KR/handwriting.qml
@@ -30,6 +30,7 @@
 import QtQuick
 import QtQuick.Layouts
 import QtQuick.VirtualKeyboard
+import QtQuick.VirtualKeyboard.Components
 
 KeyboardLayout {
     function createInputMethod() {
diff --git a/src/virtualkeyboard/content/layouts/ko_KR/main.qml b/src/layouts/ko_KR/main.qml
index 2b2e960b..cb8fa3cc 100644
--- a/src/virtualkeyboard/content/layouts/ko_KR/main.qml
+++ b/src/layouts/ko_KR/main.qml
@@ -29,6 +29,7 @@
 
 import QtQuick
 import QtQuick.VirtualKeyboard
+import QtQuick.VirtualKeyboard.Components
 import QtQuick.Layouts
 
 KeyboardLayoutLoader {
diff --git a/src/virtualkeyboard/content/layouts/ko_KR/numbers.fallback b/src/layouts/ko_KR/numbers.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/ko_KR/numbers.fallback
+++ b/src/layouts/ko_KR/numbers.fallback
diff --git a/src/virtualkeyboard/content/layouts/ko_KR/symbols.qml b/src/layouts/ko_KR/symbols.qml
index 95e3dcae..fc0dfb2f 100644
--- a/src/virtualkeyboard/content/layouts/ko_KR/symbols.qml
+++ b/src/layouts/ko_KR/symbols.qml
@@ -30,6 +30,7 @@
 import QtQuick
 import QtQuick.Layouts
 import QtQuick.VirtualKeyboard
+import QtQuick.VirtualKeyboard.Components
 
 KeyboardLayoutLoader {
     function createInputMethod() {
diff --git a/src/virtualkeyboard/content/layouts/ms_MY/dialpad.fallback b/src/layouts/ms_MY/dialpad.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/ms_MY/dialpad.fallback
+++ b/src/layouts/ms_MY/dialpad.fallback
diff --git a/src/virtualkeyboard/content/layouts/ms_MY/digits.fallback b/src/layouts/ms_MY/digits.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/ms_MY/digits.fallback
+++ b/src/layouts/ms_MY/digits.fallback
diff --git a/src/virtualkeyboard/content/layouts/ms_MY/handwriting.fallback b/src/layouts/ms_MY/handwriting.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/ms_MY/handwriting.fallback
+++ b/src/layouts/ms_MY/handwriting.fallback
diff --git a/src/virtualkeyboard/content/layouts/ms_MY/main.fallback b/src/layouts/ms_MY/main.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/ms_MY/main.fallback
+++ b/src/layouts/ms_MY/main.fallback
diff --git a/src/virtualkeyboard/content/layouts/ms_MY/numbers.fallback b/src/layouts/ms_MY/numbers.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/ms_MY/numbers.fallback
+++ b/src/layouts/ms_MY/numbers.fallback
diff --git a/src/virtualkeyboard/content/layouts/ms_MY/symbols.fallback b/src/layouts/ms_MY/symbols.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/ms_MY/symbols.fallback
+++ b/src/layouts/ms_MY/symbols.fallback
diff --git a/src/virtualkeyboard/content/layouts/nb_NO/dialpad.fallback b/src/layouts/nb_NO/dialpad.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/nb_NO/dialpad.fallback
+++ b/src/layouts/nb_NO/dialpad.fallback
diff --git a/src/virtualkeyboard/content/layouts/nb_NO/digits.fallback b/src/layouts/nb_NO/digits.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/nb_NO/digits.fallback
+++ b/src/layouts/nb_NO/digits.fallback
diff --git a/src/virtualkeyboard/content/layouts/nb_NO/handwriting.fallback b/src/layouts/nb_NO/handwriting.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/nb_NO/handwriting.fallback
+++ b/src/layouts/nb_NO/handwriting.fallback
diff --git a/src/virtualkeyboard/content/layouts/nb_NO/main.qml b/src/layouts/nb_NO/main.qml
index 200ebb7b..3c127710 100644
--- a/src/virtualkeyboard/content/layouts/nb_NO/main.qml
+++ b/src/layouts/nb_NO/main.qml
@@ -29,6 +29,7 @@
 
 import QtQuick
 import QtQuick.VirtualKeyboard
+import QtQuick.VirtualKeyboard.Components
 import QtQuick.Layouts
 
 KeyboardLayout {
diff --git a/src/virtualkeyboard/content/layouts/nb_NO/numbers.fallback b/src/layouts/nb_NO/numbers.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/nb_NO/numbers.fallback
+++ b/src/layouts/nb_NO/numbers.fallback
diff --git a/src/virtualkeyboard/content/layouts/nb_NO/symbols.fallback b/src/layouts/nb_NO/symbols.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/nb_NO/symbols.fallback
+++ b/src/layouts/nb_NO/symbols.fallback
diff --git a/src/virtualkeyboard/content/layouts/nl_NL/dialpad.fallback b/src/layouts/nl_NL/dialpad.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/nl_NL/dialpad.fallback
+++ b/src/layouts/nl_NL/dialpad.fallback
diff --git a/src/virtualkeyboard/content/layouts/nl_NL/digits.fallback b/src/layouts/nl_NL/digits.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/nl_NL/digits.fallback
+++ b/src/layouts/nl_NL/digits.fallback
diff --git a/src/virtualkeyboard/content/layouts/nl_NL/handwriting.fallback b/src/layouts/nl_NL/handwriting.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/nl_NL/handwriting.fallback
+++ b/src/layouts/nl_NL/handwriting.fallback
diff --git a/src/virtualkeyboard/content/layouts/nl_NL/main.fallback b/src/layouts/nl_NL/main.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/nl_NL/main.fallback
+++ b/src/layouts/nl_NL/main.fallback
diff --git a/src/virtualkeyboard/content/layouts/nl_NL/numbers.fallback b/src/layouts/nl_NL/numbers.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/nl_NL/numbers.fallback
+++ b/src/layouts/nl_NL/numbers.fallback
diff --git a/src/virtualkeyboard/content/layouts/nl_NL/symbols.fallback b/src/layouts/nl_NL/symbols.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/nl_NL/symbols.fallback
+++ b/src/layouts/nl_NL/symbols.fallback
diff --git a/src/virtualkeyboard/content/layouts/pl_PL/dialpad.fallback b/src/layouts/pl_PL/dialpad.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/pl_PL/dialpad.fallback
+++ b/src/layouts/pl_PL/dialpad.fallback
diff --git a/src/virtualkeyboard/content/layouts/pl_PL/digits.fallback b/src/layouts/pl_PL/digits.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/pl_PL/digits.fallback
+++ b/src/layouts/pl_PL/digits.fallback
diff --git a/src/virtualkeyboard/content/layouts/pl_PL/handwriting.fallback b/src/layouts/pl_PL/handwriting.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/pl_PL/handwriting.fallback
+++ b/src/layouts/pl_PL/handwriting.fallback
diff --git a/src/virtualkeyboard/content/layouts/pl_PL/main.qml b/src/layouts/pl_PL/main.qml
index ec1bb4a7..cbf074fb 100644
--- a/src/virtualkeyboard/content/layouts/pl_PL/main.qml
+++ b/src/layouts/pl_PL/main.qml
@@ -29,6 +29,7 @@
 
 import QtQuick
 import QtQuick.VirtualKeyboard
+import QtQuick.VirtualKeyboard.Components
 import QtQuick.Layouts
 
 KeyboardLayout {
diff --git a/src/virtualkeyboard/content/layouts/pl_PL/numbers.fallback b/src/layouts/pl_PL/numbers.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/pl_PL/numbers.fallback
+++ b/src/layouts/pl_PL/numbers.fallback
diff --git a/src/virtualkeyboard/content/layouts/pl_PL/symbols.fallback b/src/layouts/pl_PL/symbols.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/pl_PL/symbols.fallback
+++ b/src/layouts/pl_PL/symbols.fallback
diff --git a/src/virtualkeyboard/content/layouts/pt_BR/dialpad.fallback b/src/layouts/pt_BR/dialpad.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/pt_BR/dialpad.fallback
+++ b/src/layouts/pt_BR/dialpad.fallback
diff --git a/src/virtualkeyboard/content/layouts/pt_BR/digits.fallback b/src/layouts/pt_BR/digits.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/pt_BR/digits.fallback
+++ b/src/layouts/pt_BR/digits.fallback
diff --git a/src/virtualkeyboard/content/layouts/pt_BR/handwriting.fallback b/src/layouts/pt_BR/handwriting.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/pt_BR/handwriting.fallback
+++ b/src/layouts/pt_BR/handwriting.fallback
diff --git a/src/virtualkeyboard/content/layouts/pt_BR/main.qml b/src/layouts/pt_BR/main.qml
index 59114818..e5d2cb0d 100644
--- a/src/virtualkeyboard/content/layouts/pt_BR/main.qml
+++ b/src/layouts/pt_BR/main.qml
@@ -29,6 +29,7 @@
 
 import QtQuick
 import QtQuick.VirtualKeyboard
+import QtQuick.VirtualKeyboard.Components
 import QtQuick.Layouts
 
 KeyboardLayout {
diff --git a/src/virtualkeyboard/content/layouts/pt_BR/numbers.fallback b/src/layouts/pt_BR/numbers.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/pt_BR/numbers.fallback
+++ b/src/layouts/pt_BR/numbers.fallback
diff --git a/src/virtualkeyboard/content/layouts/pt_BR/symbols.fallback b/src/layouts/pt_BR/symbols.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/pt_BR/symbols.fallback
+++ b/src/layouts/pt_BR/symbols.fallback
diff --git a/src/virtualkeyboard/content/layouts/pt_PT/dialpad.fallback b/src/layouts/pt_PT/dialpad.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/pt_PT/dialpad.fallback
+++ b/src/layouts/pt_PT/dialpad.fallback
diff --git a/src/virtualkeyboard/content/layouts/pt_PT/digits.fallback b/src/layouts/pt_PT/digits.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/pt_PT/digits.fallback
+++ b/src/layouts/pt_PT/digits.fallback
diff --git a/src/virtualkeyboard/content/layouts/pt_PT/handwriting.fallback b/src/layouts/pt_PT/handwriting.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/pt_PT/handwriting.fallback
+++ b/src/layouts/pt_PT/handwriting.fallback
diff --git a/src/virtualkeyboard/content/layouts/pt_PT/main.qml b/src/layouts/pt_PT/main.qml
index 59114818..e5d2cb0d 100644
--- a/src/virtualkeyboard/content/layouts/pt_PT/main.qml
+++ b/src/layouts/pt_PT/main.qml
@@ -29,6 +29,7 @@
 
 import QtQuick
 import QtQuick.VirtualKeyboard
+import QtQuick.VirtualKeyboard.Components
 import QtQuick.Layouts
 
 KeyboardLayout {
diff --git a/src/virtualkeyboard/content/layouts/pt_PT/numbers.fallback b/src/layouts/pt_PT/numbers.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/pt_PT/numbers.fallback
+++ b/src/layouts/pt_PT/numbers.fallback
diff --git a/src/virtualkeyboard/content/layouts/pt_PT/symbols.fallback b/src/layouts/pt_PT/symbols.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/pt_PT/symbols.fallback
+++ b/src/layouts/pt_PT/symbols.fallback
diff --git a/src/virtualkeyboard/content/layouts/ro_RO/dialpad.fallback b/src/layouts/ro_RO/dialpad.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/ro_RO/dialpad.fallback
+++ b/src/layouts/ro_RO/dialpad.fallback
diff --git a/src/virtualkeyboard/content/layouts/ro_RO/digits.fallback b/src/layouts/ro_RO/digits.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/ro_RO/digits.fallback
+++ b/src/layouts/ro_RO/digits.fallback
diff --git a/src/virtualkeyboard/content/layouts/ro_RO/handwriting.qml b/src/layouts/ro_RO/handwriting.qml
index 078888a0..80b6d45f 100644
--- a/src/virtualkeyboard/content/layouts/ro_RO/handwriting.qml
+++ b/src/layouts/ro_RO/handwriting.qml
@@ -30,6 +30,7 @@
 import QtQuick
 import QtQuick.Layouts
 import QtQuick.VirtualKeyboard
+import QtQuick.VirtualKeyboard.Components
 
 KeyboardLayout {
     function createInputMethod() {
diff --git a/src/virtualkeyboard/content/layouts/ro_RO/main.qml b/src/layouts/ro_RO/main.qml
index 7b0f0fe2..4bb7478c 100644
--- a/src/virtualkeyboard/content/layouts/ro_RO/main.qml
+++ b/src/layouts/ro_RO/main.qml
@@ -29,6 +29,7 @@
 
 import QtQuick
 import QtQuick.VirtualKeyboard
+import QtQuick.VirtualKeyboard.Components
 import QtQuick.Layouts
 
 KeyboardLayout {
diff --git a/src/virtualkeyboard/content/layouts/ro_RO/numbers.fallback b/src/layouts/ro_RO/numbers.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/ro_RO/numbers.fallback
+++ b/src/layouts/ro_RO/numbers.fallback
diff --git a/src/virtualkeyboard/content/layouts/ro_RO/symbols.fallback b/src/layouts/ro_RO/symbols.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/ro_RO/symbols.fallback
+++ b/src/layouts/ro_RO/symbols.fallback
diff --git a/src/virtualkeyboard/content/layouts/ru_RU/dialpad.fallback b/src/layouts/ru_RU/dialpad.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/ru_RU/dialpad.fallback
+++ b/src/layouts/ru_RU/dialpad.fallback
diff --git a/src/virtualkeyboard/content/layouts/ru_RU/digits.fallback b/src/layouts/ru_RU/digits.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/ru_RU/digits.fallback
+++ b/src/layouts/ru_RU/digits.fallback
diff --git a/src/virtualkeyboard/content/layouts/ru_RU/handwriting.qml b/src/layouts/ru_RU/handwriting.qml
index 7df21ab6..092d746e 100644
--- a/src/virtualkeyboard/content/layouts/ru_RU/handwriting.qml
+++ b/src/layouts/ru_RU/handwriting.qml
@@ -30,6 +30,7 @@
 import QtQuick
 import QtQuick.Layouts
 import QtQuick.VirtualKeyboard
+import QtQuick.VirtualKeyboard.Components
 
 KeyboardLayout {
     function createInputMethod() {
diff --git a/src/virtualkeyboard/content/layouts/ru_RU/main.qml b/src/layouts/ru_RU/main.qml
index df7164ad..91b0415a 100644
--- a/src/virtualkeyboard/content/layouts/ru_RU/main.qml
+++ b/src/layouts/ru_RU/main.qml
@@ -29,6 +29,7 @@
 
 import QtQuick
 import QtQuick.VirtualKeyboard
+import QtQuick.VirtualKeyboard.Components
 import QtQuick.Layouts
 
 KeyboardLayoutLoader {
diff --git a/src/virtualkeyboard/content/layouts/ru_RU/numbers.fallback b/src/layouts/ru_RU/numbers.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/ru_RU/numbers.fallback
+++ b/src/layouts/ru_RU/numbers.fallback
diff --git a/src/virtualkeyboard/content/layouts/ru_RU/symbols.fallback b/src/layouts/ru_RU/symbols.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/ru_RU/symbols.fallback
+++ b/src/layouts/ru_RU/symbols.fallback
diff --git a/src/virtualkeyboard/content/layouts/sk_SK/dialpad.fallback b/src/layouts/sk_SK/dialpad.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/sk_SK/dialpad.fallback
+++ b/src/layouts/sk_SK/dialpad.fallback
diff --git a/src/virtualkeyboard/content/layouts/sk_SK/digits.fallback b/src/layouts/sk_SK/digits.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/sk_SK/digits.fallback
+++ b/src/layouts/sk_SK/digits.fallback
diff --git a/src/virtualkeyboard/content/layouts/sk_SK/handwriting.fallback b/src/layouts/sk_SK/handwriting.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/sk_SK/handwriting.fallback
+++ b/src/layouts/sk_SK/handwriting.fallback
diff --git a/src/virtualkeyboard/content/layouts/sk_SK/main.qml b/src/layouts/sk_SK/main.qml
index 17817303..7a4631bb 100644
--- a/src/virtualkeyboard/content/layouts/sk_SK/main.qml
+++ b/src/layouts/sk_SK/main.qml
@@ -29,6 +29,7 @@
 
 import QtQuick
 import QtQuick.VirtualKeyboard
+import QtQuick.VirtualKeyboard.Components
 import QtQuick.Layouts
 
 KeyboardLayout {
diff --git a/src/virtualkeyboard/content/layouts/sk_SK/numbers.fallback b/src/layouts/sk_SK/numbers.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/sk_SK/numbers.fallback
+++ b/src/layouts/sk_SK/numbers.fallback
diff --git a/src/virtualkeyboard/content/layouts/sk_SK/symbols.fallback b/src/layouts/sk_SK/symbols.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/sk_SK/symbols.fallback
+++ b/src/layouts/sk_SK/symbols.fallback
diff --git a/src/virtualkeyboard/content/layouts/sl_SI/dialpad.fallback b/src/layouts/sl_SI/dialpad.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/sl_SI/dialpad.fallback
+++ b/src/layouts/sl_SI/dialpad.fallback
diff --git a/src/virtualkeyboard/content/layouts/sl_SI/digits.fallback b/src/layouts/sl_SI/digits.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/sl_SI/digits.fallback
+++ b/src/layouts/sl_SI/digits.fallback
diff --git a/src/virtualkeyboard/content/layouts/sl_SI/handwriting.fallback b/src/layouts/sl_SI/handwriting.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/sl_SI/handwriting.fallback
+++ b/src/layouts/sl_SI/handwriting.fallback
diff --git a/src/virtualkeyboard/content/layouts/sl_SI/main.qml b/src/layouts/sl_SI/main.qml
index ed6b3d13..d08dac49 100644
--- a/src/virtualkeyboard/content/layouts/sl_SI/main.qml
+++ b/src/layouts/sl_SI/main.qml
@@ -29,6 +29,7 @@
 
 import QtQuick
 import QtQuick.VirtualKeyboard
+import QtQuick.VirtualKeyboard.Components
 import QtQuick.Layouts
 
 KeyboardLayout {
diff --git a/src/virtualkeyboard/content/layouts/sl_SI/numbers.fallback b/src/layouts/sl_SI/numbers.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/sl_SI/numbers.fallback
+++ b/src/layouts/sl_SI/numbers.fallback
diff --git a/src/virtualkeyboard/content/layouts/sl_SI/symbols.fallback b/src/layouts/sl_SI/symbols.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/sl_SI/symbols.fallback
+++ b/src/layouts/sl_SI/symbols.fallback
diff --git a/src/virtualkeyboard/content/layouts/sq_AL/dialpad.fallback b/src/layouts/sq_AL/dialpad.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/sq_AL/dialpad.fallback
+++ b/src/layouts/sq_AL/dialpad.fallback
diff --git a/src/virtualkeyboard/content/layouts/sq_AL/digits.fallback b/src/layouts/sq_AL/digits.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/sq_AL/digits.fallback
+++ b/src/layouts/sq_AL/digits.fallback
diff --git a/src/virtualkeyboard/content/layouts/sq_AL/handwriting.fallback b/src/layouts/sq_AL/handwriting.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/sq_AL/handwriting.fallback
+++ b/src/layouts/sq_AL/handwriting.fallback
diff --git a/src/virtualkeyboard/content/layouts/sq_AL/main.qml b/src/layouts/sq_AL/main.qml
index 6d13b9d5..4a00858d 100644
--- a/src/virtualkeyboard/content/layouts/sq_AL/main.qml
+++ b/src/layouts/sq_AL/main.qml
@@ -29,6 +29,7 @@
 
 import QtQuick
 import QtQuick.VirtualKeyboard
+import QtQuick.VirtualKeyboard.Components
 import QtQuick.Layouts
 
 KeyboardLayout {
diff --git a/src/virtualkeyboard/content/layouts/sq_AL/numbers.fallback b/src/layouts/sq_AL/numbers.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/sq_AL/numbers.fallback
+++ b/src/layouts/sq_AL/numbers.fallback
diff --git a/src/virtualkeyboard/content/layouts/sq_AL/symbols.fallback b/src/layouts/sq_AL/symbols.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/sq_AL/symbols.fallback
+++ b/src/layouts/sq_AL/symbols.fallback
diff --git a/src/virtualkeyboard/content/layouts/sr_SP/dialpad.fallback b/src/layouts/sr_SP/dialpad.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/sr_SP/dialpad.fallback
+++ b/src/layouts/sr_SP/dialpad.fallback
diff --git a/src/virtualkeyboard/content/layouts/sr_SP/digits.fallback b/src/layouts/sr_SP/digits.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/sr_SP/digits.fallback
+++ b/src/layouts/sr_SP/digits.fallback
diff --git a/src/virtualkeyboard/content/layouts/bg_BG/handwriting.qml b/src/layouts/sr_SP/handwriting.qml
index 7df21ab6..092d746e 100644
--- a/src/virtualkeyboard/content/layouts/bg_BG/handwriting.qml
+++ b/src/layouts/sr_SP/handwriting.qml
@@ -30,6 +30,7 @@
 import QtQuick
 import QtQuick.Layouts
 import QtQuick.VirtualKeyboard
+import QtQuick.VirtualKeyboard.Components
 
 KeyboardLayout {
     function createInputMethod() {
diff --git a/src/virtualkeyboard/content/layouts/sr_SP/main.qml b/src/layouts/sr_SP/main.qml
index 5dd8ee47..461c426a 100644
--- a/src/virtualkeyboard/content/layouts/sr_SP/main.qml
+++ b/src/layouts/sr_SP/main.qml
@@ -29,6 +29,7 @@
 
 import QtQuick
 import QtQuick.VirtualKeyboard
+import QtQuick.VirtualKeyboard.Components
 import QtQuick.Layouts
 
 KeyboardLayoutLoader {
diff --git a/src/virtualkeyboard/content/layouts/sr_SP/numbers.fallback b/src/layouts/sr_SP/numbers.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/sr_SP/numbers.fallback
+++ b/src/layouts/sr_SP/numbers.fallback
diff --git a/src/virtualkeyboard/content/layouts/sr_SP/symbols.fallback b/src/layouts/sr_SP/symbols.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/sr_SP/symbols.fallback
+++ b/src/layouts/sr_SP/symbols.fallback
diff --git a/src/virtualkeyboard/content/layouts/sv_SE/dialpad.fallback b/src/layouts/sv_SE/dialpad.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/sv_SE/dialpad.fallback
+++ b/src/layouts/sv_SE/dialpad.fallback
diff --git a/src/virtualkeyboard/content/layouts/sv_SE/digits.fallback b/src/layouts/sv_SE/digits.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/sv_SE/digits.fallback
+++ b/src/layouts/sv_SE/digits.fallback
diff --git a/src/virtualkeyboard/content/layouts/sv_SE/handwriting.fallback b/src/layouts/sv_SE/handwriting.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/sv_SE/handwriting.fallback
+++ b/src/layouts/sv_SE/handwriting.fallback
diff --git a/src/virtualkeyboard/content/layouts/sv_SE/main.qml b/src/layouts/sv_SE/main.qml
index d0ff7713..8d02cffb 100644
--- a/src/virtualkeyboard/content/layouts/sv_SE/main.qml
+++ b/src/layouts/sv_SE/main.qml
@@ -29,6 +29,7 @@
 
 import QtQuick
 import QtQuick.VirtualKeyboard
+import QtQuick.VirtualKeyboard.Components
 import QtQuick.Layouts
 
 KeyboardLayout {
diff --git a/src/virtualkeyboard/content/layouts/sv_SE/numbers.fallback b/src/layouts/sv_SE/numbers.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/sv_SE/numbers.fallback
+++ b/src/layouts/sv_SE/numbers.fallback
diff --git a/src/virtualkeyboard/content/layouts/sv_SE/symbols.fallback b/src/layouts/sv_SE/symbols.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/sv_SE/symbols.fallback
+++ b/src/layouts/sv_SE/symbols.fallback
diff --git a/src/virtualkeyboard/content/layouts/th_TH/dialpad.fallback b/src/layouts/th_TH/dialpad.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/th_TH/dialpad.fallback
+++ b/src/layouts/th_TH/dialpad.fallback
diff --git a/src/virtualkeyboard/content/layouts/th_TH/digits.fallback b/src/layouts/th_TH/digits.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/th_TH/digits.fallback
+++ b/src/layouts/th_TH/digits.fallback
diff --git a/src/virtualkeyboard/content/layouts/th_TH/handwriting.fallback b/src/layouts/th_TH/handwriting.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/th_TH/handwriting.fallback
+++ b/src/layouts/th_TH/handwriting.fallback
diff --git a/src/virtualkeyboard/content/layouts/th_TH/handwriting.qml b/src/layouts/th_TH/handwriting.qml
index 8e6c99ad..8cf4301c 100644
--- a/src/virtualkeyboard/content/layouts/th_TH/handwriting.qml
+++ b/src/layouts/th_TH/handwriting.qml
@@ -30,6 +30,7 @@
 import QtQuick
 import QtQuick.Layouts
 import QtQuick.VirtualKeyboard
+import QtQuick.VirtualKeyboard.Components
 
 KeyboardLayout {
     function createInputMethod() {
diff --git a/src/virtualkeyboard/content/layouts/th_TH/main.qml b/src/layouts/th_TH/main.qml
index 1be89912..41f104d3 100644
--- a/src/virtualkeyboard/content/layouts/th_TH/main.qml
+++ b/src/layouts/th_TH/main.qml
@@ -30,6 +30,7 @@
 import QtQuick
 import QtQuick.Layouts
 import QtQuick.VirtualKeyboard
+import QtQuick.VirtualKeyboard.Components
 
 KeyboardLayoutLoader {
     inputMode: InputEngine.InputMode.Latin
diff --git a/src/virtualkeyboard/content/layouts/th_TH/numbers.fallback b/src/layouts/th_TH/numbers.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/th_TH/numbers.fallback
+++ b/src/layouts/th_TH/numbers.fallback
diff --git a/src/virtualkeyboard/content/layouts/th_TH/symbols.qml b/src/layouts/th_TH/symbols.qml
index 3014417f..fbe3c801 100644
--- a/src/virtualkeyboard/content/layouts/th_TH/symbols.qml
+++ b/src/layouts/th_TH/symbols.qml
@@ -30,6 +30,7 @@
 import QtQuick
 import QtQuick.Layouts
 import QtQuick.VirtualKeyboard
+import QtQuick.VirtualKeyboard.Components
 
 KeyboardLayoutLoader {
     property bool secondPage
diff --git a/src/virtualkeyboard/content/layouts/tr_TR/dialpad.fallback b/src/layouts/tr_TR/dialpad.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/tr_TR/dialpad.fallback
+++ b/src/layouts/tr_TR/dialpad.fallback
diff --git a/src/virtualkeyboard/content/layouts/tr_TR/digits.fallback b/src/layouts/tr_TR/digits.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/tr_TR/digits.fallback
+++ b/src/layouts/tr_TR/digits.fallback
diff --git a/src/virtualkeyboard/content/layouts/tr_TR/handwriting.fallback b/src/layouts/tr_TR/handwriting.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/tr_TR/handwriting.fallback
+++ b/src/layouts/tr_TR/handwriting.fallback
diff --git a/src/virtualkeyboard/content/layouts/tr_TR/main.qml b/src/layouts/tr_TR/main.qml
index 4ca5a7b8..ff097e1c 100644
--- a/src/virtualkeyboard/content/layouts/tr_TR/main.qml
+++ b/src/layouts/tr_TR/main.qml
@@ -29,6 +29,7 @@
 
 import QtQuick
 import QtQuick.VirtualKeyboard
+import QtQuick.VirtualKeyboard.Components
 import QtQuick.Layouts
 
 KeyboardLayout {
diff --git a/src/virtualkeyboard/content/layouts/tr_TR/numbers.fallback b/src/layouts/tr_TR/numbers.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/tr_TR/numbers.fallback
+++ b/src/layouts/tr_TR/numbers.fallback
diff --git a/src/virtualkeyboard/content/layouts/tr_TR/symbols.fallback b/src/layouts/tr_TR/symbols.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/tr_TR/symbols.fallback
+++ b/src/layouts/tr_TR/symbols.fallback
diff --git a/src/virtualkeyboard/content/layouts/uk_UA/dialpad.fallback b/src/layouts/uk_UA/dialpad.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/uk_UA/dialpad.fallback
+++ b/src/layouts/uk_UA/dialpad.fallback
diff --git a/src/virtualkeyboard/content/layouts/uk_UA/digits.fallback b/src/layouts/uk_UA/digits.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/uk_UA/digits.fallback
+++ b/src/layouts/uk_UA/digits.fallback
diff --git a/src/virtualkeyboard/content/layouts/uk_UA/handwriting.qml b/src/layouts/uk_UA/handwriting.qml
index 7df21ab6..092d746e 100644
--- a/src/virtualkeyboard/content/layouts/uk_UA/handwriting.qml
+++ b/src/layouts/uk_UA/handwriting.qml
@@ -30,6 +30,7 @@
 import QtQuick
 import QtQuick.Layouts
 import QtQuick.VirtualKeyboard
+import QtQuick.VirtualKeyboard.Components
 
 KeyboardLayout {
     function createInputMethod() {
diff --git a/src/virtualkeyboard/content/layouts/uk_UA/main.qml b/src/layouts/uk_UA/main.qml
index 61a70169..48f1507f 100644
--- a/src/virtualkeyboard/content/layouts/uk_UA/main.qml
+++ b/src/layouts/uk_UA/main.qml
@@ -29,6 +29,7 @@
 
 import QtQuick
 import QtQuick.VirtualKeyboard
+import QtQuick.VirtualKeyboard.Components
 import QtQuick.Layouts
 
 KeyboardLayoutLoader {
diff --git a/src/virtualkeyboard/content/layouts/uk_UA/numbers.fallback b/src/layouts/uk_UA/numbers.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/uk_UA/numbers.fallback
+++ b/src/layouts/uk_UA/numbers.fallback
diff --git a/src/virtualkeyboard/content/layouts/uk_UA/symbols.fallback b/src/layouts/uk_UA/symbols.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/uk_UA/symbols.fallback
+++ b/src/layouts/uk_UA/symbols.fallback
diff --git a/src/virtualkeyboard/content/layouts/vi_VN/dialpad.fallback b/src/layouts/vi_VN/dialpad.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/vi_VN/dialpad.fallback
+++ b/src/layouts/vi_VN/dialpad.fallback
diff --git a/src/virtualkeyboard/content/layouts/vi_VN/digits.fallback b/src/layouts/vi_VN/digits.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/vi_VN/digits.fallback
+++ b/src/layouts/vi_VN/digits.fallback
diff --git a/src/virtualkeyboard/content/layouts/vi_VN/handwriting.fallback b/src/layouts/vi_VN/handwriting.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/vi_VN/handwriting.fallback
+++ b/src/layouts/vi_VN/handwriting.fallback
diff --git a/src/virtualkeyboard/content/layouts/vi_VN/main.qml b/src/layouts/vi_VN/main.qml
index 16a25326..05efb1ca 100644
--- a/src/virtualkeyboard/content/layouts/vi_VN/main.qml
+++ b/src/layouts/vi_VN/main.qml
@@ -29,6 +29,7 @@
 
 import QtQuick
 import QtQuick.VirtualKeyboard
+import QtQuick.VirtualKeyboard.Components
 import QtQuick.Layouts
 
 KeyboardLayout {
diff --git a/src/virtualkeyboard/content/layouts/vi_VN/numbers.fallback b/src/layouts/vi_VN/numbers.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/vi_VN/numbers.fallback
+++ b/src/layouts/vi_VN/numbers.fallback
diff --git a/src/virtualkeyboard/content/layouts/vi_VN/symbols.qml b/src/layouts/vi_VN/symbols.qml
index 7a2e7bf6..d315b9d0 100644
--- a/src/virtualkeyboard/content/layouts/vi_VN/symbols.qml
+++ b/src/layouts/vi_VN/symbols.qml
@@ -30,6 +30,7 @@
 import QtQuick
 import QtQuick.Layouts
 import QtQuick.VirtualKeyboard
+import QtQuick.VirtualKeyboard.Components
 
 KeyboardLayoutLoader {
     property bool secondPage
diff --git a/src/virtualkeyboard/content/layouts/zh_CN/dialpad.fallback b/src/layouts/zh_CN/dialpad.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/zh_CN/dialpad.fallback
+++ b/src/layouts/zh_CN/dialpad.fallback
diff --git a/src/virtualkeyboard/content/layouts/zh_CN/digits.fallback b/src/layouts/zh_CN/digits.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/zh_CN/digits.fallback
+++ b/src/layouts/zh_CN/digits.fallback
diff --git a/src/virtualkeyboard/content/layouts/zh_TW/handwriting.qml b/src/layouts/zh_CN/handwriting.qml
index 11b23e5b..f365bd15 100644
--- a/src/virtualkeyboard/content/layouts/zh_TW/handwriting.qml
+++ b/src/layouts/zh_CN/handwriting.qml
@@ -30,6 +30,7 @@
 import QtQuick
 import QtQuick.Layouts
 import QtQuick.VirtualKeyboard
+import QtQuick.VirtualKeyboard.Components
 
 KeyboardLayout {
     function createInputMethod() {
diff --git a/src/virtualkeyboard/content/layouts/zh_CN/main.qml b/src/layouts/zh_CN/main.qml
index 37509fa9..717d451f 100644
--- a/src/virtualkeyboard/content/layouts/zh_CN/main.qml
+++ b/src/layouts/zh_CN/main.qml
@@ -30,6 +30,7 @@
 import QtQuick
 import QtQuick.Layouts
 import QtQuick.VirtualKeyboard
+import QtQuick.VirtualKeyboard.Components
 
 KeyboardLayout {
     function createInputMethod() {
diff --git a/src/virtualkeyboard/content/layouts/zh_CN/numbers.fallback b/src/layouts/zh_CN/numbers.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/zh_CN/numbers.fallback
+++ b/src/layouts/zh_CN/numbers.fallback
diff --git a/src/virtualkeyboard/content/layouts/zh_CN/symbols.qml b/src/layouts/zh_CN/symbols.qml
index 5bf51b39..7ffcdb43 100644
--- a/src/virtualkeyboard/content/layouts/zh_CN/symbols.qml
+++ b/src/layouts/zh_CN/symbols.qml
@@ -30,6 +30,7 @@
 import QtQuick
 import QtQuick.Layouts
 import QtQuick.VirtualKeyboard
+import QtQuick.VirtualKeyboard.Components
 
 KeyboardLayoutLoader {
     function createInputMethod() {
diff --git a/src/virtualkeyboard/content/layouts/zh_TW/dialpad.fallback b/src/layouts/zh_TW/dialpad.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/zh_TW/dialpad.fallback
+++ b/src/layouts/zh_TW/dialpad.fallback
diff --git a/src/virtualkeyboard/content/layouts/zh_TW/digits.fallback b/src/layouts/zh_TW/digits.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/zh_TW/digits.fallback
+++ b/src/layouts/zh_TW/digits.fallback
diff --git a/src/virtualkeyboard/content/layouts/zh_CN/handwriting.qml b/src/layouts/zh_TW/handwriting.qml
index 11b23e5b..f365bd15 100644
--- a/src/virtualkeyboard/content/layouts/zh_CN/handwriting.qml
+++ b/src/layouts/zh_TW/handwriting.qml
@@ -30,6 +30,7 @@
 import QtQuick
 import QtQuick.Layouts
 import QtQuick.VirtualKeyboard
+import QtQuick.VirtualKeyboard.Components
 
 KeyboardLayout {
     function createInputMethod() {
diff --git a/src/virtualkeyboard/content/layouts/zh_TW/main.qml b/src/layouts/zh_TW/main.qml
index bf751d40..fde17ff2 100644
--- a/src/virtualkeyboard/content/layouts/zh_TW/main.qml
+++ b/src/layouts/zh_TW/main.qml
@@ -30,6 +30,7 @@
 import QtQuick
 import QtQuick.Layouts
 import QtQuick.VirtualKeyboard
+import QtQuick.VirtualKeyboard.Components
 
 KeyboardLayoutLoader {
     function createInputMethod() {
diff --git a/src/virtualkeyboard/content/layouts/zh_TW/numbers.fallback b/src/layouts/zh_TW/numbers.fallback
index e69de29b..e69de29b 100644
--- a/src/virtualkeyboard/content/layouts/zh_TW/numbers.fallback
+++ b/src/layouts/zh_TW/numbers.fallback
diff --git a/src/virtualkeyboard/content/layouts/zh_TW/symbols.qml b/src/layouts/zh_TW/symbols.qml
index 0352c55e..291622db 100644
--- a/src/virtualkeyboard/content/layouts/zh_TW/symbols.qml
+++ b/src/layouts/zh_TW/symbols.qml
@@ -30,6 +30,7 @@
 import QtQuick
 import QtQuick.Layouts
 import QtQuick.VirtualKeyboard
+import QtQuick.VirtualKeyboard.Components
 
 KeyboardLayoutLoader {
     function createInputMethod() {
diff --git a/src/plugin/CMakeLists.txt b/src/plugin/CMakeLists.txt
index 831e8acc..6db62240 100644
--- a/src/plugin/CMakeLists.txt
+++ b/src/plugin/CMakeLists.txt
@@ -1,5 +1,3 @@
-# Generated from plugin.pro.
-
 #####################################################################
 ## QVirtualKeyboardPlugin Plugin:
 #####################################################################
@@ -9,7 +7,6 @@ qt_internal_add_plugin(QVirtualKeyboardPlugin
     PLUGIN_TYPE platforminputcontexts
     DEFAULT_IF FALSE
     SOURCES
-        extensionloader.cpp extensionloader.h
         plugin.cpp plugin.h
     DEFINES
         QT_ASCII_CAST_WARNINGS
@@ -19,32 +16,10 @@ qt_internal_add_plugin(QVirtualKeyboardPlugin
     LIBRARIES
         Qt::Core
         Qt::Gui
-        Qt::Qml
         Qt::VirtualKeyboardPrivate
 )
 
-#### Keys ignored in scope 1:.:.:plugin.pro:<TRUE>:
-# OTHER_FILES = "qtvirtualkeyboard.json"
-# PLUGIN_EXTENDS = "-"
-
-## Scopes:
-#####################################################################
-
-qt_internal_extend_target(QVirtualKeyboardPlugin CONDITION no-builtin-style
-    DEFINES
-        QT_VIRTUALKEYBOARD_NO_BUILTIN_STYLES
-)
-
-qt_internal_extend_target(QVirtualKeyboardPlugin CONDITION disable-layouts
-    DEFINES
-        QT_VIRTUALKEYBOARD_DISABLE_LAYOUTS
-)
-
 qt_internal_extend_target(QVirtualKeyboardPlugin CONDITION WIN32
     LIBRARIES
         imm32
 )
-
-#### Keys ignored in scope 4:.:.:plugin.pro:WIN32:
-# QMAKE_TARGET_DESCRIPTION = "Virtual Keyboard for Qt."
-# QMAKE_TARGET_PRODUCT = "Qt Virtual Keyboard (Qt $$QT_VERSION)"
diff --git a/src/plugin/extensionloader.cpp b/src/plugin/extensionloader.cpp
deleted file mode 100644
index e68e46f3..00000000
--- a/src/plugin/extensionloader.cpp
+++ /dev/null
@@ -1,105 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2018 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 or (at your option) any later version
-** approved by the KDE Free Qt Foundation. The licenses are as published by
-** the Free Software Foundation and appearing in the file LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "extensionloader.h"
-#include <QtVirtualKeyboard/QVirtualKeyboardExtensionPlugin>
-#include <QtCore/private/qfactoryloader_p.h>
-
-#include <QtCore/QMultiHash>
-
-QT_BEGIN_NAMESPACE
-namespace QtVirtualKeyboard {
-
-QMutex ExtensionLoader::m_mutex;
-QMultiHash<QString, QCborMap> ExtensionLoader::m_plugins;
-bool ExtensionLoader::m_alreadyDiscovered = false;
-
-Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, loader,
-        (QVirtualKeyboardExtensionPluginFactoryInterface_iid,
-         QLatin1String("/virtualkeyboard")))
-
-QMultiHash<QString, QCborMap> ExtensionLoader::plugins(bool reload)
-{
-    QMutexLocker lock(&m_mutex);
-
-    if (reload == true)
-        m_alreadyDiscovered = false;
-
-    if (!m_alreadyDiscovered) {
-        loadPluginMetadata();
-        m_alreadyDiscovered = true;
-    }
-    return m_plugins;
-}
-
-QCborMap ExtensionLoader::loadMeta(const QString &extensionName)
-{
-    QCborMap metaData;
-    QList<QCborMap> candidates = ExtensionLoader::plugins().values(extensionName);
-
-    int versionFound = -1;
-
-    // figure out which version of the plugin we want
-    for (int i = 0; i < candidates.size(); ++i) {
-        QCborMap meta = candidates[i];
-        if (int ver = meta.value(QLatin1String("Version")).toInteger(); ver > versionFound) {
-            versionFound = ver;
-            metaData = std::move(meta);
-        }
-    }
-
-    if (metaData.isEmpty())
-        metaData.insert(QLatin1String("index"), -1); // not found
-    return metaData;
-}
-
-QVirtualKeyboardExtensionPlugin *ExtensionLoader::loadPlugin(QCborMap metaData)
-{
-    int idx = metaData.value(QLatin1String("index")).toInteger();
-    if (idx < 0)
-        return nullptr;
-    return qobject_cast<QVirtualKeyboardExtensionPlugin *>(loader()->instance(idx));
-}
-
-void ExtensionLoader::loadPluginMetadata()
-{
-    QFactoryLoader *l = loader();
-    QList<QPluginParsedMetaData> meta = l->metaData();
-    for (int i = 0; i < meta.size(); ++i) {
-        QCborMap obj = meta.at(i).value(QtPluginMetaDataKeys::MetaData).toMap();
-        QString name = obj.value(QLatin1String("Name")).toString();
-        if (!name.isEmpty()) {
-            obj.insert(QLatin1String("index"), i);
-            m_plugins.insert(name, obj);
-        }
-    }
-}
-
-} // namespace QtVirtualKeyboard
-QT_END_NAMESPACE
diff --git a/src/plugin/extensionloader.h b/src/plugin/extensionloader.h
deleted file mode 100644
index 812c5c29..00000000
--- a/src/plugin/extensionloader.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2018 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 or (at your option) any later version
-** approved by the KDE Free Qt Foundation. The licenses are as published by
-** the Free Software Foundation and appearing in the file LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef EXTENSIONLOADER_H
-#define EXTENSIONLOADER_H
-
-#include <QCborMap>
-#include <QMutex>
-#include <QtVirtualKeyboard/QVirtualKeyboardExtensionPlugin>
-
-QT_BEGIN_NAMESPACE
-namespace QtVirtualKeyboard {
-
-class ExtensionLoader
-{
-    Q_DISABLE_COPY(ExtensionLoader)
-public:
-    static QMultiHash<QString, QCborMap> plugins(bool reload = false);
-    static QCborMap loadMeta(const QString &extensionName);
-    static QVirtualKeyboardExtensionPlugin *loadPlugin(QCborMap metaData);
-
-private:
-    static void loadPluginMetadata();
-
-private:
-    static QMutex m_mutex;
-    static QMultiHash<QString, QCborMap> m_plugins;
-    static bool m_alreadyDiscovered;
-};
-
-} // namespace QtVirtualKeyboard
-QT_END_NAMESPACE
-
-#endif // EXTENSIONLOADER_H
diff --git a/src/plugin/plugin.cpp b/src/plugin/plugin.cpp
index 69c6177b..ff9c2826 100644
--- a/src/plugin/plugin.cpp
+++ b/src/plugin/plugin.cpp
@@ -28,12 +28,8 @@
 ****************************************************************************/
 
 #include "plugin.h"
-#include "extensionloader.h"
 #include <QtVirtualKeyboard/private/platforminputcontext_p.h>
-#include <QtVirtualKeyboard/private/plaininputmethod_p.h>
-#include <QtVirtualKeyboard/private/qvirtualkeyboard_staticplugin_p.h>
 #include <QLoggingCategory>
-#include <QtQml>
 #if defined(Q_OS_WIN)
 #include <qt_windows.h>
 #endif
@@ -44,7 +40,6 @@ using namespace QtVirtualKeyboard;
 
 Q_LOGGING_CATEGORY(qlcVirtualKeyboard, "qt.virtualkeyboard")
 
-static const char pluginsUri[] = "QtQuick.VirtualKeyboard.Plugins";
 static const char pluginName[] = "qtvirtualkeyboard";
 static const char inputMethodEnvVarName[] = "QT_IM_MODULE";
 
@@ -57,20 +52,6 @@ QPlatformInputContext *QVirtualKeyboardPlugin::create(const QString &system, con
 {
     Q_UNUSED(paramList);
 
-#if defined(QT_STATICPLUGIN)
-#if !defined(QT_VIRTUALKEYBOARD_DISABLE_LAYOUTS)
-    Q_INIT_RESOURCE(qmake_virtualkeyboard_layouts);
-#endif
-    Q_INIT_RESOURCE(virtualkeyboard_content);
-#if !defined(QT_VIRTUALKEYBOARD_NO_BUILTIN_STYLES)
-    Q_INIT_RESOURCE(virtualkeyboard_default_style);
-    Q_INIT_RESOURCE(virtualkeyboard_retro_style);
-#endif
-    Q_VKB_IMPORT_PLUGIN(QtQuickVirtualKeyboardPlugin)
-    Q_VKB_IMPORT_PLUGIN(QtQuickVirtualKeyboardSettingsPlugin)
-    Q_VKB_IMPORT_PLUGIN(QtQuickVirtualKeyboardStylesPlugin)
-#endif
-
     if (!qEnvironmentVariableIsSet(inputMethodEnvVarName) || qgetenv(inputMethodEnvVarName) != pluginName)
         return Q_NULLPTR;
 
@@ -84,62 +65,6 @@ QPlatformInputContext *QVirtualKeyboardPlugin::create(const QString &system, con
 
     PlatformInputContext *platformInputContext = new PlatformInputContext();
 
-    QStringList inputMethodList;
-    inputMethodList.append(QLatin1String("PlainInputMethod"));
-    qRegisterMetaType<PlainInputMethod *>("PlainInputMethod*");
-    qmlRegisterType<PlainInputMethod>(pluginsUri, 1, 0, "PlainInputMethod");
-    qmlRegisterType<PlainInputMethod>(pluginsUri, 2, 0, "PlainInputMethod");
-    qmlRegisterType<PlainInputMethod>(pluginsUri, 2, 3, "PlainInputMethod");
-
-    QMultiHash<QString, QCborMap> extensions = ExtensionLoader::plugins();
-    for (const QString &extensionName : extensions.uniqueKeys()) {
-        QCborMap metaData = ExtensionLoader::loadMeta(extensionName);
-        if (metaData.isEmpty()) {
-            qCWarning(qlcVirtualKeyboard) << "Error loading extension - metadata not found!";
-            continue;
-        }
-
-        const QCborValue &inputMethodValue = metaData.value(QLatin1String("InputMethod"));
-        QStringList inputMethodValueList;
-        if (inputMethodValue.isArray()) {
-            for (const QCborValue v : inputMethodValue.toArray()) {
-                const QString &inputMethod = v.toString();
-                if (!inputMethod.isEmpty())
-                    inputMethodValueList.append(inputMethod);
-            }
-        } else {
-            const QString &inputMethod = inputMethodValue.toString();
-            if (!inputMethod.isEmpty())
-                inputMethodValueList.append(inputMethod);
-        }
-
-        bool ignoreExtension = false;
-        for (const QString &inputMethod : inputMethodValueList) {
-            if (inputMethodList.contains(inputMethod)) {
-                ignoreExtension = true;
-                qCWarning(qlcVirtualKeyboard) << "Ignored extension" << extensionName <<
-                                                 "by" << metaData.value(QLatin1String("Provider")).toString() <<
-                                                 "-" << inputMethod << "is already registered!";
-                break;
-            }
-        }
-
-        if (ignoreExtension)
-            continue;
-
-        qCDebug(qlcVirtualKeyboard) << "Loading extension" << extensionName;
-        QVirtualKeyboardExtensionPlugin *extensionPlugin = ExtensionLoader::loadPlugin(metaData);
-        if (extensionPlugin && !inputMethodValueList.isEmpty()) {
-            extensionPlugin->registerTypes(pluginsUri);
-            inputMethodList.append(inputMethodValueList);
-        }
-    }
-
-    // Auto-increment the import to stay in sync with ALL future QtQuick minor versions
-    qmlRegisterModule(pluginsUri, 2, QT_VERSION_MINOR);
-
-    platformInputContext->setInputMethods(inputMethodList);
-
     return platformInputContext;
 }
 
diff --git a/src/plugin/plugin.h b/src/plugin/plugin.h
index c0548e94..175d4870 100644
--- a/src/plugin/plugin.h
+++ b/src/plugin/plugin.h
@@ -31,8 +31,6 @@
 #define PLUGIN_H
 
 #include <qpa/qplatforminputcontextplugin_p.h>
-#include <QtVirtualKeyboard/private/platforminputcontext_p.h>
-#include <QStringList>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/plugins/CMakeLists.txt b/src/plugins/CMakeLists.txt
index ae02b503..9174648b 100644
--- a/src/plugins/CMakeLists.txt
+++ b/src/plugins/CMakeLists.txt
@@ -1,26 +1,41 @@
-# Generated from plugins.pro.
-
+set(plugins_imports)
 if(QT_FEATURE_cerence_sdk)
     add_subdirectory(cerence)
+    list(APPEND plugins_imports QtQuick.VirtualKeyboard.Plugins.Cerence/auto)
 endif()
 if(QT_FEATURE_hangul)
     add_subdirectory(hangul)
+    list(APPEND plugins_imports QtQuick.VirtualKeyboard.Plugins.Hangul/auto)
 endif()
 if(QT_FEATURE_hunspell)
     add_subdirectory(hunspell)
+    list(APPEND plugins_imports QtQuick.VirtualKeyboard.Plugins.Hunspell/auto)
 endif()
 if(QT_FEATURE_openwnn)
     add_subdirectory(openwnn)
+    list(APPEND plugins_imports QtQuick.VirtualKeyboard.Plugins.OpenWNN/auto)
 endif()
 if(QT_FEATURE_pinyin AND NOT QT_FEATURE_cerence_xt9)
     add_subdirectory(pinyin)
+    list(APPEND plugins_imports QtQuick.VirtualKeyboard.Plugins.Pinyin/auto)
 endif()
 if(QT_FEATURE_tcime)
     add_subdirectory(tcime)
+    list(APPEND plugins_imports QtQuick.VirtualKeyboard.Plugins.TCIme/auto)
 endif()
 if(QT_FEATURE_myscript)
     add_subdirectory(myscript)
+    list(APPEND plugins_imports QtQuick.VirtualKeyboard.Plugins.MyScript/auto)
 endif()
 if(QT_FEATURE_thai)
     add_subdirectory(thai)
+    list(APPEND plugins_imports QtQuick.VirtualKeyboard.Plugins.Thai/auto)
 endif()
+
+qt_internal_add_qml_module(qtvkbpluginsplugin
+    URI "QtQuick.VirtualKeyboard.Plugins"
+    VERSION "${PROJECT_VERSION}"
+    PLUGIN_TARGET qtvkbpluginsplugin
+    IMPORTS
+        ${plugins_imports}
+)
diff --git a/src/plugins/cerence/CMakeLists.txt b/src/plugins/cerence/CMakeLists.txt
index e9863e9d..2d9f9cbb 100644
--- a/src/plugins/cerence/CMakeLists.txt
+++ b/src/plugins/cerence/CMakeLists.txt
@@ -1,9 +1,19 @@
-# Generated from cerence.pro.
+set(cerence_imports)
 
 add_subdirectory(cerencecommon)
 if(QT_FEATURE_cerence_hwr)
-    add_subdirectory(cerence-hwr)
+    add_subdirectory(hwr)
+    list(APPEND cerence_imports QtQuick.VirtualKeyboard.Plugins.Cerence.HWR/auto)
 endif()
 if(QT_FEATURE_cerence_xt9)
     add_subdirectory(xt9)
+    list(APPEND cerence_imports QtQuick.VirtualKeyboard.Plugins.Cerence.XT9/auto)
 endif()
+
+qt_internal_add_qml_module(qtvkbcerenceplugin
+    URI "QtQuick.VirtualKeyboard.Plugins.Cerence"
+    VERSION "${PROJECT_VERSION}"
+    PLUGIN_TARGET qtvkbcerenceplugin
+    IMPORTS
+        ${cerence_imports}
+)
diff --git a/src/plugins/cerence/cerence-hwr/plugin/CMakeLists.txt b/src/plugins/cerence/cerence-hwr/plugin/CMakeLists.txt
deleted file mode 100644
index 0dc94935..00000000
--- a/src/plugins/cerence/cerence-hwr/plugin/CMakeLists.txt
+++ /dev/null
@@ -1,647 +0,0 @@
-# Generated from plugin.pro.
-
-#####################################################################
-## QtVirtualKeyboardCerenceHwrPlugin Plugin:
-#####################################################################
-
-qt_internal_add_plugin(QtVirtualKeyboardCerenceHwrPlugin
-    OUTPUT_NAME qtvirtualkeyboard_cerence_hwr
-    PLUGIN_TYPE virtualkeyboard
-    SOURCES
-        cerence_hwr_p.h
-        qtvirtualkeyboardcerencehwrplugin.cpp qtvirtualkeyboardcerencehwrplugin.h
-        t9writeabstractdictionary_p.h
-        t9writedictionary.cpp t9writedictionary_p.h
-        t9writeinputmethod.cpp t9writeinputmethod_p.h
-        t9writewordcandidate.cpp t9writewordcandidate_p.h
-        t9writeworker.cpp t9writeworker_p.h
-    DEFINES
-        HAVE_CERENCE_HWR
-        QT_ASCII_CAST_WARNINGS
-        QT_NO_CAST_FROM_ASCII
-        QT_NO_CAST_FROM_BYTEARRAY
-        QT_NO_CAST_TO_ASCII
-    LIBRARIES
-        Qt::BundledCerencecommon
-    PUBLIC_LIBRARIES
-        Qt::Core
-        Qt::Gui
-        Qt::Qml
-        Qt::VirtualKeyboardPrivate
-)
-
-# Resources:
-set(qmake_virtualkeyboard_cerence_hwr_layouts_resource_files
-    "${VKB_LAYOUTS_BASE}/content/layouts/fallback/handwriting.qml"
-)
-
-if (QT_FEATURE_vkb_lang_en_GB)
-    list(APPEND qmake_virtualkeyboard_cerence_hwr_layouts_resource_files
-        "${VKB_LAYOUTS_BASE}/content/layouts/en_GB/handwriting.fallback"
-    )
-endif()
-
-if (QT_FEATURE_vkb_lang_en_US)
-    list(APPEND qmake_virtualkeyboard_cerence_hwr_layouts_resource_files
-        "${VKB_LAYOUTS_BASE}/content/layouts/en_US/handwriting.fallback"
-    )
-endif()
-
-if (QT_FEATURE_vkb_lang_ar_AR)
-    list(APPEND qmake_virtualkeyboard_cerence_hwr_layouts_resource_files
-        "${VKB_LAYOUTS_BASE}/content/layouts/ar_AR/handwriting.qml"
-    )
-endif()
-
-if (QT_FEATURE_vkb_lang_bg_BG)
-    list(APPEND qmake_virtualkeyboard_cerence_hwr_layouts_resource_files
-        "${VKB_LAYOUTS_BASE}/content/layouts/bg_BG/handwriting.qml"
-    )
-endif()
-
-if (QT_FEATURE_vkb_lang_cs_CZ)
-    list(APPEND qmake_virtualkeyboard_cerence_hwr_layouts_resource_files
-        "${VKB_LAYOUTS_BASE}/content/layouts/cs_CZ/handwriting.qml"
-    )
-endif()
-
-if (QT_FEATURE_vkb_lang_da_DK)
-    list(APPEND qmake_virtualkeyboard_cerence_hwr_layouts_resource_files
-        "${VKB_LAYOUTS_BASE}/content/layouts/da_DK/handwriting.fallback"
-    )
-endif()
-
-if (QT_FEATURE_vkb_lang_de_DE)
-    list(APPEND qmake_virtualkeyboard_cerence_hwr_layouts_resource_files
-        "${VKB_LAYOUTS_BASE}/content/layouts/de_DE/handwriting.fallback"
-    )
-endif()
-
-if (QT_FEATURE_vkb_lang_el_GR)
-    list(APPEND qmake_virtualkeyboard_cerence_hwr_layouts_resource_files
-        "${VKB_LAYOUTS_BASE}/content/layouts/el_GR/handwriting.qml"
-    )
-endif()
-
-if (QT_FEATURE_vkb_lang_es_ES)
-    list(APPEND qmake_virtualkeyboard_cerence_hwr_layouts_resource_files
-        "${VKB_LAYOUTS_BASE}/content/layouts/es_ES/handwriting.qml"
-    )
-endif()
-
-if (QT_FEATURE_vkb_lang_es_MX)
-    list(APPEND qmake_virtualkeyboard_cerence_hwr_layouts_resource_files
-        "${VKB_LAYOUTS_BASE}/content/layouts/es_MX/handwriting.qml"
-    )
-endif()
-
-if (QT_FEATURE_vkb_lang_et_EE)
-    list(APPEND qmake_virtualkeyboard_cerence_hwr_layouts_resource_files
-        "${VKB_LAYOUTS_BASE}/content/layouts/et_EE/handwriting.fallback"
-    )
-endif()
-
-if (QT_FEATURE_vkb_lang_fa_FA)
-    list(APPEND qmake_virtualkeyboard_cerence_hwr_layouts_resource_files
-        "${VKB_LAYOUTS_BASE}/content/layouts/fa_FA/handwriting.qml"
-    )
-endif()
-
-if (QT_FEATURE_vkb_lang_fi_FI)
-    list(APPEND qmake_virtualkeyboard_cerence_hwr_layouts_resource_files
-        "${VKB_LAYOUTS_BASE}/content/layouts/fi_FI/handwriting.fallback"
-    )
-endif()
-
-if (QT_FEATURE_vkb_lang_fr_FR)
-    list(APPEND qmake_virtualkeyboard_cerence_hwr_layouts_resource_files
-        "${VKB_LAYOUTS_BASE}/content/layouts/fr_FR/handwriting.fallback"
-    )
-endif()
-
-if (QT_FEATURE_vkb_lang_fr_CA)
-    list(APPEND qmake_virtualkeyboard_cerence_hwr_layouts_resource_files
-        "${VKB_LAYOUTS_BASE}/content/layouts/fr_CA/handwriting.fallback"
-    )
-endif()
-
-if (QT_FEATURE_vkb_lang_he_IL)
-    list(APPEND qmake_virtualkeyboard_cerence_hwr_layouts_resource_files
-        "${VKB_LAYOUTS_BASE}/content/layouts/he_IL/handwriting.qml"
-    )
-endif()
-
-if (QT_FEATURE_vkb_lang_hr_HR)
-    list(APPEND qmake_virtualkeyboard_cerence_hwr_layouts_resource_files
-        "${VKB_LAYOUTS_BASE}/content/layouts/hr_HR/handwriting.qml"
-    )
-endif()
-
-if (QT_FEATURE_vkb_lang_hu_HU)
-    list(APPEND qmake_virtualkeyboard_cerence_hwr_layouts_resource_files
-        "${VKB_LAYOUTS_BASE}/content/layouts/hu_HU/handwriting.qml"
-    )
-endif()
-
-if (QT_FEATURE_vkb_lang_id_ID)
-    list(APPEND qmake_virtualkeyboard_cerence_hwr_layouts_resource_files
-        "${VKB_LAYOUTS_BASE}/content/layouts/id_ID/handwriting.fallback"
-    )
-endif()
-
-if (QT_FEATURE_vkb_lang_it_IT)
-    list(APPEND qmake_virtualkeyboard_cerence_hwr_layouts_resource_files
-        "${VKB_LAYOUTS_BASE}/content/layouts/it_IT/handwriting.fallback"
-    )
-endif()
-
-if (QT_FEATURE_vkb_lang_ms_MY)
-    list(APPEND qmake_virtualkeyboard_cerence_hwr_layouts_resource_files
-        "${VKB_LAYOUTS_BASE}/content/layouts/ms_MY/handwriting.fallback"
-    )
-endif()
-
-if (QT_FEATURE_vkb_lang_nb_NO)
-    list(APPEND qmake_virtualkeyboard_cerence_hwr_layouts_resource_files
-        "${VKB_LAYOUTS_BASE}/content/layouts/nb_NO/handwriting.fallback"
-    )
-endif()
-
-if (QT_FEATURE_vkb_lang_nl_NL)
-    list(APPEND qmake_virtualkeyboard_cerence_hwr_layouts_resource_files
-        "${VKB_LAYOUTS_BASE}/content/layouts/nl_NL/handwriting.fallback"
-    )
-endif()
-
-if (QT_FEATURE_vkb_lang_pl_PL)
-    list(APPEND qmake_virtualkeyboard_cerence_hwr_layouts_resource_files
-        "${VKB_LAYOUTS_BASE}/content/layouts/pl_PL/handwriting.fallback"
-    )
-endif()
-
-if (QT_FEATURE_vkb_lang_pt_BR)
-    list(APPEND qmake_virtualkeyboard_cerence_hwr_layouts_resource_files
-        "${VKB_LAYOUTS_BASE}/content/layouts/pt_BR/handwriting.fallback"
-    )
-endif()
-
-if (QT_FEATURE_vkb_lang_pt_PT)
-    list(APPEND qmake_virtualkeyboard_cerence_hwr_layouts_resource_files
-        "${VKB_LAYOUTS_BASE}/content/layouts/pt_PT/handwriting.fallback"
-    )
-endif()
-
-if (QT_FEATURE_vkb_lang_ro_RO)
-    list(APPEND qmake_virtualkeyboard_cerence_hwr_layouts_resource_files
-        "${VKB_LAYOUTS_BASE}/content/layouts/ro_RO/handwriting.qml"
-    )
-endif()
-
-if (QT_FEATURE_vkb_lang_ru_RU)
-    list(APPEND qmake_virtualkeyboard_cerence_hwr_layouts_resource_files
-        "${VKB_LAYOUTS_BASE}/content/layouts/ru_RU/handwriting.qml"
-    )
-endif()
-
-if (QT_FEATURE_vkb_lang_sk_SK)
-    list(APPEND qmake_virtualkeyboard_cerence_hwr_layouts_resource_files
-        "${VKB_LAYOUTS_BASE}/content/layouts/sk_SK/handwriting.fallback"
-    )
-endif()
-
-if (QT_FEATURE_vkb_lang_sl_SI)
-    list(APPEND qmake_virtualkeyboard_cerence_hwr_layouts_resource_files
-        "${VKB_LAYOUTS_BASE}/content/layouts/sl_SI/handwriting.fallback"
-    )
-endif()
-
-if (QT_FEATURE_vkb_lang_sq_AL)
-    list(APPEND qmake_virtualkeyboard_cerence_hwr_layouts_resource_files
-        "${VKB_LAYOUTS_BASE}/content/layouts/sq_AL/handwriting.fallback"
-    )
-endif()
-
-if (QT_FEATURE_vkb_lang_sr_SP)
-    list(APPEND qmake_virtualkeyboard_cerence_hwr_layouts_resource_files
-        "${VKB_LAYOUTS_BASE}/content/layouts/sr_SP/handwriting.qml"
-    )
-endif()
-
-if (QT_FEATURE_vkb_lang_sv_SE)
-    list(APPEND qmake_virtualkeyboard_cerence_hwr_layouts_resource_files
-        "${VKB_LAYOUTS_BASE}/content/layouts/sv_SE/handwriting.fallback"
-    )
-endif()
-
-if (QT_FEATURE_vkb_lang_th_TH)
-    list(APPEND qmake_virtualkeyboard_cerence_hwr_layouts_resource_files
-        "${VKB_LAYOUTS_BASE}/content/layouts/th_TH/handwriting.qml"
-    )
-endif()
-
-if (QT_FEATURE_vkb_lang_tr_TR)
-    list(APPEND qmake_virtualkeyboard_cerence_hwr_layouts_resource_files
-        "${VKB_LAYOUTS_BASE}/content/layouts/tr_TR/handwriting.fallback"
-    )
-endif()
-
-if (QT_FEATURE_vkb_lang_uk_UA)
-    list(APPEND qmake_virtualkeyboard_cerence_hwr_layouts_resource_files
-        "${VKB_LAYOUTS_BASE}/content/layouts/uk_UA/handwriting.qml"
-    )
-endif()
-
-if (QT_FEATURE_vkb_lang_vi_VN)
-    list(APPEND qmake_virtualkeyboard_cerence_hwr_layouts_resource_files
-        "${VKB_LAYOUTS_BASE}/content/layouts/vi_VN/handwriting.fallback"
-    )
-endif()
-
-if (QT_FEATURE_vkb_lang_ja_JP)
-    list(APPEND qmake_virtualkeyboard_cerence_hwr_layouts_resource_files
-        "${VKB_LAYOUTS_BASE}/content/layouts/ja_JP/handwriting.qml"
-    )
-endif()
-
-if (QT_FEATURE_vkb_lang_ko_KR)
-    list(APPEND qmake_virtualkeyboard_cerence_hwr_layouts_resource_files
-        "${VKB_LAYOUTS_BASE}/content/layouts/ko_KR/handwriting.qml"
-    )
-endif()
-
-if (QT_FEATURE_vkb_lang_zh_CN)
-    list(APPEND qmake_virtualkeyboard_cerence_hwr_layouts_resource_files
-        "${VKB_LAYOUTS_BASE}/content/layouts/zh_CN/handwriting.qml"
-    )
-endif()
-
-if (QT_FEATURE_vkb_lang_zh_TW)
-    list(APPEND qmake_virtualkeyboard_cerence_hwr_layouts_resource_files
-        "${VKB_LAYOUTS_BASE}/content/layouts/zh_TW/handwriting.qml"
-    )
-endif()
-
-qt_internal_add_resource(QtVirtualKeyboardCerenceHwrPlugin "qmake_virtualkeyboard_cerence_hwr_layouts"
-    PREFIX
-        "${VKB_LAYOUTS_PREFIX}"
-    BASE
-        "${VKB_LAYOUTS_BASE}"
-    FILES
-        ${qmake_virtualkeyboard_cerence_hwr_layouts_resource_files}
-)
-
-set(qmake_virtualkeyboard_cerence_hwr_custom_layouts_resource_files)
-if (QT_FEATURE_vkb_lang_zh_HK)
-    list(APPEND qmake_virtualkeyboard_cerence_hwr_custom_layouts_resource_files
-        "${CMAKE_CURRENT_SOURCE_DIR}/content/layouts/zh_HK/handwriting.qml"
-    )
-endif()
-
-qt_internal_add_resource(QtVirtualKeyboardCerenceHwrPlugin "qmake_virtualkeyboard_cerence_hwr_custom_layouts"
-    PREFIX
-        "${VKB_LAYOUTS_PREFIX}"
-    BASE
-        "${CMAKE_CURRENT_SOURCE_DIR}"
-    FILES
-        ${qmake_virtualkeyboard_cerence_hwr_custom_layouts_resource_files}
-)
-
-#### Keys ignored in scope 1:.:.:plugin.pro:<TRUE>:
-# DISTFILES = "cerence_hwr.json"
-# OTHER_FILES = "$$LAYOUT_FILES"
-# virtualkeyboard_cerence_hwr_custom_layouts.base = "$$PWD"
-# virtualkeyboard_cerence_hwr_custom_layouts.prefix = "$$LAYOUTS_PREFIX"
-
-## Scopes:
-#####################################################################
-
-qt_internal_extend_target(QtVirtualKeyboardCerenceHwrPlugin CONDITION QT_FEATURE_cerence_xt9
-    DEFINES
-        HAVE_XT9
-    LIBRARIES
-        Qt::BundledXt9Common
-)
-
-qt_internal_extend_target(QtVirtualKeyboardCerenceHwrPlugin CONDITION QT_FEATURE_cerence_hwr_alphabetic
-    DEFINES
-        HAVE_CERENCE_HWR_ALPHABETIC
-    LIBRARIES
-        Cerence::HWR::Alphabetic
-)
-
-qt_internal_extend_target(QtVirtualKeyboardCerenceHwrPlugin CONDITION QT_FEATURE_cerence_hwr_cjk
-    DEFINES
-        HAVE_CERENCE_HWR_CJK
-    LIBRARIES
-        Cerence::HWR::CJK
-)
-
-qt_internal_extend_target(QtVirtualKeyboardCerenceHwrPlugin CONDITION FEATURE_vkb_bundle_cerence OR FEATURE_vkb_bundle_cerence_hwr
-    DEFINES
-        HAVE_CERENCE_HWR_RESOURCE
-)
-
-if(FEATURE_vkb_bundle_cerence OR FEATURE_vkb_bundle_cerence_hwr)
-    set(resource_glob_0)
-    if(FEATURE_vkb_lang_ar_AR OR FEATURE_vkb_lang_fa_FA)
-        file(GLOB resource_glob_0 RELATIVE "${CERENCE_HWR_DATAPATH}" "${CERENCE_HWR_DATAPATH}/arabic/*.bin")
-        foreach(file IN LISTS resource_glob_0)
-            set_source_files_properties("${CERENCE_HWR_DATAPATH}/${file}" PROPERTIES QT_RESOURCE_ALIAS "${file}")
-        endforeach()
-    endif()
-
-    set(resource_glob_1)
-    if(FEATURE_vkb_lang_he_IL)
-        file(GLOB resource_glob_1 RELATIVE "${CERENCE_HWR_DATAPATH}" "${CERENCE_HWR_DATAPATH}/hebrew/*.bin")
-        foreach(file IN LISTS resource_glob_1)
-            set_source_files_properties("${CERENCE_HWR_DATAPATH}/${file}" PROPERTIES QT_RESOURCE_ALIAS "${file}")
-        endforeach()
-    endif()
-
-    set(resource_glob_2)
-    if(FEATURE_vkb_lang_th_TH)
-        file(GLOB resource_glob_2 RELATIVE "${CERENCE_HWR_DATAPATH}" "${CERENCE_HWR_DATAPATH}/thai/*.bin")
-        foreach(file IN LISTS resource_glob_2)
-            set_source_files_properties("${CERENCE_HWR_DATAPATH}/${file}" PROPERTIES QT_RESOURCE_ALIAS "${file}")
-        endforeach()
-    endif()
-
-    file(GLOB resource_glob_3 RELATIVE "${CERENCE_HWR_DATAPATH}" "${CERENCE_HWR_DATAPATH}/*.bin")
-    foreach(file IN LISTS resource_glob_3)
-        set_source_files_properties("${CERENCE_HWR_DATAPATH}/${file}" PROPERTIES QT_RESOURCE_ALIAS "${file}")
-    endforeach()
-
-    file(GLOB resource_glob_4 RELATIVE "${CERENCE_HWR_DATAPATH}" "${CERENCE_HWR_DATAPATH}/*.hdb")
-    foreach(file IN LISTS resource_glob_4)
-        set_source_files_properties("${CERENCE_HWR_DATAPATH}/${file}" PROPERTIES QT_RESOURCE_ALIAS "${file}")
-    endforeach()
-
-    file(GLOB resource_glob_5 RELATIVE "${CERENCE_HWR_DATAPATH}" "${CERENCE_HWR_DATAPATH}/*.phd")
-    foreach(file IN LISTS resource_glob_5)
-        set_source_files_properties("${CERENCE_HWR_DATAPATH}/${file}" PROPERTIES QT_RESOURCE_ALIAS "${file}")
-    endforeach()
-
-    # Resources:
-    set(qmake_cerencehwrdata_db_resource_files
-        ${resource_glob_0}
-        ${resource_glob_1}
-        ${resource_glob_2}
-        ${resource_glob_3}
-        ${resource_glob_4}
-        ${resource_glob_5}
-    )
-
-    qt_internal_add_resource(QtVirtualKeyboardCerenceHwrPlugin "qmake_cerencehwrdata_db"
-        PREFIX
-            "/QtQuick/VirtualKeyboard/Cerence/Handwriting"
-        BASE
-            "${CERENCE_HWR_DATAPATH}"
-        FILES
-            ${qmake_cerencehwrdata_db_resource_files}
-        OPTIONS
-            -no-compress
-    )
-else()
-    qt_copy_or_install(
-        DIRECTORY "${CERENCE_HWR_DATAPATH}/"
-        DESTINATION "${VKB_INSTALL_DATA}/cerence/handwriting"
-    )
-endif()
-
-if(QT_FEATURE_cerence_hwr_alphabetic AND NOT FEATURE_vkb_cerence_static)
-    qt_copy_or_install(
-        FILES "${CERENCE_HWR_ALPHABETIC_BINARIES}"
-        DESTINATION "${QT_BUILD_DIR}/${INSTALL_BINDIR}"
-    )
-endif()
-
-if(QT_FEATURE_cerence_hwr_cjk AND NOT FEATURE_vkb_cerence_static)
-    qt_copy_or_install(
-        FILES "${CERENCE_HWR_CJK_BINARIES}"
-        DESTINATION "${QT_BUILD_DIR}/${INSTALL_BINDIR}"
-    )
-endif()
-
-#### Keys ignored in scope 48:.:.:plugin.pro:FEATURE_vkb_bundle_cerence OR FEATURE_vkb_bundle_cerence_hwr:
-# QMAKE_RESOURCE_FLAGS = "-no-compress"
-
-#### Keys ignored in scope 50:.:.:plugin.pro:NOT CERENCE_HWR_ALPHABETIC_BINS_ISEMPTY:
-# INSTALLS = "t9write_alphabetic_bins"
-# t9write_alphabetic_bins.files = "$$CERENCE_HWR_ALPHABETIC_BINS"
-
-#### Keys ignored in scope 51:.:.:plugin.pro:WIN32 OR win64:
-# t9write_alphabetic_bins.path = "$$[QT_INSTALL_BINS]"
-
-#### Keys ignored in scope 52:.:.:plugin.pro:else:
-# t9write_alphabetic_bins.path = "$$[QT_INSTALL_LIBS]"
-
-#### Keys ignored in scope 53:.:.:plugin.pro:NOT prefix_build:
-# COPIES = "t9write_alphabetic_bins"
-
-#### Keys ignored in scope 55:.:.:plugin.pro:NOT CERENCE_HWR_CJK_BINS_ISEMPTY:
-# INSTALLS = "t9write_cjk_bins"
-# t9write_cjk_bins.files = "$$CERENCE_HWR_CJK_BINS"
-
-#### Keys ignored in scope 56:.:.:plugin.pro:WIN32 OR win64:
-# t9write_cjk_bins.path = "$$[QT_INSTALL_BINS]"
-
-#### Keys ignored in scope 57:.:.:plugin.pro:else:
-# t9write_cjk_bins.path = "$$[QT_INSTALL_LIBS]"
-
-#### Keys ignored in scope 58:.:.:plugin.pro:NOT prefix_build:
-# COPIES = "t9write_cjk_bins"
-
-#### Keys ignored in scope 59:.:.:plugin.pro:WIN32:
-# QMAKE_TARGET_DESCRIPTION = "Virtual Keyboard Extension for Qt."
-# QMAKE_TARGET_PRODUCT = "Qt Virtual Keyboard Cerence Handwriting (Qt $$QT_VERSION)"
-
-#### Keys ignored in scope 105:.:../../../../plugins/myscript/3rdparty/myscript:../../../../plugins/myscript/3rdparty/myscript/myscript.pri:MYSCRIPT_PATH_ISEMPTY:
-# MYSCRIPT_PATH = "$$PWD"
-
-#### Keys ignored in scope 106:.:../../../../plugins/myscript/3rdparty/myscript:../../../../plugins/myscript/3rdparty/myscript/myscript.pri:UNIX AND LINUX AND NOT ANDROID:
-# MYSCRIPT_LIB_PREFIX = "lib"
-# MYSCRIPT_LIB_SUFFIX = ".so"
-# MYSCRIPT_VOIM_LIB_NAME = "libvoim.so"
-# MYSCRIPT_VOIM_LIB_PATH = "$$MYSCRIPT_PATH/$$MYSCRIPT_VOIM_PATH/$$MYSCRIPT_VOIM_LIB_NAME"
-
-#### Keys ignored in scope 107:.:../../../../plugins/myscript/3rdparty/myscript:../../../../plugins/myscript/3rdparty/myscript/myscript.pri:QT_ARCH___equals___arm64:
-# MYSCRIPT_ENGINE_PATH = "engine/bin/lin-arm64"
-# MYSCRIPT_VOIM_PATH = "voim/bin/lin-arm64"
-
-#### Keys ignored in scope 109:.:../../../../plugins/myscript/3rdparty/myscript:../../../../plugins/myscript/3rdparty/myscript/myscript.pri:QT_ARCH___equals___arm:
-# MYSCRIPT_ENGINE_PATH = "engine/bin/lin-armv7"
-# MYSCRIPT_VOIM_PATH = "voim/bin/lin-armv7"
-
-#### Keys ignored in scope 111:.:../../../../plugins/myscript/3rdparty/myscript:../../../../plugins/myscript/3rdparty/myscript/myscript.pri:QT_ARCH___equals___x86_64:
-# MYSCRIPT_ENGINE_PATH = "engine/bin/lin-x64"
-# MYSCRIPT_VOIM_PATH = "voim/bin/lin-x64"
-
-#### Keys ignored in scope 113:.:../../../../plugins/myscript/3rdparty/myscript:../../../../plugins/myscript/3rdparty/myscript/myscript.pri:QT_ARCH___equals___x86 OR QT_ARCH___equals___i386:
-# MYSCRIPT_ENGINE_PATH = "engine/bin/lin-x86"
-# MYSCRIPT_VOIM_PATH = "voim/bin/lin-x86"
-
-#### Keys ignored in scope 114:.:../../../../plugins/myscript/3rdparty/myscript:../../../../plugins/myscript/3rdparty/myscript/myscript.pri:else:
-# MYSCRIPT_ENGINE_PATH = "engine/bin/lin-$$QT_ARCH"
-# MYSCRIPT_VOIM_PATH = "voim/bin/lin-$$QT_ARCH"
-
-#### Keys ignored in scope 116:.:../../../../plugins/myscript/3rdparty/myscript:../../../../plugins/myscript/3rdparty/myscript/myscript.pri:WIN32 OR win64:
-# MYSCRIPT_LIB_PREFIX = ""
-# MYSCRIPT_LIB_SUFFIX = ".dll"
-# MYSCRIPT_VOIM_LIB_NAME = "voim.lib"
-# MYSCRIPT_VOIM_LIB_PATH = "$$MYSCRIPT_PATH/voim/api/c/lib/$$MYSCRIPT_VOIM_LIB_NAME"
-
-#### Keys ignored in scope 117:.:../../../../plugins/myscript/3rdparty/myscript:../../../../plugins/myscript/3rdparty/myscript/myscript.pri:QT_ARCH___equals___x86_64:
-# MYSCRIPT_ENGINE_PATH = "engine/bin/win-x64"
-# MYSCRIPT_VOIM_PATH = "voim/bin/win-x64"
-
-#### Keys ignored in scope 118:.:../../../../plugins/myscript/3rdparty/myscript:../../../../plugins/myscript/3rdparty/myscript/myscript.pri:else:
-# MYSCRIPT_ENGINE_PATH = "engine/bin/win-x86"
-# MYSCRIPT_VOIM_PATH = "voim/bin/win-x86"
-
-#### Keys ignored in scope 120:.:../../../../plugins/myscript/3rdparty/myscript:../../../../plugins/myscript/3rdparty/myscript/myscript.pri:EXISTS _ss_MYSCRIPT_VOIM_LIB_PATH:
-# MYSCRIPT_FOUND = "1"
-
-#### Keys ignored in scope 122:.:../../../../plugins/myscript/3rdparty/myscript:../../../../plugins/myscript/3rdparty/myscript/myscript.pri:MYSCRIPT_PATH_ISEMPTY:
-# MYSCRIPT_PATH = "$$PWD"
-
-#### Keys ignored in scope 123:.:../../../../plugins/myscript/3rdparty/myscript:../../../../plugins/myscript/3rdparty/myscript/myscript.pri:UNIX AND LINUX AND NOT ANDROID:
-# MYSCRIPT_LIB_PREFIX = "lib"
-# MYSCRIPT_LIB_SUFFIX = ".so"
-# MYSCRIPT_VOIM_LIB_NAME = "libvoim.so"
-# MYSCRIPT_VOIM_LIB_PATH = "$$MYSCRIPT_PATH/$$MYSCRIPT_VOIM_PATH/$$MYSCRIPT_VOIM_LIB_NAME"
-
-#### Keys ignored in scope 124:.:../../../../plugins/myscript/3rdparty/myscript:../../../../plugins/myscript/3rdparty/myscript/myscript.pri:QT_ARCH___equals___arm64:
-# MYSCRIPT_ENGINE_PATH = "engine/bin/lin-arm64"
-# MYSCRIPT_VOIM_PATH = "voim/bin/lin-arm64"
-
-#### Keys ignored in scope 126:.:../../../../plugins/myscript/3rdparty/myscript:../../../../plugins/myscript/3rdparty/myscript/myscript.pri:QT_ARCH___equals___arm:
-# MYSCRIPT_ENGINE_PATH = "engine/bin/lin-armv7"
-# MYSCRIPT_VOIM_PATH = "voim/bin/lin-armv7"
-
-#### Keys ignored in scope 128:.:../../../../plugins/myscript/3rdparty/myscript:../../../../plugins/myscript/3rdparty/myscript/myscript.pri:QT_ARCH___equals___x86_64:
-# MYSCRIPT_ENGINE_PATH = "engine/bin/lin-x64"
-# MYSCRIPT_VOIM_PATH = "voim/bin/lin-x64"
-
-#### Keys ignored in scope 130:.:../../../../plugins/myscript/3rdparty/myscript:../../../../plugins/myscript/3rdparty/myscript/myscript.pri:QT_ARCH___equals___x86 OR QT_ARCH___equals___i386:
-# MYSCRIPT_ENGINE_PATH = "engine/bin/lin-x86"
-# MYSCRIPT_VOIM_PATH = "voim/bin/lin-x86"
-
-#### Keys ignored in scope 131:.:../../../../plugins/myscript/3rdparty/myscript:../../../../plugins/myscript/3rdparty/myscript/myscript.pri:else:
-# MYSCRIPT_ENGINE_PATH = "engine/bin/lin-$$QT_ARCH"
-# MYSCRIPT_VOIM_PATH = "voim/bin/lin-$$QT_ARCH"
-
-#### Keys ignored in scope 133:.:../../../../plugins/myscript/3rdparty/myscript:../../../../plugins/myscript/3rdparty/myscript/myscript.pri:WIN32 OR win64:
-# MYSCRIPT_LIB_PREFIX = ""
-# MYSCRIPT_LIB_SUFFIX = ".dll"
-# MYSCRIPT_VOIM_LIB_NAME = "voim.lib"
-# MYSCRIPT_VOIM_LIB_PATH = "$$MYSCRIPT_PATH/voim/api/c/lib/$$MYSCRIPT_VOIM_LIB_NAME"
-
-#### Keys ignored in scope 134:.:../../../../plugins/myscript/3rdparty/myscript:../../../../plugins/myscript/3rdparty/myscript/myscript.pri:QT_ARCH___equals___x86_64:
-# MYSCRIPT_ENGINE_PATH = "engine/bin/win-x64"
-# MYSCRIPT_VOIM_PATH = "voim/bin/win-x64"
-
-#### Keys ignored in scope 135:.:../../../../plugins/myscript/3rdparty/myscript:../../../../plugins/myscript/3rdparty/myscript/myscript.pri:else:
-# MYSCRIPT_ENGINE_PATH = "engine/bin/win-x86"
-# MYSCRIPT_VOIM_PATH = "voim/bin/win-x86"
-
-#### Keys ignored in scope 137:.:../../../../plugins/myscript/3rdparty/myscript:../../../../plugins/myscript/3rdparty/myscript/myscript.pri:EXISTS _ss_MYSCRIPT_VOIM_LIB_PATH:
-# MYSCRIPT_FOUND = "1"
-
-#### Keys ignored in scope 139:.:../../../../plugins/cerence:../../../../plugins/cerence/cerence.pri:CERENCE_SDK_ROOT_ISEMPTY:
-# EXT_CERENCE_SDK_ROOT = "$$(CERENCE_SDK_ROOT)"
-
-#### Keys ignored in scope 140:.:../../../../plugins/cerence:../../../../plugins/cerence/cerence.pri:NOT EXT_CERENCE_SDK_ROOT_ISEMPTY:
-# CERENCE_SDK_ROOT = "$$EXT_CERENCE_SDK_ROOT"
-
-#### Keys ignored in scope 142:.:../../../../plugins/cerence:../../../../plugins/cerence/cerence.pri:CERENCE_SDK_ROOT_ISEMPTY:
-# CERENCE_SDK_ROOT = "$$PWD/sdk"
-
-#### Keys ignored in scope 145:.:../../../../plugins/cerence:../../../../plugins/cerence/cerence.pri:QT_ARCH___equals___arm:
-# CERENCE_SHARED_LIB_PATH = "lib/linux/arm/shared"
-# CERENCE_STATIC_LIB_PATH = "lib/linux/arm/static"
-
-#### Keys ignored in scope 147:.:../../../../plugins/cerence:../../../../plugins/cerence/cerence.pri:QT_ARCH___equals___arm64:
-# CERENCE_SHARED_LIB_PATH = "lib/linux/arm64/shared"
-# CERENCE_STATIC_LIB_PATH = "lib/linux/arm64/static"
-
-#### Keys ignored in scope 149:.:../../../../plugins/cerence:../../../../plugins/cerence/cerence.pri:QT_ARCH___equals___x86_64:
-# CERENCE_SHARED_LIB_PATH = "lib/linux/x86_64/shared"
-# CERENCE_STATIC_LIB_PATH = "lib/linux/x86_64/static"
-
-#### Keys ignored in scope 151:.:../../../../plugins/cerence:../../../../plugins/cerence/cerence.pri:QT_ARCH___equals___x86 OR QT_ARCH___equals___i386:
-# CERENCE_SHARED_LIB_PATH = "lib/linux/x86/shared"
-# CERENCE_STATIC_LIB_PATH = "lib/linux/x86/static"
-
-#### Keys ignored in scope 154:.:../../../../plugins/cerence:../../../../plugins/cerence/cerence.pri:QT_ARCH___equals___x86_64:
-# CERENCE_SHARED_LIB_PATH = "lib/win32/x86_64/shared"
-# CERENCE_STATIC_LIB_PATH = "lib/win32/x86_64/static"
-
-#### Keys ignored in scope 155:.:../../../../plugins/cerence:../../../../plugins/cerence/cerence.pri:else:
-# CERENCE_SHARED_LIB_PATH = "lib/win32/x86/shared"
-# CERENCE_STATIC_LIB_PATH = "lib/win32/x86/static"
-
-#### Keys ignored in scope 157:.:../../../../plugins/cerence:../../../../plugins/cerence/cerence.pri:WIN32:
-# result = "$$1/*.obj"
-
-#### Keys ignored in scope 158:.:../../../../plugins/cerence:../../../../plugins/cerence/cerence.pri:result_ISEMPTY:
-# result = "$$1/*.lib"
-
-#### Keys ignored in scope 159:.:../../../../plugins/cerence:../../../../plugins/cerence/cerence.pri:else:
-# result = "$$1/*.o"
-
-#### Keys ignored in scope 160:.:../../../../plugins/cerence:../../../../plugins/cerence/cerence.pri:result_ISEMPTY:
-# result = "$$1/*.a"
-
-#### Keys ignored in scope 162:.:../../../../plugins/cerence:../../../../plugins/cerence/cerence.pri:WIN32:
-# result = "$$1/*.lib"
-
-#### Keys ignored in scope 163:.:../../../../plugins/cerence:../../../../plugins/cerence/cerence.pri:else:
-# result = "$$1/*.so"
-
-#### Keys ignored in scope 165:.:../../../../plugins/cerence:../../../../plugins/cerence/cerence.pri:WIN32:
-# result = "$$1/*.dll"
-
-#### Keys ignored in scope 166:.:../../../../plugins/cerence:../../../../plugins/cerence/cerence.pri:else:
-# result = "$$1/*.so"
-
-#### Keys ignored in scope 167:.:../../../../plugins/cerence:../../../../plugins/cerence/cerence.pri:EXISTS _ss_CERENCE_HWR_INCLUDEPATH/decuma_hwr.h:
-# CERENCE_HWR_ALPHABETIC_FOUND = "1"
-
-#### Keys ignored in scope 168:.:../../../../plugins/cerence:../../../../plugins/cerence/cerence.pri:EXISTS _ss_CERENCE_HWR_INCLUDEPATH/decuma_hwr_cjk.h:
-# CERENCE_HWR_CJK_FOUND = "1"
-
-#### Keys ignored in scope 171:.:../../../../plugins/cerence:../../../../plugins/cerence/cerence.pri:NOT cerence-hwr-static:
-# CERENCE_HWR_ALPHABETIC_LIBS = "$$findSharedLibrary($$CERENCE_SDK_ROOT/t9write/$$CERENCE_SHARED_LIB_PATH/alphabetic)"
-
-#### Keys ignored in scope 172:.:../../../../plugins/cerence:../../../../plugins/cerence/cerence.pri:NOT CERENCE_HWR_ALPHABETIC_LIBS_ISEMPTY:
-# CERENCE_HWR_ALPHABETIC_BINS = "$$findSharedBinary($$CERENCE_SDK_ROOT/t9write/$$CERENCE_SHARED_LIB_PATH/alphabetic)"
-
-#### Keys ignored in scope 173:.:../../../../plugins/cerence:../../../../plugins/cerence/cerence.pri:else:
-# CERENCE_HWR_ALPHABETIC_LIBS = "$$findStaticLibrary($$CERENCE_SDK_ROOT/t9write/$$CERENCE_STATIC_LIB_PATH/alphabetic)"
-
-#### Keys ignored in scope 175:.:../../../../plugins/cerence:../../../../plugins/cerence/cerence.pri:NOT cerence-hwr-static:
-# CERENCE_HWR_CJK_LIBS = "$$findSharedLibrary($$CERENCE_SDK_ROOT/t9write/$$CERENCE_SHARED_LIB_PATH/cjk)"
-
-#### Keys ignored in scope 176:.:../../../../plugins/cerence:../../../../plugins/cerence/cerence.pri:NOT CERENCE_HWR_CJK_LIBS_ISEMPTY:
-# CERENCE_HWR_CJK_BINS = "$$findSharedBinary($$CERENCE_SDK_ROOT/t9write/$$CERENCE_SHARED_LIB_PATH/cjk)"
-
-#### Keys ignored in scope 177:.:../../../../plugins/cerence:../../../../plugins/cerence/cerence.pri:else:
-# CERENCE_HWR_CJK_LIBS = "$$findStaticLibrary($$CERENCE_SDK_ROOT/t9write/$$CERENCE_STATIC_LIB_PATH/cjk)"
-
-#### Keys ignored in scope 178:.:../../../../plugins/cerence:../../../../plugins/cerence/cerence.pri:(CERENCE_HWR_ALPHABETIC_FOUND EQUAL 1) AND NOT CERENCE_HWR_ALPHABETIC_LIBS_ISEMPTY:
-# CERENCE_HWR_FOUND = "1"
-
-#### Keys ignored in scope 179:.:../../../../plugins/cerence:../../../../plugins/cerence/cerence.pri:(CERENCE_HWR_CJK_FOUND EQUAL 1) AND NOT CERENCE_HWR_CJK_LIBS_ISEMPTY:
-# CERENCE_HWR_FOUND = "1"
-
-#### Keys ignored in scope 180:.:../../../../plugins/cerence:../../../../plugins/cerence/cerence.pri:EXISTS _ss_XT9_INCLUDEPATH/et9api.h:
-# XT9_FOUND = "1"
-
-#### Keys ignored in scope 182:.:../../../../plugins/cerence:../../../../plugins/cerence/cerence.pri:NOT QT_FEATURE_xt9_static:
-# XT9_LIBS = "$$findSharedLibrary($$CERENCE_SDK_ROOT/xt9/$$CERENCE_SHARED_LIB_PATH)"
-
-#### Keys ignored in scope 183:.:../../../../plugins/cerence:../../../../plugins/cerence/cerence.pri:NOT XT9_LIBS_ISEMPTY:
-# XT9_BINS = "$$findSharedBinary($$CERENCE_SDK_ROOT/xt9/$$CERENCE_SHARED_LIB_PATH)"
-
-#### Keys ignored in scope 184:.:../../../../plugins/cerence:../../../../plugins/cerence/cerence.pri:else:
-# XT9_LIBS = "$$findStaticLibrary($$CERENCE_SDK_ROOT/xt9/$$CERENCE_STATIC_LIB_PATH)"
diff --git a/src/plugins/cerence/cerence-hwr/plugin/cerence_hwr.json b/src/plugins/cerence/cerence-hwr/plugin/cerence_hwr.json
deleted file mode 100644
index d0970d3a..00000000
--- a/src/plugins/cerence/cerence-hwr/plugin/cerence_hwr.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "Name": "handwriting",
-    "Provider": "Qt Cerence Handwriting Extension",
-    "InputMethod": "HandwritingInputMethod",
-    "Version": 200
-}
diff --git a/src/plugins/cerence/cerence-hwr/plugin/qtvirtualkeyboardcerencehwrplugin.h b/src/plugins/cerence/cerence-hwr/plugin/qtvirtualkeyboardcerencehwrplugin.h
deleted file mode 100644
index 61fc9870..00000000
--- a/src/plugins/cerence/cerence-hwr/plugin/qtvirtualkeyboardcerencehwrplugin.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2021 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 or (at your option) any later version
-** approved by the KDE Free Qt Foundation. The licenses are as published by
-** the Free Software Foundation and appearing in the file LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QTVIRTUALKEYBOARDCERENCEHWRPLUGIN_H
-#define QTVIRTUALKEYBOARDCERENCEHWRPLUGIN_H
-
-#include <QVirtualKeyboardExtensionPlugin>
-
-QT_BEGIN_NAMESPACE
-
-class QtVirtualKeyboardCerenceHwrPlugin : public QVirtualKeyboardExtensionPlugin
-{
-    Q_OBJECT
-    Q_INTERFACES(QVirtualKeyboardExtensionPlugin)
-    Q_PLUGIN_METADATA(IID QVirtualKeyboardExtensionPluginFactoryInterface_iid
-                      FILE "cerence_hwr.json")
-public:
-    void registerTypes(const char *uri) const;
-};
-
-QT_END_NAMESPACE
-
-#endif
diff --git a/src/plugins/cerence/cerencecommon/CMakeLists.txt b/src/plugins/cerence/cerencecommon/CMakeLists.txt
index 1719d0d7..b5ee6d05 100644
--- a/src/plugins/cerence/cerencecommon/CMakeLists.txt
+++ b/src/plugins/cerence/cerencecommon/CMakeLists.txt
@@ -1,5 +1,3 @@
-# Generated from cerencecommon.pro.
-
 #####################################################################
 ## BundledCerencecommon Generic Library:
 #####################################################################
@@ -17,9 +15,6 @@ qt_internal_add_3rdparty_library(BundledCerencecommon
         Qt::VirtualKeyboardPrivate
 )
 
-## Scopes:
-#####################################################################
-
 qt_internal_extend_target(BundledCerencecommon CONDITION FEATURE_vkb_bundle_cerence OR FEATURE_vkb_bundle_cerence_xt9
     PUBLIC_DEFINES
         HAVE_XT9_RESOURCE
@@ -77,7 +72,7 @@ if(FEATURE_vkb_bundle_cerence OR FEATURE_vkb_bundle_cerence_xt9)
 
     qt_internal_add_resource(BundledCerencecommon "qmake_cerencecommondata_db"
         PREFIX
-            "/QtQuick/VirtualKeyboard/Cerence/Xt9"
+            "/qt-project.org/imports/QtQuick/VirtualKeyboard/Cerence/Xt9"
         BASE
             "${CERENCE_XT9_DATAPATH}"
         FILES
@@ -93,108 +88,3 @@ else()
         PATTERN "*.ldb"
     )
 endif()
-
-#### Keys ignored in scope 2:.:.:cerencecommon.pro:FEATURE_vkb_bundle_cerence OR FEATURE_vkb_bundle_cerence_xt9:
-# QMAKE_RESOURCE_FLAGS = "-no-compress"
-
-#### Keys ignored in scope 3:.:.:cerencecommon.pro:COMMON_RESOURCE_FILES_ISEMPTY:
-# COMMON_RESOURCE_FILES = "dummy.txt"
-
-#### Keys ignored in scope 5:.:..:../cerence.pri:CERENCE_SDK_ROOT_ISEMPTY:
-# EXT_CERENCE_SDK_ROOT = "$$(CERENCE_SDK_ROOT)"
-
-#### Keys ignored in scope 6:.:..:../cerence.pri:NOT EXT_CERENCE_SDK_ROOT_ISEMPTY:
-# CERENCE_SDK_ROOT = "$$EXT_CERENCE_SDK_ROOT"
-
-#### Keys ignored in scope 8:.:..:../cerence.pri:CERENCE_SDK_ROOT_ISEMPTY:
-# CERENCE_SDK_ROOT = "$$PWD/sdk"
-
-#### Keys ignored in scope 11:.:..:../cerence.pri:QT_ARCH___equals___arm:
-# CERENCE_SHARED_LIB_PATH = "lib/linux/arm/shared"
-# CERENCE_STATIC_LIB_PATH = "lib/linux/arm/static"
-
-#### Keys ignored in scope 13:.:..:../cerence.pri:QT_ARCH___equals___arm64:
-# CERENCE_SHARED_LIB_PATH = "lib/linux/arm64/shared"
-# CERENCE_STATIC_LIB_PATH = "lib/linux/arm64/static"
-
-#### Keys ignored in scope 15:.:..:../cerence.pri:QT_ARCH___equals___x86_64:
-# CERENCE_SHARED_LIB_PATH = "lib/linux/x86_64/shared"
-# CERENCE_STATIC_LIB_PATH = "lib/linux/x86_64/static"
-
-#### Keys ignored in scope 17:.:..:../cerence.pri:QT_ARCH___equals___x86 OR QT_ARCH___equals___i386:
-# CERENCE_SHARED_LIB_PATH = "lib/linux/x86/shared"
-# CERENCE_STATIC_LIB_PATH = "lib/linux/x86/static"
-
-#### Keys ignored in scope 20:.:..:../cerence.pri:QT_ARCH___equals___x86_64:
-# CERENCE_SHARED_LIB_PATH = "lib/win32/x86_64/shared"
-# CERENCE_STATIC_LIB_PATH = "lib/win32/x86_64/static"
-
-#### Keys ignored in scope 21:.:..:../cerence.pri:else:
-# CERENCE_SHARED_LIB_PATH = "lib/win32/x86/shared"
-# CERENCE_STATIC_LIB_PATH = "lib/win32/x86/static"
-
-#### Keys ignored in scope 23:.:..:../cerence.pri:WIN32:
-# result = "$$1/*.obj"
-
-#### Keys ignored in scope 24:.:..:../cerence.pri:result_ISEMPTY:
-# result = "$$1/*.lib"
-
-#### Keys ignored in scope 25:.:..:../cerence.pri:else:
-# result = "$$1/*.o"
-
-#### Keys ignored in scope 26:.:..:../cerence.pri:result_ISEMPTY:
-# result = "$$1/*.a"
-
-#### Keys ignored in scope 28:.:..:../cerence.pri:WIN32:
-# result = "$$1/*.lib"
-
-#### Keys ignored in scope 29:.:..:../cerence.pri:else:
-# result = "$$1/*.so"
-
-#### Keys ignored in scope 31:.:..:../cerence.pri:WIN32:
-# result = "$$1/*.dll"
-
-#### Keys ignored in scope 32:.:..:../cerence.pri:else:
-# result = "$$1/*.so"
-
-#### Keys ignored in scope 33:.:..:../cerence.pri:EXISTS _ss_CERENCE_HWR_INCLUDEPATH/decuma_hwr.h:
-# CERENCE_HWR_ALPHABETIC_FOUND = "1"
-
-#### Keys ignored in scope 34:.:..:../cerence.pri:EXISTS _ss_CERENCE_HWR_INCLUDEPATH/decuma_hwr_cjk.h:
-# CERENCE_HWR_CJK_FOUND = "1"
-
-#### Keys ignored in scope 37:.:..:../cerence.pri:NOT cerence-hwr-static:
-# CERENCE_HWR_ALPHABETIC_LIBS = "$$findSharedLibrary($$CERENCE_SDK_ROOT/t9write/$$CERENCE_SHARED_LIB_PATH/alphabetic)"
-
-#### Keys ignored in scope 38:.:..:../cerence.pri:NOT CERENCE_HWR_ALPHABETIC_LIBS_ISEMPTY:
-# CERENCE_HWR_ALPHABETIC_BINS = "$$findSharedBinary($$CERENCE_SDK_ROOT/t9write/$$CERENCE_SHARED_LIB_PATH/alphabetic)"
-
-#### Keys ignored in scope 39:.:..:../cerence.pri:else:
-# CERENCE_HWR_ALPHABETIC_LIBS = "$$findStaticLibrary($$CERENCE_SDK_ROOT/t9write/$$CERENCE_STATIC_LIB_PATH/alphabetic)"
-
-#### Keys ignored in scope 41:.:..:../cerence.pri:NOT cerence-hwr-static:
-# CERENCE_HWR_CJK_LIBS = "$$findSharedLibrary($$CERENCE_SDK_ROOT/t9write/$$CERENCE_SHARED_LIB_PATH/cjk)"
-
-#### Keys ignored in scope 42:.:..:../cerence.pri:NOT CERENCE_HWR_CJK_LIBS_ISEMPTY:
-# CERENCE_HWR_CJK_BINS = "$$findSharedBinary($$CERENCE_SDK_ROOT/t9write/$$CERENCE_SHARED_LIB_PATH/cjk)"
-
-#### Keys ignored in scope 43:.:..:../cerence.pri:else:
-# CERENCE_HWR_CJK_LIBS = "$$findStaticLibrary($$CERENCE_SDK_ROOT/t9write/$$CERENCE_STATIC_LIB_PATH/cjk)"
-
-#### Keys ignored in scope 44:.:..:../cerence.pri:(CERENCE_HWR_ALPHABETIC_FOUND EQUAL 1) AND NOT CERENCE_HWR_ALPHABETIC_LIBS_ISEMPTY:
-# CERENCE_HWR_FOUND = "1"
-
-#### Keys ignored in scope 45:.:..:../cerence.pri:(CERENCE_HWR_CJK_FOUND EQUAL 1) AND NOT CERENCE_HWR_CJK_LIBS_ISEMPTY:
-# CERENCE_HWR_FOUND = "1"
-
-#### Keys ignored in scope 46:.:..:../cerence.pri:EXISTS _ss_XT9_INCLUDEPATH/et9api.h:
-# XT9_FOUND = "1"
-
-#### Keys ignored in scope 48:.:..:../cerence.pri:NOT QT_FEATURE_xt9_static:
-# XT9_LIBS = "$$findSharedLibrary($$CERENCE_SDK_ROOT/xt9/$$CERENCE_SHARED_LIB_PATH)"
-
-#### Keys ignored in scope 49:.:..:../cerence.pri:NOT XT9_LIBS_ISEMPTY:
-# XT9_BINS = "$$findSharedBinary($$CERENCE_SDK_ROOT/xt9/$$CERENCE_SHARED_LIB_PATH)"
-
-#### Keys ignored in scope 50:.:..:../cerence.pri:else:
-# XT9_LIBS = "$$findStaticLibrary($$CERENCE_SDK_ROOT/xt9/$$CERENCE_STATIC_LIB_PATH)"
diff --git a/src/plugins/cerence/cerencecommon/xt9ldbmanager.cpp b/src/plugins/cerence/cerencecommon/xt9ldbmanager.cpp
index 409dd6b5..463ec1b4 100644
--- a/src/plugins/cerence/cerencecommon/xt9ldbmanager.cpp
+++ b/src/plugins/cerence/cerencecommon/xt9ldbmanager.cpp
@@ -53,7 +53,7 @@ Xt9LdbManager::Xt9LdbManager() :
     QStringList userPaths(xt9LdbPath.split(pathListSep, Qt::SkipEmptyParts));
     const QStringList defaultPaths = userPaths
             << QDir(QStringLiteral("%1/qtvirtualkeyboard/cerence/xt9/").arg(QLibraryInfo::path(QLibraryInfo::DataPath))).absolutePath()
-            << QLatin1String(":/QtQuick/VirtualKeyboard/Cerence/Xt9")
+            << QLatin1String(":/qt-project.org/imports/QtQuick/VirtualKeyboard/Cerence/Xt9")
                ;
     for (const QString &defaultPath : defaultPaths) {
         addSearchPath(defaultPath);
diff --git a/src/plugins/cerence/cerence-hwr/CMakeLists.txt b/src/plugins/cerence/hwr/CMakeLists.txt
index 472a3475..472a3475 100644
--- a/src/plugins/cerence/cerence-hwr/CMakeLists.txt
+++ b/src/plugins/cerence/hwr/CMakeLists.txt
diff --git a/src/plugins/cerence/hwr/plugin/CMakeLists.txt b/src/plugins/cerence/hwr/plugin/CMakeLists.txt
new file mode 100644
index 00000000..f1342077
--- /dev/null
+++ b/src/plugins/cerence/hwr/plugin/CMakeLists.txt
@@ -0,0 +1,414 @@
+#####################################################################
+## QtVirtualKeyboardCerenceHwrPlugin Plugin:
+#####################################################################
+
+qt_internal_add_qml_module(qtvkbcerencehwrplugin
+    URI "QtQuick.VirtualKeyboard.Plugins.Cerence.HWR"
+    VERSION "${PROJECT_VERSION}"
+    PLUGIN_TARGET qtvkbcerencehwrplugin
+    NO_PLUGIN_OPTIONAL
+    DEPENDENCIES
+        QtQuick.VirtualKeyboard/auto
+    SOURCES
+        cerence_hwr_p.h
+        t9writeabstractdictionary_p.h
+        t9writedictionary.cpp t9writedictionary_p.h
+        t9writeinputmethod.cpp t9writeinputmethod_p.h
+        t9writewordcandidate.cpp t9writewordcandidate_p.h
+        t9writeworker.cpp t9writeworker_p.h
+    DEFINES
+        HAVE_CERENCE_HWR
+        QT_ASCII_CAST_WARNINGS
+        QT_NO_CAST_FROM_ASCII
+        QT_NO_CAST_FROM_BYTEARRAY
+        QT_NO_CAST_TO_ASCII
+    LIBRARIES
+        Qt::BundledCerencecommon
+        Qt::Core
+        Qt::Gui
+        Qt::Qml
+        Qt::VirtualKeyboardPrivate
+)
+
+# Resources:
+set(qmake_virtualkeyboard_cerence_hwr_layouts_resource_files
+    "${VKB_LAYOUTS_BASE}/fallback/handwriting.qml"
+)
+
+if (QT_FEATURE_vkb_lang_en_GB)
+    list(APPEND qmake_virtualkeyboard_cerence_hwr_layouts_resource_files
+        "${VKB_LAYOUTS_BASE}/en_GB/handwriting.fallback"
+    )
+endif()
+
+if (QT_FEATURE_vkb_lang_en_US)
+    list(APPEND qmake_virtualkeyboard_cerence_hwr_layouts_resource_files
+        "${VKB_LAYOUTS_BASE}/en_US/handwriting.fallback"
+    )
+endif()
+
+if (QT_FEATURE_vkb_lang_ar_AR)
+    list(APPEND qmake_virtualkeyboard_cerence_hwr_layouts_resource_files
+        "${VKB_LAYOUTS_BASE}/ar_AR/handwriting.qml"
+    )
+endif()
+
+if (QT_FEATURE_vkb_lang_bg_BG)
+    list(APPEND qmake_virtualkeyboard_cerence_hwr_layouts_resource_files
+        "${VKB_LAYOUTS_BASE}/bg_BG/handwriting.qml"
+    )
+endif()
+
+if (QT_FEATURE_vkb_lang_cs_CZ)
+    list(APPEND qmake_virtualkeyboard_cerence_hwr_layouts_resource_files
+        "${VKB_LAYOUTS_BASE}/cs_CZ/handwriting.qml"
+    )
+endif()
+
+if (QT_FEATURE_vkb_lang_da_DK)
+    list(APPEND qmake_virtualkeyboard_cerence_hwr_layouts_resource_files
+        "${VKB_LAYOUTS_BASE}/da_DK/handwriting.fallback"
+    )
+endif()
+
+if (QT_FEATURE_vkb_lang_de_DE)
+    list(APPEND qmake_virtualkeyboard_cerence_hwr_layouts_resource_files
+        "${VKB_LAYOUTS_BASE}/de_DE/handwriting.fallback"
+    )
+endif()
+
+if (QT_FEATURE_vkb_lang_el_GR)
+    list(APPEND qmake_virtualkeyboard_cerence_hwr_layouts_resource_files
+        "${VKB_LAYOUTS_BASE}/el_GR/handwriting.qml"
+    )
+endif()
+
+if (QT_FEATURE_vkb_lang_es_ES)
+    list(APPEND qmake_virtualkeyboard_cerence_hwr_layouts_resource_files
+        "${VKB_LAYOUTS_BASE}/es_ES/handwriting.qml"
+    )
+endif()
+
+if (QT_FEATURE_vkb_lang_es_MX)
+    list(APPEND qmake_virtualkeyboard_cerence_hwr_layouts_resource_files
+        "${VKB_LAYOUTS_BASE}/es_MX/handwriting.qml"
+    )
+endif()
+
+if (QT_FEATURE_vkb_lang_et_EE)
+    list(APPEND qmake_virtualkeyboard_cerence_hwr_layouts_resource_files
+        "${VKB_LAYOUTS_BASE}/et_EE/handwriting.fallback"
+    )
+endif()
+
+if (QT_FEATURE_vkb_lang_fa_FA)
+    list(APPEND qmake_virtualkeyboard_cerence_hwr_layouts_resource_files
+        "${VKB_LAYOUTS_BASE}/fa_FA/handwriting.qml"
+    )
+endif()
+
+if (QT_FEATURE_vkb_lang_fi_FI)
+    list(APPEND qmake_virtualkeyboard_cerence_hwr_layouts_resource_files
+        "${VKB_LAYOUTS_BASE}/fi_FI/handwriting.fallback"
+    )
+endif()
+
+if (QT_FEATURE_vkb_lang_fr_FR)
+    list(APPEND qmake_virtualkeyboard_cerence_hwr_layouts_resource_files
+        "${VKB_LAYOUTS_BASE}/fr_FR/handwriting.fallback"
+    )
+endif()
+
+if (QT_FEATURE_vkb_lang_fr_CA)
+    list(APPEND qmake_virtualkeyboard_cerence_hwr_layouts_resource_files
+        "${VKB_LAYOUTS_BASE}/fr_CA/handwriting.fallback"
+    )
+endif()
+
+if (QT_FEATURE_vkb_lang_he_IL)
+    list(APPEND qmake_virtualkeyboard_cerence_hwr_layouts_resource_files
+        "${VKB_LAYOUTS_BASE}/he_IL/handwriting.qml"
+    )
+endif()
+
+if (QT_FEATURE_vkb_lang_hr_HR)
+    list(APPEND qmake_virtualkeyboard_cerence_hwr_layouts_resource_files
+        "${VKB_LAYOUTS_BASE}/hr_HR/handwriting.qml"
+    )
+endif()
+
+if (QT_FEATURE_vkb_lang_hu_HU)
+    list(APPEND qmake_virtualkeyboard_cerence_hwr_layouts_resource_files
+        "${VKB_LAYOUTS_BASE}/hu_HU/handwriting.qml"
+    )
+endif()
+
+if (QT_FEATURE_vkb_lang_id_ID)
+    list(APPEND qmake_virtualkeyboard_cerence_hwr_layouts_resource_files
+        "${VKB_LAYOUTS_BASE}/id_ID/handwriting.fallback"
+    )
+endif()
+
+if (QT_FEATURE_vkb_lang_it_IT)
+    list(APPEND qmake_virtualkeyboard_cerence_hwr_layouts_resource_files
+        "${VKB_LAYOUTS_BASE}/it_IT/handwriting.fallback"
+    )
+endif()
+
+if (QT_FEATURE_vkb_lang_ms_MY)
+    list(APPEND qmake_virtualkeyboard_cerence_hwr_layouts_resource_files
+        "${VKB_LAYOUTS_BASE}/ms_MY/handwriting.fallback"
+    )
+endif()
+
+if (QT_FEATURE_vkb_lang_nb_NO)
+    list(APPEND qmake_virtualkeyboard_cerence_hwr_layouts_resource_files
+        "${VKB_LAYOUTS_BASE}/nb_NO/handwriting.fallback"
+    )
+endif()
+
+if (QT_FEATURE_vkb_lang_nl_NL)
+    list(APPEND qmake_virtualkeyboard_cerence_hwr_layouts_resource_files
+        "${VKB_LAYOUTS_BASE}/nl_NL/handwriting.fallback"
+    )
+endif()
+
+if (QT_FEATURE_vkb_lang_pl_PL)
+    list(APPEND qmake_virtualkeyboard_cerence_hwr_layouts_resource_files
+        "${VKB_LAYOUTS_BASE}/pl_PL/handwriting.fallback"
+    )
+endif()
+
+if (QT_FEATURE_vkb_lang_pt_BR)
+    list(APPEND qmake_virtualkeyboard_cerence_hwr_layouts_resource_files
+        "${VKB_LAYOUTS_BASE}/pt_BR/handwriting.fallback"
+    )
+endif()
+
+if (QT_FEATURE_vkb_lang_pt_PT)
+    list(APPEND qmake_virtualkeyboard_cerence_hwr_layouts_resource_files
+        "${VKB_LAYOUTS_BASE}/pt_PT/handwriting.fallback"
+    )
+endif()
+
+if (QT_FEATURE_vkb_lang_ro_RO)
+    list(APPEND qmake_virtualkeyboard_cerence_hwr_layouts_resource_files
+        "${VKB_LAYOUTS_BASE}/ro_RO/handwriting.qml"
+    )
+endif()
+
+if (QT_FEATURE_vkb_lang_ru_RU)
+    list(APPEND qmake_virtualkeyboard_cerence_hwr_layouts_resource_files
+        "${VKB_LAYOUTS_BASE}/ru_RU/handwriting.qml"
+    )
+endif()
+
+if (QT_FEATURE_vkb_lang_sk_SK)
+    list(APPEND qmake_virtualkeyboard_cerence_hwr_layouts_resource_files
+        "${VKB_LAYOUTS_BASE}/sk_SK/handwriting.fallback"
+    )
+endif()
+
+if (QT_FEATURE_vkb_lang_sl_SI)
+    list(APPEND qmake_virtualkeyboard_cerence_hwr_layouts_resource_files
+        "${VKB_LAYOUTS_BASE}/sl_SI/handwriting.fallback"
+    )
+endif()
+
+if (QT_FEATURE_vkb_lang_sq_AL)
+    list(APPEND qmake_virtualkeyboard_cerence_hwr_layouts_resource_files
+        "${VKB_LAYOUTS_BASE}/sq_AL/handwriting.fallback"
+    )
+endif()
+
+if (QT_FEATURE_vkb_lang_sr_SP)
+    list(APPEND qmake_virtualkeyboard_cerence_hwr_layouts_resource_files
+        "${VKB_LAYOUTS_BASE}/sr_SP/handwriting.qml"
+    )
+endif()
+
+if (QT_FEATURE_vkb_lang_sv_SE)
+    list(APPEND qmake_virtualkeyboard_cerence_hwr_layouts_resource_files
+        "${VKB_LAYOUTS_BASE}/sv_SE/handwriting.fallback"
+    )
+endif()
+
+if (QT_FEATURE_vkb_lang_th_TH)
+    list(APPEND qmake_virtualkeyboard_cerence_hwr_layouts_resource_files
+        "${VKB_LAYOUTS_BASE}/th_TH/handwriting.qml"
+    )
+endif()
+
+if (QT_FEATURE_vkb_lang_tr_TR)
+    list(APPEND qmake_virtualkeyboard_cerence_hwr_layouts_resource_files
+        "${VKB_LAYOUTS_BASE}/tr_TR/handwriting.fallback"
+    )
+endif()
+
+if (QT_FEATURE_vkb_lang_uk_UA)
+    list(APPEND qmake_virtualkeyboard_cerence_hwr_layouts_resource_files
+        "${VKB_LAYOUTS_BASE}/uk_UA/handwriting.qml"
+    )
+endif()
+
+if (QT_FEATURE_vkb_lang_vi_VN)
+    list(APPEND qmake_virtualkeyboard_cerence_hwr_layouts_resource_files
+        "${VKB_LAYOUTS_BASE}/vi_VN/handwriting.fallback"
+    )
+endif()
+
+if (QT_FEATURE_vkb_lang_ja_JP)
+    list(APPEND qmake_virtualkeyboard_cerence_hwr_layouts_resource_files
+        "${VKB_LAYOUTS_BASE}/ja_JP/handwriting.qml"
+    )
+endif()
+
+if (QT_FEATURE_vkb_lang_ko_KR)
+    list(APPEND qmake_virtualkeyboard_cerence_hwr_layouts_resource_files
+        "${VKB_LAYOUTS_BASE}/ko_KR/handwriting.qml"
+    )
+endif()
+
+if (QT_FEATURE_vkb_lang_zh_CN)
+    list(APPEND qmake_virtualkeyboard_cerence_hwr_layouts_resource_files
+        "${VKB_LAYOUTS_BASE}/zh_CN/handwriting.qml"
+    )
+endif()
+
+if (QT_FEATURE_vkb_lang_zh_TW)
+    list(APPEND qmake_virtualkeyboard_cerence_hwr_layouts_resource_files
+        "${VKB_LAYOUTS_BASE}/zh_TW/handwriting.qml"
+    )
+endif()
+
+qt_internal_add_resource(qtvkbcerencehwrplugin "qmake_virtualkeyboard_cerence_hwr_layouts"
+    PREFIX
+        "${VKB_LAYOUTS_PREFIX}"
+    BASE
+        "${VKB_LAYOUTS_BASE}"
+    FILES
+        ${qmake_virtualkeyboard_cerence_hwr_layouts_resource_files}
+)
+
+set(qmake_virtualkeyboard_cerence_hwr_custom_layouts_resource_files)
+if (QT_FEATURE_vkb_lang_zh_HK)
+    list(APPEND qmake_virtualkeyboard_cerence_hwr_custom_layouts_resource_files
+        "${CMAKE_CURRENT_SOURCE_DIR}/content/layouts/zh_HK/handwriting.qml"
+    )
+endif()
+
+qt_internal_add_resource(qtvkbcerencehwrplugin "qmake_virtualkeyboard_cerence_hwr_custom_layouts"
+    PREFIX
+        "${VKB_LAYOUTS_PREFIX}"
+    BASE
+        "${CMAKE_CURRENT_SOURCE_DIR}/content/layouts"
+    FILES
+        ${qmake_virtualkeyboard_cerence_hwr_custom_layouts_resource_files}
+)
+
+qt_internal_extend_target(qtvkbcerencehwrplugin CONDITION QT_FEATURE_cerence_xt9
+    DEFINES
+        HAVE_XT9
+    LIBRARIES
+        Qt::BundledXt9Common
+)
+
+qt_internal_extend_target(qtvkbcerencehwrplugin CONDITION QT_FEATURE_cerence_hwr_alphabetic
+    DEFINES
+        HAVE_CERENCE_HWR_ALPHABETIC
+    LIBRARIES
+        Cerence::HWR::Alphabetic
+)
+
+qt_internal_extend_target(qtvkbcerencehwrplugin CONDITION QT_FEATURE_cerence_hwr_cjk
+    DEFINES
+        HAVE_CERENCE_HWR_CJK
+    LIBRARIES
+        Cerence::HWR::CJK
+)
+
+qt_internal_extend_target(qtvkbcerencehwrplugin CONDITION FEATURE_vkb_bundle_cerence OR FEATURE_vkb_bundle_cerence_hwr
+    DEFINES
+        HAVE_CERENCE_HWR_RESOURCE
+)
+
+if(FEATURE_vkb_bundle_cerence OR FEATURE_vkb_bundle_cerence_hwr)
+    set(resource_glob_0)
+    if(FEATURE_vkb_lang_ar_AR OR FEATURE_vkb_lang_fa_FA)
+        file(GLOB resource_glob_0 RELATIVE "${CERENCE_HWR_DATAPATH}" "${CERENCE_HWR_DATAPATH}/arabic/*.bin")
+        foreach(file IN LISTS resource_glob_0)
+            set_source_files_properties("${CERENCE_HWR_DATAPATH}/${file}" PROPERTIES QT_RESOURCE_ALIAS "${file}")
+        endforeach()
+    endif()
+
+    set(resource_glob_1)
+    if(FEATURE_vkb_lang_he_IL)
+        file(GLOB resource_glob_1 RELATIVE "${CERENCE_HWR_DATAPATH}" "${CERENCE_HWR_DATAPATH}/hebrew/*.bin")
+        foreach(file IN LISTS resource_glob_1)
+            set_source_files_properties("${CERENCE_HWR_DATAPATH}/${file}" PROPERTIES QT_RESOURCE_ALIAS "${file}")
+        endforeach()
+    endif()
+
+    set(resource_glob_2)
+    if(FEATURE_vkb_lang_th_TH)
+        file(GLOB resource_glob_2 RELATIVE "${CERENCE_HWR_DATAPATH}" "${CERENCE_HWR_DATAPATH}/thai/*.bin")
+        foreach(file IN LISTS resource_glob_2)
+            set_source_files_properties("${CERENCE_HWR_DATAPATH}/${file}" PROPERTIES QT_RESOURCE_ALIAS "${file}")
+        endforeach()
+    endif()
+
+    file(GLOB resource_glob_3 RELATIVE "${CERENCE_HWR_DATAPATH}" "${CERENCE_HWR_DATAPATH}/*.bin")
+    foreach(file IN LISTS resource_glob_3)
+        set_source_files_properties("${CERENCE_HWR_DATAPATH}/${file}" PROPERTIES QT_RESOURCE_ALIAS "${file}")
+    endforeach()
+
+    file(GLOB resource_glob_4 RELATIVE "${CERENCE_HWR_DATAPATH}" "${CERENCE_HWR_DATAPATH}/*.hdb")
+    foreach(file IN LISTS resource_glob_4)
+        set_source_files_properties("${CERENCE_HWR_DATAPATH}/${file}" PROPERTIES QT_RESOURCE_ALIAS "${file}")
+    endforeach()
+
+    file(GLOB resource_glob_5 RELATIVE "${CERENCE_HWR_DATAPATH}" "${CERENCE_HWR_DATAPATH}/*.phd")
+    foreach(file IN LISTS resource_glob_5)
+        set_source_files_properties("${CERENCE_HWR_DATAPATH}/${file}" PROPERTIES QT_RESOURCE_ALIAS "${file}")
+    endforeach()
+
+    # Resources:
+    set(qmake_cerencehwrdata_db_resource_files
+        ${resource_glob_0}
+        ${resource_glob_1}
+        ${resource_glob_2}
+        ${resource_glob_3}
+        ${resource_glob_4}
+        ${resource_glob_5}
+    )
+
+    qt_internal_add_resource(qtvkbcerencehwrplugin "qmake_cerencehwrdata_db"
+        PREFIX
+            "/qt-project.org/imports/QtQuick/VirtualKeyboard/Cerence/Handwriting"
+        BASE
+            "${CERENCE_HWR_DATAPATH}"
+        FILES
+            ${qmake_cerencehwrdata_db_resource_files}
+        OPTIONS
+            -no-compress
+    )
+else()
+    qt_copy_or_install(
+        DIRECTORY "${CERENCE_HWR_DATAPATH}/"
+        DESTINATION "${VKB_INSTALL_DATA}/cerence/handwriting"
+    )
+endif()
+
+if(QT_FEATURE_cerence_hwr_alphabetic AND NOT FEATURE_vkb_cerence_static)
+    qt_copy_or_install(
+        FILES "${CERENCE_HWR_ALPHABETIC_BINARIES}"
+        DESTINATION "${QT_BUILD_DIR}/${INSTALL_BINDIR}"
+    )
+endif()
+
+if(QT_FEATURE_cerence_hwr_cjk AND NOT FEATURE_vkb_cerence_static)
+    qt_copy_or_install(
+        FILES "${CERENCE_HWR_CJK_BINARIES}"
+        DESTINATION "${QT_BUILD_DIR}/${INSTALL_BINDIR}"
+    )
+endif()
diff --git a/src/plugins/cerence/cerence-hwr/plugin/cerence_hwr_p.h b/src/plugins/cerence/hwr/plugin/cerence_hwr_p.h
index 935b3007..935b3007 100644
--- a/src/plugins/cerence/cerence-hwr/plugin/cerence_hwr_p.h
+++ b/src/plugins/cerence/hwr/plugin/cerence_hwr_p.h
diff --git a/src/plugins/cerence/cerence-hwr/plugin/content/layouts/zh_HK/handwriting.qml b/src/plugins/cerence/hwr/plugin/content/layouts/zh_HK/handwriting.qml
index 7650b026..696d321a 100644
--- a/src/plugins/cerence/cerence-hwr/plugin/content/layouts/zh_HK/handwriting.qml
+++ b/src/plugins/cerence/hwr/plugin/content/layouts/zh_HK/handwriting.qml
@@ -30,6 +30,7 @@
 import QtQuick
 import QtQuick.Layouts
 import QtQuick.VirtualKeyboard
+import QtQuick.VirtualKeyboard.Components
 
 KeyboardLayout {
     function createInputMethod() {
diff --git a/src/plugins/cerence/cerence-hwr/plugin/t9writeabstractdictionary_p.h b/src/plugins/cerence/hwr/plugin/t9writeabstractdictionary_p.h
index f25c8352..f25c8352 100644
--- a/src/plugins/cerence/cerence-hwr/plugin/t9writeabstractdictionary_p.h
+++ b/src/plugins/cerence/hwr/plugin/t9writeabstractdictionary_p.h
diff --git a/src/plugins/cerence/cerence-hwr/plugin/t9writedictionary.cpp b/src/plugins/cerence/hwr/plugin/t9writedictionary.cpp
index 59c89b45..59c89b45 100644
--- a/src/plugins/cerence/cerence-hwr/plugin/t9writedictionary.cpp
+++ b/src/plugins/cerence/hwr/plugin/t9writedictionary.cpp
diff --git a/src/plugins/cerence/cerence-hwr/plugin/t9writedictionary_p.h b/src/plugins/cerence/hwr/plugin/t9writedictionary_p.h
index e4be1c33..e4be1c33 100644
--- a/src/plugins/cerence/cerence-hwr/plugin/t9writedictionary_p.h
+++ b/src/plugins/cerence/hwr/plugin/t9writedictionary_p.h
diff --git a/src/plugins/cerence/cerence-hwr/plugin/t9writeinputmethod.cpp b/src/plugins/cerence/hwr/plugin/t9writeinputmethod.cpp
index 13640d38..600e970c 100644
--- a/src/plugins/cerence/cerence-hwr/plugin/t9writeinputmethod.cpp
+++ b/src/plugins/cerence/hwr/plugin/t9writeinputmethod.cpp
@@ -149,6 +149,10 @@ public:
         , unipenTrace()
 #endif
     {
+#ifdef HAVE_CERENCE_HWR_RESOURCE
+        Q_INIT_RESOURCE(qmake_cerencecommondata_db);
+        Q_INIT_RESOURCE(qmake_cerencehwrdata_db);
+#endif
         const QString pathListSep(
 #if defined(Q_OS_WIN32)
             QStringLiteral(";")
@@ -159,7 +163,7 @@ public:
         const QString userHwrDbPath(qEnvironmentVariable("QT_VIRTUALKEYBOARD_CERENCE_HWR_DB_PATH"));
         defaultHwrDbPaths = userHwrDbPath.split(pathListSep, Qt::SkipEmptyParts)
                 << QDir(QStringLiteral("%1/qtvirtualkeyboard/cerence/handwriting/").arg(QLibraryInfo::path(QLibraryInfo::DataPath))).absolutePath()
-                << QStringLiteral(":/QtQuick/VirtualKeyboard/Cerence/Handwriting/");
+                << QStringLiteral(":/qt-project.org/imports/QtQuick/VirtualKeyboard/Cerence/Handwriting/");
         ldbManager->setPhdEnabled(true);
         for (const QString &searchPath : defaultHwrDbPaths) {
             ldbManager->addSearchPath(searchPath);
diff --git a/src/plugins/cerence/cerence-hwr/plugin/t9writeinputmethod_p.h b/src/plugins/cerence/hwr/plugin/t9writeinputmethod_p.h
index 0d9adf27..320cc416 100644
--- a/src/plugins/cerence/cerence-hwr/plugin/t9writeinputmethod_p.h
+++ b/src/plugins/cerence/hwr/plugin/t9writeinputmethod_p.h
@@ -53,6 +53,7 @@ class T9WriteInputMethod : public QVirtualKeyboardAbstractInputMethod
 {
     Q_OBJECT
     Q_DECLARE_PRIVATE(T9WriteInputMethod)
+    QML_NAMED_ELEMENT(HandwritingInputMethod)
 
 public:
     enum class EngineMode {
diff --git a/src/plugins/cerence/cerence-hwr/plugin/t9writewordcandidate.cpp b/src/plugins/cerence/hwr/plugin/t9writewordcandidate.cpp
index a1f7df32..a1f7df32 100644
--- a/src/plugins/cerence/cerence-hwr/plugin/t9writewordcandidate.cpp
+++ b/src/plugins/cerence/hwr/plugin/t9writewordcandidate.cpp
diff --git a/src/plugins/cerence/cerence-hwr/plugin/t9writewordcandidate_p.h b/src/plugins/cerence/hwr/plugin/t9writewordcandidate_p.h
index 9f35d772..9f35d772 100644
--- a/src/plugins/cerence/cerence-hwr/plugin/t9writewordcandidate_p.h
+++ b/src/plugins/cerence/hwr/plugin/t9writewordcandidate_p.h
diff --git a/src/plugins/cerence/cerence-hwr/plugin/t9writeworker.cpp b/src/plugins/cerence/hwr/plugin/t9writeworker.cpp
index 76b9696c..76b9696c 100644
--- a/src/plugins/cerence/cerence-hwr/plugin/t9writeworker.cpp
+++ b/src/plugins/cerence/hwr/plugin/t9writeworker.cpp
diff --git a/src/plugins/cerence/cerence-hwr/plugin/t9writeworker_p.h b/src/plugins/cerence/hwr/plugin/t9writeworker_p.h
index d21735fe..d21735fe 100644
--- a/src/plugins/cerence/cerence-hwr/plugin/t9writeworker_p.h
+++ b/src/plugins/cerence/hwr/plugin/t9writeworker_p.h
diff --git a/src/plugins/cerence/xt9/CMakeLists.txt b/src/plugins/cerence/xt9/CMakeLists.txt
index 941e8ffc..7f4bad45 100644
--- a/src/plugins/cerence/xt9/CMakeLists.txt
+++ b/src/plugins/cerence/xt9/CMakeLists.txt
@@ -1,4 +1,2 @@
-# Generated from xt9.pro.
-
 add_subdirectory(plugin)
 add_subdirectory(xt9common)
diff --git a/src/plugins/cerence/xt9/plugin/9key_layouts/content/layouts/ja_JP/main.qml b/src/plugins/cerence/xt9/plugin/9key_layouts/content/layouts/ja_JP/main.qml
index 738bb096..efc6549b 100644
--- a/src/plugins/cerence/xt9/plugin/9key_layouts/content/layouts/ja_JP/main.qml
+++ b/src/plugins/cerence/xt9/plugin/9key_layouts/content/layouts/ja_JP/main.qml
@@ -30,6 +30,7 @@
 import QtQuick
 import QtQuick.Layouts
 import QtQuick.VirtualKeyboard
+import QtQuick.VirtualKeyboard.Components
 
 KeyboardLayoutLoader {
     function createInputMethod() {
diff --git a/src/plugins/cerence/xt9/plugin/9key_layouts/content/layouts/zh_CN/main.qml b/src/plugins/cerence/xt9/plugin/9key_layouts/content/layouts/zh_CN/main.qml
index 14fca086..53b46961 100644
--- a/src/plugins/cerence/xt9/plugin/9key_layouts/content/layouts/zh_CN/main.qml
+++ b/src/plugins/cerence/xt9/plugin/9key_layouts/content/layouts/zh_CN/main.qml
@@ -30,6 +30,7 @@
 import QtQuick
 import QtQuick.Layouts
 import QtQuick.VirtualKeyboard
+import QtQuick.VirtualKeyboard.Components
 
 KeyboardLayout {
     function createInputMethod() {
diff --git a/src/plugins/cerence/xt9/plugin/9key_layouts/content/layouts/zh_TW/main.qml b/src/plugins/cerence/xt9/plugin/9key_layouts/content/layouts/zh_TW/main.qml
index 9b580c15..85cacc71 100644
--- a/src/plugins/cerence/xt9/plugin/9key_layouts/content/layouts/zh_TW/main.qml
+++ b/src/plugins/cerence/xt9/plugin/9key_layouts/content/layouts/zh_TW/main.qml
@@ -30,6 +30,7 @@
 import QtQuick
 import QtQuick.Layouts
 import QtQuick.VirtualKeyboard
+import QtQuick.VirtualKeyboard.Components
 
 KeyboardLayout {
     function createInputMethod() {
diff --git a/src/plugins/cerence/xt9/plugin/CMakeLists.txt b/src/plugins/cerence/xt9/plugin/CMakeLists.txt
index 23f0b98d..a1a08742 100644
--- a/src/plugins/cerence/xt9/plugin/CMakeLists.txt
+++ b/src/plugins/cerence/xt9/plugin/CMakeLists.txt
@@ -1,12 +1,14 @@
-# Generated from plugin.pro.
-
 #####################################################################
 ## QtVirtualKeyboardXt9Plugin Plugin:
 #####################################################################
 
-qt_internal_add_plugin(QtVirtualKeyboardXt9Plugin
-    OUTPUT_NAME qtvirtualkeyboard_cerence_xt9
-    PLUGIN_TYPE virtualkeyboard
+qt_internal_add_qml_module(qtvkbcerencext9plugin
+    URI "QtQuick.VirtualKeyboard.Plugins.Cerence.XT9"
+    VERSION "${PROJECT_VERSION}"
+    PLUGIN_TARGET qtvkbcerencext9plugin
+    NO_PLUGIN_OPTIONAL
+    DEPENDENCIES
+        QtQuick.VirtualKeyboard/auto
     SOURCES
         xt9awinputmethod.cpp xt9awinputmethod_p.h
         xt9awinputmethodprivate.cpp xt9awinputmethodprivate_p.h
@@ -18,7 +20,6 @@ qt_internal_add_plugin(QtVirtualKeyboardXt9Plugin
         xt9jinputmethodprivate.cpp xt9jinputmethodprivate_p.h
         xt9kinputmethod.cpp xt9kinputmethod_p.h
         xt9kinputmethodprivate.cpp xt9kinputmethodprivate_p.h
-        xt9plugin.cpp xt9plugin.h
         xt9thaiinputmethod.cpp xt9thaiinputmethod_p.h
         xt9thaiinputmethodprivate.cpp xt9thaiinputmethodprivate_p.h
     DEFINES
@@ -29,114 +30,62 @@ qt_internal_add_plugin(QtVirtualKeyboardXt9Plugin
     LIBRARIES
         Qt::BundledCerencecommon
         Qt::BundledXt9Common
-    PUBLIC_LIBRARIES
         Qt::Core
         Qt::Gui
         Qt::Qml
         Qt::VirtualKeyboardPrivate
 )
 
-#### Keys ignored in scope 1:.:.:plugin.pro:<TRUE>:
-# DISTFILES = "cerence_xt9.json"
-# OTHER_FILES = "$$LAYOUT_FILES"
-# virtualkeyboard_xt9_custom_layouts.base = "$$PWD"
-# virtualkeyboard_xt9_custom_layouts.prefix = "$$LAYOUTS_PREFIX"
-# virtualkeyboard_xt9_layouts.base = "$$LAYOUTS_BASE"
-# virtualkeyboard_xt9_layouts.prefix = "$$LAYOUTS_PREFIX"
-
-## Scopes:
-#####################################################################
-
-#### Keys ignored in scope 3:.:.:plugin.pro:NOT XT9_BINS_ISEMPTY:
-# INSTALLS = "xt9_bins"
-# xt9_bins.files = "$$XT9_BINS"
-
-#### Keys ignored in scope 4:.:.:plugin.pro:WIN32 OR win64:
-# xt9_bins.path = "$$[QT_INSTALL_BINS]"
-
-#### Keys ignored in scope 5:.:.:plugin.pro:else:
-# xt9_bins.path = "$$[QT_INSTALL_LIBS]"
-
-#### Keys ignored in scope 6:.:.:plugin.pro:NOT prefix_build:
-# COPIES = "xt9_bins"
-
-#### Keys ignored in scope 7:.:.:plugin.pro:CONFIG___contains___lang-ja._x_:
-# LAYOUT_FILES = "$$LAYOUTS_BASE/content/layouts/ja_JP/digits.fallback" "$$LAYOUTS_BASE/content/layouts/ja_JP/numbers.fallback" "$$LAYOUTS_BASE/content/layouts/ja_JP/symbols.qml" "$$LAYOUTS_BASE/content/layouts/ja_JP/dialpad.fallback"
-
-#### Keys ignored in scope 11:.:.:plugin.pro:CONFIG___contains___lang-ko._x_:
-# LAYOUT_FILES = "$$LAYOUTS_BASE/content/layouts/ko_KR/digits.fallback" "$$LAYOUTS_BASE/content/layouts/ko_KR/main.qml" "$$LAYOUTS_BASE/content/layouts/ko_KR/numbers.fallback" "$$LAYOUTS_BASE/content/layouts/ko_KR/symbols.qml" "$$LAYOUTS_BASE/content/layouts/ko_KR/dialpad.fallback"
-
-#### Keys ignored in scope 16:.:.:plugin.pro:CONFIG___contains___lang-th._x_:
-# LAYOUT_FILES = "$$LAYOUTS_BASE/content/layouts/th_TH/digits.fallback" "$$LAYOUTS_BASE/content/layouts/th_TH/main.qml" "$$LAYOUTS_BASE/content/layouts/th_TH/numbers.fallback" "$$LAYOUTS_BASE/content/layouts/th_TH/symbols.qml" "$$LAYOUTS_BASE/content/layouts/th_TH/dialpad.fallback"
-
-#### Keys ignored in scope 21:.:.:plugin.pro:CONFIG___contains___lang-zh(_CN?):
-# LAYOUT_FILES = "$$LAYOUTS_BASE/content/layouts/zh_CN/digits.fallback" "$$LAYOUTS_BASE/content/layouts/zh_CN/numbers.fallback" "$$LAYOUTS_BASE/content/layouts/zh_CN/symbols.qml" "$$LAYOUTS_BASE/content/layouts/zh_CN/dialpad.fallback"
-
-#### Keys ignored in scope 25:.:.:plugin.pro:NOT xt9-9key-pinyin AND CONFIG___contains___lang-zh(_CN?):
-# LAYOUT_FILES = "$$LAYOUTS_BASE/content/layouts/zh_CN/main.qml"
-
-#### Keys ignored in scope 26:.:.:plugin.pro:CONFIG___contains___lang-zh(_TW?):
-# LAYOUT_FILES = "$$LAYOUTS_BASE/content/layouts/zh_TW/digits.fallback" "$$LAYOUTS_BASE/content/layouts/zh_TW/numbers.fallback" "$$LAYOUTS_BASE/content/layouts/zh_TW/symbols.qml" "$$LAYOUTS_BASE/content/layouts/zh_TW/dialpad.fallback"
-
-#### Keys ignored in scope 31:.:.:plugin.pro:xt9-9key-pinyin AND CONFIG___contains___lang-zh(_CN?):
-# CUSTOM_LAYOUT_FILES = "$$PWD/content/layouts/zh_CN/main.qml"
-
-#### Keys ignored in scope 32:.:.:plugin.pro:CONFIG___contains___lang-zh(_HK?):
-# CUSTOM_LAYOUT_FILES = "$$PWD/content/layouts/zh_HK/digits.fallback" "$$PWD/content/layouts/zh_HK/numbers.fallback" "$$PWD/content/layouts/zh_HK/symbols.qml" "$$PWD/content/layouts/zh_HK/main.qml" "$$PWD/content/layouts/zh_HK/dialpad.fallback"
-
-#### Keys ignored in scope 38:.:.:plugin.pro:xt9-9key-stroke:
-# CUSTOM_LAYOUT_FILES = "$$PWD/content/layouts/zh_TW/main.qml"
-
 set(qmake_virtualkeyboard_xt9_layouts_resource_files)
 if (QT_FEATURE_vkb_lang_ja_JP)
     list(APPEND qmake_virtualkeyboard_xt9_layouts_resource_files
-        "${VKB_LAYOUTS_BASE}/content/layouts/ja_JP/digits.fallback"
-        "${VKB_LAYOUTS_BASE}/content/layouts/ja_JP/numbers.fallback"
-        "${VKB_LAYOUTS_BASE}/content/layouts/ja_JP/symbols.qml"
-        "${VKB_LAYOUTS_BASE}/content/layouts/ja_JP/dialpad.fallback"
+        "${VKB_LAYOUTS_BASE}/ja_JP/digits.fallback"
+        "${VKB_LAYOUTS_BASE}/ja_JP/numbers.fallback"
+        "${VKB_LAYOUTS_BASE}/ja_JP/symbols.qml"
+        "${VKB_LAYOUTS_BASE}/ja_JP/dialpad.fallback"
     )
 endif()
 if (QT_FEATURE_vkb_lang_ko_KR)
     list(APPEND qmake_virtualkeyboard_xt9_layouts_resource_files
-        "${VKB_LAYOUTS_BASE}/content/layouts/ko_KR/digits.fallback"
-        "${VKB_LAYOUTS_BASE}/content/layouts/ko_KR/main.qml"
-        "${VKB_LAYOUTS_BASE}/content/layouts/ko_KR/numbers.fallback"
-        "${VKB_LAYOUTS_BASE}/content/layouts/ko_KR/symbols.qml"
-        "${VKB_LAYOUTS_BASE}/content/layouts/ko_KR/dialpad.fallback"
+        "${VKB_LAYOUTS_BASE}/ko_KR/digits.fallback"
+        "${VKB_LAYOUTS_BASE}/ko_KR/main.qml"
+        "${VKB_LAYOUTS_BASE}/ko_KR/numbers.fallback"
+        "${VKB_LAYOUTS_BASE}/ko_KR/symbols.qml"
+        "${VKB_LAYOUTS_BASE}/ko_KR/dialpad.fallback"
     )
 endif()
 if (QT_FEATURE_vkb_lang_th_TH)
     list(APPEND qmake_virtualkeyboard_xt9_layouts_resource_files
-        "${VKB_LAYOUTS_BASE}/content/layouts/th_TH/digits.fallback"
-        "${VKB_LAYOUTS_BASE}/content/layouts/th_TH/main.qml"
-        "${VKB_LAYOUTS_BASE}/content/layouts/th_TH/numbers.fallback"
-        "${VKB_LAYOUTS_BASE}/content/layouts/th_TH/symbols.qml"
-        "${VKB_LAYOUTS_BASE}/content/layouts/th_TH/dialpad.fallback"
+        "${VKB_LAYOUTS_BASE}/th_TH/digits.fallback"
+        "${VKB_LAYOUTS_BASE}/th_TH/main.qml"
+        "${VKB_LAYOUTS_BASE}/th_TH/numbers.fallback"
+        "${VKB_LAYOUTS_BASE}/th_TH/symbols.qml"
+        "${VKB_LAYOUTS_BASE}/th_TH/dialpad.fallback"
     )
 endif()
 if (QT_FEATURE_vkb_lang_zh_CN)
     list(APPEND qmake_virtualkeyboard_xt9_layouts_resource_files
-        "${VKB_LAYOUTS_BASE}/content/layouts/zh_CN/digits.fallback"
-        "${VKB_LAYOUTS_BASE}/content/layouts/zh_CN/numbers.fallback"
-        "${VKB_LAYOUTS_BASE}/content/layouts/zh_CN/symbols.qml"
-        "${VKB_LAYOUTS_BASE}/content/layouts/zh_CN/dialpad.fallback"
+        "${VKB_LAYOUTS_BASE}/zh_CN/digits.fallback"
+        "${VKB_LAYOUTS_BASE}/zh_CN/numbers.fallback"
+        "${VKB_LAYOUTS_BASE}/zh_CN/symbols.qml"
+        "${VKB_LAYOUTS_BASE}/zh_CN/dialpad.fallback"
     )
 endif()
 if (NOT FEATURE_vkb_cerence_xt9_9key_layouts AND QT_FEATURE_vkb_lang_zh_CN)
     list(APPEND qmake_virtualkeyboard_xt9_layouts_resource_files
-        "${VKB_LAYOUTS_BASE}/content/layouts/zh_CN/main.qml"
+        "${VKB_LAYOUTS_BASE}/zh_CN/main.qml"
     )
 endif()
 if (QT_FEATURE_vkb_lang_zh_TW)
     list(APPEND qmake_virtualkeyboard_xt9_layouts_resource_files
-        "${VKB_LAYOUTS_BASE}/content/layouts/zh_TW/digits.fallback"
-        "${VKB_LAYOUTS_BASE}/content/layouts/zh_TW/numbers.fallback"
-        "${VKB_LAYOUTS_BASE}/content/layouts/zh_TW/symbols.qml"
-        "${VKB_LAYOUTS_BASE}/content/layouts/zh_TW/dialpad.fallback"
+        "${VKB_LAYOUTS_BASE}/zh_TW/digits.fallback"
+        "${VKB_LAYOUTS_BASE}/zh_TW/numbers.fallback"
+        "${VKB_LAYOUTS_BASE}/zh_TW/symbols.qml"
+        "${VKB_LAYOUTS_BASE}/zh_TW/dialpad.fallback"
     )
 endif()
 
-qt_internal_add_resource(QtVirtualKeyboardXt9Plugin "qmake_virtualkeyboard_xt9_layouts"
+qt_internal_add_resource(qtvkbcerencext9plugin "qmake_virtualkeyboard_xt9_layouts"
     PREFIX
         "${VKB_LAYOUTS_PREFIX}"
     BASE
@@ -162,11 +111,11 @@ if (QT_FEATURE_vkb_lang_zh_HK)
     )
 endif()
 
-qt_internal_add_resource(QtVirtualKeyboardXt9Plugin "qmake_virtualkeyboard_xt9_custom_layouts"
+qt_internal_add_resource(qtvkbcerencext9plugin "qmake_virtualkeyboard_xt9_custom_layouts"
     PREFIX
         "${VKB_LAYOUTS_PREFIX}"
     BASE
-        "${CMAKE_CURRENT_SOURCE_DIR}"
+        "${CMAKE_CURRENT_SOURCE_DIR}/content/layouts"
     FILES
         ${qmake_virtualkeyboard_xt9_custom_layouts_resource_files}
 )
@@ -178,11 +127,11 @@ if (QT_FEATURE_vkb_lang_zh_TW AND NOT FEATURE_vkb_cerence_xt9_9key_layouts)
         "${CMAKE_CURRENT_BINARY_DIR}/content/layouts/zh_TW/main.qml"
     )
 
-    qt_internal_add_resource(QtVirtualKeyboardXt9Plugin "qmake_virtualkeyboard_xt9_cangjie_layouts"
+    qt_internal_add_resource(qtvkbcerencext9plugin "qmake_virtualkeyboard_xt9_cangjie_layouts"
         PREFIX
             "${VKB_LAYOUTS_PREFIX}"
         BASE
-            "${CMAKE_CURRENT_BINARY_DIR}"
+            "${CMAKE_CURRENT_BINARY_DIR}/content/layouts"
         FILES
             ${qmake_virtualkeyboard_xt9_cangjie_layouts_resource_files}
     )
@@ -207,207 +156,12 @@ if (FEATURE_vkb_cerence_xt9_9key_layouts)
         )
     endif()
 
-    qt_internal_add_resource(QtVirtualKeyboardXt9Plugin "qmake_virtualkeyboard_xt9_9key_layouts"
+    qt_internal_add_resource(qtvkbcerencext9plugin "qmake_virtualkeyboard_xt9_9key_layouts"
         PREFIX
             "${VKB_LAYOUTS_PREFIX}"
         BASE
-            "${CMAKE_CURRENT_SOURCE_DIR}/9key_layouts"
+            "${CMAKE_CURRENT_SOURCE_DIR}/9key_layouts/content/layouts"
         FILES
             ${qmake_virtualkeyboard_xt9_9key_layouts_resource_files}
     )
 endif()
-
-#### Keys ignored in scope 40:.:.:plugin.pro:WIN32:
-# QMAKE_TARGET_DESCRIPTION = "Virtual Keyboard Extension for Qt."
-# QMAKE_TARGET_PRODUCT = "Qt Virtual Keyboard Cerence XT9 (Qt $$QT_VERSION)"
-
-#### Keys ignored in scope 42:.:../..:../../cerence.pri:CERENCE_SDK_ROOT_ISEMPTY:
-# EXT_CERENCE_SDK_ROOT = "$$(CERENCE_SDK_ROOT)"
-
-#### Keys ignored in scope 43:.:../..:../../cerence.pri:NOT EXT_CERENCE_SDK_ROOT_ISEMPTY:
-# CERENCE_SDK_ROOT = "$$EXT_CERENCE_SDK_ROOT"
-
-#### Keys ignored in scope 45:.:../..:../../cerence.pri:CERENCE_SDK_ROOT_ISEMPTY:
-# CERENCE_SDK_ROOT = "$$PWD/sdk"
-
-#### Keys ignored in scope 48:.:../..:../../cerence.pri:QT_ARCH___equals___arm:
-# CERENCE_SHARED_LIB_PATH = "lib/linux/arm/shared"
-# CERENCE_STATIC_LIB_PATH = "lib/linux/arm/static"
-
-#### Keys ignored in scope 50:.:../..:../../cerence.pri:QT_ARCH___equals___arm64:
-# CERENCE_SHARED_LIB_PATH = "lib/linux/arm64/shared"
-# CERENCE_STATIC_LIB_PATH = "lib/linux/arm64/static"
-
-#### Keys ignored in scope 52:.:../..:../../cerence.pri:QT_ARCH___equals___x86_64:
-# CERENCE_SHARED_LIB_PATH = "lib/linux/x86_64/shared"
-# CERENCE_STATIC_LIB_PATH = "lib/linux/x86_64/static"
-
-#### Keys ignored in scope 54:.:../..:../../cerence.pri:QT_ARCH___equals___x86 OR QT_ARCH___equals___i386:
-# CERENCE_SHARED_LIB_PATH = "lib/linux/x86/shared"
-# CERENCE_STATIC_LIB_PATH = "lib/linux/x86/static"
-
-#### Keys ignored in scope 57:.:../..:../../cerence.pri:QT_ARCH___equals___x86_64:
-# CERENCE_SHARED_LIB_PATH = "lib/win32/x86_64/shared"
-# CERENCE_STATIC_LIB_PATH = "lib/win32/x86_64/static"
-
-#### Keys ignored in scope 58:.:../..:../../cerence.pri:else:
-# CERENCE_SHARED_LIB_PATH = "lib/win32/x86/shared"
-# CERENCE_STATIC_LIB_PATH = "lib/win32/x86/static"
-
-#### Keys ignored in scope 60:.:../..:../../cerence.pri:WIN32:
-# result = "$$1/*.obj"
-
-#### Keys ignored in scope 61:.:../..:../../cerence.pri:result_ISEMPTY:
-# result = "$$1/*.lib"
-
-#### Keys ignored in scope 62:.:../..:../../cerence.pri:else:
-# result = "$$1/*.o"
-
-#### Keys ignored in scope 63:.:../..:../../cerence.pri:result_ISEMPTY:
-# result = "$$1/*.a"
-
-#### Keys ignored in scope 65:.:../..:../../cerence.pri:WIN32:
-# result = "$$1/*.lib"
-
-#### Keys ignored in scope 66:.:../..:../../cerence.pri:else:
-# result = "$$1/*.so"
-
-#### Keys ignored in scope 68:.:../..:../../cerence.pri:WIN32:
-# result = "$$1/*.dll"
-
-#### Keys ignored in scope 69:.:../..:../../cerence.pri:else:
-# result = "$$1/*.so"
-
-#### Keys ignored in scope 70:.:../..:../../cerence.pri:EXISTS _ss_CERENCE_HWR_INCLUDEPATH/decuma_hwr.h:
-# CERENCE_HWR_ALPHABETIC_FOUND = "1"
-
-#### Keys ignored in scope 71:.:../..:../../cerence.pri:EXISTS _ss_CERENCE_HWR_INCLUDEPATH/decuma_hwr_cjk.h:
-# CERENCE_HWR_CJK_FOUND = "1"
-
-#### Keys ignored in scope 74:.:../..:../../cerence.pri:NOT cerence-hwr-static:
-# CERENCE_HWR_ALPHABETIC_LIBS = "$$findSharedLibrary($$CERENCE_SDK_ROOT/t9write/$$CERENCE_SHARED_LIB_PATH/alphabetic)"
-
-#### Keys ignored in scope 75:.:../..:../../cerence.pri:NOT CERENCE_HWR_ALPHABETIC_LIBS_ISEMPTY:
-# CERENCE_HWR_ALPHABETIC_BINS = "$$findSharedBinary($$CERENCE_SDK_ROOT/t9write/$$CERENCE_SHARED_LIB_PATH/alphabetic)"
-
-#### Keys ignored in scope 76:.:../..:../../cerence.pri:else:
-# CERENCE_HWR_ALPHABETIC_LIBS = "$$findStaticLibrary($$CERENCE_SDK_ROOT/t9write/$$CERENCE_STATIC_LIB_PATH/alphabetic)"
-
-#### Keys ignored in scope 78:.:../..:../../cerence.pri:NOT cerence-hwr-static:
-# CERENCE_HWR_CJK_LIBS = "$$findSharedLibrary($$CERENCE_SDK_ROOT/t9write/$$CERENCE_SHARED_LIB_PATH/cjk)"
-
-#### Keys ignored in scope 79:.:../..:../../cerence.pri:NOT CERENCE_HWR_CJK_LIBS_ISEMPTY:
-# CERENCE_HWR_CJK_BINS = "$$findSharedBinary($$CERENCE_SDK_ROOT/t9write/$$CERENCE_SHARED_LIB_PATH/cjk)"
-
-#### Keys ignored in scope 80:.:../..:../../cerence.pri:else:
-# CERENCE_HWR_CJK_LIBS = "$$findStaticLibrary($$CERENCE_SDK_ROOT/t9write/$$CERENCE_STATIC_LIB_PATH/cjk)"
-
-#### Keys ignored in scope 81:.:../..:../../cerence.pri:(CERENCE_HWR_ALPHABETIC_FOUND EQUAL 1) AND NOT CERENCE_HWR_ALPHABETIC_LIBS_ISEMPTY:
-# CERENCE_HWR_FOUND = "1"
-
-#### Keys ignored in scope 82:.:../..:../../cerence.pri:(CERENCE_HWR_CJK_FOUND EQUAL 1) AND NOT CERENCE_HWR_CJK_LIBS_ISEMPTY:
-# CERENCE_HWR_FOUND = "1"
-
-#### Keys ignored in scope 83:.:../..:../../cerence.pri:EXISTS _ss_XT9_INCLUDEPATH/et9api.h:
-# XT9_FOUND = "1"
-
-#### Keys ignored in scope 85:.:../..:../../cerence.pri:NOT QT_FEATURE_xt9_static:
-# XT9_LIBS = "$$findSharedLibrary($$CERENCE_SDK_ROOT/xt9/$$CERENCE_SHARED_LIB_PATH)"
-
-#### Keys ignored in scope 86:.:../..:../../cerence.pri:NOT XT9_LIBS_ISEMPTY:
-# XT9_BINS = "$$findSharedBinary($$CERENCE_SDK_ROOT/xt9/$$CERENCE_SHARED_LIB_PATH)"
-
-#### Keys ignored in scope 87:.:../..:../../cerence.pri:else:
-# XT9_LIBS = "$$findStaticLibrary($$CERENCE_SDK_ROOT/xt9/$$CERENCE_STATIC_LIB_PATH)"
-
-#### Keys ignored in scope 133:.:../../../../plugins/myscript/3rdparty/myscript:../../../../plugins/myscript/3rdparty/myscript/myscript.pri:MYSCRIPT_PATH_ISEMPTY:
-# MYSCRIPT_PATH = "$$PWD"
-
-#### Keys ignored in scope 134:.:../../../../plugins/myscript/3rdparty/myscript:../../../../plugins/myscript/3rdparty/myscript/myscript.pri:UNIX AND LINUX AND NOT ANDROID:
-# MYSCRIPT_LIB_PREFIX = "lib"
-# MYSCRIPT_LIB_SUFFIX = ".so"
-# MYSCRIPT_VOIM_LIB_NAME = "libvoim.so"
-# MYSCRIPT_VOIM_LIB_PATH = "$$MYSCRIPT_PATH/$$MYSCRIPT_VOIM_PATH/$$MYSCRIPT_VOIM_LIB_NAME"
-
-#### Keys ignored in scope 135:.:../../../../plugins/myscript/3rdparty/myscript:../../../../plugins/myscript/3rdparty/myscript/myscript.pri:QT_ARCH___equals___arm64:
-# MYSCRIPT_ENGINE_PATH = "engine/bin/lin-arm64"
-# MYSCRIPT_VOIM_PATH = "voim/bin/lin-arm64"
-
-#### Keys ignored in scope 137:.:../../../../plugins/myscript/3rdparty/myscript:../../../../plugins/myscript/3rdparty/myscript/myscript.pri:QT_ARCH___equals___arm:
-# MYSCRIPT_ENGINE_PATH = "engine/bin/lin-armv7"
-# MYSCRIPT_VOIM_PATH = "voim/bin/lin-armv7"
-
-#### Keys ignored in scope 139:.:../../../../plugins/myscript/3rdparty/myscript:../../../../plugins/myscript/3rdparty/myscript/myscript.pri:QT_ARCH___equals___x86_64:
-# MYSCRIPT_ENGINE_PATH = "engine/bin/lin-x64"
-# MYSCRIPT_VOIM_PATH = "voim/bin/lin-x64"
-
-#### Keys ignored in scope 141:.:../../../../plugins/myscript/3rdparty/myscript:../../../../plugins/myscript/3rdparty/myscript/myscript.pri:QT_ARCH___equals___x86 OR QT_ARCH___equals___i386:
-# MYSCRIPT_ENGINE_PATH = "engine/bin/lin-x86"
-# MYSCRIPT_VOIM_PATH = "voim/bin/lin-x86"
-
-#### Keys ignored in scope 142:.:../../../../plugins/myscript/3rdparty/myscript:../../../../plugins/myscript/3rdparty/myscript/myscript.pri:else:
-# MYSCRIPT_ENGINE_PATH = "engine/bin/lin-$$QT_ARCH"
-# MYSCRIPT_VOIM_PATH = "voim/bin/lin-$$QT_ARCH"
-
-#### Keys ignored in scope 144:.:../../../../plugins/myscript/3rdparty/myscript:../../../../plugins/myscript/3rdparty/myscript/myscript.pri:WIN32 OR win64:
-# MYSCRIPT_LIB_PREFIX = ""
-# MYSCRIPT_LIB_SUFFIX = ".dll"
-# MYSCRIPT_VOIM_LIB_NAME = "voim.lib"
-# MYSCRIPT_VOIM_LIB_PATH = "$$MYSCRIPT_PATH/voim/api/c/lib/$$MYSCRIPT_VOIM_LIB_NAME"
-
-#### Keys ignored in scope 145:.:../../../../plugins/myscript/3rdparty/myscript:../../../../plugins/myscript/3rdparty/myscript/myscript.pri:QT_ARCH___equals___x86_64:
-# MYSCRIPT_ENGINE_PATH = "engine/bin/win-x64"
-# MYSCRIPT_VOIM_PATH = "voim/bin/win-x64"
-
-#### Keys ignored in scope 146:.:../../../../plugins/myscript/3rdparty/myscript:../../../../plugins/myscript/3rdparty/myscript/myscript.pri:else:
-# MYSCRIPT_ENGINE_PATH = "engine/bin/win-x86"
-# MYSCRIPT_VOIM_PATH = "voim/bin/win-x86"
-
-#### Keys ignored in scope 148:.:../../../../plugins/myscript/3rdparty/myscript:../../../../plugins/myscript/3rdparty/myscript/myscript.pri:EXISTS _ss_MYSCRIPT_VOIM_LIB_PATH:
-# MYSCRIPT_FOUND = "1"
-
-#### Keys ignored in scope 150:.:../../../../plugins/myscript/3rdparty/myscript:../../../../plugins/myscript/3rdparty/myscript/myscript.pri:MYSCRIPT_PATH_ISEMPTY:
-# MYSCRIPT_PATH = "$$PWD"
-
-#### Keys ignored in scope 151:.:../../../../plugins/myscript/3rdparty/myscript:../../../../plugins/myscript/3rdparty/myscript/myscript.pri:UNIX AND LINUX AND NOT ANDROID:
-# MYSCRIPT_LIB_PREFIX = "lib"
-# MYSCRIPT_LIB_SUFFIX = ".so"
-# MYSCRIPT_VOIM_LIB_NAME = "libvoim.so"
-# MYSCRIPT_VOIM_LIB_PATH = "$$MYSCRIPT_PATH/$$MYSCRIPT_VOIM_PATH/$$MYSCRIPT_VOIM_LIB_NAME"
-
-#### Keys ignored in scope 152:.:../../../../plugins/myscript/3rdparty/myscript:../../../../plugins/myscript/3rdparty/myscript/myscript.pri:QT_ARCH___equals___arm64:
-# MYSCRIPT_ENGINE_PATH = "engine/bin/lin-arm64"
-# MYSCRIPT_VOIM_PATH = "voim/bin/lin-arm64"
-
-#### Keys ignored in scope 154:.:../../../../plugins/myscript/3rdparty/myscript:../../../../plugins/myscript/3rdparty/myscript/myscript.pri:QT_ARCH___equals___arm:
-# MYSCRIPT_ENGINE_PATH = "engine/bin/lin-armv7"
-# MYSCRIPT_VOIM_PATH = "voim/bin/lin-armv7"
-
-#### Keys ignored in scope 156:.:../../../../plugins/myscript/3rdparty/myscript:../../../../plugins/myscript/3rdparty/myscript/myscript.pri:QT_ARCH___equals___x86_64:
-# MYSCRIPT_ENGINE_PATH = "engine/bin/lin-x64"
-# MYSCRIPT_VOIM_PATH = "voim/bin/lin-x64"
-
-#### Keys ignored in scope 158:.:../../../../plugins/myscript/3rdparty/myscript:../../../../plugins/myscript/3rdparty/myscript/myscript.pri:QT_ARCH___equals___x86 OR QT_ARCH___equals___i386:
-# MYSCRIPT_ENGINE_PATH = "engine/bin/lin-x86"
-# MYSCRIPT_VOIM_PATH = "voim/bin/lin-x86"
-
-#### Keys ignored in scope 159:.:../../../../plugins/myscript/3rdparty/myscript:../../../../plugins/myscript/3rdparty/myscript/myscript.pri:else:
-# MYSCRIPT_ENGINE_PATH = "engine/bin/lin-$$QT_ARCH"
-# MYSCRIPT_VOIM_PATH = "voim/bin/lin-$$QT_ARCH"
-
-#### Keys ignored in scope 161:.:../../../../plugins/myscript/3rdparty/myscript:../../../../plugins/myscript/3rdparty/myscript/myscript.pri:WIN32 OR win64:
-# MYSCRIPT_LIB_PREFIX = ""
-# MYSCRIPT_LIB_SUFFIX = ".dll"
-# MYSCRIPT_VOIM_LIB_NAME = "voim.lib"
-# MYSCRIPT_VOIM_LIB_PATH = "$$MYSCRIPT_PATH/voim/api/c/lib/$$MYSCRIPT_VOIM_LIB_NAME"
-
-#### Keys ignored in scope 162:.:../../../../plugins/myscript/3rdparty/myscript:../../../../plugins/myscript/3rdparty/myscript/myscript.pri:QT_ARCH___equals___x86_64:
-# MYSCRIPT_ENGINE_PATH = "engine/bin/win-x64"
-# MYSCRIPT_VOIM_PATH = "voim/bin/win-x64"
-
-#### Keys ignored in scope 163:.:../../../../plugins/myscript/3rdparty/myscript:../../../../plugins/myscript/3rdparty/myscript/myscript.pri:else:
-# MYSCRIPT_ENGINE_PATH = "engine/bin/win-x86"
-# MYSCRIPT_VOIM_PATH = "voim/bin/win-x86"
-
-#### Keys ignored in scope 165:.:../../../../plugins/myscript/3rdparty/myscript:../../../../plugins/myscript/3rdparty/myscript/myscript.pri:EXISTS _ss_MYSCRIPT_VOIM_LIB_PATH:
-# MYSCRIPT_FOUND = "1"
diff --git a/src/plugins/cerence/xt9/plugin/cerence_xt9.json b/src/plugins/cerence/xt9/plugin/cerence_xt9.json
deleted file mode 100644
index 6eb368ed..00000000
--- a/src/plugins/cerence/xt9/plugin/cerence_xt9.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "Name": "xt9",
-    "Provider": "Qt Cerence XT9 Extension",
-    "InputMethod": [
-        "DefaultInputMethod",
-        "PinyinInputMethod",
-        "StrokeInputMethod",
-        "HangulInputMethod",
-        "JapaneseInputMethod"
-    ],
-    "Version": 200
-}
diff --git a/src/plugins/cerence/xt9/plugin/content/layouts/ja_JP/main.qml b/src/plugins/cerence/xt9/plugin/content/layouts/ja_JP/main.qml
index 810ff82a..f92f84f7 100644
--- a/src/plugins/cerence/xt9/plugin/content/layouts/ja_JP/main.qml
+++ b/src/plugins/cerence/xt9/plugin/content/layouts/ja_JP/main.qml
@@ -30,6 +30,7 @@
 import QtQuick
 import QtQuick.Layouts
 import QtQuick.VirtualKeyboard
+import QtQuick.VirtualKeyboard.Components
 
 KeyboardLayoutLoader {
     function createInputMethod() {
diff --git a/src/plugins/cerence/xt9/plugin/content/layouts/zh_HK/main.qml b/src/plugins/cerence/xt9/plugin/content/layouts/zh_HK/main.qml
index 46a320d0..af95e744 100644
--- a/src/plugins/cerence/xt9/plugin/content/layouts/zh_HK/main.qml
+++ b/src/plugins/cerence/xt9/plugin/content/layouts/zh_HK/main.qml
@@ -30,6 +30,7 @@
 import QtQuick
 import QtQuick.Layouts
 import QtQuick.VirtualKeyboard
+import QtQuick.VirtualKeyboard.Components
 
 KeyboardLayout {
     keyWeight: 160
diff --git a/src/plugins/cerence/xt9/plugin/content/layouts/zh_HK/symbols.qml b/src/plugins/cerence/xt9/plugin/content/layouts/zh_HK/symbols.qml
index 4243e783..6e1a186d 100644
--- a/src/plugins/cerence/xt9/plugin/content/layouts/zh_HK/symbols.qml
+++ b/src/plugins/cerence/xt9/plugin/content/layouts/zh_HK/symbols.qml
@@ -30,6 +30,7 @@
 import QtQuick
 import QtQuick.Layouts
 import QtQuick.VirtualKeyboard
+import QtQuick.VirtualKeyboard.Components
 
 KeyboardLayoutLoader {
     function createInputMethod() {
diff --git a/src/plugins/cerence/xt9/plugin/xt9awinputmethod_p.h b/src/plugins/cerence/xt9/plugin/xt9awinputmethod_p.h
index 37bf9e1d..6491d69b 100644
--- a/src/plugins/cerence/xt9/plugin/xt9awinputmethod_p.h
+++ b/src/plugins/cerence/xt9/plugin/xt9awinputmethod_p.h
@@ -41,6 +41,7 @@ class Xt9AwInputMethod : public Xt9InputMethod
 {
     Q_OBJECT
     Q_DECLARE_PRIVATE(Xt9AwInputMethod)
+    QML_NAMED_ELEMENT(DefaultInputMethod)
 protected:
     Xt9AwInputMethod(Xt9AwInputMethodPrivate &dd, QObject *parent = nullptr);
 
diff --git a/src/plugins/cerence/xt9/plugin/xt9cpinputmethod.cpp b/src/plugins/cerence/xt9/plugin/xt9cpinputmethod.cpp
index ae3d8e0d..225224ac 100644
--- a/src/plugins/cerence/xt9/plugin/xt9cpinputmethod.cpp
+++ b/src/plugins/cerence/xt9/plugin/xt9cpinputmethod.cpp
@@ -175,5 +175,17 @@ void Xt9CpInputMethod::update()
     d->reset();
 }
 
+CangjieInputMethod::CangjieInputMethod(QObject *parent) :
+    Xt9CpInputMethod(parent)
+{
+
+}
+
+StrokeInputMethod::StrokeInputMethod(QObject *parent) :
+    Xt9CpInputMethod(parent)
+{
+
+}
+
 } // namespace QtVirtualKeyboard
 QT_END_NAMESPACE
diff --git a/src/plugins/cerence/xt9/plugin/xt9cpinputmethod_p.h b/src/plugins/cerence/xt9/plugin/xt9cpinputmethod_p.h
index f727dbe4..c4b07563 100644
--- a/src/plugins/cerence/xt9/plugin/xt9cpinputmethod_p.h
+++ b/src/plugins/cerence/xt9/plugin/xt9cpinputmethod_p.h
@@ -41,6 +41,7 @@ class Xt9CpInputMethod : public Xt9InputMethod
 {
     Q_OBJECT
     Q_DECLARE_PRIVATE(Xt9CpInputMethod)
+    QML_NAMED_ELEMENT(PinyinInputMethod)
 public:
     explicit Xt9CpInputMethod(QObject *parent = nullptr);
 
@@ -59,6 +60,22 @@ public:
     void update();
 };
 
+class CangjieInputMethod : public Xt9CpInputMethod
+{
+    Q_OBJECT
+    QML_NAMED_ELEMENT(CangjieInputMethod)
+public:
+    explicit CangjieInputMethod(QObject *parent = nullptr);
+};
+
+class StrokeInputMethod : public Xt9CpInputMethod
+{
+    Q_OBJECT
+    QML_NAMED_ELEMENT(StrokeInputMethod)
+public:
+    explicit StrokeInputMethod(QObject *parent = nullptr);
+};
+
 } // namespace QtVirtualKeyboard
 QT_END_NAMESPACE
 
diff --git a/src/plugins/cerence/xt9/plugin/xt9inputmethodprivate.cpp b/src/plugins/cerence/xt9/plugin/xt9inputmethodprivate.cpp
index 66510475..8f98f9a0 100644
--- a/src/plugins/cerence/xt9/plugin/xt9inputmethodprivate.cpp
+++ b/src/plugins/cerence/xt9/plugin/xt9inputmethodprivate.cpp
@@ -52,6 +52,9 @@ Xt9InputMethodPrivate::Xt9InputMethodPrivate(Xt9InputMethod *q_ptr, Xt9Ime *xt9I
     initDone(false),
     dlmFileName(aDlmFileName)
 {
+#ifdef HAVE_XT9_RESOURCE
+    Q_INIT_RESOURCE(qmake_cerencecommondata_db);
+#endif
 }
 
 void Xt9InputMethodPrivate::sysInit()
diff --git a/src/plugins/cerence/xt9/plugin/xt9jinputmethod_p.h b/src/plugins/cerence/xt9/plugin/xt9jinputmethod_p.h
index 95ac2848..59a6708c 100644
--- a/src/plugins/cerence/xt9/plugin/xt9jinputmethod_p.h
+++ b/src/plugins/cerence/xt9/plugin/xt9jinputmethod_p.h
@@ -42,6 +42,7 @@ class Xt9JInputMethod : public Xt9AwInputMethod
     Q_OBJECT
     Q_DECLARE_PRIVATE(Xt9JInputMethod)
     Q_PROPERTY(bool modifyKeyEnabled READ isModifyKeyEnabled NOTIFY modifyKeyEnabledChanged)
+    QML_NAMED_ELEMENT(JapaneseInputMethod)
 public:
     explicit Xt9JInputMethod(QObject *parent = nullptr);
 
diff --git a/src/plugins/cerence/xt9/plugin/xt9kinputmethod_p.h b/src/plugins/cerence/xt9/plugin/xt9kinputmethod_p.h
index 9b5623ac..057db2ae 100644
--- a/src/plugins/cerence/xt9/plugin/xt9kinputmethod_p.h
+++ b/src/plugins/cerence/xt9/plugin/xt9kinputmethod_p.h
@@ -41,6 +41,7 @@ class Xt9KInputMethod : public Xt9AwInputMethod
 {
     Q_OBJECT
     Q_DECLARE_PRIVATE(Xt9KInputMethod)
+    QML_NAMED_ELEMENT(HangulInputMethod)
 public:
     explicit Xt9KInputMethod(QObject *parent = nullptr);
 
diff --git a/src/plugins/cerence/xt9/plugin/xt9plugin.cpp b/src/plugins/cerence/xt9/plugin/xt9plugin.cpp
deleted file mode 100644
index 9de8805e..00000000
--- a/src/plugins/cerence/xt9/plugin/xt9plugin.cpp
+++ /dev/null
@@ -1,56 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2021 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 or (at your option) any later version
-** approved by the KDE Free Qt Foundation. The licenses are as published by
-** the Free Software Foundation and appearing in the file LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "xt9plugin.h"
-#include "xt9awinputmethod_p.h"
-#include "xt9cpinputmethod_p.h"
-#include "xt9kinputmethod_p.h"
-#include "xt9jinputmethod_p.h"
-#include "xt9thaiinputmethod_p.h"
-#include <QtQml>
-
-QT_BEGIN_NAMESPACE
-
-using namespace QtVirtualKeyboard;
-
-void QtVirtualKeyboardXt9Plugin::registerTypes(const char *uri) const
-{
-#ifdef HAVE_XT9_RESOURCE
-    Q_INIT_RESOURCE(qmake_cerencecommondata_db);
-#endif
-    qmlRegisterType<Xt9AwInputMethod>(uri, 2, 0, "DefaultInputMethod");
-    qmlRegisterType<Xt9CpInputMethod>(uri, 2, 0, "PinyinInputMethod");
-    qmlRegisterType<Xt9CpInputMethod>(uri, 2, 0, "CangjieInputMethod");
-    qmlRegisterType<Xt9CpInputMethod>(uri, 2, 0, "StrokeInputMethod");
-    qmlRegisterType<Xt9KInputMethod>(uri, 2, 0, "HangulInputMethod");
-    qmlRegisterType<Xt9JInputMethod>(uri, 2, 0, "JapaneseInputMethod");
-    qmlRegisterType<Xt9ThaiInputMethod>(uri, 2, 0, "ThaiInputMethod");
-}
-
-QT_END_NAMESPACE
diff --git a/src/plugins/cerence/xt9/plugin/xt9plugin.h b/src/plugins/cerence/xt9/plugin/xt9plugin.h
deleted file mode 100644
index 9afe3b34..00000000
--- a/src/plugins/cerence/xt9/plugin/xt9plugin.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2021 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 or (at your option) any later version
-** approved by the KDE Free Qt Foundation. The licenses are as published by
-** the Free Software Foundation and appearing in the file LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef XT9PLUGIN_H
-#define XT9PLUGIN_H
-
-#include <QVirtualKeyboardExtensionPlugin>
-
-QT_BEGIN_NAMESPACE
-
-class QtVirtualKeyboardXt9Plugin : public QVirtualKeyboardExtensionPlugin
-{
-    Q_OBJECT
-    Q_INTERFACES(QVirtualKeyboardExtensionPlugin)
-    Q_PLUGIN_METADATA(IID QVirtualKeyboardExtensionPluginFactoryInterface_iid
-                      FILE "cerence_xt9.json")
-public:
-    void registerTypes(const char *uri) const;
-};
-
-QT_END_NAMESPACE
-
-#endif
diff --git a/src/plugins/cerence/xt9/plugin/xt9thaiinputmethod_p.h b/src/plugins/cerence/xt9/plugin/xt9thaiinputmethod_p.h
index 0611db34..95d365d4 100644
--- a/src/plugins/cerence/xt9/plugin/xt9thaiinputmethod_p.h
+++ b/src/plugins/cerence/xt9/plugin/xt9thaiinputmethod_p.h
@@ -41,6 +41,7 @@ class Xt9ThaiInputMethod : public Xt9AwInputMethod
 {
     Q_OBJECT
     Q_DECLARE_PRIVATE(Xt9ThaiInputMethod)
+    QML_NAMED_ELEMENT(ThaiInputMethod)
 public:
     explicit Xt9ThaiInputMethod(QObject *parent = nullptr);
 
diff --git a/src/plugins/hangul/CMakeLists.txt b/src/plugins/hangul/CMakeLists.txt
index c218fb73..34931c1e 100644
--- a/src/plugins/hangul/CMakeLists.txt
+++ b/src/plugins/hangul/CMakeLists.txt
@@ -1,16 +1,17 @@
-# Generated from hangul.pro.
-
 #####################################################################
 ## QtVirtualKeyboardHangulPlugin Plugin:
 #####################################################################
 
-qt_internal_add_plugin(QtVirtualKeyboardHangulPlugin
-    OUTPUT_NAME qtvirtualkeyboard_hangul
-    PLUGIN_TYPE virtualkeyboard
+qt_internal_add_qml_module(qtvkbhangulplugin
+    URI "QtQuick.VirtualKeyboard.Plugins.Hangul"
+    VERSION "${PROJECT_VERSION}"
+    PLUGIN_TARGET qtvkbhangulplugin
+    NO_PLUGIN_OPTIONAL
+    DEPENDENCIES
+        QtQuick.VirtualKeyboard/auto
     SOURCES
         hangul.cpp hangul_p.h
         hangulinputmethod.cpp hangulinputmethod_p.h
-        hangulplugin.cpp hangulplugin.h
     DEFINES
         QT_ASCII_CAST_WARNINGS
         QT_NO_CAST_FROM_ASCII
@@ -25,29 +26,18 @@ qt_internal_add_plugin(QtVirtualKeyboardHangulPlugin
 
 # Resources:
 set(qmake_virtualkeyboard_hangul_layouts_resource_files
-    "${VKB_LAYOUTS_BASE}/content/layouts/ko_KR/dialpad.fallback"
-    "${VKB_LAYOUTS_BASE}/content/layouts/ko_KR/digits.fallback"
-    "${VKB_LAYOUTS_BASE}/content/layouts/ko_KR/main.qml"
-    "${VKB_LAYOUTS_BASE}/content/layouts/ko_KR/numbers.fallback"
-    "${VKB_LAYOUTS_BASE}/content/layouts/ko_KR/symbols.qml"
+    "${VKB_LAYOUTS_BASE}/ko_KR/dialpad.fallback"
+    "${VKB_LAYOUTS_BASE}/ko_KR/digits.fallback"
+    "${VKB_LAYOUTS_BASE}/ko_KR/main.qml"
+    "${VKB_LAYOUTS_BASE}/ko_KR/numbers.fallback"
+    "${VKB_LAYOUTS_BASE}/ko_KR/symbols.qml"
 )
 
-qt_internal_add_resource(QtVirtualKeyboardHangulPlugin "qmake_virtualkeyboard_hangul_layouts"
+qt_internal_add_resource(qtvkbhangulplugin "qmake_virtualkeyboard_hangul_layouts"
     PREFIX
-        "${VKB_LAYOUTS_PREFIX}" #special case
+        "${VKB_LAYOUTS_PREFIX}"
     BASE
-        "${VKB_LAYOUTS_BASE}" #special case
+        "${VKB_LAYOUTS_BASE}"
     FILES
         ${qmake_virtualkeyboard_hangul_layouts_resource_files}
 )
-
-
-#### Keys ignored in scope 1:.:.:hangul.pro:<TRUE>:
-# OTHER_FILES = "hangul.json" "$$LAYOUT_FILES"
-
-## Scopes:
-#####################################################################
-
-#### Keys ignored in scope 2:.:.:hangul.pro:WIN32:
-# QMAKE_TARGET_DESCRIPTION = "Virtual Keyboard Extension for Qt."
-# QMAKE_TARGET_PRODUCT = "Qt Virtual Keyboard Hangul (Qt $$QT_VERSION)"
diff --git a/src/plugins/hangul/hangul.json b/src/plugins/hangul/hangul.json
deleted file mode 100644
index f7008a87..00000000
--- a/src/plugins/hangul/hangul.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "Name": "hangul",
-    "Provider": "Qt Hangul Extension",
-    "InputMethod": "HangulInputMethod",
-    "Version": 100
-}
diff --git a/src/plugins/hangul/hangulinputmethod_p.h b/src/plugins/hangul/hangulinputmethod_p.h
index 212e6b2b..0d71d828 100644
--- a/src/plugins/hangul/hangulinputmethod_p.h
+++ b/src/plugins/hangul/hangulinputmethod_p.h
@@ -52,6 +52,7 @@ class HangulInputMethod : public QVirtualKeyboardAbstractInputMethod
 {
     Q_OBJECT
     Q_DECLARE_PRIVATE(HangulInputMethod)
+    QML_ELEMENT
 public:
     explicit HangulInputMethod(QObject *parent = nullptr);
     ~HangulInputMethod();
diff --git a/src/plugins/hangul/hangulplugin.cpp b/src/plugins/hangul/hangulplugin.cpp
deleted file mode 100644
index a1438ed8..00000000
--- a/src/plugins/hangul/hangulplugin.cpp
+++ /dev/null
@@ -1,44 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2018 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 or (at your option) any later version
-** approved by the KDE Free Qt Foundation. The licenses are as published by
-** the Free Software Foundation and appearing in the file LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "hangulplugin.h"
-#include "hangulinputmethod_p.h"
-#include <QtQml>
-
-QT_BEGIN_NAMESPACE
-
-using namespace QtVirtualKeyboard;
-
-void QtVirtualKeyboardHangulPlugin::registerTypes(const char *uri) const
-{
-    qmlRegisterType<HangulInputMethod>(uri, 1, 3, "HangulInputMethod");
-    qmlRegisterType<HangulInputMethod>(uri, 2, 0, "HangulInputMethod");
-}
-
-QT_END_NAMESPACE
diff --git a/src/plugins/hangul/hangulplugin.h b/src/plugins/hangul/hangulplugin.h
deleted file mode 100644
index 84ab3e1e..00000000
--- a/src/plugins/hangul/hangulplugin.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2018 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 or (at your option) any later version
-** approved by the KDE Free Qt Foundation. The licenses are as published by
-** the Free Software Foundation and appearing in the file LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef HANGULPLUGIN_H
-#define HANGULPLUGIN_H
-
-#include <QVirtualKeyboardExtensionPlugin>
-
-QT_BEGIN_NAMESPACE
-
-class QtVirtualKeyboardHangulPlugin : public QVirtualKeyboardExtensionPlugin
-{
-    Q_OBJECT
-    Q_INTERFACES(QVirtualKeyboardExtensionPlugin)
-    Q_PLUGIN_METADATA(IID QVirtualKeyboardExtensionPluginFactoryInterface_iid
-                      FILE "hangul.json")
-public:
-    void registerTypes(const char *uri) const override;
-};
-
-QT_END_NAMESPACE
-
-#endif
diff --git a/src/plugins/hunspell/CMakeLists.txt b/src/plugins/hunspell/CMakeLists.txt
index df705c47..e9a1be72 100644
--- a/src/plugins/hunspell/CMakeLists.txt
+++ b/src/plugins/hunspell/CMakeLists.txt
@@ -1,7 +1,4 @@
-# Generated from hunspell.pro.
-
 if(QT_FEATURE_3rdparty_hunspell)
     add_subdirectory(3rdparty/hunspell)
 endif()
-add_subdirectory(hunspellinputmethod)
-add_subdirectory(plugin)
+add_subdirectory(module)
diff --git a/src/plugins/hunspell/hunspellinputmethod/CMakeLists.txt b/src/plugins/hunspell/module/CMakeLists.txt
index f07cf03f..5fc2c8f4 100644
--- a/src/plugins/hunspell/hunspellinputmethod/CMakeLists.txt
+++ b/src/plugins/hunspell/module/CMakeLists.txt
@@ -1,11 +1,14 @@
-# Generated from hunspellinputmethod.pro.
-
 #####################################################################
-## HunspellInputMethodPrivate Module:
+## QtQuickVirtualKeyboardHunspellPlugin Plugin:
 #####################################################################
 
-qt_internal_add_module(HunspellInputMethodPrivate
-    INTERNAL_MODULE
+qt_internal_add_qml_module(HunspellInputMethod
+    URI "QtQuick.VirtualKeyboard.Plugins.Hunspell"
+    VERSION "${PROJECT_VERSION}"
+    PLUGIN_TARGET qtvkbhunspellplugin
+    NO_PLUGIN_OPTIONAL
+    DEPENDENCIES
+        QtQuick.VirtualKeyboard/auto
     SOURCES
         hunspellinputmethod.cpp hunspellinputmethod_p.cpp hunspellinputmethod_p.h
         hunspellinputmethod_p_p.h
@@ -18,31 +21,31 @@ qt_internal_add_module(HunspellInputMethodPrivate
         QT_NO_CAST_FROM_ASCII
         QT_NO_CAST_FROM_BYTEARRAY
         QT_NO_CAST_TO_ASCII
-    PUBLIC_LIBRARIES
+    LIBRARIES
         Qt::Core
         Qt::Gui
+    PUBLIC_LIBRARIES
         Qt::VirtualKeyboardPrivate
     GENERATE_CPP_EXPORTS
     GENERATE_PRIVATE_CPP_EXPORTS
 )
 
-#### Keys ignored in scope 1:.:.:hunspellinputmethod.pro:<TRUE>:
-# MODULE = "hunspellinputmethod"
-
-## Scopes:
-#####################################################################
-
-qt_internal_extend_target(HunspellInputMethodPrivate CONDITION QT_FEATURE_system_hunspell
-    PUBLIC_LIBRARIES
+qt_internal_extend_target(HunspellInputMethod CONDITION QT_FEATURE_system_hunspell
+    LIBRARIES
         Hunspell::Hunspell
 )
 
-# special case begin
-qt_internal_extend_target(HunspellInputMethodPrivate CONDITION NOT QT_FEATURE_system_hunspell AND QT_FEATURE_3rdparty_hunspell
+qt_internal_extend_target(HunspellInputMethod CONDITION NOT QT_FEATURE_system_hunspell AND QT_FEATURE_3rdparty_hunspell
     LIBRARIES
         Qt::BundledHunspell
 )
-# special case end
 
-#### Keys ignored in scope 4:.:.:hunspellinputmethod.pro:QT_FEATURE_3rdparty_hunspell:
-# PKGCONFIG = "hunspell"
+if(QT_FEATURE_3rdparty_hunspell)
+    qt_copy_or_install(
+        DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../3rdparty/hunspell/data/"
+        DESTINATION "${VKB_INSTALL_DATA}/hunspell"
+        FILES_MATCHING
+        PATTERN "*.dic"
+        PATTERN "*.aff"
+    )
+endif()
diff --git a/src/plugins/hunspell/hunspellinputmethod/hunspellinputmethod.cpp b/src/plugins/hunspell/module/hunspellinputmethod.cpp
index d179e2a6..d179e2a6 100644
--- a/src/plugins/hunspell/hunspellinputmethod/hunspellinputmethod.cpp
+++ b/src/plugins/hunspell/module/hunspellinputmethod.cpp
diff --git a/src/plugins/hunspell/hunspellinputmethod/hunspellinputmethod_p.cpp b/src/plugins/hunspell/module/hunspellinputmethod_p.cpp
index 9d01a7bf..9d01a7bf 100644
--- a/src/plugins/hunspell/hunspellinputmethod/hunspellinputmethod_p.cpp
+++ b/src/plugins/hunspell/module/hunspellinputmethod_p.cpp
diff --git a/src/plugins/hunspell/hunspellinputmethod/hunspellinputmethod_p.h b/src/plugins/hunspell/module/hunspellinputmethod_p.h
index 39c88f0c..8d957d39 100644
--- a/src/plugins/hunspell/hunspellinputmethod/hunspellinputmethod_p.h
+++ b/src/plugins/hunspell/module/hunspellinputmethod_p.h
@@ -54,6 +54,7 @@ class Q_HUNSPELLINPUTMETHOD_EXPORT HunspellInputMethod : public QVirtualKeyboard
 {
     Q_OBJECT
     Q_DECLARE_PRIVATE(HunspellInputMethod)
+    QML_NAMED_ELEMENT(DefaultInputMethod)
 protected:
     HunspellInputMethod(HunspellInputMethodPrivate &dd, QObject *parent);
 public:
diff --git a/src/plugins/hunspell/hunspellinputmethod/hunspellinputmethod_p_p.h b/src/plugins/hunspell/module/hunspellinputmethod_p_p.h
index 42b862e5..42b862e5 100644
--- a/src/plugins/hunspell/hunspellinputmethod/hunspellinputmethod_p_p.h
+++ b/src/plugins/hunspell/module/hunspellinputmethod_p_p.h
diff --git a/src/plugins/hunspell/hunspellinputmethod/hunspellwordlist.cpp b/src/plugins/hunspell/module/hunspellwordlist.cpp
index 87b3ad24..87b3ad24 100644
--- a/src/plugins/hunspell/hunspellinputmethod/hunspellwordlist.cpp
+++ b/src/plugins/hunspell/module/hunspellwordlist.cpp
diff --git a/src/plugins/hunspell/hunspellinputmethod/hunspellwordlist_p.h b/src/plugins/hunspell/module/hunspellwordlist_p.h
index 036076a1..036076a1 100644
--- a/src/plugins/hunspell/hunspellinputmethod/hunspellwordlist_p.h
+++ b/src/plugins/hunspell/module/hunspellwordlist_p.h
diff --git a/src/plugins/hunspell/hunspellinputmethod/hunspellworker.cpp b/src/plugins/hunspell/module/hunspellworker.cpp
index 16d5fd62..16d5fd62 100644
--- a/src/plugins/hunspell/hunspellinputmethod/hunspellworker.cpp
+++ b/src/plugins/hunspell/module/hunspellworker.cpp
diff --git a/src/plugins/hunspell/hunspellinputmethod/hunspellworker_p.h b/src/plugins/hunspell/module/hunspellworker_p.h
index aa1dd078..aa1dd078 100644
--- a/src/plugins/hunspell/hunspellinputmethod/hunspellworker_p.h
+++ b/src/plugins/hunspell/module/hunspellworker_p.h
diff --git a/src/plugins/hunspell/hunspellinputmethod/qhunspellinputmethod_global.h b/src/plugins/hunspell/module/qhunspellinputmethod_global.h
index 08b20c0e..08b20c0e 100644
--- a/src/plugins/hunspell/hunspellinputmethod/qhunspellinputmethod_global.h
+++ b/src/plugins/hunspell/module/qhunspellinputmethod_global.h
diff --git a/src/plugins/hunspell/plugin/CMakeLists.txt b/src/plugins/hunspell/plugin/CMakeLists.txt
deleted file mode 100644
index 2cfeb395..00000000
--- a/src/plugins/hunspell/plugin/CMakeLists.txt
+++ /dev/null
@@ -1,53 +0,0 @@
-# Generated from plugin.pro.
-
-#####################################################################
-## QtVirtualKeyboardHunspellPlugin Plugin:
-#####################################################################
-
-qt_internal_add_plugin(QtVirtualKeyboardHunspellPlugin
-    OUTPUT_NAME qtvirtualkeyboard_hunspell
-    PLUGIN_TYPE virtualkeyboard
-    SOURCES
-        hunspellplugin.cpp hunspellplugin.h
-    DEFINES
-        QT_ASCII_CAST_WARNINGS
-        QT_NO_CAST_FROM_ASCII
-        QT_NO_CAST_FROM_BYTEARRAY
-        QT_NO_CAST_TO_ASCII
-    PUBLIC_LIBRARIES
-        Qt::Core
-        Qt::Gui
-        Qt::HunspellInputMethodPrivate
-        Qt::Qml
-        Qt::VirtualKeyboard
-)
-
-#### Keys ignored in scope 1:.:.:plugin.pro:<TRUE>:
-# OTHER_FILES = "hunspell.json"
-
-## Scopes:
-#####################################################################
-
-# special case begin
-if(QT_FEATURE_3rdparty_hunspell)
-    qt_copy_or_install(
-        DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../3rdparty/hunspell/data/"
-        DESTINATION "${VKB_INSTALL_DATA}/hunspell"
-        FILES_MATCHING
-        PATTERN "*.dic"
-        PATTERN "*.aff"
-    )
-endif()
-# special case end
-
-#### Keys ignored in scope 3:.:.:plugin.pro:EXISTS ../3rdparty/hunspell/data:
-# INSTALLS = "hunspell_data"
-# hunspell_data.files = "$$PWD/../3rdparty/hunspell/data/*.dic" "$$PWD/../3rdparty/hunspell/data/*.aff"
-# hunspell_data.path = "$$VIRTUALKEYBOARD_INSTALL_DATA/hunspell"
-
-#### Keys ignored in scope 4:.:.:plugin.pro:NOT prefix_build:
-# COPIES = "hunspell_data"
-
-#### Keys ignored in scope 6:.:.:plugin.pro:WIN32:
-# QMAKE_TARGET_DESCRIPTION = "Virtual Keyboard Extension for Qt."
-# QMAKE_TARGET_PRODUCT = "Qt Virtual Keyboard Hunspell (Qt $$QT_VERSION)"
diff --git a/src/plugins/hunspell/plugin/hunspell.json b/src/plugins/hunspell/plugin/hunspell.json
deleted file mode 100644
index 449e440c..00000000
--- a/src/plugins/hunspell/plugin/hunspell.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "Name": "default",
-    "Provider": "Qt Hunspell Extension",
-    "InputMethod": "DefaultInputMethod",
-    "Version": 100
-}
diff --git a/src/plugins/hunspell/plugin/hunspellplugin.cpp b/src/plugins/hunspell/plugin/hunspellplugin.cpp
deleted file mode 100644
index 0a952675..00000000
--- a/src/plugins/hunspell/plugin/hunspellplugin.cpp
+++ /dev/null
@@ -1,45 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2018 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 or (at your option) any later version
-** approved by the KDE Free Qt Foundation. The licenses are as published by
-** the Free Software Foundation and appearing in the file LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "hunspellplugin.h"
-#include <QtHunspellInputMethod/private/hunspellinputmethod_p.h>
-#include <QtQml>
-
-QT_BEGIN_NAMESPACE
-
-using namespace QtVirtualKeyboard;
-
-void QtVirtualKeyboardHunspellPlugin::registerTypes(const char *uri) const
-{
-    qmlRegisterType<HunspellInputMethod>(uri, 1, 0, "HunspellInputMethod");
-    qmlRegisterType<HunspellInputMethod>(uri, 2, 0, "HunspellInputMethod");
-    qmlRegisterType<HunspellInputMethod>(uri, 2, 3, "DefaultInputMethod");
-}
-
-QT_END_NAMESPACE
diff --git a/src/plugins/hunspell/plugin/hunspellplugin.h b/src/plugins/hunspell/plugin/hunspellplugin.h
deleted file mode 100644
index f79c1535..00000000
--- a/src/plugins/hunspell/plugin/hunspellplugin.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2018 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 or (at your option) any later version
-** approved by the KDE Free Qt Foundation. The licenses are as published by
-** the Free Software Foundation and appearing in the file LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef HUNSPELLPLUGIN_H
-#define HUNSPELLPLUGIN_H
-
-#include <QVirtualKeyboardExtensionPlugin>
-
-QT_BEGIN_NAMESPACE
-
-class QtVirtualKeyboardHunspellPlugin : public QVirtualKeyboardExtensionPlugin
-{
-    Q_OBJECT
-    Q_INTERFACES(QVirtualKeyboardExtensionPlugin)
-    Q_PLUGIN_METADATA(IID QVirtualKeyboardExtensionPluginFactoryInterface_iid
-                      FILE "hunspell.json")
-public:
-    void registerTypes(const char *uri) const override;
-};
-
-QT_END_NAMESPACE
-
-#endif
diff --git a/src/plugins/myscript/CMakeLists.txt b/src/plugins/myscript/CMakeLists.txt
index bf32310f..7d5453f6 100644
--- a/src/plugins/myscript/CMakeLists.txt
+++ b/src/plugins/myscript/CMakeLists.txt
@@ -1,3 +1 @@
-# Generated from myscript.pro.
-
 add_subdirectory(plugin)
diff --git a/src/plugins/myscript/plugin/CMakeLists.txt b/src/plugins/myscript/plugin/CMakeLists.txt
index 53bfce75..f0cca44d 100644
--- a/src/plugins/myscript/plugin/CMakeLists.txt
+++ b/src/plugins/myscript/plugin/CMakeLists.txt
@@ -1,5 +1,3 @@
-# Generated from plugin.pro.
-
 #####################################################################
 ## QtVirtualKeyboardMyScriptPlugin Plugin:
 #####################################################################
@@ -19,9 +17,13 @@ set(MYSCRIPT_VOIM_PROPERTY_NAME "voim/conf")
 set(MYSCRIPT_LANGUAGE_CONF_NAME "conf")
 set(MYSCRIPT_LANGUAGE_RESOURCES_NAME "resources")
 
-qt_internal_add_plugin(QtVirtualKeyboardMyScriptPlugin
-    OUTPUT_NAME qtvirtualkeyboard_myscript
-    PLUGIN_TYPE virtualkeyboard
+qt_internal_add_qml_module(qtvkbmyscriptplugin
+    URI "QtQuick.VirtualKeyboard.Plugins.MyScript"
+    VERSION "${PROJECT_VERSION}"
+    PLUGIN_TARGET qtvkbmyscriptplugin
+    NO_PLUGIN_OPTIONAL
+    DEPENDENCIES
+        QtQuick.VirtualKeyboard/auto
     SOURCES
         ${MyScript_ROOT_DIR}/voim/api/c/examples/common/Properties.c
         myscriptinputmethod.cpp myscriptinputmethod_p.h
@@ -71,421 +73,267 @@ qt_copy_or_install(
 
 # Resources:
 set(qmake_virtualkeyboard_myscript_layouts_resource_files
-    "${VKB_LAYOUTS_BASE}/content/layouts/fallback/handwriting.qml"
+    "${VKB_LAYOUTS_BASE}/fallback/handwriting.qml"
 )
 
 # special case begin
 if (QT_FEATURE_vkb_lang_en_GB)
     list(APPEND qmake_virtualkeyboard_myscript_layouts_resource_files
-        "${VKB_LAYOUTS_BASE}/content/layouts/en_GB/handwriting.fallback"
+        "${VKB_LAYOUTS_BASE}/en_GB/handwriting.fallback"
     )
 endif()
 
 if (QT_FEATURE_vkb_lang_en_US)
     list(APPEND qmake_virtualkeyboard_myscript_layouts_resource_files
-        "${VKB_LAYOUTS_BASE}/content/layouts/en_US/handwriting.fallback"
+        "${VKB_LAYOUTS_BASE}/en_US/handwriting.fallback"
     )
 endif()
 
 if (QT_FEATURE_vkb_lang_ar_AR)
     list(APPEND qmake_virtualkeyboard_myscript_layouts_resource_files
-        "${VKB_LAYOUTS_BASE}/content/layouts/ar_AR/handwriting.qml"
+        "${VKB_LAYOUTS_BASE}/ar_AR/handwriting.qml"
     )
 endif()
 
 if (QT_FEATURE_vkb_lang_bg_BG)
     list(APPEND qmake_virtualkeyboard_myscript_layouts_resource_files
-        "${VKB_LAYOUTS_BASE}/content/layouts/bg_BG/handwriting.qml"
+        "${VKB_LAYOUTS_BASE}/bg_BG/handwriting.qml"
     )
 endif()
 
 if (QT_FEATURE_vkb_lang_cs_CZ)
     list(APPEND qmake_virtualkeyboard_myscript_layouts_resource_files
-        "${VKB_LAYOUTS_BASE}/content/layouts/cs_CZ/handwriting.qml"
+        "${VKB_LAYOUTS_BASE}/cs_CZ/handwriting.qml"
     )
 endif()
 
 if (QT_FEATURE_vkb_lang_da_DK)
     list(APPEND qmake_virtualkeyboard_myscript_layouts_resource_files
-        "${VKB_LAYOUTS_BASE}/content/layouts/da_DK/handwriting.fallback"
+        "${VKB_LAYOUTS_BASE}/da_DK/handwriting.fallback"
     )
 endif()
 
 if (QT_FEATURE_vkb_lang_de_DE)
     list(APPEND qmake_virtualkeyboard_myscript_layouts_resource_files
-        "${VKB_LAYOUTS_BASE}/content/layouts/de_DE/handwriting.fallback"
+        "${VKB_LAYOUTS_BASE}/de_DE/handwriting.fallback"
     )
 endif()
 
 if (QT_FEATURE_vkb_lang_el_GR)
     list(APPEND qmake_virtualkeyboard_myscript_layouts_resource_files
-        "${VKB_LAYOUTS_BASE}/content/layouts/el_GR/handwriting.qml"
+        "${VKB_LAYOUTS_BASE}/el_GR/handwriting.qml"
     )
 endif()
 
 if (QT_FEATURE_vkb_lang_es_ES)
     list(APPEND qmake_virtualkeyboard_myscript_layouts_resource_files
-        "${VKB_LAYOUTS_BASE}/content/layouts/es_ES/handwriting.qml"
+        "${VKB_LAYOUTS_BASE}/es_ES/handwriting.qml"
     )
 endif()
 
 if (QT_FEATURE_vkb_lang_es_MX)
     list(APPEND qmake_virtualkeyboard_myscript_layouts_resource_files
-        "${VKB_LAYOUTS_BASE}/content/layouts/es_MX/handwriting.qml"
+        "${VKB_LAYOUTS_BASE}/es_MX/handwriting.qml"
     )
 endif()
 
 if (QT_FEATURE_vkb_lang_et_EE)
     list(APPEND qmake_virtualkeyboard_myscript_layouts_resource_files
-        "${VKB_LAYOUTS_BASE}/content/layouts/et_EE/handwriting.fallback"
+        "${VKB_LAYOUTS_BASE}/et_EE/handwriting.fallback"
     )
 endif()
 
 if (QT_FEATURE_vkb_lang_fa_FA)
     list(APPEND qmake_virtualkeyboard_myscript_layouts_resource_files
-        "${VKB_LAYOUTS_BASE}/content/layouts/fa_FA/handwriting.qml"
+        "${VKB_LAYOUTS_BASE}/fa_FA/handwriting.qml"
     )
 endif()
 
 if (QT_FEATURE_vkb_lang_fi_FI)
     list(APPEND qmake_virtualkeyboard_myscript_layouts_resource_files
-        "${VKB_LAYOUTS_BASE}/content/layouts/fi_FI/handwriting.fallback"
+        "${VKB_LAYOUTS_BASE}/fi_FI/handwriting.fallback"
     )
 endif()
 
 if (QT_FEATURE_vkb_lang_fr_CA)
     list(APPEND qmake_virtualkeyboard_myscript_layouts_resource_files
-        "${VKB_LAYOUTS_BASE}/content/layouts/fr_CA/handwriting.fallback"
+        "${VKB_LAYOUTS_BASE}/fr_CA/handwriting.fallback"
     )
 endif()
 
 if (QT_FEATURE_vkb_lang_fr_FR)
     list(APPEND qmake_virtualkeyboard_myscript_layouts_resource_files
-        "${VKB_LAYOUTS_BASE}/content/layouts/fr_FR/handwriting.fallback"
+        "${VKB_LAYOUTS_BASE}/fr_FR/handwriting.fallback"
     )
 endif()
 
 if (QT_FEATURE_vkb_lang_he_IL)
     list(APPEND qmake_virtualkeyboard_myscript_layouts_resource_files
-        "${VKB_LAYOUTS_BASE}/content/layouts/he_IL/handwriting.qml"
+        "${VKB_LAYOUTS_BASE}/he_IL/handwriting.qml"
     )
 endif()
 
 if (QT_FEATURE_vkb_lang_hi_IN)
     list(APPEND qmake_virtualkeyboard_myscript_layouts_resource_files
-        "${VKB_LAYOUTS_BASE}/content/layouts/hi_IN/handwriting.qml"
+        "${VKB_LAYOUTS_BASE}/hi_IN/handwriting.qml"
     )
 endif()
 
 if (QT_FEATURE_vkb_lang_hr_HR)
     list(APPEND qmake_virtualkeyboard_myscript_layouts_resource_files
-        "${VKB_LAYOUTS_BASE}/content/layouts/hr_HR/handwriting.qml"
+        "${VKB_LAYOUTS_BASE}/hr_HR/handwriting.qml"
     )
 endif()
 
 if (QT_FEATURE_vkb_lang_hu_HU)
     list(APPEND qmake_virtualkeyboard_myscript_layouts_resource_files
-        "${VKB_LAYOUTS_BASE}/content/layouts/hu_HU/handwriting.qml"
+        "${VKB_LAYOUTS_BASE}/hu_HU/handwriting.qml"
     )
 endif()
 
 if (QT_FEATURE_vkb_lang_id_ID)
     list(APPEND qmake_virtualkeyboard_myscript_layouts_resource_files
-        "${VKB_LAYOUTS_BASE}/content/layouts/id_ID/handwriting.fallback"
+        "${VKB_LAYOUTS_BASE}/id_ID/handwriting.fallback"
     )
 endif()
 
 if (QT_FEATURE_vkb_lang_it_IT)
     list(APPEND qmake_virtualkeyboard_myscript_layouts_resource_files
-        "${VKB_LAYOUTS_BASE}/content/layouts/it_IT/handwriting.fallback"
+        "${VKB_LAYOUTS_BASE}/it_IT/handwriting.fallback"
     )
 endif()
 
 if (QT_FEATURE_vkb_lang_ja_JP)
     list(APPEND qmake_virtualkeyboard_myscript_layouts_resource_files
-        "${VKB_LAYOUTS_BASE}/content/layouts/ja_JP/handwriting.qml"
+        "${VKB_LAYOUTS_BASE}/ja_JP/handwriting.qml"
     )
 endif()
 
 if (QT_FEATURE_vkb_lang_ko_KR)
     list(APPEND qmake_virtualkeyboard_myscript_layouts_resource_files
-        "${VKB_LAYOUTS_BASE}/content/layouts/ko_KR/handwriting.qml"
+        "${VKB_LAYOUTS_BASE}/ko_KR/handwriting.qml"
     )
 endif()
 
 if (QT_FEATURE_vkb_lang_ms_MY)
     list(APPEND qmake_virtualkeyboard_myscript_layouts_resource_files
-        "${VKB_LAYOUTS_BASE}/content/layouts/ms_MY/handwriting.fallback"
+        "${VKB_LAYOUTS_BASE}/ms_MY/handwriting.fallback"
     )
 endif()
 
 if (QT_FEATURE_vkb_lang_nb_NO)
     list(APPEND qmake_virtualkeyboard_myscript_layouts_resource_files
-        "${VKB_LAYOUTS_BASE}/content/layouts/nb_NO/handwriting.fallback"
+        "${VKB_LAYOUTS_BASE}/nb_NO/handwriting.fallback"
     )
 endif()
 
 if (QT_FEATURE_vkb_lang_nl_NL)
     list(APPEND qmake_virtualkeyboard_myscript_layouts_resource_files
-        "${VKB_LAYOUTS_BASE}/content/layouts/nl_NL/handwriting.fallback"
+        "${VKB_LAYOUTS_BASE}/nl_NL/handwriting.fallback"
     )
 endif()
 
 if (QT_FEATURE_vkb_lang_pl_PL)
     list(APPEND qmake_virtualkeyboard_myscript_layouts_resource_files
-        "${VKB_LAYOUTS_BASE}/content/layouts/pl_PL/handwriting.fallback"
+        "${VKB_LAYOUTS_BASE}/pl_PL/handwriting.fallback"
     )
 endif()
 
 if (QT_FEATURE_vkb_lang_pt_BR)
     list(APPEND qmake_virtualkeyboard_myscript_layouts_resource_files
-        "${VKB_LAYOUTS_BASE}/content/layouts/pt_BR/handwriting.fallback"
+        "${VKB_LAYOUTS_BASE}/pt_BR/handwriting.fallback"
     )
 endif()
 
 if (QT_FEATURE_vkb_lang_pt_PT)
     list(APPEND qmake_virtualkeyboard_myscript_layouts_resource_files
-        "${VKB_LAYOUTS_BASE}/content/layouts/pt_PT/handwriting.fallback"
+        "${VKB_LAYOUTS_BASE}/pt_PT/handwriting.fallback"
     )
 endif()
 
 if (QT_FEATURE_vkb_lang_ro_RO)
     list(APPEND qmake_virtualkeyboard_myscript_layouts_resource_files
-        "${VKB_LAYOUTS_BASE}/content/layouts/ro_RO/handwriting.qml"
+        "${VKB_LAYOUTS_BASE}/ro_RO/handwriting.qml"
     )
 endif()
 
 if (QT_FEATURE_vkb_lang_ru_RU)
     list(APPEND qmake_virtualkeyboard_myscript_layouts_resource_files
-        "${VKB_LAYOUTS_BASE}/content/layouts/ru_RU/handwriting.qml"
+        "${VKB_LAYOUTS_BASE}/ru_RU/handwriting.qml"
     )
 endif()
 
 if (QT_FEATURE_vkb_lang_sk_SK)
     list(APPEND qmake_virtualkeyboard_myscript_layouts_resource_files
-        "${VKB_LAYOUTS_BASE}/content/layouts/sk_SK/handwriting.fallback"
+        "${VKB_LAYOUTS_BASE}/sk_SK/handwriting.fallback"
     )
 endif()
 
 if (QT_FEATURE_vkb_lang_sl_SI)
     list(APPEND qmake_virtualkeyboard_myscript_layouts_resource_files
-        "${VKB_LAYOUTS_BASE}/content/layouts/sl_SI/handwriting.fallback"
+        "${VKB_LAYOUTS_BASE}/sl_SI/handwriting.fallback"
     )
 endif()
 
 if (QT_FEATURE_vkb_lang_sq_AL)
     list(APPEND qmake_virtualkeyboard_myscript_layouts_resource_files
-        "${VKB_LAYOUTS_BASE}/content/layouts/sq_AL/handwriting.fallback"
+        "${VKB_LAYOUTS_BASE}/sq_AL/handwriting.fallback"
     )
 endif()
 
 if (QT_FEATURE_vkb_lang_sr_SP)
     list(APPEND qmake_virtualkeyboard_myscript_layouts_resource_files
-        "${VKB_LAYOUTS_BASE}/content/layouts/sr_SP/handwriting.qml"
+        "${VKB_LAYOUTS_BASE}/sr_SP/handwriting.qml"
     )
 endif()
 
 if (QT_FEATURE_vkb_lang_sv_SE)
     list(APPEND qmake_virtualkeyboard_myscript_layouts_resource_files
-        "${VKB_LAYOUTS_BASE}/content/layouts/sv_SE/handwriting.fallback"
+        "${VKB_LAYOUTS_BASE}/sv_SE/handwriting.fallback"
     )
 endif()
 
 if (QT_FEATURE_vkb_lang_th_TH)
     list(APPEND qmake_virtualkeyboard_myscript_layouts_resource_files
-        "${VKB_LAYOUTS_BASE}/content/layouts/th_TH/handwriting.fallback"
+        "${VKB_LAYOUTS_BASE}/th_TH/handwriting.fallback"
     )
 endif()
 
 if (QT_FEATURE_vkb_lang_tr_TR)
     list(APPEND qmake_virtualkeyboard_myscript_layouts_resource_files
-        "${VKB_LAYOUTS_BASE}/content/layouts/tr_TR/handwriting.fallback"
+        "${VKB_LAYOUTS_BASE}/tr_TR/handwriting.fallback"
     )
 endif()
 
 if (QT_FEATURE_vkb_lang_uk_UA)
     list(APPEND qmake_virtualkeyboard_myscript_layouts_resource_files
-        "${VKB_LAYOUTS_BASE}/content/layouts/uk_UA/handwriting.qml"
+        "${VKB_LAYOUTS_BASE}/uk_UA/handwriting.qml"
     )
 endif()
 
 if (QT_FEATURE_vkb_lang_vi_VN)
     list(APPEND qmake_virtualkeyboard_myscript_layouts_resource_files
-        "${VKB_LAYOUTS_BASE}/content/layouts/vi_VN/handwriting.fallback"
+        "${VKB_LAYOUTS_BASE}/vi_VN/handwriting.fallback"
     )
 endif()
 
 if (QT_FEATURE_vkb_lang_zh_CN)
     list(APPEND qmake_virtualkeyboard_myscript_layouts_resource_files
-        "${VKB_LAYOUTS_BASE}/content/layouts/zh_CN/handwriting.qml"
+        "${VKB_LAYOUTS_BASE}/zh_CN/handwriting.qml"
     )
 endif()
 
 if (QT_FEATURE_vkb_lang_zh_TW)
     list(APPEND qmake_virtualkeyboard_myscript_layouts_resource_files
-        "${VKB_LAYOUTS_BASE}/content/layouts/zh_TW/handwriting.qml"
+        "${VKB_LAYOUTS_BASE}/zh_TW/handwriting.qml"
     )
 endif()
 
-# special case end
-
-qt_internal_add_resource(QtVirtualKeyboardMyScriptPlugin "qmake_virtualkeyboard_myscript_layouts"
+qt_internal_add_resource(qtvkbmyscriptplugin "qmake_virtualkeyboard_myscript_layouts"
     PREFIX
-        "${VKB_LAYOUTS_PREFIX}" # special case
+        "${VKB_LAYOUTS_PREFIX}"
     BASE
-        "${VKB_LAYOUTS_BASE}" # special case
+        "${VKB_LAYOUTS_BASE}"
     FILES
         ${qmake_virtualkeyboard_myscript_layouts_resource_files}
 )
-
-
-#### Keys ignored in scope 1:.:.:plugin.pro:<TRUE>:
-# INSTALLS = "myscript_engine_bins" "myscript_voim_conf" "myscript_language_conf" "myscript_resources"
-# OTHER_FILES = "myscript.json" "$$LAYOUT_FILES"
-# myscript_engine_bins.files = "$$MYSCRIPT_ENGINE_BINS"
-# myscript_engine_bins.path = "$$[QT_INSTALL_BINS]"
-# myscript_language_conf.files = "$$MYSCRIPT_PATH/$$MYSCRIPT_LANGUAGE_CONF"
-# myscript_language_conf.path = "$$[QT_INSTALL_DATA]/$$MYSCRIPT_DATA"
-# myscript_resources.files = "$$MYSCRIPT_PATH/$$MYSCRIPT_RESOURCES"
-# myscript_resources.path = "$$[QT_INSTALL_DATA]/$$MYSCRIPT_DATA"
-# myscript_voim_conf.files = "$$MYSCRIPT_PATH/$$MYSCRIPT_VOIM_CONF"
-# myscript_voim_conf.path = "$$[QT_INSTALL_DATA]/$$MYSCRIPT_DATA/voim"
-
-## Scopes:
-#####################################################################
-
-#### Keys ignored in scope 3:.:.:plugin.pro:UNIX AND LINUX AND NOT ANDROID:
-# QMAKE_RPATHDIR = "$$MYSCRIPT_PATH/$$MYSCRIPT_VOIM_PATH"
-
-#### Keys ignored in scope 4:.:.:plugin.pro:NOT prefix_build:
-# COPIES = "myscript_engine_bins" "myscript_voim_conf" "myscript_language_conf" "myscript_resources"
-
-#### Keys ignored in scope 5:.:.:plugin.pro:QT_FEATURE_vkb_lang_en_GB:
-# LAYOUT_FILES = "$$LAYOUTS_BASE/content/layouts/en_GB/handwriting.fallback"
-
-#### Keys ignored in scope 6:.:.:plugin.pro:QT_FEATURE_vkb_lang_en_US:
-# LAYOUT_FILES = "$$LAYOUTS_BASE/content/layouts/en_US/handwriting.fallback"
-
-#### Keys ignored in scope 7:.:.:plugin.pro:QT_FEATURE_vkb_lang_ar_AR:
-# LAYOUT_FILES = "$$LAYOUTS_BASE/content/layouts/ar_AR/handwriting.qml"
-
-#### Keys ignored in scope 8:.:.:plugin.pro:QT_FEATURE_vkb_lang_bg_BG:
-# LAYOUT_FILES = "$$LAYOUTS_BASE/content/layouts/bg_BG/handwriting.qml"
-
-#### Keys ignored in scope 9:.:.:plugin.pro:QT_FEATURE_vkb_lang_cs_CZ:
-# LAYOUT_FILES = "$$LAYOUTS_BASE/content/layouts/cs_CZ/handwriting.qml"
-
-#### Keys ignored in scope 10:.:.:plugin.pro:QT_FEATURE_vkb_lang_da_DK:
-# LAYOUT_FILES = "$$LAYOUTS_BASE/content/layouts/da_DK/handwriting.fallback"
-
-#### Keys ignored in scope 11:.:.:plugin.pro:QT_FEATURE_vkb_lang_de_DE:
-# LAYOUT_FILES = "$$LAYOUTS_BASE/content/layouts/de_DE/handwriting.fallback"
-
-#### Keys ignored in scope 12:.:.:plugin.pro:QT_FEATURE_vkb_lang_el_GR:
-# LAYOUT_FILES = "$$LAYOUTS_BASE/content/layouts/el_GR/handwriting.qml"
-
-#### Keys ignored in scope 13:.:.:plugin.pro:QT_FEATURE_vkb_lang_es_ES:
-# LAYOUT_FILES = "$$LAYOUTS_BASE/content/layouts/es_ES/handwriting.qml"
-
-#### Keys ignored in scope 14:.:.:plugin.pro:QT_FEATURE_vkb_lang_es_MX:
-# LAYOUT_FILES = "$$LAYOUTS_BASE/content/layouts/es_MX/handwriting.qml"
-
-#### Keys ignored in scope 15:.:.:plugin.pro:QT_FEATURE_vkb_lang_et_EE:
-# LAYOUT_FILES = "$$LAYOUTS_BASE/content/layouts/et_EE/handwriting.fallback"
-
-#### Keys ignored in scope 16:.:.:plugin.pro:QT_FEATURE_vkb_lang_fa_FA:
-# LAYOUT_FILES = "$$LAYOUTS_BASE/content/layouts/fa_FA/handwriting.qml"
-
-#### Keys ignored in scope 17:.:.:plugin.pro:QT_FEATURE_vkb_lang_fi_FI:
-# LAYOUT_FILES = "$$LAYOUTS_BASE/content/layouts/fi_FI/handwriting.fallback"
-
-#### Keys ignored in scope 18:.:.:plugin.pro:QT_FEATURE_vkb_lang_fr_FR:
-# LAYOUT_FILES = "$$LAYOUTS_BASE/content/layouts/fr_FR/handwriting.fallback"
-
-#### Keys ignored in scope 19:.:.:plugin.pro:QT_FEATURE_vkb_lang_fr_CA:
-# LAYOUT_FILES = "$$LAYOUTS_BASE/content/layouts/fr_CA/handwriting.fallback"
-
-#### Keys ignored in scope 20:.:.:plugin.pro:QT_FEATURE_vkb_lang_he_IL:
-# LAYOUT_FILES = "$$LAYOUTS_BASE/content/layouts/he_IL/handwriting.qml"
-
-#### Keys ignored in scope 21:.:.:plugin.pro:QT_FEATURE_vkb_lang_hi_IN:
-# LAYOUT_FILES = "$$LAYOUTS_BASE/content/layouts/hi_IN/handwriting.qml"
-
-#### Keys ignored in scope 22:.:.:plugin.pro:QT_FEATURE_vkb_lang_hr_HR:
-# LAYOUT_FILES = "$$LAYOUTS_BASE/content/layouts/hr_HR/handwriting.qml"
-
-#### Keys ignored in scope 23:.:.:plugin.pro:QT_FEATURE_vkb_lang_hu_HU:
-# LAYOUT_FILES = "$$LAYOUTS_BASE/content/layouts/hu_HU/handwriting.qml"
-
-#### Keys ignored in scope 24:.:.:plugin.pro:QT_FEATURE_vkb_lang_id_ID:
-# LAYOUT_FILES = "$$LAYOUTS_BASE/content/layouts/id_ID/handwriting.fallback"
-
-#### Keys ignored in scope 25:.:.:plugin.pro:QT_FEATURE_vkb_lang_it_IT:
-# LAYOUT_FILES = "$$LAYOUTS_BASE/content/layouts/it_IT/handwriting.fallback"
-
-#### Keys ignored in scope 26:.:.:plugin.pro:QT_FEATURE_vkb_lang_ja_JP:
-# LAYOUT_FILES = "$$LAYOUTS_BASE/content/layouts/ja_JP/handwriting.qml"
-
-#### Keys ignored in scope 27:.:.:plugin.pro:QT_FEATURE_vkb_lang_ko_KR:
-# LAYOUT_FILES = "$$LAYOUTS_BASE/content/layouts/ko_KR/handwriting.qml"
-
-#### Keys ignored in scope 28:.:.:plugin.pro:QT_FEATURE_vkb_lang_ms_MY:
-# LAYOUT_FILES = "$$LAYOUTS_BASE/content/layouts/ms_MY/handwriting.fallback"
-
-#### Keys ignored in scope 29:.:.:plugin.pro:QT_FEATURE_vkb_lang_nb_NO:
-# LAYOUT_FILES = "$$LAYOUTS_BASE/content/layouts/nb_NO/handwriting.fallback"
-
-#### Keys ignored in scope 30:.:.:plugin.pro:QT_FEATURE_vkb_lang_nl_NL:
-# LAYOUT_FILES = "$$LAYOUTS_BASE/content/layouts/nl_NL/handwriting.fallback"
-
-#### Keys ignored in scope 31:.:.:plugin.pro:QT_FEATURE_vkb_lang_pl_PL:
-# LAYOUT_FILES = "$$LAYOUTS_BASE/content/layouts/pl_PL/handwriting.fallback"
-
-#### Keys ignored in scope 32:.:.:plugin.pro:QT_FEATURE_vkb_lang_pt_BR:
-# LAYOUT_FILES = "$$LAYOUTS_BASE/content/layouts/pt_BR/handwriting.fallback"
-
-#### Keys ignored in scope 33:.:.:plugin.pro:QT_FEATURE_vkb_lang_pt_PT:
-# LAYOUT_FILES = "$$LAYOUTS_BASE/content/layouts/pt_PT/handwriting.fallback"
-
-#### Keys ignored in scope 34:.:.:plugin.pro:QT_FEATURE_vkb_lang_ro_RO:
-# LAYOUT_FILES = "$$LAYOUTS_BASE/content/layouts/ro_RO/handwriting.qml"
-
-#### Keys ignored in scope 35:.:.:plugin.pro:QT_FEATURE_vkb_lang_ru_RU:
-# LAYOUT_FILES = "$$LAYOUTS_BASE/content/layouts/ru_RU/handwriting.fallback"
-
-#### Keys ignored in scope 36:.:.:plugin.pro:QT_FEATURE_vkb_lang_sk_SK:
-# LAYOUT_FILES = "$$LAYOUTS_BASE/content/layouts/sk_SK/handwriting.fallback"
-
-#### Keys ignored in scope 37:.:.:plugin.pro:QT_FEATURE_vkb_lang_sl_SI:
-# LAYOUT_FILES = "$$LAYOUTS_BASE/content/layouts/sl_SI/handwriting.fallback"
-
-#### Keys ignored in scope 38:.:.:plugin.pro:QT_FEATURE_vkb_lang_sq_AL:
-# LAYOUT_FILES = "$$LAYOUTS_BASE/content/layouts/sq_AL/handwriting.fallback"
-
-#### Keys ignored in scope 39:.:.:plugin.pro:QT_FEATURE_vkb_lang_sr_SP:
-# LAYOUT_FILES = "$$LAYOUTS_BASE/content/layouts/sr_SP/handwriting.qml"
-
-#### Keys ignored in scope 40:.:.:plugin.pro:QT_FEATURE_vkb_lang_sv_SE:
-# LAYOUT_FILES = "$$LAYOUTS_BASE/content/layouts/sv_SE/handwriting.fallback"
-
-#### Keys ignored in scope 41:.:.:plugin.pro:QT_FEATURE_vkb_lang_th_TH:
-# LAYOUT_FILES = "$$LAYOUTS_BASE/content/layouts/th_TH/handwriting.fallback"
-
-#### Keys ignored in scope 42:.:.:plugin.pro:QT_FEATURE_vkb_lang_tr_TR:
-# LAYOUT_FILES = "$$LAYOUTS_BASE/content/layouts/tr_TR/handwriting.fallback"
-
-#### Keys ignored in scope 43:.:.:plugin.pro:QT_FEATURE_vkb_lang_uk_UA:
-# LAYOUT_FILES = "$$LAYOUTS_BASE/content/layouts/uk_UA/handwriting.fallback"
-
-#### Keys ignored in scope 44:.:.:plugin.pro:QT_FEATURE_vkb_lang_vi_VN:
-# LAYOUT_FILES = "$$LAYOUTS_BASE/content/layouts/vi_VN/handwriting.fallback"
-
-#### Keys ignored in scope 45:.:.:plugin.pro:QT_FEATURE_vkb_lang_zh_CN:
-# LAYOUT_FILES = "$$LAYOUTS_BASE/content/layouts/zh_CN/handwriting.qml"
-
-#### Keys ignored in scope 46:.:.:plugin.pro:QT_FEATURE_vkb_lang_zh_TW:
-# LAYOUT_FILES = "$$LAYOUTS_BASE/content/layouts/zh_TW/handwriting.qml"
-
-#### Keys ignored in scope 47:.:.:plugin.pro:WIN32:
-# QMAKE_TARGET_DESCRIPTION = "Virtual Keyboard Extension for Qt."
-# QMAKE_TARGET_PRODUCT = "Qt Virtual Keyboard MyScript (Qt $$QT_VERSION)"
diff --git a/src/plugins/myscript/plugin/myscript.json b/src/plugins/myscript/plugin/myscript.json
deleted file mode 100644
index 8f573972..00000000
--- a/src/plugins/myscript/plugin/myscript.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "Name": "handwriting",
-    "Provider": "Qt MyScript Extension",
-    "InputMethod": "HandwritingInputMethod",
-    "Version": 300
-}
diff --git a/src/plugins/myscript/plugin/myscriptinputmethod_p.h b/src/plugins/myscript/plugin/myscriptinputmethod_p.h
index 2f022fd2..2b4267b3 100644
--- a/src/plugins/myscript/plugin/myscriptinputmethod_p.h
+++ b/src/plugins/myscript/plugin/myscriptinputmethod_p.h
@@ -55,6 +55,7 @@ class MyScriptInputMethod : public QVirtualKeyboardAbstractInputMethod
     Q_OBJECT
     Q_DECLARE_PRIVATE(MyScriptInputMethod)
     Q_PROPERTY(bool superimposed READ superimposed CONSTANT)
+    QML_NAMED_ELEMENT(HandwritingInputMethod)
 public:
     explicit MyScriptInputMethod(QObject *parent = nullptr);
     ~MyScriptInputMethod();
diff --git a/src/plugins/myscript/plugin/myscriptplugin.cpp b/src/plugins/myscript/plugin/myscriptplugin.cpp
deleted file mode 100644
index 779a52d2..00000000
--- a/src/plugins/myscript/plugin/myscriptplugin.cpp
+++ /dev/null
@@ -1,43 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2018 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 or (at your option) any later version
-** approved by the KDE Free Qt Foundation. The licenses are as published by
-** the Free Software Foundation and appearing in the file LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "myscriptplugin.h"
-#include "myscriptinputmethod_p.h"
-#include <QtQml>
-
-QT_BEGIN_NAMESPACE
-
-using namespace QtVirtualKeyboard;
-
-void QtVirtualKeyboardMyScriptPlugin::registerTypes(const char *uri) const
-{
-    qmlRegisterType<MyScriptInputMethod>(uri, 2, 0, "HandwritingInputMethod");
-}
-
-QT_END_NAMESPACE
diff --git a/src/plugins/myscript/plugin/myscriptplugin.h b/src/plugins/myscript/plugin/myscriptplugin.h
deleted file mode 100644
index 0849d829..00000000
--- a/src/plugins/myscript/plugin/myscriptplugin.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2018 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 or (at your option) any later version
-** approved by the KDE Free Qt Foundation. The licenses are as published by
-** the Free Software Foundation and appearing in the file LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef MYSCRIPTPLUGIN_H
-#define MYSCRIPTPLUGIN_H
-
-#include <QVirtualKeyboardExtensionPlugin>
-
-QT_BEGIN_NAMESPACE
-
-class QtVirtualKeyboardMyScriptPlugin : public QVirtualKeyboardExtensionPlugin
-{
-    Q_OBJECT
-    Q_INTERFACES(QVirtualKeyboardExtensionPlugin)
-    Q_PLUGIN_METADATA(IID QVirtualKeyboardExtensionPluginFactoryInterface_iid
-                      FILE "myscript.json")
-public:
-    void registerTypes(const char *uri) const override;
-};
-
-QT_END_NAMESPACE
-
-#endif
diff --git a/src/plugins/openwnn/CMakeLists.txt b/src/plugins/openwnn/CMakeLists.txt
index f3f86808..26c2c6a1 100644
--- a/src/plugins/openwnn/CMakeLists.txt
+++ b/src/plugins/openwnn/CMakeLists.txt
@@ -1,4 +1,45 @@
-# Generated from openwnn.pro.
-
 add_subdirectory(3rdparty/openwnn)
-add_subdirectory(plugin)
+
+#####################################################################
+## QtVirtualKeyboardOpenWnnPlugin Plugin:
+#####################################################################
+
+qt_internal_add_qml_module(qtvkbopenwnnplugin
+    URI "QtQuick.VirtualKeyboard.Plugins.OpenWNN"
+    VERSION "${PROJECT_VERSION}"
+    PLUGIN_TARGET qtvkbopenwnnplugin
+    NO_PLUGIN_OPTIONAL
+    DEPENDENCIES
+        QtQuick.VirtualKeyboard/auto
+    SOURCES
+        openwnninputmethod.cpp openwnninputmethod_p.h
+    DEFINES
+        QT_ASCII_CAST_WARNINGS
+        QT_NO_CAST_FROM_ASCII
+        QT_NO_CAST_FROM_BYTEARRAY
+        QT_NO_CAST_TO_ASCII
+    LIBRARIES
+        Qt::Core
+        Qt::Gui
+        Qt::Qml
+        Qt::VirtualKeyboard
+        Qt::BundledOpenwnn
+)
+
+# Resources:
+set(qmake_virtualkeyboard_openwnn_layouts_resource_files
+    "${VKB_LAYOUTS_BASE}/ja_JP/dialpad.fallback"
+    "${VKB_LAYOUTS_BASE}/ja_JP/digits.fallback"
+    "${VKB_LAYOUTS_BASE}/ja_JP/main.qml"
+    "${VKB_LAYOUTS_BASE}/ja_JP/numbers.fallback"
+    "${VKB_LAYOUTS_BASE}/ja_JP/symbols.qml"
+)
+
+qt_internal_add_resource(qtvkbopenwnnplugin "qmake_virtualkeyboard_openwnn_layouts"
+    PREFIX
+        "${VKB_LAYOUTS_PREFIX}"
+    BASE
+        "${VKB_LAYOUTS_BASE}"
+    FILES
+        ${qmake_virtualkeyboard_openwnn_layouts_resource_files}
+)
diff --git a/src/plugins/openwnn/plugin/openwnninputmethod.cpp b/src/plugins/openwnn/openwnninputmethod.cpp
index 9cdce140..9cdce140 100644
--- a/src/plugins/openwnn/plugin/openwnninputmethod.cpp
+++ b/src/plugins/openwnn/openwnninputmethod.cpp
diff --git a/src/plugins/openwnn/plugin/openwnninputmethod_p.h b/src/plugins/openwnn/openwnninputmethod_p.h
index f2e9c6a9..a49e7d2a 100644
--- a/src/plugins/openwnn/plugin/openwnninputmethod_p.h
+++ b/src/plugins/openwnn/openwnninputmethod_p.h
@@ -52,6 +52,7 @@ class OpenWnnInputMethod : public QVirtualKeyboardAbstractInputMethod
 {
     Q_OBJECT
     Q_DECLARE_PRIVATE(OpenWnnInputMethod)
+    QML_NAMED_ELEMENT(JapaneseInputMethod)
 
 public:
     explicit OpenWnnInputMethod(QObject *parent = nullptr);
diff --git a/src/plugins/openwnn/plugin/CMakeLists.txt b/src/plugins/openwnn/plugin/CMakeLists.txt
deleted file mode 100644
index 260cbff4..00000000
--- a/src/plugins/openwnn/plugin/CMakeLists.txt
+++ /dev/null
@@ -1,53 +0,0 @@
-# Generated from plugin.pro.
-
-#####################################################################
-## QtVirtualKeyboardOpenWnnPlugin Plugin:
-#####################################################################
-
-qt_internal_add_plugin(QtVirtualKeyboardOpenWnnPlugin
-    OUTPUT_NAME qtvirtualkeyboard_openwnn
-    PLUGIN_TYPE virtualkeyboard
-    SOURCES
-        openwnninputmethod.cpp openwnninputmethod_p.h
-        openwnnplugin.cpp openwnnplugin.h
-    DEFINES
-        QT_ASCII_CAST_WARNINGS
-        QT_NO_CAST_FROM_ASCII
-        QT_NO_CAST_FROM_BYTEARRAY
-        QT_NO_CAST_TO_ASCII
-    LIBRARIES
-        Qt::Core
-        Qt::Gui
-        Qt::Qml
-        Qt::VirtualKeyboard
-        Qt::BundledOpenwnn
-)
-
-# Resources:
-set(qmake_virtualkeyboard_openwnn_layouts_resource_files
-    "${VKB_LAYOUTS_BASE}/content/layouts/ja_JP/dialpad.fallback"
-    "${VKB_LAYOUTS_BASE}/content/layouts/ja_JP/digits.fallback"
-    "${VKB_LAYOUTS_BASE}/content/layouts/ja_JP/main.qml"
-    "${VKB_LAYOUTS_BASE}/content/layouts/ja_JP/numbers.fallback"
-    "${VKB_LAYOUTS_BASE}/content/layouts/ja_JP/symbols.qml"
-)
-
-qt_internal_add_resource(QtVirtualKeyboardOpenWnnPlugin "qmake_virtualkeyboard_openwnn_layouts"
-    PREFIX
-        "${VKB_LAYOUTS_PREFIX}" #special case
-    BASE
-        "${VKB_LAYOUTS_BASE}" #special case
-    FILES
-        ${qmake_virtualkeyboard_openwnn_layouts_resource_files}
-)
-
-
-#### Keys ignored in scope 1:.:.:plugin.pro:<TRUE>:
-# OTHER_FILES = "openwnn.json" "$$LAYOUT_FILES"
-
-## Scopes:
-#####################################################################
-
-#### Keys ignored in scope 2:.:.:plugin.pro:WIN32:
-# QMAKE_TARGET_DESCRIPTION = "Virtual Keyboard Extension for Qt."
-# QMAKE_TARGET_PRODUCT = "Qt Virtual Keyboard OpenWNN (Qt $$QT_VERSION)"
diff --git a/src/plugins/openwnn/plugin/openwnn.json b/src/plugins/openwnn/plugin/openwnn.json
deleted file mode 100644
index 053875f0..00000000
--- a/src/plugins/openwnn/plugin/openwnn.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "Name": "japanese",
-    "Provider": "Qt OpenWNN Extension",
-    "InputMethod": "JapaneseInputMethod",
-    "Version": 100
-}
diff --git a/src/plugins/openwnn/plugin/openwnnplugin.cpp b/src/plugins/openwnn/plugin/openwnnplugin.cpp
deleted file mode 100644
index a8490960..00000000
--- a/src/plugins/openwnn/plugin/openwnnplugin.cpp
+++ /dev/null
@@ -1,44 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2018 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 or (at your option) any later version
-** approved by the KDE Free Qt Foundation. The licenses are as published by
-** the Free Software Foundation and appearing in the file LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "openwnnplugin.h"
-#include "openwnninputmethod_p.h"
-#include <QtQml>
-
-QT_BEGIN_NAMESPACE
-
-using namespace QtVirtualKeyboard;
-
-void QtVirtualKeyboardOpenWnnPlugin::registerTypes(const char *uri) const
-{
-    qmlRegisterType<OpenWnnInputMethod>(uri, 1, 3, "JapaneseInputMethod");
-    qmlRegisterType<OpenWnnInputMethod>(uri, 2, 0, "JapaneseInputMethod");
-}
-
-QT_END_NAMESPACE
diff --git a/src/plugins/openwnn/plugin/openwnnplugin.h b/src/plugins/openwnn/plugin/openwnnplugin.h
deleted file mode 100644
index b11132b5..00000000
--- a/src/plugins/openwnn/plugin/openwnnplugin.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2018 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 or (at your option) any later version
-** approved by the KDE Free Qt Foundation. The licenses are as published by
-** the Free Software Foundation and appearing in the file LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef OPENWNNPLUGIN_H
-#define OPENWNNPLUGIN_H
-
-#include <QVirtualKeyboardExtensionPlugin>
-
-QT_BEGIN_NAMESPACE
-
-class QtVirtualKeyboardOpenWnnPlugin : public QVirtualKeyboardExtensionPlugin
-{
-    Q_OBJECT
-    Q_INTERFACES(QVirtualKeyboardExtensionPlugin)
-    Q_PLUGIN_METADATA(IID QVirtualKeyboardExtensionPluginFactoryInterface_iid
-                      FILE "openwnn.json")
-public:
-    void registerTypes(const char *uri) const override;
-};
-
-QT_END_NAMESPACE
-
-#endif
diff --git a/src/plugins/pinyin/CMakeLists.txt b/src/plugins/pinyin/CMakeLists.txt
index 1269695a..ebeb04f4 100644
--- a/src/plugins/pinyin/CMakeLists.txt
+++ b/src/plugins/pinyin/CMakeLists.txt
@@ -1,4 +1,69 @@
-# Generated from pinyin.pro.
-
 add_subdirectory(3rdparty/pinyin)
-add_subdirectory(plugin)
+
+#####################################################################
+## QtVirtualKeyboardPinyinPlugin Plugin:
+#####################################################################
+
+qt_internal_add_qml_module(qtvkbpinyinplugin
+    URI "QtQuick.VirtualKeyboard.Plugins.Pinyin"
+    VERSION "${PROJECT_VERSION}"
+    PLUGIN_TARGET qtvkbpinyinplugin
+    NO_PLUGIN_OPTIONAL
+    DEPENDENCIES
+        QtQuick.VirtualKeyboard/auto
+    SOURCES
+        pinyindecoderservice.cpp pinyindecoderservice_p.h
+        pinyininputmethod.cpp pinyininputmethod_p.h
+    DEFINES
+        QT_ASCII_CAST_WARNINGS
+        QT_NO_CAST_FROM_ASCII
+        QT_NO_CAST_FROM_BYTEARRAY
+        QT_NO_CAST_TO_ASCII
+    LIBRARIES
+        Qt::Core
+        Qt::Gui
+        Qt::Qml
+        Qt::VirtualKeyboard
+        Qt::BundledPinyin
+)
+
+# Resources:
+set(qmake_virtualkeyboard_pinyin_layouts_resource_files
+    "${VKB_LAYOUTS_BASE}/zh_CN/dialpad.fallback"
+    "${VKB_LAYOUTS_BASE}/zh_CN/digits.fallback"
+    "${VKB_LAYOUTS_BASE}/zh_CN/main.qml"
+    "${VKB_LAYOUTS_BASE}/zh_CN/numbers.fallback"
+    "${VKB_LAYOUTS_BASE}/zh_CN/symbols.qml"
+)
+
+qt_internal_add_resource(qtvkbpinyinplugin "qmake_virtualkeyboard_pinyin_layouts"
+    PREFIX
+        "${VKB_LAYOUTS_PREFIX}" #special case
+    BASE
+        "${VKB_LAYOUTS_BASE}" #special case
+    FILES
+        ${qmake_virtualkeyboard_pinyin_layouts_resource_files}
+)
+
+if (NOT FEATURE_vkb_no_bundle_pinyin)
+    # Resources:
+    set(qmake_pinyin_resource_files
+        "3rdparty/pinyin/data/dict_pinyin.dat"
+    )
+
+    qt_internal_add_resource(qtvkbpinyinplugin "qmake_pinyin"
+        PREFIX
+            "/qt-project.org/imports/QtQuick/VirtualKeyboard"
+        BASE
+            "${CMAKE_CURRENT_SOURCE_DIR}"
+        FILES
+            ${qmake_pinyin_resource_files}
+    )
+else()
+    qt_copy_or_install(
+        DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/pinyin/data/"
+        DESTINATION "${VKB_INSTALL_DATA}/pinyin"
+        FILES_MATCHING
+        PATTERN "*.dat"
+    )
+endif()
diff --git a/src/plugins/pinyin/plugin/pinyindecoderservice.cpp b/src/plugins/pinyin/pinyindecoderservice.cpp
index 50c382ca..41026002 100644
--- a/src/plugins/pinyin/plugin/pinyindecoderservice.cpp
+++ b/src/plugins/pinyin/pinyindecoderservice.cpp
@@ -82,7 +82,7 @@ bool PinyinDecoderService::init()
     if (!QFileInfo::exists(sysDict)) {
         sysDict = QLibraryInfo::path(QLibraryInfo::DataPath) + QLatin1String("/qtvirtualkeyboard/pinyin/dict_pinyin.dat");
         if (!QFileInfo::exists(sysDict))
-            sysDict = QLatin1String(":///QtQuick/VirtualKeyboard/3rdparty/pinyin/data/dict_pinyin.dat");
+            sysDict = QLatin1String(":/qt-project.org/imports/QtQuick/VirtualKeyboard/3rdparty/pinyin/data/dict_pinyin.dat");
     }
 
     QString usrDictPath = QStandardPaths::writableLocation(QStandardPaths::ConfigLocation);
diff --git a/src/plugins/pinyin/plugin/pinyindecoderservice_p.h b/src/plugins/pinyin/pinyindecoderservice_p.h
index 4c5884dd..4c5884dd 100644
--- a/src/plugins/pinyin/plugin/pinyindecoderservice_p.h
+++ b/src/plugins/pinyin/pinyindecoderservice_p.h
diff --git a/src/plugins/pinyin/plugin/pinyininputmethod.cpp b/src/plugins/pinyin/pinyininputmethod.cpp
index 975ce9cf..975ce9cf 100644
--- a/src/plugins/pinyin/plugin/pinyininputmethod.cpp
+++ b/src/plugins/pinyin/pinyininputmethod.cpp
diff --git a/src/plugins/pinyin/plugin/pinyininputmethod_p.h b/src/plugins/pinyin/pinyininputmethod_p.h
index 14df2e55..f205de7a 100644
--- a/src/plugins/pinyin/plugin/pinyininputmethod_p.h
+++ b/src/plugins/pinyin/pinyininputmethod_p.h
@@ -52,6 +52,7 @@ class PinyinInputMethod : public QVirtualKeyboardAbstractInputMethod
 {
     Q_OBJECT
     Q_DECLARE_PRIVATE(PinyinInputMethod)
+    QML_ELEMENT
 
 public:
     explicit PinyinInputMethod(QObject *parent = nullptr);
diff --git a/src/plugins/pinyin/plugin/CMakeLists.txt b/src/plugins/pinyin/plugin/CMakeLists.txt
deleted file mode 100644
index 43c7c83e..00000000
--- a/src/plugins/pinyin/plugin/CMakeLists.txt
+++ /dev/null
@@ -1,85 +0,0 @@
-# Generated from plugin.pro.
-
-#####################################################################
-## QtVirtualKeyboardPinyinPlugin Plugin:
-#####################################################################
-
-qt_internal_add_plugin(QtVirtualKeyboardPinyinPlugin
-    OUTPUT_NAME qtvirtualkeyboard_pinyin
-    PLUGIN_TYPE virtualkeyboard
-    SOURCES
-        pinyindecoderservice.cpp pinyindecoderservice_p.h
-        pinyininputmethod.cpp pinyininputmethod_p.h
-        pinyinplugin.cpp pinyinplugin.h
-    DEFINES
-        QT_ASCII_CAST_WARNINGS
-        QT_NO_CAST_FROM_ASCII
-        QT_NO_CAST_FROM_BYTEARRAY
-        QT_NO_CAST_TO_ASCII
-    LIBRARIES
-        Qt::Core
-        Qt::Gui
-        Qt::Qml
-        Qt::VirtualKeyboard
-        Qt::BundledPinyin
-)
-
-# Resources:
-set(qmake_virtualkeyboard_pinyin_layouts_resource_files
-    "${VKB_LAYOUTS_BASE}/content/layouts/zh_CN/dialpad.fallback"
-    "${VKB_LAYOUTS_BASE}/content/layouts/zh_CN/digits.fallback"
-    "${VKB_LAYOUTS_BASE}/content/layouts/zh_CN/main.qml"
-    "${VKB_LAYOUTS_BASE}/content/layouts/zh_CN/numbers.fallback"
-    "${VKB_LAYOUTS_BASE}/content/layouts/zh_CN/symbols.qml"
-)
-
-qt_internal_add_resource(QtVirtualKeyboardPinyinPlugin "qmake_virtualkeyboard_pinyin_layouts"
-    PREFIX
-        "${VKB_LAYOUTS_PREFIX}" #special case
-    BASE
-        "${VKB_LAYOUTS_BASE}" #special case
-    FILES
-        ${qmake_virtualkeyboard_pinyin_layouts_resource_files}
-)
-
-
-#### Keys ignored in scope 1:.:.:plugin.pro:<TRUE>:
-# OTHER_FILES = "pinyin.json" "$$LAYOUT_FILES"
-
-## Scopes:
-#####################################################################
-
-if (NOT FEATURE_vkb_no_bundle_pinyin)
-    # Resources:
-    set(qmake_pinyin_resource_files
-        "../3rdparty/pinyin/data/dict_pinyin.dat"
-    )
-
-    qt_internal_add_resource(QtVirtualKeyboardPinyinPlugin "qmake_pinyin"
-        PREFIX
-            "/QtQuick/VirtualKeyboard"
-        BASE
-            "${CMAKE_CURRENT_SOURCE_DIR}/.." #special case
-        FILES
-            ${qmake_pinyin_resource_files}
-    )
-else()
-    qt_copy_or_install(
-        DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../3rdparty/pinyin/data/"
-        DESTINATION "${VKB_INSTALL_DATA}/pinyin"
-        FILES_MATCHING
-        PATTERN "*.dat"
-    )
-endif()
-
-#### Keys ignored in scope 3:.:.:plugin.pro:else:
-# INSTALLS = "pinyin_data"
-# pinyin_data.files = "$$PWD/../3rdparty/pinyin/data/dict_pinyin.dat"
-# pinyin_data.path = "$$DATAPATH/pinyin"
-
-#### Keys ignored in scope 4:.:.:plugin.pro:NOT prefix_build:
-# COPIES = "pinyin_data"
-
-#### Keys ignored in scope 5:.:.:plugin.pro:WIN32:
-# QMAKE_TARGET_DESCRIPTION = "Virtual Keyboard Extension for Qt."
-# QMAKE_TARGET_PRODUCT = "Qt Virtual Keyboard Pinyin (Qt $$QT_VERSION)"
diff --git a/src/plugins/pinyin/plugin/pinyin.json b/src/plugins/pinyin/plugin/pinyin.json
deleted file mode 100644
index 6bb19d11..00000000
--- a/src/plugins/pinyin/plugin/pinyin.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "Name": "pinyin",
-    "Provider": "Qt Pinyin Extension",
-    "InputMethod": "PinyinInputMethod",
-    "Version": 100
-}
diff --git a/src/plugins/pinyin/plugin/pinyinplugin.cpp b/src/plugins/pinyin/plugin/pinyinplugin.cpp
deleted file mode 100644
index 6edef332..00000000
--- a/src/plugins/pinyin/plugin/pinyinplugin.cpp
+++ /dev/null
@@ -1,44 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2018 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 or (at your option) any later version
-** approved by the KDE Free Qt Foundation. The licenses are as published by
-** the Free Software Foundation and appearing in the file LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "pinyinplugin.h"
-#include "pinyininputmethod_p.h"
-#include <QtQml>
-
-QT_BEGIN_NAMESPACE
-
-using namespace QtVirtualKeyboard;
-
-void QtVirtualKeyboardPinyinPlugin::registerTypes(const char *uri) const
-{
-    qmlRegisterType<PinyinInputMethod>(uri, 1, 1, "PinyinInputMethod");
-    qmlRegisterType<PinyinInputMethod>(uri, 2, 0, "PinyinInputMethod");
-}
-
-QT_END_NAMESPACE
diff --git a/src/plugins/pinyin/plugin/pinyinplugin.h b/src/plugins/pinyin/plugin/pinyinplugin.h
deleted file mode 100644
index c642919c..00000000
--- a/src/plugins/pinyin/plugin/pinyinplugin.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2018 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 or (at your option) any later version
-** approved by the KDE Free Qt Foundation. The licenses are as published by
-** the Free Software Foundation and appearing in the file LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef PINYINPLUGIN_H
-#define PINYINPLUGIN_H
-
-#include <QVirtualKeyboardExtensionPlugin>
-
-QT_BEGIN_NAMESPACE
-
-class QtVirtualKeyboardPinyinPlugin : public QVirtualKeyboardExtensionPlugin
-{
-    Q_OBJECT
-    Q_INTERFACES(QVirtualKeyboardExtensionPlugin)
-    Q_PLUGIN_METADATA(IID QVirtualKeyboardExtensionPluginFactoryInterface_iid
-                      FILE "pinyin.json")
-public:
-    void registerTypes(const char *uri) const override;
-};
-
-QT_END_NAMESPACE
-
-#endif
diff --git a/src/plugins/tcime/CMakeLists.txt b/src/plugins/tcime/CMakeLists.txt
index abb63707..e6d076fe 100644
--- a/src/plugins/tcime/CMakeLists.txt
+++ b/src/plugins/tcime/CMakeLists.txt
@@ -1,4 +1,69 @@
-# Generated from tcime.pro.
-
 add_subdirectory(3rdparty/tcime)
-add_subdirectory(plugin)
+
+#####################################################################
+## QtVirtualKeyboardTCImePlugin Plugin:
+#####################################################################
+
+qt_internal_add_qml_module(qtvkbtcimeplugin
+    URI "QtQuick.VirtualKeyboard.Plugins.TCIme"
+    VERSION "${PROJECT_VERSION}"
+    PLUGIN_TARGET qtvkbtcimeplugin
+    NO_PLUGIN_OPTIONAL
+    DEPENDENCIES
+        QtQuick.VirtualKeyboard/auto
+    SOURCES
+        tcinputmethod.cpp tcinputmethod_p.h
+    DEFINES
+        QT_ASCII_CAST_WARNINGS
+        QT_NO_CAST_FROM_ASCII
+        QT_NO_CAST_FROM_BYTEARRAY
+        QT_NO_CAST_TO_ASCII
+    LIBRARIES
+        Qt::Core
+        Qt::Gui
+        Qt::Qml
+        Qt::VirtualKeyboardPrivate
+        Qt::BundledTcime
+)
+
+set(qmake_virtualkeyboard_tcime_layouts_resource_files
+    "${VKB_LAYOUTS_BASE}/zh_TW/dialpad.fallback"
+    "${VKB_LAYOUTS_BASE}/zh_TW/digits.fallback"
+    "${VKB_LAYOUTS_BASE}/zh_TW/main.qml"
+    "${VKB_LAYOUTS_BASE}/zh_TW/numbers.fallback"
+    "${VKB_LAYOUTS_BASE}/zh_TW/symbols.qml"
+)
+
+qt_internal_add_resource(qtvkbtcimeplugin "qmake_virtualkeyboard_tcime_layouts"
+    PREFIX
+        "${VKB_LAYOUTS_PREFIX}"
+    BASE
+        "${VKB_LAYOUTS_BASE}"
+    FILES
+        ${qmake_virtualkeyboard_tcime_layouts_resource_files}
+)
+
+if (NOT FEATURE_vkb_no_bundle_tcime)
+    # Resources:
+    set(qmake_tcime_resource_files
+        "3rdparty/tcime/data/qt/dict_cangjie.dat"
+        "3rdparty/tcime/data/qt/dict_phrases.dat"
+        "3rdparty/tcime/data/qt/dict_zhuyin.dat"
+    )
+
+    qt_internal_add_resource(qtvkbtcimeplugin "qmake_tcime"
+        PREFIX
+            "/qt-project.org/imports/QtQuick/VirtualKeyboard"
+        BASE
+            "${CMAKE_CURRENT_SOURCE_DIR}"
+        FILES
+            ${qmake_tcime_resource_files}
+    )
+else()
+    qt_copy_or_install(
+        DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/tcime/data/qt/"
+        DESTINATION "${VKB_INSTALL_DATA}/tcime"
+        FILES_MATCHING
+        PATTERN "*.dat"
+    )
+endif()
diff --git a/src/plugins/tcime/plugin/CMakeLists.txt b/src/plugins/tcime/plugin/CMakeLists.txt
deleted file mode 100644
index ff693a3e..00000000
--- a/src/plugins/tcime/plugin/CMakeLists.txt
+++ /dev/null
@@ -1,98 +0,0 @@
-# Generated from plugin.pro.
-
-#####################################################################
-## QtVirtualKeyboardTCImePlugin Plugin:
-#####################################################################
-
-qt_internal_add_plugin(QtVirtualKeyboardTCImePlugin
-    OUTPUT_NAME qtvirtualkeyboard_tcime
-    PLUGIN_TYPE virtualkeyboard
-    SOURCES
-        tcimeplugin.cpp tcimeplugin.h
-        tcinputmethod.cpp tcinputmethod_p.h
-    DEFINES
-        QT_ASCII_CAST_WARNINGS
-        QT_NO_CAST_FROM_ASCII
-        QT_NO_CAST_FROM_BYTEARRAY
-        QT_NO_CAST_TO_ASCII
-    LIBRARIES
-        Qt::Core
-        Qt::Gui
-        Qt::Qml
-        Qt::VirtualKeyboardPrivate
-        Qt::BundledTcime
-)
-
-# Resources:
-set(qmake_virtualkeyboard_tcime_layouts_resource_files
-    "${VKB_LAYOUTS_BASE}/content/layouts/zh_TW/dialpad.fallback"
-    "${VKB_LAYOUTS_BASE}/content/layouts/zh_TW/digits.fallback"
-    "${VKB_LAYOUTS_BASE}/content/layouts/zh_TW/main.qml"
-    "${VKB_LAYOUTS_BASE}/content/layouts/zh_TW/numbers.fallback"
-    "${VKB_LAYOUTS_BASE}/content/layouts/zh_TW/symbols.qml"
-)
-
-qt_internal_add_resource(QtVirtualKeyboardTCImePlugin "qmake_virtualkeyboard_tcime_layouts"
-    PREFIX
-        "${VKB_LAYOUTS_PREFIX}" #special case
-    BASE
-        "${VKB_LAYOUTS_BASE}" #special case
-    FILES
-        ${qmake_virtualkeyboard_tcime_layouts_resource_files}
-)
-
-
-#### Keys ignored in scope 1:.:.:plugin.pro:<TRUE>:
-# OTHER_FILES = "tcime.json"
-
-## Scopes:
-#####################################################################
-
-if (NOT FEATURE_vkb_no_bundle_tcime)
-    # Resources:
-    set(qmake_tcime_resource_files
-        "../3rdparty/tcime/data/qt/dict_cangjie.dat"
-        "../3rdparty/tcime/data/qt/dict_phrases.dat"
-        "../3rdparty/tcime/data/qt/dict_zhuyin.dat"
-    )
-
-    qt_internal_add_resource(QtVirtualKeyboardTCImePlugin "qmake_tcime"
-        PREFIX
-            "/QtQuick/VirtualKeyboard"
-        BASE
-            "${CMAKE_CURRENT_SOURCE_DIR}/.." #special case
-        FILES
-            ${qmake_tcime_resource_files}
-    )
-else()
-    qt_copy_or_install(
-        DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../3rdparty/tcime/data/qt/"
-        DESTINATION "${VKB_INSTALL_DATA}/tcime"
-        FILES_MATCHING
-        PATTERN "*.dat"
-    )
-endif()
-
-#### Keys ignored in scope 3:.:.:plugin.pro:QT_FEATURE_cangjie:
-# TCIME_FILES = "../3rdparty/tcime/data/qt/dict_cangjie.dat"
-
-#### Keys ignored in scope 4:.:.:plugin.pro:QT_FEATURE_zhuyin:
-# TCIME_FILES = "../3rdparty/tcime/data/qt/dict_zhuyin.dat"
-
-#### Keys ignored in scope 5:.:.:plugin.pro:else:
-# INSTALLS = "tcime_data"
-# tcime_data.files = "$$PWD/../3rdparty/tcime/data/qt/dict_phrases.dat"
-# tcime_data.path = "$$VIRTUALKEYBOARD_INSTALL_DATA/tcime"
-
-#### Keys ignored in scope 6:.:.:plugin.pro:QT_FEATURE_cangjie:
-# tcime_data.files = "$$PWD/../3rdparty/tcime/data/qt/dict_cangjie.dat"
-
-#### Keys ignored in scope 7:.:.:plugin.pro:QT_FEATURE_zhuyin:
-# tcime_data.files = "$$PWD/../3rdparty/tcime/data/qt/dict_zhuyin.dat"
-
-#### Keys ignored in scope 8:.:.:plugin.pro:NOT prefix_build:
-# COPIES = "tcime_data"
-
-#### Keys ignored in scope 9:.:.:plugin.pro:WIN32:
-# QMAKE_TARGET_DESCRIPTION = "Virtual Keyboard Extension for Qt."
-# QMAKE_TARGET_PRODUCT = "Qt Virtual Keyboard TCIME (Qt $$QT_VERSION)"
diff --git a/src/plugins/tcime/plugin/tcime.json b/src/plugins/tcime/plugin/tcime.json
deleted file mode 100644
index 421ae0cc..00000000
--- a/src/plugins/tcime/plugin/tcime.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "Name": "traditional_chinese",
-    "Provider": "Qt TCIME Extension",
-    "InputMethod": "TCInputMethod",
-    "Version": 100
-}
diff --git a/src/plugins/tcime/plugin/tcimeplugin.h b/src/plugins/tcime/plugin/tcimeplugin.h
deleted file mode 100644
index d7bb588a..00000000
--- a/src/plugins/tcime/plugin/tcimeplugin.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2018 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 or (at your option) any later version
-** approved by the KDE Free Qt Foundation. The licenses are as published by
-** the Free Software Foundation and appearing in the file LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef TCIMEPLUGIN_H
-#define TCIMEPLUGIN_H
-
-#include <QVirtualKeyboardExtensionPlugin>
-
-QT_BEGIN_NAMESPACE
-
-class QtVirtualKeyboardTCImePlugin : public QVirtualKeyboardExtensionPlugin
-{
-    Q_OBJECT
-    Q_INTERFACES(QVirtualKeyboardExtensionPlugin)
-    Q_PLUGIN_METADATA(IID QVirtualKeyboardExtensionPluginFactoryInterface_iid
-                      FILE "tcime.json")
-public:
-    void registerTypes(const char *uri) const override;
-};
-
-QT_END_NAMESPACE
-
-#endif
diff --git a/src/plugins/tcime/plugin/tcinputmethod.cpp b/src/plugins/tcime/tcinputmethod.cpp
index bfca9835..a7955b83 100644
--- a/src/plugins/tcime/plugin/tcinputmethod.cpp
+++ b/src/plugins/tcime/tcinputmethod.cpp
@@ -380,7 +380,7 @@ bool TCInputMethod::setInputMode(const QString &locale, QVirtualKeyboardInputEng
             if (!QFileInfo::exists(cangjieDictionary)) {
                 cangjieDictionary = QLibraryInfo::path(QLibraryInfo::DataPath) + QLatin1String("/qtvirtualkeyboard/tcime/dict_cangjie.dat");
                 if (!QFileInfo::exists(cangjieDictionary))
-                    cangjieDictionary = QLatin1String(":///QtQuick/VirtualKeyboard/3rdparty/tcime/data/qt/dict_cangjie.dat");
+                    cangjieDictionary = QLatin1String(":/qt-project.org/imports/QtQuick/VirtualKeyboard/3rdparty/tcime/data/qt/dict_cangjie.dat");
             }
             d->cangjieDictionary.load(cangjieDictionary);
         }
@@ -394,7 +394,7 @@ bool TCInputMethod::setInputMode(const QString &locale, QVirtualKeyboardInputEng
             if (!QFileInfo::exists(zhuyinDictionary)) {
                 zhuyinDictionary = QLibraryInfo::path(QLibraryInfo::DataPath) + QLatin1String("/qtvirtualkeyboard/tcime/dict_zhuyin.dat");
                 if (!QFileInfo::exists(zhuyinDictionary))
-                    zhuyinDictionary = QLatin1String(":///QtQuick/VirtualKeyboard/3rdparty/tcime/data/qt/dict_zhuyin.dat");
+                    zhuyinDictionary = QLatin1String(":/qt-project.org/imports/QtQuick/VirtualKeyboard/3rdparty/tcime/data/qt/dict_zhuyin.dat");
             }
             d->zhuyinDictionary.load(zhuyinDictionary);
         }
@@ -407,7 +407,7 @@ bool TCInputMethod::setInputMode(const QString &locale, QVirtualKeyboardInputEng
         if (!QFileInfo::exists(phraseDictionary)) {
             phraseDictionary = QLibraryInfo::path(QLibraryInfo::DataPath) + QLatin1String("/qtvirtualkeyboard/tcime/dict_phrases.dat");
             if (!QFileInfo::exists(phraseDictionary))
-                phraseDictionary = QLatin1String(":///QtQuick/VirtualKeyboard/3rdparty/tcime/data/qt/dict_phrases.dat");
+                phraseDictionary = QLatin1String(":/qt-project.org/imports/QtQuick/VirtualKeyboard/3rdparty/tcime/data/qt/dict_phrases.dat");
         }
         d->phraseDictionary.load(phraseDictionary);
     }
diff --git a/src/plugins/tcime/plugin/tcinputmethod_p.h b/src/plugins/tcime/tcinputmethod_p.h
index cdfe8525..eeee6f86 100644
--- a/src/plugins/tcime/plugin/tcinputmethod_p.h
+++ b/src/plugins/tcime/tcinputmethod_p.h
@@ -54,6 +54,7 @@ class TCInputMethod : public QVirtualKeyboardAbstractInputMethod
     Q_OBJECT
     Q_DECLARE_PRIVATE(TCInputMethod)
     Q_PROPERTY(bool simplified READ simplified WRITE setSimplified NOTIFY simplifiedChanged)
+    QML_ELEMENT
 
 public:
     explicit TCInputMethod(QObject *parent = nullptr);
diff --git a/src/plugins/thai/CMakeLists.txt b/src/plugins/thai/CMakeLists.txt
index c70b9a73..bed9f935 100644
--- a/src/plugins/thai/CMakeLists.txt
+++ b/src/plugins/thai/CMakeLists.txt
@@ -1,3 +1,47 @@
-# Generated from thai.pro.
+#####################################################################
+## QtVirtualKeyboardThaiPlugin Plugin:
+#####################################################################
 
-add_subdirectory(plugin)
+qt_internal_add_qml_module(qtvkbthaiplugin
+    URI "QtQuick.VirtualKeyboard.Plugins.Thai"
+    VERSION "${PROJECT_VERSION}"
+    PLUGIN_TARGET qtvkbthaiplugin
+    NO_PLUGIN_OPTIONAL
+    DEPENDENCIES
+        QtQuick.VirtualKeyboard/auto
+    SOURCES
+        thaiinputmethod.cpp thaiinputmethod_p.h
+    DEFINES
+        QT_ASCII_CAST_WARNINGS
+        QT_NO_CAST_FROM_ASCII
+        QT_NO_CAST_FROM_BYTEARRAY
+        QT_NO_CAST_TO_ASCII
+    LIBRARIES
+        Qt::Core
+        Qt::Gui
+        Qt::Qml
+        Qt::VirtualKeyboard
+)
+
+# Resources:
+set(qmake_virtualkeyboard_thai_layouts_resource_files
+    "${VKB_LAYOUTS_BASE}/th_TH/dialpad.fallback"
+    "${VKB_LAYOUTS_BASE}/th_TH/digits.fallback"
+    "${VKB_LAYOUTS_BASE}/th_TH/main.qml"
+    "${VKB_LAYOUTS_BASE}/th_TH/numbers.fallback"
+    "${VKB_LAYOUTS_BASE}/th_TH/symbols.qml"
+)
+
+qt_internal_add_resource(qtvkbthaiplugin "qmake_virtualkeyboard_thai_layouts"
+    PREFIX
+        "${VKB_LAYOUTS_PREFIX}"
+    BASE
+        "${VKB_LAYOUTS_BASE}"
+    FILES
+        ${qmake_virtualkeyboard_thai_layouts_resource_files}
+)
+
+qt_internal_extend_target(qtvkbthaiplugin CONDITION QT_FEATURE_hunspell
+    LIBRARIES
+        Qt::HunspellInputMethodPrivate
+)
diff --git a/src/plugins/thai/plugin/CMakeLists.txt b/src/plugins/thai/plugin/CMakeLists.txt
deleted file mode 100644
index b4328b24..00000000
--- a/src/plugins/thai/plugin/CMakeLists.txt
+++ /dev/null
@@ -1,58 +0,0 @@
-# Generated from plugin.pro.
-
-#####################################################################
-## QtVirtualKeyboardThaiPlugin Plugin:
-#####################################################################
-
-qt_internal_add_plugin(QtVirtualKeyboardThaiPlugin
-    OUTPUT_NAME qtvirtualkeyboard_thai
-    PLUGIN_TYPE virtualkeyboard
-    SOURCES
-        thaiinputmethod.cpp thaiinputmethod_p.h
-        thaiplugin.cpp thaiplugin.h
-    DEFINES
-        QT_ASCII_CAST_WARNINGS
-        QT_NO_CAST_FROM_ASCII
-        QT_NO_CAST_FROM_BYTEARRAY
-        QT_NO_CAST_TO_ASCII
-    LIBRARIES
-        Qt::Core
-        Qt::Gui
-        Qt::Qml
-        Qt::VirtualKeyboard
-)
-
-# Resources:
-set(qmake_virtualkeyboard_thai_layouts_resource_files
-    "${VKB_LAYOUTS_BASE}/content/layouts/th_TH/dialpad.fallback"
-    "${VKB_LAYOUTS_BASE}/content/layouts/th_TH/digits.fallback"
-    "${VKB_LAYOUTS_BASE}/content/layouts/th_TH/main.qml"
-    "${VKB_LAYOUTS_BASE}/content/layouts/th_TH/numbers.fallback"
-    "${VKB_LAYOUTS_BASE}/content/layouts/th_TH/symbols.qml"
-)
-
-qt_internal_add_resource(QtVirtualKeyboardThaiPlugin "qmake_virtualkeyboard_thai_layouts"
-    PREFIX
-        "${VKB_LAYOUTS_PREFIX}" #special case
-    BASE
-        "${VKB_LAYOUTS_BASE}" #special case
-    FILES
-        ${qmake_virtualkeyboard_thai_layouts_resource_files}
-)
-
-
-#### Keys ignored in scope 1:.:.:plugin.pro:<TRUE>:
-# OTHER_FILES = "thai.json" "$$LAYOUT_FILES"
-# QT_FOR_CONFIG = "virtualkeyboard-private"
-
-## Scopes:
-#####################################################################
-
-qt_internal_extend_target(QtVirtualKeyboardThaiPlugin CONDITION QT_FEATURE_hunspell
-    LIBRARIES
-        Qt::HunspellInputMethodPrivate
-)
-
-#### Keys ignored in scope 3:.:.:plugin.pro:WIN32:
-# QMAKE_TARGET_DESCRIPTION = "Virtual Keyboard Extension for Qt."
-# QMAKE_TARGET_PRODUCT = "Qt Virtual Keyboard Thai (Qt $$QT_VERSION)"
diff --git a/src/plugins/thai/plugin/thai.json b/src/plugins/thai/plugin/thai.json
deleted file mode 100644
index aac036cb..00000000
--- a/src/plugins/thai/plugin/thai.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "Name": "thai",
-    "Provider": "Qt Thai Extension",
-    "InputMethod": "ThaiInputMethod",
-    "Version": 100
-}
diff --git a/src/plugins/thai/plugin/thaiplugin.cpp b/src/plugins/thai/plugin/thaiplugin.cpp
deleted file mode 100644
index 1f9428fc..00000000
--- a/src/plugins/thai/plugin/thaiplugin.cpp
+++ /dev/null
@@ -1,43 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2018 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 or (at your option) any later version
-** approved by the KDE Free Qt Foundation. The licenses are as published by
-** the Free Software Foundation and appearing in the file LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "thaiplugin.h"
-#include "thaiinputmethod_p.h"
-#include <QtQml>
-
-QT_BEGIN_NAMESPACE
-
-using namespace QtVirtualKeyboard;
-
-void QtVirtualKeyboardThaiPlugin::registerTypes(const char *uri) const
-{
-    qmlRegisterType<ThaiInputMethod>(uri, 2, 3, "ThaiInputMethod");
-}
-
-QT_END_NAMESPACE
diff --git a/src/plugins/thai/plugin/thaiplugin.h b/src/plugins/thai/plugin/thaiplugin.h
deleted file mode 100644
index 6af272cb..00000000
--- a/src/plugins/thai/plugin/thaiplugin.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2018 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 or (at your option) any later version
-** approved by the KDE Free Qt Foundation. The licenses are as published by
-** the Free Software Foundation and appearing in the file LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef THAIPLUGIN_H
-#define THAIPLUGIN_H
-
-#include <QVirtualKeyboardExtensionPlugin>
-
-QT_BEGIN_NAMESPACE
-
-class QtVirtualKeyboardThaiPlugin : public QVirtualKeyboardExtensionPlugin
-{
-    Q_OBJECT
-    Q_INTERFACES(QVirtualKeyboardExtensionPlugin)
-    Q_PLUGIN_METADATA(IID QVirtualKeyboardExtensionPluginFactoryInterface_iid
-                      FILE "thai.json")
-public:
-    void registerTypes(const char *uri) const override;
-};
-
-QT_END_NAMESPACE
-
-#endif
diff --git a/src/plugins/thai/plugin/thaiinputmethod.cpp b/src/plugins/thai/thaiinputmethod.cpp
index f4e9663e..f4e9663e 100644
--- a/src/plugins/thai/plugin/thaiinputmethod.cpp
+++ b/src/plugins/thai/thaiinputmethod.cpp
diff --git a/src/plugins/thai/plugin/thaiinputmethod_p.h b/src/plugins/thai/thaiinputmethod_p.h
index ef1dd547..020af40b 100644
--- a/src/plugins/thai/plugin/thaiinputmethod_p.h
+++ b/src/plugins/thai/thaiinputmethod_p.h
@@ -47,6 +47,7 @@ class ThaiInputMethod : public ThaiInputMethodBase
 {
     Q_OBJECT
     Q_DECLARE_PRIVATE(ThaiInputMethod)
+    QML_ELEMENT
 public:
     explicit ThaiInputMethod(QObject *parent = nullptr);
 
diff --git a/src/settings/CMakeLists.txt b/src/settings/CMakeLists.txt
index 870b40b5..125e7bc4 100644
--- a/src/settings/CMakeLists.txt
+++ b/src/settings/CMakeLists.txt
@@ -1,20 +1,22 @@
 #####################################################################
-## qtquickvirtualkeyboardsettingsplugin Plugin:
+## qtvkbsettingsplugin Plugin:
 #####################################################################
 
-qt_internal_add_qml_module(qtquickvirtualkeyboardsettingsplugin
+qt_internal_add_qml_module(qtvkbsettingsplugin
     URI "QtQuick.VirtualKeyboard.Settings"
-    VERSION "2.${PROJECT_VERSION_MINOR}"
-    CLASS_NAME QtQuickVirtualKeyboardSettingsPlugin
-    PLUGIN_TARGET qtquickvirtualkeyboardsettingsplugin
-    NO_GENERATE_PLUGIN_SOURCE
+    VERSION "${PROJECT_VERSION}"
+    PAST_MAJOR_VERSIONS 2 1
+    PLUGIN_TARGET qtvkbsettingsplugin
     NO_PLUGIN_OPTIONAL
-    NO_GENERATE_QMLTYPES
-    INSTALL_SOURCE_QMLTYPES "plugins.qmltypes"
-    DEPENDENCIES
-        QtQuick/2.0
     SOURCES
-        qtquickvirtualkeyboardsettingsplugin.cpp qtquickvirtualkeyboardsettingsplugin.h
+        qquickvirtualkeyboardsettings.cpp
+        qquickvirtualkeyboardsettings_p.h
+    DEFINES
+        QT_ASCII_CAST_WARNINGS
+        QT_NO_CAST_FROM_ASCII
+        QT_NO_CAST_FROM_BYTEARRAY
+        QT_NO_CAST_TO_ASCII
+        QT_VIRTUALKEYBOARD_DEFAULT_LAYOUTS_DIR=\\\"qrc:${VKB_LAYOUTS_PREFIX}\\\"
     LIBRARIES
         Qt::Core
         Qt::Gui
@@ -23,9 +25,18 @@ qt_internal_add_qml_module(qtquickvirtualkeyboardsettingsplugin
         Qt::VirtualKeyboardPrivate
 )
 
-## Scopes:
-#####################################################################
+qt_internal_extend_target(qtvkbsettingsplugin CONDITION QT_FEATURE_vkb_no_builtin_style
+    DEFINES
+        QT_VIRTUALKEYBOARD_DEFAULT_STYLE=\\\"\\\"
+)
+
+qt_internal_extend_target(qtvkbsettingsplugin CONDITION QT_FEATURE_vkb_retro_style AND NOT QT_FEATURE_vkb_no_builtin_style
+    DEFINES
+        QT_VIRTUALKEYBOARD_DEFAULT_STYLE=\\\"retro\\\"
+)
+
+qt_internal_extend_target(qtvkbsettingsplugin CONDITION NOT QT_FEATURE_vkb_no_builtin_style AND NOT QT_FEATURE_vkb_retro_style
+    DEFINES
+        QT_VIRTUALKEYBOARD_DEFAULT_STYLE=\\\"default\\\"
+)
 
-#### Keys ignored in scope 2:.:.:settings.pro:WIN32:
-# QMAKE_TARGET_DESCRIPTION = "Virtual Keyboard for Qt."
-# QMAKE_TARGET_PRODUCT = "Qt Virtual Keyboard (Qt $$QT_VERSION)"
diff --git a/src/settings/dependencies.json b/src/settings/dependencies.json
deleted file mode 100644
index 0d4f101c..00000000
--- a/src/settings/dependencies.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/src/settings/plugins.qmltypes b/src/settings/plugins.qmltypes
deleted file mode 100644
index 8b1402e6..00000000
--- a/src/settings/plugins.qmltypes
+++ /dev/null
@@ -1,50 +0,0 @@
-import QtQuick.tooling 1.2
-
-// This file describes the plugin-supplied types contained in the library.
-// It is used for QML tooling purposes only.
-//
-// This file was auto-generated by:
-// 'qmlplugindump -nonrelocatable -dependencies dependencies.json QtQuick.VirtualKeyboard.Settings 2.14'
-
-Module {
-    dependencies: []
-    Component {
-        name: "QtVirtualKeyboard::VirtualKeyboardSettings"
-        prototype: "QObject"
-        exports: [
-            "QtQuick.VirtualKeyboard.Settings/VirtualKeyboardSettings 1.0",
-            "QtQuick.VirtualKeyboard.Settings/VirtualKeyboardSettings 1.1",
-            "QtQuick.VirtualKeyboard.Settings/VirtualKeyboardSettings 1.2",
-            "QtQuick.VirtualKeyboard.Settings/VirtualKeyboardSettings 2.0",
-            "QtQuick.VirtualKeyboard.Settings/VirtualKeyboardSettings 2.1"
-        ]
-        isCreatable: false
-        isSingleton: true
-        exportMetaObjectRevisions: [0, 0, 0, 0, 0]
-        Property { name: "style"; type: "QUrl"; isReadonly: true }
-        Property { name: "layoutPath"; type: "QUrl" }
-        Property { name: "styleName"; type: "string" }
-        Property { name: "locale"; type: "string" }
-        Property { name: "availableLocales"; type: "QStringList"; isReadonly: true }
-        Property { name: "activeLocales"; type: "QStringList" }
-        Property {
-            name: "wordCandidateList"
-            type: "WordCandidateListSettings"
-            isReadonly: true
-            isPointer: true
-        }
-        Property { name: "fullScreenMode"; type: "bool" }
-    }
-    Component {
-        name: "QtVirtualKeyboard::WordCandidateListSettings"
-        prototype: "QObject"
-        exports: [
-            "QtQuick.VirtualKeyboard.Settings/WordCandidateListSettings 2.2"
-        ]
-        isCreatable: false
-        exportMetaObjectRevisions: [0]
-        Property { name: "autoHideDelay"; type: "int" }
-        Property { name: "alwaysVisible"; type: "bool" }
-        Property { name: "autoCommitWord"; type: "bool" }
-    }
-}
diff --git a/src/settings/qmldir b/src/settings/qmldir
deleted file mode 100644
index ac07347d..00000000
--- a/src/settings/qmldir
+++ /dev/null
@@ -1,5 +0,0 @@
-module QtQuick.VirtualKeyboard.Settings
-plugin qtquickvirtualkeyboardsettingsplugin
-classname QtQuickVirtualKeyboardSettingsPlugin
-typeinfo plugins.qmltypes
-depends QtQuick 2.0
diff --git a/src/virtualkeyboard/virtualkeyboardsettings.cpp b/src/settings/qquickvirtualkeyboardsettings.cpp
index 2938aaac..7357c2ab 100644
--- a/src/virtualkeyboard/virtualkeyboardsettings.cpp
+++ b/src/settings/qquickvirtualkeyboardsettings.cpp
@@ -27,10 +27,11 @@
 **
 ****************************************************************************/
 
-#include <QtVirtualKeyboard/private/virtualkeyboardsettings_p.h>
+#include "qquickvirtualkeyboardsettings_p.h"
 #include <QtVirtualKeyboard/private/settings_p.h>
 #include <QtVirtualKeyboard/private/virtualkeyboarddebug_p.h>
 #include <QQmlEngine>
+#include <QQmlContext>
 #include <QFileInfo>
 #include <QDir>
 #include <QRegularExpression>
@@ -39,15 +40,16 @@
 QT_BEGIN_NAMESPACE
 namespace QtVirtualKeyboard {
 
-class VirtualKeyboardSettingsPrivate : public QObjectPrivate
+class QQuickVirtualKeyboardSettingsPrivate : public QObjectPrivate
 {
+    Q_DECLARE_PUBLIC(QQuickVirtualKeyboardSettings)
 public:
-    VirtualKeyboardSettingsPrivate() :
+    QQuickVirtualKeyboardSettingsPrivate(QQuickVirtualKeyboardSettings *q_ptr) :
         QObjectPrivate(),
-        engine()
+        q_ptr(q_ptr)
     {}
 
-    QString buildStyleImportPath(const QString &path, const QString &name) const
+    QString buildStylePath(const QString &path, const QString &name) const
     {
         QString importPath(path + name + QLatin1String("/style.qml"));
         if (!importPath.startsWith(QLatin1String("qrc:"))) {
@@ -65,37 +67,48 @@ public:
         return filePath + name + QLatin1String("/style.qml");
     }
 
-    QString styleImportPath(const QString &name) const
+    QStringList qmlImportPathList() const
+    {
+        Q_Q(const QQuickVirtualKeyboardSettings);
+        if (QQmlContext *context = QQmlEngine::contextForObject(q)) {
+            if (QQmlEngine *engine = context->engine()) {
+                return engine->importPathList();
+            }
+        }
+        return QStringList();
+    }
+
+    QString stylePath(const QString &name) const
     {
         if (name.isEmpty())
             return QString();
 
-        QStringList styleImportPathList;
-        styleImportPathList << QLatin1String("qrc:/QtQuick/VirtualKeyboard/content/styles/");
-        const QStringList importPathList = engine->importPathList();
+        QStringList stylePathList;
+        stylePathList << QLatin1String("qrc:/qt-project.org/imports/QtQuick/VirtualKeyboard/Styles/Builtin/");
+        const QStringList importPathList = qmlImportPathList();
         // Add QML import path (Note: the QML base dir is usually the last entry in the list)
         for (int i = importPathList.size() - 1; i >= 0; --i) {
             const QString stylesPath = importPathList.at(i)
                 + QLatin1String("/QtQuick/VirtualKeyboard/Styles/");
-            styleImportPathList += stylesPath;
+            stylePathList += stylesPath;
         }
 
-        for (const QString &styleImportPath : qAsConst(styleImportPathList)) {
-            QString filePath = buildStyleFilePath(styleImportPath, name);
+        for (const QString &stylePath : qAsConst(stylePathList)) {
+            QString filePath = buildStyleFilePath(stylePath, name);
             bool pathExist = false;
             pathExist = QFileInfo::exists(filePath);
             if (pathExist)
-                return buildStyleImportPath(styleImportPath, name);
+                return buildStylePath(stylePath, name);
         }
         return QString();
     }
 
-    QPointer<QQmlEngine> engine;
-    WordCandidateListSettings wordCandidateListSettings;
+    QQuickVirtualKeyboardSettings *q_ptr;
+    QQuickWordCandidateListSettings wordCandidateListSettings;
 };
 
 /*!
-    \qmlmodule QtQuick.VirtualKeyboard.Settings 2.\QtMinorVersion
+    \qmlmodule QtQuick.VirtualKeyboard.Settings
     \title Qt Quick Virtual Keyboard Settings QML Types
     \ingroup qmlmodules
 
@@ -105,7 +118,7 @@ public:
     import statements in your .qml file:
 
     \qml \QtMinorVersion
-    import QtQuick.VirtualKeyboard.Settings 2.\1
+    import QtQuick.VirtualKeyboard.Settings
     \endqml
 */
 
@@ -131,15 +144,6 @@ public:
 */
 
 /*!
-    \internal
-*/
-QObject *VirtualKeyboardSettings::registerSettingsModule(QQmlEngine *engine, QJSEngine *jsEngine)
-{
-    Q_UNUSED(jsEngine);
-    return new VirtualKeyboardSettings(engine);
-}
-
-/*!
     \class QtVirtualKeyboard::VirtualKeyboardSettings
     \internal
 */
@@ -147,11 +151,10 @@ QObject *VirtualKeyboardSettings::registerSettingsModule(QQmlEngine *engine, QJS
 /*!
     \internal
 */
-VirtualKeyboardSettings::VirtualKeyboardSettings(QQmlEngine *engine) :
-    QObject(*new VirtualKeyboardSettingsPrivate())
+QQuickVirtualKeyboardSettings::QQuickVirtualKeyboardSettings(QObject *parent) :
+    QObject(*new QQuickVirtualKeyboardSettingsPrivate(this), parent)
 {
-    Q_D(VirtualKeyboardSettings);
-    d->engine = engine;
+    Q_D(QQuickVirtualKeyboardSettings);
     Settings *settings = Settings::instance();
     if (settings->styleName().isEmpty())
         resetStyle();
@@ -180,7 +183,7 @@ VirtualKeyboardSettings::VirtualKeyboardSettings(QQmlEngine *engine) :
 /*!
     \internal
 */
-QString VirtualKeyboardSettings::style() const
+QString QQuickVirtualKeyboardSettings::style() const
 {
     return Settings::instance()->style();
 }
@@ -188,7 +191,7 @@ QString VirtualKeyboardSettings::style() const
 /*!
     \internal
 */
-QString VirtualKeyboardSettings::styleName() const
+QString QQuickVirtualKeyboardSettings::styleName() const
 {
     return Settings::instance()->styleName();
 }
@@ -196,11 +199,11 @@ QString VirtualKeyboardSettings::styleName() const
 /*!
     \internal
 */
-void VirtualKeyboardSettings::setStyleName(const QString &styleName)
+void QQuickVirtualKeyboardSettings::setStyleName(const QString &styleName)
 {
-    Q_D(VirtualKeyboardSettings);
+    Q_D(QQuickVirtualKeyboardSettings);
     Settings *settings = Settings::instance();
-    QString style = d->styleImportPath(styleName);
+    QString style = d->stylePath(styleName);
     if (style.isEmpty()) {
         qWarning() << "WARNING: Cannot find style" << styleName << "- fallback:" << settings->styleName();
         return;
@@ -212,7 +215,7 @@ void VirtualKeyboardSettings::setStyleName(const QString &styleName)
 /*!
     \internal
 */
-QUrl VirtualKeyboardSettings::layoutPath() const
+QUrl QQuickVirtualKeyboardSettings::layoutPath() const
 {
     return Settings::instance()->layoutPath();
 }
@@ -220,7 +223,7 @@ QUrl VirtualKeyboardSettings::layoutPath() const
 /*!
     \internal
 */
-void VirtualKeyboardSettings::setLayoutPath(const QUrl &layoutPath)
+void QQuickVirtualKeyboardSettings::setLayoutPath(const QUrl &layoutPath)
 {
     Settings *settings = Settings::instance();
     QDir layoutDirectory(layoutPath.toLocalFile());
@@ -231,7 +234,7 @@ void VirtualKeyboardSettings::setLayoutPath(const QUrl &layoutPath)
     settings->setLayoutPath(layoutPath);
 }
 
-void VirtualKeyboardSettings::resetLayoutPath()
+void QQuickVirtualKeyboardSettings::resetLayoutPath()
 {
     Settings *settings = Settings::instance();
     QUrl layoutPath(QLatin1String(QT_VIRTUALKEYBOARD_DEFAULT_LAYOUTS_DIR));
@@ -256,130 +259,130 @@ void VirtualKeyboardSettings::resetLayoutPath()
     settings->setLayoutPath(layoutPath);
 }
 
-QString VirtualKeyboardSettings::locale() const
+QString QQuickVirtualKeyboardSettings::locale() const
 {
     return Settings::instance()->locale();
 }
 
-void VirtualKeyboardSettings::setLocale(const QString &locale)
+void QQuickVirtualKeyboardSettings::setLocale(const QString &locale)
 {
     Settings::instance()->setLocale(locale);
 }
 
-QStringList VirtualKeyboardSettings::availableLocales() const
+QStringList QQuickVirtualKeyboardSettings::availableLocales() const
 {
     return Settings::instance()->availableLocales();
 }
 
-void VirtualKeyboardSettings::setActiveLocales(const QStringList &activeLocales)
+void QQuickVirtualKeyboardSettings::setActiveLocales(const QStringList &activeLocales)
 {
     Settings::instance()->setActiveLocales(activeLocales);
 }
 
-QStringList VirtualKeyboardSettings::activeLocales() const
+QStringList QQuickVirtualKeyboardSettings::activeLocales() const
 {
     return Settings::instance()->activeLocales();
 }
 
-WordCandidateListSettings *VirtualKeyboardSettings::wordCandidateList() const
+QQuickWordCandidateListSettings *QQuickVirtualKeyboardSettings::wordCandidateList() const
 {
-    Q_D(const VirtualKeyboardSettings);
-    return const_cast<WordCandidateListSettings *>(&d->wordCandidateListSettings);
+    Q_D(const QQuickVirtualKeyboardSettings);
+    return const_cast<QQuickWordCandidateListSettings *>(&d->wordCandidateListSettings);
 }
 
-bool VirtualKeyboardSettings::fullScreenMode() const
+bool QQuickVirtualKeyboardSettings::fullScreenMode() const
 {
     return Settings::instance()->fullScreenMode();
 }
 
-void VirtualKeyboardSettings::setFullScreenMode(bool fullScreenMode)
+void QQuickVirtualKeyboardSettings::setFullScreenMode(bool fullScreenMode)
 {
     return Settings::instance()->setFullScreenMode(fullScreenMode);
 }
 
-QString VirtualKeyboardSettings::userDataPath() const
+QString QQuickVirtualKeyboardSettings::userDataPath() const
 {
     return Settings::instance()->userDataPath();
 }
 
-void VirtualKeyboardSettings::setUserDataPath(const QString &userDataPath)
+void QQuickVirtualKeyboardSettings::setUserDataPath(const QString &userDataPath)
 {
     return Settings::instance()->setUserDataPath(userDataPath);
 }
 
-int VirtualKeyboardSettings::hwrTimeoutForAlphabetic() const
+int QQuickVirtualKeyboardSettings::hwrTimeoutForAlphabetic() const
 {
     return Settings::instance()->hwrTimeoutForAlphabetic();
 }
 
-void VirtualKeyboardSettings::setHwrTimeoutForAlphabetic(int hwrTimeoutForAlphabetic)
+void QQuickVirtualKeyboardSettings::setHwrTimeoutForAlphabetic(int hwrTimeoutForAlphabetic)
 {
     return Settings::instance()->setHwrTimeoutForAlphabetic(hwrTimeoutForAlphabetic);
 }
 
-int VirtualKeyboardSettings::hwrTimeoutForCjk() const
+int QQuickVirtualKeyboardSettings::hwrTimeoutForCjk() const
 {
     return Settings::instance()->hwrTimeoutForCjk();
 }
 
-void VirtualKeyboardSettings::setHwrTimeoutForCjk(int hwrTimeoutForCjk)
+void QQuickVirtualKeyboardSettings::setHwrTimeoutForCjk(int hwrTimeoutForCjk)
 {
     return Settings::instance()->setHwrTimeoutForCjk(hwrTimeoutForCjk);
 }
 
-Qt::InputMethodHints VirtualKeyboardSettings::inputMethodHints() const
+Qt::InputMethodHints QQuickVirtualKeyboardSettings::inputMethodHints() const
 {
     return Settings::instance()->inputMethodHints();
 }
 
-void VirtualKeyboardSettings::setInputMethodHints(const Qt::InputMethodHints &inputMethodHints)
+void QQuickVirtualKeyboardSettings::setInputMethodHints(const Qt::InputMethodHints &inputMethodHints)
 {
     Settings::instance()->setInputMethodHints(inputMethodHints);
 }
 
-bool VirtualKeyboardSettings::isHandwritingModeDisabled() const
+bool QQuickVirtualKeyboardSettings::isHandwritingModeDisabled() const
 {
     return Settings::instance()->isHandwritingModeDisabled();
 }
 
-void VirtualKeyboardSettings::setHandwritingModeDisabled(bool handwritingModeDisabled)
+void QQuickVirtualKeyboardSettings::setHandwritingModeDisabled(bool handwritingModeDisabled)
 {
     Settings::instance()->setHandwritingModeDisabled(handwritingModeDisabled);
 }
 
-bool VirtualKeyboardSettings::isDefaultInputMethodDisabled() const
+bool QQuickVirtualKeyboardSettings::isDefaultInputMethodDisabled() const
 {
     return Settings::instance()->isDefaultInputMethodDisabled();
 }
 
-void VirtualKeyboardSettings::setDefaultInputMethodDisabled(bool defaultInputMethodDisabled)
+void QQuickVirtualKeyboardSettings::setDefaultInputMethodDisabled(bool defaultInputMethodDisabled)
 {
     return Settings::instance()->setDefaultInputMethodDisabled(defaultInputMethodDisabled);
 }
 
-bool VirtualKeyboardSettings::isDefaultDictionaryDisabled() const
+bool QQuickVirtualKeyboardSettings::isDefaultDictionaryDisabled() const
 {
     return Settings::instance()->isDefaultDictionaryDisabled();
 }
 
-void VirtualKeyboardSettings::setDefaultDictionaryDisabled(bool defaultDictionaryDisabled)
+void QQuickVirtualKeyboardSettings::setDefaultDictionaryDisabled(bool defaultDictionaryDisabled)
 {
     return Settings::instance()->setDefaultDictionaryDisabled(defaultDictionaryDisabled);
 }
 
-void VirtualKeyboardSettings::resetStyle()
+void QQuickVirtualKeyboardSettings::resetStyle()
 {
-    Q_D(VirtualKeyboardSettings);
+    Q_D(QQuickVirtualKeyboardSettings);
     Settings *settings = Settings::instance();
     QString styleName = QLatin1String(QT_VIRTUALKEYBOARD_DEFAULT_STYLE);
-    QString style = d->styleImportPath(styleName);
+    QString style = d->stylePath(styleName);
     QString customStyleName = QString::fromLatin1(qgetenv("QT_VIRTUALKEYBOARD_STYLE"));
     if (!customStyleName.isEmpty()) {
         bool found = false;
         QRegularExpression styleNameValidator(QLatin1String("\\A(?:\\w+)\\z"));
         QRegularExpressionMatch match = styleNameValidator.match(customStyleName);
         if (match.hasMatch()) {
-            QString customStyle = d->styleImportPath(customStyleName);
+            QString customStyle = d->stylePath(customStyleName);
             if (!customStyle.isEmpty()) {
                 styleName = customStyleName;
                 style = customStyle;
@@ -587,37 +590,37 @@ void VirtualKeyboardSettings::resetStyle()
     \endtable
 */
 
-WordCandidateListSettings::WordCandidateListSettings(QObject *parent) :
+QQuickWordCandidateListSettings::QQuickWordCandidateListSettings(QObject *parent) :
     QObject(parent)
 {
 }
 
-int WordCandidateListSettings::autoHideDelay() const
+int QQuickWordCandidateListSettings::autoHideDelay() const
 {
     return Settings::instance()->wclAutoHideDelay();
 }
 
-void WordCandidateListSettings::setAutoHideDelay(int autoHideDelay)
+void QQuickWordCandidateListSettings::setAutoHideDelay(int autoHideDelay)
 {
     Settings::instance()->setWclAutoHideDelay(autoHideDelay);
 }
 
-bool WordCandidateListSettings::alwaysVisible() const
+bool QQuickWordCandidateListSettings::alwaysVisible() const
 {
     return Settings::instance()->wclAlwaysVisible();
 }
 
-void WordCandidateListSettings::setAlwaysVisible(bool alwaysVisible)
+void QQuickWordCandidateListSettings::setAlwaysVisible(bool alwaysVisible)
 {
     Settings::instance()->setWclAlwaysVisible(alwaysVisible);
 }
 
-bool WordCandidateListSettings::autoCommitWord() const
+bool QQuickWordCandidateListSettings::autoCommitWord() const
 {
     return Settings::instance()->wclAutoCommitWord();
 }
 
-void WordCandidateListSettings::setAutoCommitWord(bool autoCommitWord)
+void QQuickWordCandidateListSettings::setAutoCommitWord(bool autoCommitWord)
 {
     Settings::instance()->setWclAutoCommitWord(autoCommitWord);
 }
diff --git a/src/virtualkeyboard/virtualkeyboardsettings_p.h b/src/settings/qquickvirtualkeyboardsettings_p.h
index e7b6b108..f022b334 100644
--- a/src/virtualkeyboard/virtualkeyboardsettings_p.h
+++ b/src/settings/qquickvirtualkeyboardsettings_p.h
@@ -41,27 +41,26 @@
 // We mean it.
 //
 
-#include <qqml.h>
-#include <QtVirtualKeyboard/qvirtualkeyboard_global.h>
+#include <QtQml/qqml.h>
 #include <QtCore/private/qglobal_p.h>
 
 QT_BEGIN_NAMESPACE
 namespace QtVirtualKeyboard {
 
-class WordCandidateListSettings;
-class VirtualKeyboardSettingsPrivate;
+class QQuickWordCandidateListSettings;
+class QQuickVirtualKeyboardSettingsPrivate;
 
-class Q_VIRTUALKEYBOARD_EXPORT VirtualKeyboardSettings : public QObject
+class QQuickVirtualKeyboardSettings : public QObject
 {
     Q_OBJECT
-    Q_DECLARE_PRIVATE(VirtualKeyboardSettings)
+    Q_DECLARE_PRIVATE(QQuickVirtualKeyboardSettings)
     Q_PROPERTY(QUrl style READ style NOTIFY styleChanged)
     Q_PROPERTY(QUrl layoutPath READ layoutPath WRITE setLayoutPath NOTIFY layoutPathChanged)
     Q_PROPERTY(QString styleName READ styleName WRITE setStyleName NOTIFY styleNameChanged)
     Q_PROPERTY(QString locale READ locale WRITE setLocale NOTIFY localeChanged)
     Q_PROPERTY(QStringList availableLocales READ availableLocales NOTIFY availableLocalesChanged)
     Q_PROPERTY(QStringList activeLocales READ activeLocales WRITE setActiveLocales NOTIFY activeLocalesChanged)
-    Q_PROPERTY(WordCandidateListSettings *wordCandidateList READ wordCandidateList CONSTANT)
+    Q_PROPERTY(QQuickWordCandidateListSettings *wordCandidateList READ wordCandidateList CONSTANT)
     Q_PROPERTY(bool fullScreenMode READ fullScreenMode WRITE setFullScreenMode NOTIFY fullScreenModeChanged)
     Q_PROPERTY(QString userDataPath READ userDataPath WRITE setUserDataPath NOTIFY userDataPathChanged REVISION(6, 1))
     Q_PROPERTY(int hwrTimeoutForAlphabetic READ hwrTimeoutForAlphabetic WRITE setHwrTimeoutForAlphabetic NOTIFY hwrTimeoutForAlphabeticChanged REVISION(6, 1))
@@ -70,11 +69,13 @@ class Q_VIRTUALKEYBOARD_EXPORT VirtualKeyboardSettings : public QObject
     Q_PROPERTY(bool handwritingModeDisabled READ isHandwritingModeDisabled WRITE setHandwritingModeDisabled NOTIFY handwritingModeDisabledChanged REVISION(6, 1))
     Q_PROPERTY(bool defaultInputMethodDisabled READ isDefaultInputMethodDisabled WRITE setDefaultInputMethodDisabled NOTIFY defaultInputMethodDisabledChanged REVISION(6, 1))
     Q_PROPERTY(bool defaultDictionaryDisabled READ isDefaultDictionaryDisabled WRITE setDefaultDictionaryDisabled NOTIFY defaultDictionaryDisabledChanged REVISION(6, 1))
+    QML_NAMED_ELEMENT(VirtualKeyboardSettings)
+    QML_SINGLETON
+    QML_ADDED_IN_VERSION(1, 0)
+    QML_EXTRA_VERSION(2, 0)
 
 public:
-    static QObject *registerSettingsModule(QQmlEngine *engine, QJSEngine *jsEngine);
-
-    explicit VirtualKeyboardSettings(QQmlEngine *engine);
+    explicit QQuickVirtualKeyboardSettings(QObject *parent = nullptr);
 
     QString style() const;
 
@@ -92,7 +93,7 @@ public:
     void setActiveLocales(const QStringList &activeLocales);
     QStringList activeLocales() const;
 
-    WordCandidateListSettings *wordCandidateList() const;
+    QQuickWordCandidateListSettings *wordCandidateList() const;
 
     bool fullScreenMode() const;
     void setFullScreenMode(bool fullScreenMode);
@@ -140,15 +141,16 @@ private:
     void resetLayoutPath();
 };
 
-class Q_VIRTUALKEYBOARD_EXPORT WordCandidateListSettings : public QObject
+class QQuickWordCandidateListSettings : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(int autoHideDelay READ autoHideDelay WRITE setAutoHideDelay NOTIFY autoHideDelayChanged)
     Q_PROPERTY(bool alwaysVisible READ alwaysVisible WRITE setAlwaysVisible NOTIFY alwaysVisibleChanged)
     Q_PROPERTY(bool autoCommitWord READ autoCommitWord WRITE setAutoCommitWord NOTIFY autoCommitWordChanged)
+    QML_ANONYMOUS
 
-    explicit WordCandidateListSettings(QObject *parent = nullptr);
-    friend class VirtualKeyboardSettingsPrivate;
+    explicit QQuickWordCandidateListSettings(QObject *parent = nullptr);
+    friend class QQuickVirtualKeyboardSettingsPrivate;
 
 public:
     int autoHideDelay() const;
diff --git a/src/settings/qtquickvirtualkeyboardsettingsplugin.cpp b/src/settings/qtquickvirtualkeyboardsettingsplugin.cpp
deleted file mode 100644
index e7b05980..00000000
--- a/src/settings/qtquickvirtualkeyboardsettingsplugin.cpp
+++ /dev/null
@@ -1,58 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2018 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 or (at your option) any later version
-** approved by the KDE Free Qt Foundation. The licenses are as published by
-** the Free Software Foundation and appearing in the file LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qtquickvirtualkeyboardsettingsplugin.h"
-#include <QtVirtualKeyboard/private/virtualkeyboardsettings_p.h>
-#include <QtVirtualKeyboard/private/qvirtualkeyboard_staticplugin_p.h>
-
-QT_BEGIN_NAMESPACE
-
-using namespace QtVirtualKeyboard;
-
-void QtQuickVirtualKeyboardSettingsPlugin::registerTypes(const char *uri)
-{
-#if defined(QT_STATICPLUGIN)
-    Q_VKB_IMPORT_PLUGIN(QtQuick2Plugin)
-#endif
-
-    qmlRegisterSingletonType<VirtualKeyboardSettings>(uri, 1, 0, "VirtualKeyboardSettings", VirtualKeyboardSettings::registerSettingsModule);
-    qmlRegisterSingletonType<VirtualKeyboardSettings>(uri, 1, 1, "VirtualKeyboardSettings", VirtualKeyboardSettings::registerSettingsModule);
-    qmlRegisterSingletonType<VirtualKeyboardSettings>(uri, 1, 2, "VirtualKeyboardSettings", VirtualKeyboardSettings::registerSettingsModule);
-    qmlRegisterSingletonType<VirtualKeyboardSettings>(uri, 2, 0, "VirtualKeyboardSettings", VirtualKeyboardSettings::registerSettingsModule);
-    qmlRegisterSingletonType<VirtualKeyboardSettings>(uri, 2, 1, "VirtualKeyboardSettings", VirtualKeyboardSettings::registerSettingsModule);
-    qmlRegisterSingletonType<VirtualKeyboardSettings>(uri, 6, 1, "VirtualKeyboardSettings", VirtualKeyboardSettings::registerSettingsModule);
-    qRegisterMetaType<WordCandidateListSettings *>("WordCandidateListSettings*");
-    qmlRegisterUncreatableType<WordCandidateListSettings>(uri, 2, 2, "WordCandidateListSettings", QLatin1String("Cannot create word candidate list settings"));
-
-    // The minor version used to be the current Qt 5 minor. For compatibility it is the last
-    // Qt 5 release.
-    qmlRegisterModule(uri, 2, 15);
-}
-
-QT_END_NAMESPACE
diff --git a/src/settings/qtquickvirtualkeyboardsettingsplugin.h b/src/settings/qtquickvirtualkeyboardsettingsplugin.h
deleted file mode 100644
index 355a2d66..00000000
--- a/src/settings/qtquickvirtualkeyboardsettingsplugin.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2018 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 or (at your option) any later version
-** approved by the KDE Free Qt Foundation. The licenses are as published by
-** the Free Software Foundation and appearing in the file LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QTQUICKVIRTUALKEYBOARDSETTINGSPLUGIN_H
-#define QTQUICKVIRTUALKEYBOARDSETTINGSPLUGIN_H
-
-#include <QQmlExtensionPlugin>
-
-QT_BEGIN_NAMESPACE
-
-class QtQuickVirtualKeyboardSettingsPlugin : public QQmlExtensionPlugin
-{
-    Q_OBJECT
-    Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid)
-
-public:
-    QtQuickVirtualKeyboardSettingsPlugin(QObject *parent = nullptr) : QQmlExtensionPlugin(parent) { }
-    void registerTypes(const char *uri) override;
-};
-
-QT_END_NAMESPACE
-
-#endif // QTQUICKVIRTUALKEYBOARDSETTINGSPLUGIN_H
-
diff --git a/src/styles/CMakeLists.txt b/src/styles/CMakeLists.txt
index 2650d44e..6e14f976 100644
--- a/src/styles/CMakeLists.txt
+++ b/src/styles/CMakeLists.txt
@@ -1,21 +1,38 @@
+set(styles_imports)
+if(NOT QT_FEATURE_vkb_no_builtin_style)
+    add_subdirectory(builtin)
+    list(APPEND styles_imports QtQuick.VirtualKeyboard.Styles.Builtin/auto)
+endif()
+
 #####################################################################
-## qtquickvirtualkeyboardstylesplugin Plugin:
+## QtQuick.VirtualKeyboard.Styles
 #####################################################################
 
-qt_internal_add_qml_module(qtquickvirtualkeyboardstylesplugin
+qt_internal_add_qml_module(qtvkbstylesplugin
     URI "QtQuick.VirtualKeyboard.Styles"
-    VERSION "2.${PROJECT_VERSION_MINOR}"
-    CLASS_NAME QtQuickVirtualKeyboardStylesPlugin
-    PLUGIN_TARGET qtquickvirtualkeyboardstylesplugin
+    VERSION "${PROJECT_VERSION}"
+    PAST_MAJOR_VERSIONS 2 1
+    PLUGIN_TARGET qtvkbstylesplugin
+    # Note: The plugin source is defined manually because it uses an
+    #       image provider. Once the image provider doesn't need an
+    #       engine anymore, we can auto-generate the plugin.
     NO_GENERATE_PLUGIN_SOURCE
     NO_PLUGIN_OPTIONAL
-    NO_GENERATE_QMLTYPES
-    INSTALL_SOURCE_QMLTYPES "plugins.qmltypes"
     DEPENDENCIES
-        QtQuick/2.0
+        QtQuick/auto
+    IMPORTS
+        ${styles_imports}
     SOURCES
         qtquickvirtualkeyboardstylesplugin.cpp qtquickvirtualkeyboardstylesplugin.h
         svgimageprovider.cpp svgimageprovider.h
+    QML_FILES
+        KeyboardStyle.qml
+        KeyIcon.qml
+        KeyPanel.qml
+        SelectionListItem.qml
+        TraceInputKeyPanel.qml
+        TraceCanvas.qml
+        TraceUtils.js
     DEFINES
         QT_ASCII_CAST_WARNINGS
         QT_NO_CAST_FROM_ASCII
@@ -27,30 +44,4 @@ qt_internal_add_qml_module(qtquickvirtualkeyboardstylesplugin
         Qt::Qml
         Qt::Quick
         Qt::Svg
-        Qt::VirtualKeyboardPrivate
-)
-
-# Resources:
-set(styles_resource_files
-    "KeyIcon.qml"
-    "KeyPanel.qml"
-    "KeyboardStyle.qml"
-    "SelectionListItem.qml"
-    "TraceCanvas.qml"
-    "TraceInputKeyPanel.qml"
-    "TraceUtils.js"
-)
-
-qt_internal_add_resource(qtquickvirtualkeyboardstylesplugin "styles"
-    PREFIX
-        "/QtQuick/VirtualKeyboard/Styles/content"
-    FILES
-        ${styles_resource_files}
 )
-
-## Scopes:
-#####################################################################
-
-#### Keys ignored in scope 2:.:.:styles.pro:WIN32:
-# QMAKE_TARGET_DESCRIPTION = "Virtual Keyboard for Qt."
-# QMAKE_TARGET_PRODUCT = "Qt Virtual Keyboard (Qt $$QT_VERSION)"
diff --git a/src/styles/builtin/CMakeLists.txt b/src/styles/builtin/CMakeLists.txt
new file mode 100644
index 00000000..1ef540e6
--- /dev/null
+++ b/src/styles/builtin/CMakeLists.txt
@@ -0,0 +1,89 @@
+qt_internal_add_qml_module(qtvkbbuiltinstylesplugin
+    URI "QtQuick.VirtualKeyboard.Styles.Builtin"
+    VERSION "${PROJECT_VERSION}"
+    PLUGIN_TARGET qtvkbbuiltinstylesplugin
+    NO_PLUGIN_OPTIONAL
+    NO_GENERATE_PLUGIN_SOURCE
+    SOURCES
+        qtquickvirtualkeyboardbstylesbuiltinplugin.cpp qtquickvirtualkeyboardbstylesbuiltinplugin.h
+)
+
+# Resources:
+set(virtualkeyboard_default_style_resource_files
+    "default/images/backspace-fff.svg"
+    "default/images/check-fff.svg"
+    "default/images/enter-fff.svg"
+    "default/images/globe-fff.svg"
+    "default/images/handwriting-fff.svg"
+    "default/images/hidekeyboard-fff.svg"
+    "default/images/search-fff.svg"
+    "default/images/selectionhandle-bottom.svg"
+    "default/images/shift-80c342.svg"
+    "default/images/shift-fff.svg"
+    "default/images/shift-c5d6b6.svg"
+    "default/images/textmode-fff.svg"
+    "default/images/settings-fff.svg"
+    "default/style.qml"
+)
+
+qt_internal_add_resource(qtvkbbuiltinstylesplugin "virtualkeyboard_default_style"
+    PREFIX
+        "/qt-project.org/imports/QtQuick/VirtualKeyboard/Styles/Builtin/default"
+    BASE
+        "default"
+    FILES
+        ${virtualkeyboard_default_style_resource_files}
+)
+set(virtualkeyboard_retro_style_resource_files
+    "retro/images/backspace-c5a96f.svg"
+    "retro/images/check-c5a96f.svg"
+    "retro/images/enter-c5a96f.svg"
+    "retro/images/globe-110b05.svg"
+    "retro/images/globe-c5a96f.svg"
+    "retro/images/globe-fff.svg"
+    "retro/images/handwriting-110b05.svg"
+    "retro/images/handwriting-c5a96f.svg"
+    "retro/images/handwriting-fff.svg"
+    "retro/images/hidekeyboard-110b05.svg"
+    "retro/images/hidekeyboard-c5a96f.svg"
+    "retro/images/hidekeyboard-fff.svg"
+    "retro/images/key154px_black.png"
+    "retro/images/key154px_black.svg"
+    "retro/images/key154px_black_long.png"
+    "retro/images/key154px_capslock.png"
+    "retro/images/key154px_capslock_long.png"
+    "retro/images/key154px_colorA.png"
+    "retro/images/key154px_colorA.svg"
+    "retro/images/key154px_colorA_long.png"
+    "retro/images/key154px_colorB.png"
+    "retro/images/key154px_shiftcase.png"
+    "retro/images/key154px_shiftcase_long.png"
+    "retro/images/key156px_black_long.png"
+    "retro/images/key156px_black_medium_long.png"
+    "retro/images/key156px_colorA.png"
+    "retro/images/key156px_colorB.png"
+    "retro/images/key160px_black.png"
+    "retro/images/key160px_colorA.png"
+    "retro/images/key160px_colorB.png"
+    "retro/images/key_preview.png"
+    "retro/images/search-c5a96f.svg"
+    "retro/images/selectionhandle-bottom.svg"
+    "retro/images/shift-c5a96f.svg"
+    "retro/images/shift-cd8865.svg"
+    "retro/images/shift-dc4f28.svg"
+    "retro/images/textmode-110b05.svg"
+    "retro/images/textmode-c5a96f.svg"
+    "retro/images/textmode-fff.svg"
+    "retro/images/triangle_black.png"
+    "retro/images/triangle_highlight.png"
+    "retro/style.qml"
+)
+
+qt_internal_add_resource(qtvkbbuiltinstylesplugin "virtualkeyboard_retro_style"
+    PREFIX
+        "/qt-project.org/imports/QtQuick/VirtualKeyboard/Styles/Builtin/retro"
+    BASE
+        "retro"
+    FILES
+        ${virtualkeyboard_retro_style_resource_files}
+)
diff --git a/src/virtualkeyboard/content/styles/default/images/backspace-fff.svg b/src/styles/builtin/default/images/backspace-fff.svg
index e3dac14a..e3dac14a 100644
--- a/src/virtualkeyboard/content/styles/default/images/backspace-fff.svg
+++ b/src/styles/builtin/default/images/backspace-fff.svg
diff --git a/src/virtualkeyboard/content/styles/default/images/check-fff.svg b/src/styles/builtin/default/images/check-fff.svg
index 9e5ebb00..9e5ebb00 100644
--- a/src/virtualkeyboard/content/styles/default/images/check-fff.svg
+++ b/src/styles/builtin/default/images/check-fff.svg
diff --git a/src/virtualkeyboard/content/styles/default/images/enter-fff.svg b/src/styles/builtin/default/images/enter-fff.svg
index 3a400341..3a400341 100644
--- a/src/virtualkeyboard/content/styles/default/images/enter-fff.svg
+++ b/src/styles/builtin/default/images/enter-fff.svg
diff --git a/src/virtualkeyboard/content/styles/default/images/globe-fff.svg b/src/styles/builtin/default/images/globe-fff.svg
index e865b9fd..e865b9fd 100644
--- a/src/virtualkeyboard/content/styles/default/images/globe-fff.svg
+++ b/src/styles/builtin/default/images/globe-fff.svg
diff --git a/src/virtualkeyboard/content/styles/default/images/handwriting-fff.svg b/src/styles/builtin/default/images/handwriting-fff.svg
index cc74e1d5..cc74e1d5 100644
--- a/src/virtualkeyboard/content/styles/default/images/handwriting-fff.svg
+++ b/src/styles/builtin/default/images/handwriting-fff.svg
diff --git a/src/virtualkeyboard/content/styles/default/images/hidekeyboard-fff.svg b/src/styles/builtin/default/images/hidekeyboard-fff.svg
index a4f0b9b3..a4f0b9b3 100644
--- a/src/virtualkeyboard/content/styles/default/images/hidekeyboard-fff.svg
+++ b/src/styles/builtin/default/images/hidekeyboard-fff.svg
diff --git a/src/virtualkeyboard/content/styles/default/images/search-fff.svg b/src/styles/builtin/default/images/search-fff.svg
index 9c21e291..9c21e291 100644
--- a/src/virtualkeyboard/content/styles/default/images/search-fff.svg
+++ b/src/styles/builtin/default/images/search-fff.svg
diff --git a/src/virtualkeyboard/content/styles/default/images/selectionhandle-bottom.svg b/src/styles/builtin/default/images/selectionhandle-bottom.svg
index 312e3ab5..312e3ab5 100644
--- a/src/virtualkeyboard/content/styles/default/images/selectionhandle-bottom.svg
+++ b/src/styles/builtin/default/images/selectionhandle-bottom.svg
diff --git a/src/virtualkeyboard/content/styles/default/images/settings-fff.svg b/src/styles/builtin/default/images/settings-fff.svg
index fdda82fa..fdda82fa 100644
--- a/src/virtualkeyboard/content/styles/default/images/settings-fff.svg
+++ b/src/styles/builtin/default/images/settings-fff.svg
diff --git a/src/virtualkeyboard/content/styles/default/images/shift-80c342.svg b/src/styles/builtin/default/images/shift-80c342.svg
index d39a2230..d39a2230 100644
--- a/src/virtualkeyboard/content/styles/default/images/shift-80c342.svg
+++ b/src/styles/builtin/default/images/shift-80c342.svg
diff --git a/src/virtualkeyboard/content/styles/default/images/shift-c5d6b6.svg b/src/styles/builtin/default/images/shift-c5d6b6.svg
index 22f9d5de..22f9d5de 100644
--- a/src/virtualkeyboard/content/styles/default/images/shift-c5d6b6.svg
+++ b/src/styles/builtin/default/images/shift-c5d6b6.svg
diff --git a/src/virtualkeyboard/content/styles/default/images/shift-fff.svg b/src/styles/builtin/default/images/shift-fff.svg
index ff65317b..ff65317b 100644
--- a/src/virtualkeyboard/content/styles/default/images/shift-fff.svg
+++ b/src/styles/builtin/default/images/shift-fff.svg
diff --git a/src/virtualkeyboard/content/styles/default/images/textmode-fff.svg b/src/styles/builtin/default/images/textmode-fff.svg
index bdb144cd..bdb144cd 100644
--- a/src/virtualkeyboard/content/styles/default/images/textmode-fff.svg
+++ b/src/styles/builtin/default/images/textmode-fff.svg
diff --git a/src/virtualkeyboard/content/styles/default/style.qml b/src/styles/builtin/default/style.qml
index 50c76990..3bb0f739 100644
--- a/src/virtualkeyboard/content/styles/default/style.qml
+++ b/src/styles/builtin/default/style.qml
@@ -39,7 +39,7 @@ KeyboardStyle {
     readonly property real keyBackgroundMargin: Math.round(8 * scaleHint)
     readonly property real keyContentMargin: Math.round(40 * scaleHint)
     readonly property real keyIconScale: scaleHint * 0.8
-    readonly property string resourcePrefix: "qrc:/QtQuick/VirtualKeyboard/content/styles/default/"
+    readonly property string resourcePrefix: "qrc:/qt-project.org/imports/QtQuick/VirtualKeyboard/Styles/Builtin/default/"
 
     readonly property string inputLocale: InputContext.locale
     property color primaryColor: "#263238"
diff --git a/src/plugins/cerence/cerence-hwr/plugin/qtvirtualkeyboardcerencehwrplugin.cpp b/src/styles/builtin/qtquickvirtualkeyboardbstylesbuiltinplugin.cpp
index 6189b6ac..8ece6549 100644
--- a/src/plugins/cerence/cerence-hwr/plugin/qtvirtualkeyboardcerencehwrplugin.cpp
+++ b/src/styles/builtin/qtquickvirtualkeyboardbstylesbuiltinplugin.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2021 The Qt Company Ltd.
+** Copyright (C) 2022 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit.
@@ -27,21 +27,22 @@
 **
 ****************************************************************************/
 
-#include "qtvirtualkeyboardcerencehwrplugin.h"
-#include "t9writeinputmethod_p.h"
-#include <QtQml>
+#include "qtquickvirtualkeyboardbstylesbuiltinplugin.h"
 
 QT_BEGIN_NAMESPACE
 
-using namespace QtVirtualKeyboard;
+extern void qml_register_types_QtQuick_VirtualKeyboard_Styles_Builtin();
+Q_GHS_KEEP_REFERENCE(qml_register_types_QtQuick_VirtualKeyboard_Styles_Builtin);
 
-void QtVirtualKeyboardCerenceHwrPlugin::registerTypes(const char *uri) const
+QtQuickVirtualKeyboardStylesBuiltinPlugin::QtQuickVirtualKeyboardStylesBuiltinPlugin(QObject *parent) :
+    QQmlEngineExtensionPlugin(parent)
 {
-#ifdef HAVE_CERENCE_HWR_RESOURCE
-    Q_INIT_RESOURCE(qmake_cerencecommondata_db);
-    Q_INIT_RESOURCE(qmake_cerencehwrdata_db);
+    volatile auto registration = &qml_register_types_QtQuick_VirtualKeyboard_Styles_Builtin;
+    Q_UNUSED(registration);
+#if defined(QT_STATICPLUGIN)
+    Q_INIT_RESOURCE(virtualkeyboard_default_style);
+    Q_INIT_RESOURCE(virtualkeyboard_retro_style);
 #endif
-    qmlRegisterType<T9WriteInputMethod>(uri, 2, 0, "HandwritingInputMethod");
 }
 
 QT_END_NAMESPACE
diff --git a/src/import/qtquickvirtualkeyboardplugin.h b/src/styles/builtin/qtquickvirtualkeyboardbstylesbuiltinplugin.h
index 14d64b8a..e937ee52 100644
--- a/src/import/qtquickvirtualkeyboardplugin.h
+++ b/src/styles/builtin/qtquickvirtualkeyboardbstylesbuiltinplugin.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2018 The Qt Company Ltd.
+** Copyright (C) 2022 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit.
@@ -27,24 +27,23 @@
 **
 ****************************************************************************/
 
-#ifndef QTQUICKVIRTUALKEYBOARDPLUGIN_H
-#define QTQUICKVIRTUALKEYBOARDPLUGIN_H
+#ifndef QTQUICKVIRTUALKEYBOARDSTYLESBUILTINPLUGIN_H
+#define QTQUICKVIRTUALKEYBOARDSTYLESBUILTINPLUGIN_H
 
-#include <QQmlExtensionPlugin>
+#include <QQmlEngineExtensionPlugin>
 
 QT_BEGIN_NAMESPACE
 
-class QtQuickVirtualKeyboardPlugin : public QQmlExtensionPlugin
+class QtQuickVirtualKeyboardStylesBuiltinPlugin : public QQmlEngineExtensionPlugin
 {
     Q_OBJECT
     Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid)
 
 public:
-    QtQuickVirtualKeyboardPlugin(QObject *parent = nullptr) : QQmlExtensionPlugin(parent) { }
-    void registerTypes(const char *uri) override;
+    QtQuickVirtualKeyboardStylesBuiltinPlugin(QObject *parent = nullptr);
 };
 
 QT_END_NAMESPACE
 
-#endif // QTQUICKVIRTUALKEYBOARDPLUGIN_H
+#endif // QTQUICKVIRTUALKEYBOARDSTYLESBUILTINPLUGIN_H
 
diff --git a/src/virtualkeyboard/content/styles/retro/images/backspace-c5a96f.svg b/src/styles/builtin/retro/images/backspace-c5a96f.svg
index a242531a..a242531a 100644
--- a/src/virtualkeyboard/content/styles/retro/images/backspace-c5a96f.svg
+++ b/src/styles/builtin/retro/images/backspace-c5a96f.svg
diff --git a/src/virtualkeyboard/content/styles/retro/images/check-c5a96f.svg b/src/styles/builtin/retro/images/check-c5a96f.svg
index e45b41ab..e45b41ab 100644
--- a/src/virtualkeyboard/content/styles/retro/images/check-c5a96f.svg
+++ b/src/styles/builtin/retro/images/check-c5a96f.svg
diff --git a/src/virtualkeyboard/content/styles/retro/images/enter-c5a96f.svg b/src/styles/builtin/retro/images/enter-c5a96f.svg
index ddbd86e8..ddbd86e8 100644
--- a/src/virtualkeyboard/content/styles/retro/images/enter-c5a96f.svg
+++ b/src/styles/builtin/retro/images/enter-c5a96f.svg
diff --git a/src/virtualkeyboard/content/styles/retro/images/globe-110b05.svg b/src/styles/builtin/retro/images/globe-110b05.svg
index 591ab50f..591ab50f 100644
--- a/src/virtualkeyboard/content/styles/retro/images/globe-110b05.svg
+++ b/src/styles/builtin/retro/images/globe-110b05.svg
diff --git a/src/virtualkeyboard/content/styles/retro/images/globe-c5a96f.svg b/src/styles/builtin/retro/images/globe-c5a96f.svg
index 68025577..68025577 100644
--- a/src/virtualkeyboard/content/styles/retro/images/globe-c5a96f.svg
+++ b/src/styles/builtin/retro/images/globe-c5a96f.svg
diff --git a/src/virtualkeyboard/content/styles/retro/images/globe-fff.svg b/src/styles/builtin/retro/images/globe-fff.svg
index f45af34a..f45af34a 100644
--- a/src/virtualkeyboard/content/styles/retro/images/globe-fff.svg
+++ b/src/styles/builtin/retro/images/globe-fff.svg
diff --git a/src/virtualkeyboard/content/styles/retro/images/handwriting-110b05.svg b/src/styles/builtin/retro/images/handwriting-110b05.svg
index 2093bb6d..2093bb6d 100644
--- a/src/virtualkeyboard/content/styles/retro/images/handwriting-110b05.svg
+++ b/src/styles/builtin/retro/images/handwriting-110b05.svg
diff --git a/src/virtualkeyboard/content/styles/retro/images/handwriting-c5a96f.svg b/src/styles/builtin/retro/images/handwriting-c5a96f.svg
index f23fe5e0..f23fe5e0 100644
--- a/src/virtualkeyboard/content/styles/retro/images/handwriting-c5a96f.svg
+++ b/src/styles/builtin/retro/images/handwriting-c5a96f.svg
diff --git a/src/virtualkeyboard/content/styles/retro/images/handwriting-fff.svg b/src/styles/builtin/retro/images/handwriting-fff.svg
index 8c169421..8c169421 100644
--- a/src/virtualkeyboard/content/styles/retro/images/handwriting-fff.svg
+++ b/src/styles/builtin/retro/images/handwriting-fff.svg
diff --git a/src/virtualkeyboard/content/styles/retro/images/hidekeyboard-110b05.svg b/src/styles/builtin/retro/images/hidekeyboard-110b05.svg
index 9debcac6..9debcac6 100644
--- a/src/virtualkeyboard/content/styles/retro/images/hidekeyboard-110b05.svg
+++ b/src/styles/builtin/retro/images/hidekeyboard-110b05.svg
diff --git a/src/virtualkeyboard/content/styles/retro/images/hidekeyboard-c5a96f.svg b/src/styles/builtin/retro/images/hidekeyboard-c5a96f.svg
index a4019bf3..a4019bf3 100644
--- a/src/virtualkeyboard/content/styles/retro/images/hidekeyboard-c5a96f.svg
+++ b/src/styles/builtin/retro/images/hidekeyboard-c5a96f.svg
diff --git a/src/virtualkeyboard/content/styles/retro/images/hidekeyboard-fff.svg b/src/styles/builtin/retro/images/hidekeyboard-fff.svg
index eb81f0b9..eb81f0b9 100644
--- a/src/virtualkeyboard/content/styles/retro/images/hidekeyboard-fff.svg
+++ b/src/styles/builtin/retro/images/hidekeyboard-fff.svg
diff --git a/src/virtualkeyboard/content/styles/retro/images/key154px_black.png b/src/styles/builtin/retro/images/key154px_black.png
index d9bf8e72..d9bf8e72 100644
--- a/src/virtualkeyboard/content/styles/retro/images/key154px_black.png
+++ b/src/styles/builtin/retro/images/key154px_black.png
diff --git a/src/virtualkeyboard/content/styles/retro/images/key154px_black.svg b/src/styles/builtin/retro/images/key154px_black.svg
index 635dd9a3..635dd9a3 100644
--- a/src/virtualkeyboard/content/styles/retro/images/key154px_black.svg
+++ b/src/styles/builtin/retro/images/key154px_black.svg
diff --git a/src/virtualkeyboard/content/styles/retro/images/key154px_black_long.png b/src/styles/builtin/retro/images/key154px_black_long.png
index 492c718a..492c718a 100644
--- a/src/virtualkeyboard/content/styles/retro/images/key154px_black_long.png
+++ b/src/styles/builtin/retro/images/key154px_black_long.png
diff --git a/src/virtualkeyboard/content/styles/retro/images/key154px_capslock.png b/src/styles/builtin/retro/images/key154px_capslock.png
index 7cb0bd4a..7cb0bd4a 100644
--- a/src/virtualkeyboard/content/styles/retro/images/key154px_capslock.png
+++ b/src/styles/builtin/retro/images/key154px_capslock.png
diff --git a/src/virtualkeyboard/content/styles/retro/images/key154px_capslock_long.png b/src/styles/builtin/retro/images/key154px_capslock_long.png
index 429d4bb5..429d4bb5 100644
--- a/src/virtualkeyboard/content/styles/retro/images/key154px_capslock_long.png
+++ b/src/styles/builtin/retro/images/key154px_capslock_long.png
diff --git a/src/virtualkeyboard/content/styles/retro/images/key154px_colorA.png b/src/styles/builtin/retro/images/key154px_colorA.png
index 778384cd..778384cd 100644
--- a/src/virtualkeyboard/content/styles/retro/images/key154px_colorA.png
+++ b/src/styles/builtin/retro/images/key154px_colorA.png
diff --git a/src/virtualkeyboard/content/styles/retro/images/key154px_colorA.svg b/src/styles/builtin/retro/images/key154px_colorA.svg
index 13af8a63..13af8a63 100644
--- a/src/virtualkeyboard/content/styles/retro/images/key154px_colorA.svg
+++ b/src/styles/builtin/retro/images/key154px_colorA.svg
diff --git a/src/virtualkeyboard/content/styles/retro/images/key154px_colorA_long.png b/src/styles/builtin/retro/images/key154px_colorA_long.png
index e1b6e5b8..e1b6e5b8 100644
--- a/src/virtualkeyboard/content/styles/retro/images/key154px_colorA_long.png
+++ b/src/styles/builtin/retro/images/key154px_colorA_long.png
diff --git a/src/virtualkeyboard/content/styles/retro/images/key154px_colorB.png b/src/styles/builtin/retro/images/key154px_colorB.png
index cef9fd29..cef9fd29 100644
--- a/src/virtualkeyboard/content/styles/retro/images/key154px_colorB.png
+++ b/src/styles/builtin/retro/images/key154px_colorB.png
diff --git a/src/virtualkeyboard/content/styles/retro/images/key154px_shiftcase.png b/src/styles/builtin/retro/images/key154px_shiftcase.png
index 58bf8282..58bf8282 100644
--- a/src/virtualkeyboard/content/styles/retro/images/key154px_shiftcase.png
+++ b/src/styles/builtin/retro/images/key154px_shiftcase.png
diff --git a/src/virtualkeyboard/content/styles/retro/images/key154px_shiftcase_long.png b/src/styles/builtin/retro/images/key154px_shiftcase_long.png
index bfcba5fd..bfcba5fd 100644
--- a/src/virtualkeyboard/content/styles/retro/images/key154px_shiftcase_long.png
+++ b/src/styles/builtin/retro/images/key154px_shiftcase_long.png
diff --git a/src/virtualkeyboard/content/styles/retro/images/key156px_black_long.png b/src/styles/builtin/retro/images/key156px_black_long.png
index a22109bd..a22109bd 100644
--- a/src/virtualkeyboard/content/styles/retro/images/key156px_black_long.png
+++ b/src/styles/builtin/retro/images/key156px_black_long.png
diff --git a/src/virtualkeyboard/content/styles/retro/images/key156px_black_medium_long.png b/src/styles/builtin/retro/images/key156px_black_medium_long.png
index 8c92d3b1..8c92d3b1 100644
--- a/src/virtualkeyboard/content/styles/retro/images/key156px_black_medium_long.png
+++ b/src/styles/builtin/retro/images/key156px_black_medium_long.png
diff --git a/src/virtualkeyboard/content/styles/retro/images/key156px_colorA.png b/src/styles/builtin/retro/images/key156px_colorA.png
index 6da57d60..6da57d60 100644
--- a/src/virtualkeyboard/content/styles/retro/images/key156px_colorA.png
+++ b/src/styles/builtin/retro/images/key156px_colorA.png
diff --git a/src/virtualkeyboard/content/styles/retro/images/key156px_colorB.png b/src/styles/builtin/retro/images/key156px_colorB.png
index af0912e3..af0912e3 100644
--- a/src/virtualkeyboard/content/styles/retro/images/key156px_colorB.png
+++ b/src/styles/builtin/retro/images/key156px_colorB.png
diff --git a/src/virtualkeyboard/content/styles/retro/images/key160px_black.png b/src/styles/builtin/retro/images/key160px_black.png
index 565c4bf7..565c4bf7 100644
--- a/src/virtualkeyboard/content/styles/retro/images/key160px_black.png
+++ b/src/styles/builtin/retro/images/key160px_black.png
diff --git a/src/virtualkeyboard/content/styles/retro/images/key160px_colorA.png b/src/styles/builtin/retro/images/key160px_colorA.png
index e2125cf8..e2125cf8 100644
--- a/src/virtualkeyboard/content/styles/retro/images/key160px_colorA.png
+++ b/src/styles/builtin/retro/images/key160px_colorA.png
diff --git a/src/virtualkeyboard/content/styles/retro/images/key160px_colorB.png b/src/styles/builtin/retro/images/key160px_colorB.png
index 9b543b05..9b543b05 100644
--- a/src/virtualkeyboard/content/styles/retro/images/key160px_colorB.png
+++ b/src/styles/builtin/retro/images/key160px_colorB.png
diff --git a/src/virtualkeyboard/content/styles/retro/images/key_preview.png b/src/styles/builtin/retro/images/key_preview.png
index 3e9e9557..3e9e9557 100644
--- a/src/virtualkeyboard/content/styles/retro/images/key_preview.png
+++ b/src/styles/builtin/retro/images/key_preview.png
diff --git a/src/virtualkeyboard/content/styles/retro/images/search-c5a96f.svg b/src/styles/builtin/retro/images/search-c5a96f.svg
index a1f7c903..a1f7c903 100644
--- a/src/virtualkeyboard/content/styles/retro/images/search-c5a96f.svg
+++ b/src/styles/builtin/retro/images/search-c5a96f.svg
diff --git a/src/virtualkeyboard/content/styles/retro/images/selectionhandle-bottom.svg b/src/styles/builtin/retro/images/selectionhandle-bottom.svg
index 1a45a736..1a45a736 100644
--- a/src/virtualkeyboard/content/styles/retro/images/selectionhandle-bottom.svg
+++ b/src/styles/builtin/retro/images/selectionhandle-bottom.svg
diff --git a/src/virtualkeyboard/content/styles/retro/images/shift-c5a96f.svg b/src/styles/builtin/retro/images/shift-c5a96f.svg
index 3da185d2..3da185d2 100644
--- a/src/virtualkeyboard/content/styles/retro/images/shift-c5a96f.svg
+++ b/src/styles/builtin/retro/images/shift-c5a96f.svg
diff --git a/src/virtualkeyboard/content/styles/retro/images/shift-cd8865.svg b/src/styles/builtin/retro/images/shift-cd8865.svg
index 09eba7cd..09eba7cd 100644
--- a/src/virtualkeyboard/content/styles/retro/images/shift-cd8865.svg
+++ b/src/styles/builtin/retro/images/shift-cd8865.svg
diff --git a/src/virtualkeyboard/content/styles/retro/images/shift-dc4f28.svg b/src/styles/builtin/retro/images/shift-dc4f28.svg
index d1a5d5ee..d1a5d5ee 100644
--- a/src/virtualkeyboard/content/styles/retro/images/shift-dc4f28.svg
+++ b/src/styles/builtin/retro/images/shift-dc4f28.svg
diff --git a/src/virtualkeyboard/content/styles/retro/images/textmode-110b05.svg b/src/styles/builtin/retro/images/textmode-110b05.svg
index c5bfd98d..c5bfd98d 100644
--- a/src/virtualkeyboard/content/styles/retro/images/textmode-110b05.svg
+++ b/src/styles/builtin/retro/images/textmode-110b05.svg
diff --git a/src/virtualkeyboard/content/styles/retro/images/textmode-c5a96f.svg b/src/styles/builtin/retro/images/textmode-c5a96f.svg
index e6340558..e6340558 100644
--- a/src/virtualkeyboard/content/styles/retro/images/textmode-c5a96f.svg
+++ b/src/styles/builtin/retro/images/textmode-c5a96f.svg
diff --git a/src/virtualkeyboard/content/styles/retro/images/textmode-fff.svg b/src/styles/builtin/retro/images/textmode-fff.svg
index e14961dc..e14961dc 100644
--- a/src/virtualkeyboard/content/styles/retro/images/textmode-fff.svg
+++ b/src/styles/builtin/retro/images/textmode-fff.svg
diff --git a/src/virtualkeyboard/content/styles/retro/images/triangle_black.png b/src/styles/builtin/retro/images/triangle_black.png
index a45e733b..a45e733b 100644
--- a/src/virtualkeyboard/content/styles/retro/images/triangle_black.png
+++ b/src/styles/builtin/retro/images/triangle_black.png
diff --git a/src/virtualkeyboard/content/styles/retro/images/triangle_highlight.png b/src/styles/builtin/retro/images/triangle_highlight.png
index 34853263..34853263 100644
--- a/src/virtualkeyboard/content/styles/retro/images/triangle_highlight.png
+++ b/src/styles/builtin/retro/images/triangle_highlight.png
diff --git a/src/virtualkeyboard/content/styles/retro/style.qml b/src/styles/builtin/retro/style.qml
index 3ee8c7eb..fc610163 100644
--- a/src/virtualkeyboard/content/styles/retro/style.qml
+++ b/src/styles/builtin/retro/style.qml
@@ -38,7 +38,7 @@ KeyboardStyle {
     readonly property real keyBackgroundMargin: Math.round(9 * scaleHint)
     readonly property real keyContentMargin: Math.round(30 * scaleHint)
     readonly property real keyIconScale: scaleHint * 0.6
-    readonly property string resourcePath: "QtQuick/VirtualKeyboard/content/styles/retro/"
+    readonly property string resourcePath: "qt-project.org/imports/QtQuick/VirtualKeyboard/Styles/Builtin/retro/"
     readonly property string resourcePrefix: "qrc:/" + resourcePath
 
     readonly property string inputLocale: InputContext.locale
diff --git a/src/styles/plugins.qmltypes b/src/styles/plugins.qmltypes
deleted file mode 100644
index 2aecdcb7..00000000
--- a/src/styles/plugins.qmltypes
+++ /dev/null
@@ -1,570 +0,0 @@
-import QtQuick.tooling 1.2
-
-// This file describes the plugin-supplied types contained in the library.
-// It is used for QML tooling purposes only.
-//
-// This file was auto-generated by:
-// 'qmlplugindump -nonrelocatable QtQuick.VirtualKeyboard.Styles 2.14'
-
-Module {
-    dependencies: ["QtQuick 2.0"]
-    Component {
-        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" }
-    }
-    Component {
-        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" }
-    }
-    Component {
-        prototype: "QQuickItem"
-        name: "QtQuick.VirtualKeyboard.Styles/KeyPanel 1.0"
-        exports: ["QtQuick.VirtualKeyboard.Styles/KeyPanel 1.0"]
-        exportMetaObjectRevisions: [0]
-        isComposite: true
-        defaultProperty: "data"
-        Property { name: "control"; type: "QQuickItem"; isPointer: true }
-        Property { name: "soundEffect"; type: "QUrl" }
-    }
-    Component {
-        prototype: "QQuickItem"
-        name: "QtQuick.VirtualKeyboard.Styles/KeyPanel 2.0"
-        exports: ["QtQuick.VirtualKeyboard.Styles/KeyPanel 2.0"]
-        exportMetaObjectRevisions: [0]
-        isComposite: true
-        defaultProperty: "data"
-        Property { name: "control"; type: "QQuickItem"; isPointer: true }
-        Property { name: "soundEffect"; type: "QUrl" }
-    }
-    Component {
-        prototype: "QObject"
-        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" }
-        Property { name: "keyboardDesignHeight"; type: "double" }
-        Property { name: "scaleHint"; type: "double"; isReadonly: true }
-        Property { name: "keyboardRelativeLeftMargin"; type: "double" }
-        Property { name: "keyboardRelativeRightMargin"; type: "double" }
-        Property { name: "keyboardRelativeTopMargin"; type: "double" }
-        Property { name: "keyboardRelativeBottomMargin"; type: "double" }
-        Property { name: "keyboardBackground"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "keyPanel"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "backspaceKeyPanel"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "languageKeyPanel"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "enterKeyPanel"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "hideKeyPanel"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "shiftKeyPanel"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "spaceKeyPanel"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "symbolKeyPanel"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "modeKeyPanel"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "handwritingKeyPanel"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "characterPreviewMargin"; type: "double" }
-        Property { name: "characterPreviewDelegate"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "alternateKeysListItemWidth"; type: "double" }
-        Property { name: "alternateKeysListItemHeight"; type: "double" }
-        Property { name: "alternateKeysListTopMargin"; type: "double" }
-        Property { name: "alternateKeysListBottomMargin"; type: "double" }
-        Property { name: "alternateKeysListLeftMargin"; type: "double" }
-        Property { name: "alternateKeysListRightMargin"; type: "double" }
-        Property { name: "alternateKeysListDelegate"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "alternateKeysListHighlight"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "alternateKeysListBackground"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "selectionListHeight"; type: "double" }
-        Property { name: "selectionListDelegate"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "selectionListHighlight"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "selectionListBackground"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "selectionListAdd"; type: "QQuickTransition"; isPointer: true }
-        Property { name: "selectionListRemove"; type: "QQuickTransition"; isPointer: true }
-        Property { name: "navigationHighlight"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "traceInputKeyPanelDelegate"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "traceCanvasDelegate"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "popupListDelegate"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "popupListHighlight"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "popupListBackground"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "popupListAdd"; type: "QQuickTransition"; isPointer: true }
-        Property { name: "popupListRemove"; type: "QQuickTransition"; isPointer: true }
-        Property { name: "languagePopupListEnabled"; type: "bool" }
-        Property { name: "languageListDelegate"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "languageListHighlight"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "languageListBackground"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "languageListAdd"; type: "QQuickTransition"; isPointer: true }
-        Property { name: "languageListRemove"; type: "QQuickTransition"; isPointer: true }
-        Property { name: "selectionHandle"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "fullScreenInputContainerBackground"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "fullScreenInputBackground"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "fullScreenInputMargins"; type: "double" }
-        Property { name: "fullScreenInputPadding"; type: "double" }
-        Property { name: "fullScreenInputCursor"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "fullScreenInputFont"; type: "QFont" }
-        Property { name: "fullScreenInputPasswordCharacter"; type: "string" }
-        Property { name: "fullScreenInputColor"; type: "QColor" }
-        Property { name: "fullScreenInputSelectionColor"; type: "QColor" }
-        Property { name: "fullScreenInputSelectedTextColor"; type: "QColor" }
-    }
-    Component {
-        prototype: "QObject"
-        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" }
-        Property { name: "keyboardDesignHeight"; type: "double" }
-        Property { name: "scaleHint"; type: "double"; isReadonly: true }
-        Property { name: "keyboardRelativeLeftMargin"; type: "double" }
-        Property { name: "keyboardRelativeRightMargin"; type: "double" }
-        Property { name: "keyboardRelativeTopMargin"; type: "double" }
-        Property { name: "keyboardRelativeBottomMargin"; type: "double" }
-        Property { name: "keyboardBackground"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "keyPanel"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "backspaceKeyPanel"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "languageKeyPanel"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "enterKeyPanel"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "hideKeyPanel"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "shiftKeyPanel"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "spaceKeyPanel"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "symbolKeyPanel"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "modeKeyPanel"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "handwritingKeyPanel"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "characterPreviewMargin"; type: "double" }
-        Property { name: "characterPreviewDelegate"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "alternateKeysListItemWidth"; type: "double" }
-        Property { name: "alternateKeysListItemHeight"; type: "double" }
-        Property { name: "alternateKeysListTopMargin"; type: "double" }
-        Property { name: "alternateKeysListBottomMargin"; type: "double" }
-        Property { name: "alternateKeysListLeftMargin"; type: "double" }
-        Property { name: "alternateKeysListRightMargin"; type: "double" }
-        Property { name: "alternateKeysListDelegate"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "alternateKeysListHighlight"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "alternateKeysListBackground"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "selectionListHeight"; type: "double" }
-        Property { name: "selectionListDelegate"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "selectionListHighlight"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "selectionListBackground"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "selectionListAdd"; type: "QQuickTransition"; isPointer: true }
-        Property { name: "selectionListRemove"; type: "QQuickTransition"; isPointer: true }
-        Property { name: "navigationHighlight"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "traceInputKeyPanelDelegate"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "traceCanvasDelegate"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "popupListDelegate"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "popupListHighlight"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "popupListBackground"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "popupListAdd"; type: "QQuickTransition"; isPointer: true }
-        Property { name: "popupListRemove"; type: "QQuickTransition"; isPointer: true }
-        Property { name: "languagePopupListEnabled"; type: "bool" }
-        Property { name: "languageListDelegate"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "languageListHighlight"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "languageListBackground"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "languageListAdd"; type: "QQuickTransition"; isPointer: true }
-        Property { name: "languageListRemove"; type: "QQuickTransition"; isPointer: true }
-        Property { name: "selectionHandle"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "fullScreenInputContainerBackground"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "fullScreenInputBackground"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "fullScreenInputMargins"; type: "double" }
-        Property { name: "fullScreenInputPadding"; type: "double" }
-        Property { name: "fullScreenInputCursor"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "fullScreenInputFont"; type: "QFont" }
-        Property { name: "fullScreenInputPasswordCharacter"; type: "string" }
-        Property { name: "fullScreenInputColor"; type: "QColor" }
-        Property { name: "fullScreenInputSelectionColor"; type: "QColor" }
-        Property { name: "fullScreenInputSelectedTextColor"; type: "QColor" }
-    }
-    Component {
-        prototype: "QObject"
-        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" }
-        Property { name: "keyboardDesignHeight"; type: "double" }
-        Property { name: "scaleHint"; type: "double"; isReadonly: true }
-        Property { name: "keyboardRelativeLeftMargin"; type: "double" }
-        Property { name: "keyboardRelativeRightMargin"; type: "double" }
-        Property { name: "keyboardRelativeTopMargin"; type: "double" }
-        Property { name: "keyboardRelativeBottomMargin"; type: "double" }
-        Property { name: "keyboardBackground"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "keyPanel"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "backspaceKeyPanel"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "languageKeyPanel"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "enterKeyPanel"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "hideKeyPanel"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "shiftKeyPanel"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "spaceKeyPanel"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "symbolKeyPanel"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "modeKeyPanel"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "handwritingKeyPanel"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "characterPreviewMargin"; type: "double" }
-        Property { name: "characterPreviewDelegate"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "alternateKeysListItemWidth"; type: "double" }
-        Property { name: "alternateKeysListItemHeight"; type: "double" }
-        Property { name: "alternateKeysListTopMargin"; type: "double" }
-        Property { name: "alternateKeysListBottomMargin"; type: "double" }
-        Property { name: "alternateKeysListLeftMargin"; type: "double" }
-        Property { name: "alternateKeysListRightMargin"; type: "double" }
-        Property { name: "alternateKeysListDelegate"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "alternateKeysListHighlight"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "alternateKeysListBackground"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "selectionListHeight"; type: "double" }
-        Property { name: "selectionListDelegate"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "selectionListHighlight"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "selectionListBackground"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "selectionListAdd"; type: "QQuickTransition"; isPointer: true }
-        Property { name: "selectionListRemove"; type: "QQuickTransition"; isPointer: true }
-        Property { name: "navigationHighlight"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "traceInputKeyPanelDelegate"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "traceCanvasDelegate"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "popupListDelegate"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "popupListHighlight"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "popupListBackground"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "popupListAdd"; type: "QQuickTransition"; isPointer: true }
-        Property { name: "popupListRemove"; type: "QQuickTransition"; isPointer: true }
-        Property { name: "languagePopupListEnabled"; type: "bool" }
-        Property { name: "languageListDelegate"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "languageListHighlight"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "languageListBackground"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "languageListAdd"; type: "QQuickTransition"; isPointer: true }
-        Property { name: "languageListRemove"; type: "QQuickTransition"; isPointer: true }
-        Property { name: "selectionHandle"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "fullScreenInputContainerBackground"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "fullScreenInputBackground"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "fullScreenInputMargins"; type: "double" }
-        Property { name: "fullScreenInputPadding"; type: "double" }
-        Property { name: "fullScreenInputCursor"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "fullScreenInputFont"; type: "QFont" }
-        Property { name: "fullScreenInputPasswordCharacter"; type: "string" }
-        Property { name: "fullScreenInputColor"; type: "QColor" }
-        Property { name: "fullScreenInputSelectionColor"; type: "QColor" }
-        Property { name: "fullScreenInputSelectedTextColor"; type: "QColor" }
-    }
-    Component {
-        prototype: "QObject"
-        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" }
-        Property { name: "keyboardDesignHeight"; type: "double" }
-        Property { name: "scaleHint"; type: "double"; isReadonly: true }
-        Property { name: "keyboardRelativeLeftMargin"; type: "double" }
-        Property { name: "keyboardRelativeRightMargin"; type: "double" }
-        Property { name: "keyboardRelativeTopMargin"; type: "double" }
-        Property { name: "keyboardRelativeBottomMargin"; type: "double" }
-        Property { name: "keyboardBackground"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "keyPanel"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "backspaceKeyPanel"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "languageKeyPanel"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "enterKeyPanel"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "hideKeyPanel"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "shiftKeyPanel"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "spaceKeyPanel"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "symbolKeyPanel"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "modeKeyPanel"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "handwritingKeyPanel"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "characterPreviewMargin"; type: "double" }
-        Property { name: "characterPreviewDelegate"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "alternateKeysListItemWidth"; type: "double" }
-        Property { name: "alternateKeysListItemHeight"; type: "double" }
-        Property { name: "alternateKeysListTopMargin"; type: "double" }
-        Property { name: "alternateKeysListBottomMargin"; type: "double" }
-        Property { name: "alternateKeysListLeftMargin"; type: "double" }
-        Property { name: "alternateKeysListRightMargin"; type: "double" }
-        Property { name: "alternateKeysListDelegate"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "alternateKeysListHighlight"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "alternateKeysListBackground"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "selectionListHeight"; type: "double" }
-        Property { name: "selectionListDelegate"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "selectionListHighlight"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "selectionListBackground"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "selectionListAdd"; type: "QQuickTransition"; isPointer: true }
-        Property { name: "selectionListRemove"; type: "QQuickTransition"; isPointer: true }
-        Property { name: "navigationHighlight"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "traceInputKeyPanelDelegate"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "traceCanvasDelegate"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "popupListDelegate"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "popupListHighlight"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "popupListBackground"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "popupListAdd"; type: "QQuickTransition"; isPointer: true }
-        Property { name: "popupListRemove"; type: "QQuickTransition"; isPointer: true }
-        Property { name: "languagePopupListEnabled"; type: "bool" }
-        Property { name: "languageListDelegate"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "languageListHighlight"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "languageListBackground"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "languageListAdd"; type: "QQuickTransition"; isPointer: true }
-        Property { name: "languageListRemove"; type: "QQuickTransition"; isPointer: true }
-        Property { name: "selectionHandle"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "fullScreenInputContainerBackground"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "fullScreenInputBackground"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "fullScreenInputMargins"; type: "double" }
-        Property { name: "fullScreenInputPadding"; type: "double" }
-        Property { name: "fullScreenInputCursor"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "fullScreenInputFont"; type: "QFont" }
-        Property { name: "fullScreenInputPasswordCharacter"; type: "string" }
-        Property { name: "fullScreenInputColor"; type: "QColor" }
-        Property { name: "fullScreenInputSelectionColor"; type: "QColor" }
-        Property { name: "fullScreenInputSelectedTextColor"; type: "QColor" }
-    }
-    Component {
-        prototype: "QObject"
-        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" }
-        Property { name: "keyboardDesignHeight"; type: "double" }
-        Property { name: "scaleHint"; type: "double"; isReadonly: true }
-        Property { name: "keyboardRelativeLeftMargin"; type: "double" }
-        Property { name: "keyboardRelativeRightMargin"; type: "double" }
-        Property { name: "keyboardRelativeTopMargin"; type: "double" }
-        Property { name: "keyboardRelativeBottomMargin"; type: "double" }
-        Property { name: "keyboardBackground"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "keyPanel"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "backspaceKeyPanel"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "languageKeyPanel"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "enterKeyPanel"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "hideKeyPanel"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "shiftKeyPanel"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "spaceKeyPanel"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "symbolKeyPanel"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "modeKeyPanel"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "handwritingKeyPanel"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "characterPreviewMargin"; type: "double" }
-        Property { name: "characterPreviewDelegate"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "alternateKeysListItemWidth"; type: "double" }
-        Property { name: "alternateKeysListItemHeight"; type: "double" }
-        Property { name: "alternateKeysListTopMargin"; type: "double" }
-        Property { name: "alternateKeysListBottomMargin"; type: "double" }
-        Property { name: "alternateKeysListLeftMargin"; type: "double" }
-        Property { name: "alternateKeysListRightMargin"; type: "double" }
-        Property { name: "alternateKeysListDelegate"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "alternateKeysListHighlight"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "alternateKeysListBackground"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "selectionListHeight"; type: "double" }
-        Property { name: "selectionListDelegate"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "selectionListHighlight"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "selectionListBackground"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "selectionListAdd"; type: "QQuickTransition"; isPointer: true }
-        Property { name: "selectionListRemove"; type: "QQuickTransition"; isPointer: true }
-        Property { name: "navigationHighlight"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "traceInputKeyPanelDelegate"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "traceCanvasDelegate"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "popupListDelegate"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "popupListHighlight"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "popupListBackground"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "popupListAdd"; type: "QQuickTransition"; isPointer: true }
-        Property { name: "popupListRemove"; type: "QQuickTransition"; isPointer: true }
-        Property { name: "languagePopupListEnabled"; type: "bool" }
-        Property { name: "languageListDelegate"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "languageListHighlight"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "languageListBackground"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "languageListAdd"; type: "QQuickTransition"; isPointer: true }
-        Property { name: "languageListRemove"; type: "QQuickTransition"; isPointer: true }
-        Property { name: "selectionHandle"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "fullScreenInputContainerBackground"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "fullScreenInputBackground"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "fullScreenInputMargins"; type: "double" }
-        Property { name: "fullScreenInputPadding"; type: "double" }
-        Property { name: "fullScreenInputCursor"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "fullScreenInputFont"; type: "QFont" }
-        Property { name: "fullScreenInputPasswordCharacter"; type: "string" }
-        Property { name: "fullScreenInputColor"; type: "QColor" }
-        Property { name: "fullScreenInputSelectionColor"; type: "QColor" }
-        Property { name: "fullScreenInputSelectedTextColor"; type: "QColor" }
-    }
-    Component {
-        prototype: "QObject"
-        name: "QtQuick.VirtualKeyboard.Styles/KeyboardStyle 2.1"
-        exports: ["QtQuick.VirtualKeyboard.Styles/KeyboardStyle 2.1"]
-        exportMetaObjectRevisions: [1]
-        isComposite: true
-        Property { name: "keyboardHeight"; type: "double" }
-        Property { name: "keyboardDesignWidth"; type: "double" }
-        Property { name: "keyboardDesignHeight"; type: "double" }
-        Property { name: "scaleHint"; type: "double"; isReadonly: true }
-        Property { name: "keyboardRelativeLeftMargin"; type: "double" }
-        Property { name: "keyboardRelativeRightMargin"; type: "double" }
-        Property { name: "keyboardRelativeTopMargin"; type: "double" }
-        Property { name: "keyboardRelativeBottomMargin"; type: "double" }
-        Property { name: "keyboardBackground"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "keyPanel"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "backspaceKeyPanel"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "languageKeyPanel"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "enterKeyPanel"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "hideKeyPanel"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "shiftKeyPanel"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "spaceKeyPanel"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "symbolKeyPanel"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "modeKeyPanel"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "handwritingKeyPanel"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "characterPreviewMargin"; type: "double" }
-        Property { name: "characterPreviewDelegate"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "alternateKeysListItemWidth"; type: "double" }
-        Property { name: "alternateKeysListItemHeight"; type: "double" }
-        Property { name: "alternateKeysListTopMargin"; type: "double" }
-        Property { name: "alternateKeysListBottomMargin"; type: "double" }
-        Property { name: "alternateKeysListLeftMargin"; type: "double" }
-        Property { name: "alternateKeysListRightMargin"; type: "double" }
-        Property { name: "alternateKeysListDelegate"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "alternateKeysListHighlight"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "alternateKeysListBackground"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "selectionListHeight"; type: "double" }
-        Property { name: "selectionListDelegate"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "selectionListHighlight"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "selectionListBackground"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "selectionListAdd"; type: "QQuickTransition"; isPointer: true }
-        Property { name: "selectionListRemove"; type: "QQuickTransition"; isPointer: true }
-        Property { name: "navigationHighlight"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "traceInputKeyPanelDelegate"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "traceCanvasDelegate"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "popupListDelegate"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "popupListHighlight"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "popupListBackground"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "popupListAdd"; type: "QQuickTransition"; isPointer: true }
-        Property { name: "popupListRemove"; type: "QQuickTransition"; isPointer: true }
-        Property { name: "languagePopupListEnabled"; type: "bool" }
-        Property { name: "languageListDelegate"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "languageListHighlight"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "languageListBackground"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "languageListAdd"; type: "QQuickTransition"; isPointer: true }
-        Property { name: "languageListRemove"; type: "QQuickTransition"; isPointer: true }
-        Property { name: "selectionHandle"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "fullScreenInputContainerBackground"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "fullScreenInputBackground"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "fullScreenInputMargins"; type: "double" }
-        Property { name: "fullScreenInputPadding"; type: "double" }
-        Property { name: "fullScreenInputCursor"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "fullScreenInputFont"; type: "QFont" }
-        Property { name: "fullScreenInputPasswordCharacter"; type: "string" }
-        Property { name: "fullScreenInputColor"; type: "QColor" }
-        Property { name: "fullScreenInputSelectionColor"; type: "QColor" }
-        Property { name: "fullScreenInputSelectedTextColor"; type: "QColor" }
-    }
-    Component {
-        prototype: "QObject"
-        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" }
-        Property { name: "keyboardDesignHeight"; type: "double" }
-        Property { name: "scaleHint"; type: "double"; isReadonly: true }
-        Property { name: "keyboardRelativeLeftMargin"; type: "double" }
-        Property { name: "keyboardRelativeRightMargin"; type: "double" }
-        Property { name: "keyboardRelativeTopMargin"; type: "double" }
-        Property { name: "keyboardRelativeBottomMargin"; type: "double" }
-        Property { name: "keyboardBackground"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "keyPanel"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "backspaceKeyPanel"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "languageKeyPanel"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "enterKeyPanel"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "hideKeyPanel"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "shiftKeyPanel"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "spaceKeyPanel"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "symbolKeyPanel"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "modeKeyPanel"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "handwritingKeyPanel"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "characterPreviewMargin"; type: "double" }
-        Property { name: "characterPreviewDelegate"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "alternateKeysListItemWidth"; type: "double" }
-        Property { name: "alternateKeysListItemHeight"; type: "double" }
-        Property { name: "alternateKeysListTopMargin"; type: "double" }
-        Property { name: "alternateKeysListBottomMargin"; type: "double" }
-        Property { name: "alternateKeysListLeftMargin"; type: "double" }
-        Property { name: "alternateKeysListRightMargin"; type: "double" }
-        Property { name: "alternateKeysListDelegate"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "alternateKeysListHighlight"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "alternateKeysListBackground"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "selectionListHeight"; type: "double" }
-        Property { name: "selectionListDelegate"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "selectionListHighlight"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "selectionListBackground"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "selectionListAdd"; type: "QQuickTransition"; isPointer: true }
-        Property { name: "selectionListRemove"; type: "QQuickTransition"; isPointer: true }
-        Property { name: "navigationHighlight"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "traceInputKeyPanelDelegate"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "traceCanvasDelegate"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "popupListDelegate"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "popupListHighlight"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "popupListBackground"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "popupListAdd"; type: "QQuickTransition"; isPointer: true }
-        Property { name: "popupListRemove"; type: "QQuickTransition"; isPointer: true }
-        Property { name: "languagePopupListEnabled"; type: "bool" }
-        Property { name: "languageListDelegate"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "languageListHighlight"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "languageListBackground"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "languageListAdd"; type: "QQuickTransition"; isPointer: true }
-        Property { name: "languageListRemove"; type: "QQuickTransition"; isPointer: true }
-        Property { name: "selectionHandle"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "fullScreenInputContainerBackground"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "fullScreenInputBackground"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "fullScreenInputMargins"; type: "double" }
-        Property { name: "fullScreenInputPadding"; type: "double" }
-        Property { name: "fullScreenInputCursor"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "fullScreenInputFont"; type: "QFont" }
-        Property { name: "fullScreenInputPasswordCharacter"; type: "string" }
-        Property { name: "fullScreenInputColor"; type: "QColor" }
-        Property { name: "fullScreenInputSelectionColor"; type: "QColor" }
-        Property { name: "fullScreenInputSelectedTextColor"; type: "QColor" }
-    }
-    Component {
-        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" }
-    }
-    Component {
-        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" }
-    }
-    Component {
-        prototype: "QQuickCanvasItem"
-        name: "QtQuick.VirtualKeyboard.Styles/TraceCanvas 2.0"
-        exports: ["QtQuick.VirtualKeyboard.Styles/TraceCanvas 2.0"]
-        exportMetaObjectRevisions: [0]
-        isComposite: true
-        defaultProperty: "data"
-        Property { name: "trace"; type: "QVariant" }
-        Property { name: "autoDestroy"; type: "bool" }
-        Property { name: "autoDestroyDelay"; type: "int" }
-        Property { name: "renderFunction"; type: "QVariant" }
-        Property { name: "__renderPos"; type: "int" }
-        Property { name: "__renderingEnabled"; type: "bool" }
-        Method { name: "renderSmoothedLine"; type: "QVariant" }
-    }
-    Component {
-        prototype: "QQuickItem"
-        name: "QtQuick.VirtualKeyboard.Styles/TraceInputKeyPanel 2.0"
-        exports: ["QtQuick.VirtualKeyboard.Styles/TraceInputKeyPanel 2.0"]
-        exportMetaObjectRevisions: [0]
-        isComposite: true
-        defaultProperty: "data"
-        Property { name: "control"; type: "QQuickItem"; isPointer: true }
-        Property { name: "traceMargins"; type: "double" }
-    }
-}
diff --git a/src/styles/qmldir b/src/styles/qmldir
deleted file mode 100644
index 6f4705fc..00000000
--- a/src/styles/qmldir
+++ /dev/null
@@ -1,5 +0,0 @@
-module QtQuick.VirtualKeyboard.Styles
-plugin qtquickvirtualkeyboardstylesplugin
-classname QtQuickVirtualKeyboardStylesPlugin
-typeinfo plugins.qmltypes
-depends QtQuick 2.0
diff --git a/src/styles/qtquickvirtualkeyboardstylesplugin.cpp b/src/styles/qtquickvirtualkeyboardstylesplugin.cpp
index 4a1316a2..d6f4350c 100644
--- a/src/styles/qtquickvirtualkeyboardstylesplugin.cpp
+++ b/src/styles/qtquickvirtualkeyboardstylesplugin.cpp
@@ -30,14 +30,16 @@
 #include "qtquickvirtualkeyboardstylesplugin.h"
 #include "svgimageprovider.h"
 
-#include <qqml.h>
+#include <QtQml/qqml.h>
 #include <QtCore/QLibraryInfo>
-#include <QtVirtualKeyboard/private/qvirtualkeyboard_staticplugin_p.h>
 
 QT_BEGIN_NAMESPACE
 
+extern void qml_register_types_QtQuick_VirtualKeyboard_Styles();
+Q_GHS_KEEP_REFERENCE(qml_register_types_QtQuick_VirtualKeyboard_Styles);
+
 /*!
-    \qmlmodule QtQuick.VirtualKeyboard.Styles 2.\QtMinorVersion
+    \qmlmodule QtQuick.VirtualKeyboard.Styles
     \title Qt Quick Virtual Keyboard Styles QML Types
     \ingroup qmlmodules
 
@@ -47,36 +49,20 @@ QT_BEGIN_NAMESPACE
     import statements in your .qml file:
 
     \qml \QtMinorVersion
-    import QtQuick.VirtualKeyboard.Styles 2.\1
+    import QtQuick.VirtualKeyboard.Styles
     \endqml
 */
 
-void QtQuickVirtualKeyboardStylesPlugin::registerTypes(const char *uri)
+QtQuickVirtualKeyboardStylesPlugin::QtQuickVirtualKeyboardStylesPlugin(QObject *parent) :
+    QQmlExtensionPlugin(parent)
 {
-#if defined(QT_STATICPLUGIN)
-    Q_VKB_IMPORT_PLUGIN(QtQuick2Plugin)
-#endif
-
-    const QString path(QStringLiteral("qrc:///QtQuick/VirtualKeyboard/Styles/content/"));
-    qmlRegisterType(QUrl(path + QLatin1String("KeyboardStyle.qml")), uri, 1, 0, "KeyboardStyle");
-    qmlRegisterType(QUrl(path + QLatin1String("KeyboardStyle.qml")), uri, 1, 1, "KeyboardStyle");
-    qmlRegisterType(QUrl(path + QLatin1String("KeyboardStyle.qml")), uri, 1, 2, "KeyboardStyle");
-    qmlRegisterType(QUrl(path + QLatin1String("KeyboardStyle.qml")), uri, 1, 3, "KeyboardStyle");
-    qmlRegisterType(QUrl(path + QLatin1String("KeyboardStyle.qml")), uri, 2, 0, "KeyboardStyle");
-    qmlRegisterType(QUrl(path + QLatin1String("KeyboardStyle.qml")), uri, 2, 1, "KeyboardStyle");
-    qmlRegisterType(QUrl(path + QLatin1String("KeyboardStyle.qml")), uri, 2, 2, "KeyboardStyle");
-    qmlRegisterType(QUrl(path + QLatin1String("KeyIcon.qml")), uri, 1, 0, "KeyIcon");
-    qmlRegisterType(QUrl(path + QLatin1String("KeyIcon.qml")), uri, 2, 0, "KeyIcon");
-    qmlRegisterType(QUrl(path + QLatin1String("KeyPanel.qml")), uri, 1, 0, "KeyPanel");
-    qmlRegisterType(QUrl(path + QLatin1String("KeyPanel.qml")), uri, 2, 0, "KeyPanel");
-    qmlRegisterType(QUrl(path + QLatin1String("SelectionListItem.qml")), uri, 1, 0, "SelectionListItem");
-    qmlRegisterType(QUrl(path + QLatin1String("SelectionListItem.qml")), uri, 2, 0, "SelectionListItem");
-    qmlRegisterType(QUrl(path + QLatin1String("TraceInputKeyPanel.qml")), uri, 2, 0, "TraceInputKeyPanel");
-    qmlRegisterType(QUrl(path + QLatin1String("TraceCanvas.qml")), uri, 2, 0, "TraceCanvas");
+    volatile auto registration = &qml_register_types_QtQuick_VirtualKeyboard_Styles;
+    Q_UNUSED(registration);
+}
 
-    // The minor version used to be the current Qt 5 minor. For compatibility it is the last
-    // Qt 5 release.
-    qmlRegisterModule(uri, 2, 15);
+void QtQuickVirtualKeyboardStylesPlugin::registerTypes(const char *uri)
+{
+    Q_UNUSED(uri);
 }
 
 void QtQuickVirtualKeyboardStylesPlugin::initializeEngine(QQmlEngine *engine, const char *uri)
diff --git a/src/styles/qtquickvirtualkeyboardstylesplugin.h b/src/styles/qtquickvirtualkeyboardstylesplugin.h
index 1d467332..b65537e9 100644
--- a/src/styles/qtquickvirtualkeyboardstylesplugin.h
+++ b/src/styles/qtquickvirtualkeyboardstylesplugin.h
@@ -40,7 +40,7 @@ class QtQuickVirtualKeyboardStylesPlugin : public QQmlExtensionPlugin
     Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid)
 
 public:
-    QtQuickVirtualKeyboardStylesPlugin(QObject *parent = nullptr) : QQmlExtensionPlugin(parent) { }
+    QtQuickVirtualKeyboardStylesPlugin(QObject *parent = nullptr);
     void registerTypes(const char *uri) override;
     void initializeEngine(QQmlEngine *engine, const char *uri) override;
 };
diff --git a/src/virtualkeyboard/CMakeLists.txt b/src/virtualkeyboard/CMakeLists.txt
index eaaa3f1b..80981703 100644
--- a/src/virtualkeyboard/CMakeLists.txt
+++ b/src/virtualkeyboard/CMakeLists.txt
@@ -1,8 +1,7 @@
-# Generated from virtualkeyboard.pro.
+#####################################################################
+## QtQuick.VirtualKeyboard
+#####################################################################
 
-# special case begin
-set(VKB_LAYOUTS_BASE "${CMAKE_CURRENT_SOURCE_DIR}" CACHE STRING "" FORCE)
-set(VKB_LAYOUTS_PREFIX "/QtQuick/VirtualKeyboard" CACHE STRING "" FORCE)
 set(VKB_INSTALL_DATA "${QT_INSTALL_DIR}/qtvirtualkeyboard" CACHE STRING "" FORCE)
 
 if(NOT TARGET XCB::XFIXES)
@@ -10,14 +9,29 @@ if(NOT TARGET XCB::XFIXES)
         MODULE_NAME virtualkeyboard QMAKE_LIB xcb-xfixes
     )
 endif()
-# special case end
 
-#####################################################################
-## VirtualKeyboard Module:
-#####################################################################
+set(qml_files
+    HandwritingInputPanel.qml
+    InputPanel.qml
+    EnterKey.qml ### Qt7: Remove, see QTBUG-102227
+)
 
-qt_internal_add_module(VirtualKeyboard
-    PLUGIN_TYPES virtualkeyboard
+qt_internal_add_qml_module(VirtualKeyboard
+    URI "QtQuick.VirtualKeyboard"
+    VERSION "${PROJECT_VERSION}"
+    PAST_MAJOR_VERSIONS 2 1
+    PLUGIN_TARGET qtvkbplugin
+    DEPENDENCIES
+        QtQuick/auto
+        QtQuick.Window/auto
+        QtQuick.Layouts/auto
+        Qt.labs.folderlistmodel/auto
+        QtQuick.VirtualKeyboard.Settings/auto
+        QtQuick.VirtualKeyboard.Styles/auto
+        QtQuick.VirtualKeyboard.Plugins/auto
+    IMPORTS
+        QtQuick.VirtualKeyboard.Layouts/auto
+        QtQuick.VirtualKeyboard.Components/auto ### Qt7: Move to dependencies, see QTBUG-102227
     SOURCES
         abstractinputpanel.cpp abstractinputpanel_p.h
         appinputpanel.cpp appinputpanel_p.h
@@ -36,12 +50,11 @@ qt_internal_add_module(VirtualKeyboard
         platforminputcontext.cpp platforminputcontext_p.h
         qvirtualkeyboard_global.h qvirtualkeyboard_global_p.h
         qvirtualkeyboard_namespace.h
-        qvirtualkeyboard_staticplugin_p.h
         qvirtualkeyboardabstractinputmethod.cpp qvirtualkeyboardabstractinputmethod.h
         qvirtualkeyboardabstractinputmethod_p.cpp qvirtualkeyboardabstractinputmethod_p.h
         qvirtualkeyboarddictionary.cpp qvirtualkeyboarddictionary.h
         qvirtualkeyboarddictionarymanager.cpp qvirtualkeyboarddictionarymanager.h
-        qvirtualkeyboardextensionplugin.cpp qvirtualkeyboardextensionplugin.h
+        qvirtualkeyboardfeatures_namespace_p.h
         qvirtualkeyboardinputcontext.cpp qvirtualkeyboardinputcontext.h qvirtualkeyboardinputcontext_p.cpp qvirtualkeyboardinputcontext_p.h
         qvirtualkeyboardinputengine.cpp qvirtualkeyboardinputengine.h
         qvirtualkeyboardobserver.cpp qvirtualkeyboardobserver.h
@@ -51,13 +64,13 @@ qt_internal_add_module(VirtualKeyboard
         shadowinputcontext.cpp shadowinputcontext_p.h
         shifthandler.cpp shifthandler_p.h
         virtualkeyboarddebug_p.h
-        virtualkeyboardsettings.cpp virtualkeyboardsettings_p.h
+    QML_FILES
+        ${qml_files}
     DEFINES
         QT_ASCII_CAST_WARNINGS
         QT_NO_CAST_FROM_ASCII
         QT_NO_CAST_FROM_BYTEARRAY
         QT_NO_CAST_TO_ASCII
-        QT_VIRTUALKEYBOARD_DEFAULT_LAYOUTS_DIR=\\\"qrc:/QtQuick/VirtualKeyboard/content/layouts\\\"
         QVIRTUALKEYBOARD_LIBRARY
     LIBRARIES
         Qt::CorePrivate
@@ -74,608 +87,6 @@ qt_internal_add_module(VirtualKeyboard
     GENERATE_PRIVATE_CPP_EXPORTS
 )
 
-# Resources:
-set(virtualkeyboard_content_resource_files
-    "content/HandwritingInputPanel.qml"
-    "content/InputPanel.qml"
-    "content/components/AlternativeKeys.qml"
-    "content/components/BackspaceKey.qml"
-    "content/components/BaseKey.qml"
-    "content/components/ChangeLanguageKey.qml"
-    "content/components/CharacterPreviewBubble.qml"
-    "content/components/EnterKey.qml"
-    "content/components/FillerKey.qml"
-    "content/components/FlickKey.qml"
-    "content/components/FunctionPopupList.qml"
-    "content/components/HandwritingModeKey.qml"
-    "content/components/HideKeyboardKey.qml"
-    "content/components/InputModeKey.qml"
-    "content/components/Key.qml"
-    "content/components/Keyboard.qml"
-    "content/components/KeyboardColumn.qml"
-    "content/components/KeyboardLayout.qml"
-    "content/components/KeyboardLayoutLoader.qml"
-    "content/components/KeyboardRow.qml"
-    "content/components/ModeKey.qml"
-    "content/components/MultiSoundEffect.qml"
-    "content/components/MultitapInputMethod.qml"
-    "content/components/NumberKey.qml"
-    "content/components/PopupList.qml"
-    "content/components/SelectionControl.qml"
-    "content/components/ShadowInputControl.qml"
-    "content/components/ShiftKey.qml"
-    "content/components/SpaceKey.qml"
-    "content/components/SymbolModeKey.qml"
-    "content/components/TraceInputArea.qml"
-    "content/components/TraceInputKey.qml"
-    "content/components/WordCandidatePopupList.qml"
-)
-
-qt_internal_add_resource(VirtualKeyboard "virtualkeyboard_content"
-    PREFIX
-        "/QtQuick/VirtualKeyboard/content"
-    BASE
-        "content"
-    FILES
-        ${virtualkeyboard_content_resource_files}
-)
-
-
-#### Keys ignored in scope 1:.:.:virtualkeyboard.pro:<TRUE>:
-# LAYOUT_FILES = "content/layouts/fallback/dialpad.qml" "content/layouts/fallback/digits.qml" "content/layouts/fallback/numbers.qml" "content/layouts/fallback/main.qml" "content/layouts/fallback/symbols.qml"
-# MODULE = "virtualkeyboard"
-# OTHER_FILES = "$$PWD/images/*.*" "$$PWD/images/layouts/*.*" "$$PWD/qtvirtualkeyboard.qdocconf" "$$PWD/src/*.qdoc" "$$PWD/src/includes/*.qdocinc" "content/styles/default/*.qml" "content/styles/retro/*.qml" "content/*.qml" "content/components/*.qml" "qtvirtualkeyboard.json" "$$LAYOUT_FILES"
-
-## Scopes:
-#####################################################################
-
-if(NOT no-builtin-style)
-    # Resources:
-    set(virtualkeyboard_default_style_resource_files
-        "content/styles/default/images/backspace-fff.svg"
-        "content/styles/default/images/check-fff.svg"
-        "content/styles/default/images/enter-fff.svg"
-        "content/styles/default/images/globe-fff.svg"
-        "content/styles/default/images/handwriting-fff.svg"
-        "content/styles/default/images/hidekeyboard-fff.svg"
-        "content/styles/default/images/search-fff.svg"
-        "content/styles/default/images/selectionhandle-bottom.svg"
-        "content/styles/default/images/shift-80c342.svg"
-        "content/styles/default/images/shift-fff.svg"
-        "content/styles/default/images/shift-c5d6b6.svg"
-        "content/styles/default/images/textmode-fff.svg"
-        "content/styles/default/images/settings-fff.svg"
-        "content/styles/default/style.qml"
-    )
-
-    qt_internal_add_resource(VirtualKeyboard "virtualkeyboard_default_style"
-        PREFIX
-            "/QtQuick/VirtualKeyboard/content/styles/default"
-        BASE
-            "content/styles/default"
-        FILES
-            ${virtualkeyboard_default_style_resource_files}
-    )
-    set(virtualkeyboard_retro_style_resource_files
-        "content/styles/retro/images/backspace-c5a96f.svg"
-        "content/styles/retro/images/check-c5a96f.svg"
-        "content/styles/retro/images/enter-c5a96f.svg"
-        "content/styles/retro/images/globe-110b05.svg"
-        "content/styles/retro/images/globe-c5a96f.svg"
-        "content/styles/retro/images/globe-fff.svg"
-        "content/styles/retro/images/handwriting-110b05.svg"
-        "content/styles/retro/images/handwriting-c5a96f.svg"
-        "content/styles/retro/images/handwriting-fff.svg"
-        "content/styles/retro/images/hidekeyboard-110b05.svg"
-        "content/styles/retro/images/hidekeyboard-c5a96f.svg"
-        "content/styles/retro/images/hidekeyboard-fff.svg"
-        "content/styles/retro/images/key154px_black.png"
-        "content/styles/retro/images/key154px_black.svg"
-        "content/styles/retro/images/key154px_black_long.png"
-        "content/styles/retro/images/key154px_capslock.png"
-        "content/styles/retro/images/key154px_capslock_long.png"
-        "content/styles/retro/images/key154px_colorA.png"
-        "content/styles/retro/images/key154px_colorA.svg"
-        "content/styles/retro/images/key154px_colorA_long.png"
-        "content/styles/retro/images/key154px_colorB.png"
-        "content/styles/retro/images/key154px_shiftcase.png"
-        "content/styles/retro/images/key154px_shiftcase_long.png"
-        "content/styles/retro/images/key156px_black_long.png"
-        "content/styles/retro/images/key156px_black_medium_long.png"
-        "content/styles/retro/images/key156px_colorA.png"
-        "content/styles/retro/images/key156px_colorB.png"
-        "content/styles/retro/images/key160px_black.png"
-        "content/styles/retro/images/key160px_colorA.png"
-        "content/styles/retro/images/key160px_colorB.png"
-        "content/styles/retro/images/key_preview.png"
-        "content/styles/retro/images/search-c5a96f.svg"
-        "content/styles/retro/images/selectionhandle-bottom.svg"
-        "content/styles/retro/images/shift-c5a96f.svg"
-        "content/styles/retro/images/shift-cd8865.svg"
-        "content/styles/retro/images/shift-dc4f28.svg"
-        "content/styles/retro/images/textmode-110b05.svg"
-        "content/styles/retro/images/textmode-c5a96f.svg"
-        "content/styles/retro/images/textmode-fff.svg"
-        "content/styles/retro/images/triangle_black.png"
-        "content/styles/retro/images/triangle_highlight.png"
-        "content/styles/retro/style.qml"
-    )
-
-    qt_internal_add_resource(VirtualKeyboard "virtualkeyboard_retro_style"
-        PREFIX
-            "/QtQuick/VirtualKeyboard/content/styles/retro"
-        BASE
-            "content/styles/retro"
-        FILES
-            ${virtualkeyboard_retro_style_resource_files}
-    )
-endif()
-
-# special case begin
-
-set(LAYOUT_FILES)
-if (FEATURE_vkb_lang_en_GB)
-    list(APPEND LAYOUT_FILES
-        content/layouts/en_GB/dialpad.fallback
-        content/layouts/en_GB/digits.fallback
-        content/layouts/en_GB/main.fallback
-        content/layouts/en_GB/numbers.fallback
-        content/layouts/en_GB/symbols.fallback
-    )
-endif()
-if(FEATURE_vkb_lang_en_US)
-    list(APPEND LAYOUT_FILES
-        content/layouts/en_US/dialpad.fallback
-        content/layouts/en_US/digits.fallback
-        content/layouts/en_US/main.fallback
-        content/layouts/en_US/numbers.fallback
-        content/layouts/en_US/symbols.fallback
-    )
-endif()
-if(FEATURE_vkb_lang_ar_AR)
-    list(APPEND LAYOUT_FILES
-        content/layouts/ar_AR/dialpad.fallback
-        content/layouts/ar_AR/digits.qml
-        content/layouts/ar_AR/main.qml
-        content/layouts/ar_AR/numbers.qml
-        content/layouts/ar_AR/symbols.qml
-    )
-endif()
-if(FEATURE_vkb_lang_bg_BG)
-    list(APPEND LAYOUT_FILES
-        content/layouts/bg_BG/dialpad.fallback
-        content/layouts/bg_BG/digits.fallback
-        content/layouts/bg_BG/main.qml
-        content/layouts/bg_BG/numbers.fallback
-        content/layouts/bg_BG/symbols.fallback
-    )
-endif()
-if(FEATURE_vkb_lang_cs_CZ)
-    list(APPEND LAYOUT_FILES
-        content/layouts/cs_CZ/dialpad.fallback
-        content/layouts/cs_CZ/digits.fallback
-        content/layouts/cs_CZ/main.qml
-        content/layouts/cs_CZ/numbers.fallback
-        content/layouts/cs_CZ/symbols.fallback
-    )
-endif()
-if(FEATURE_vkb_lang_da_DK)
-    list(APPEND LAYOUT_FILES
-        content/layouts/da_DK/dialpad.fallback
-        content/layouts/da_DK/digits.fallback
-        content/layouts/da_DK/main.qml
-        content/layouts/da_DK/numbers.fallback
-        content/layouts/da_DK/symbols.fallback
-    )
-endif()
-if(FEATURE_vkb_lang_de_DE)
-    list(APPEND LAYOUT_FILES
-        content/layouts/de_DE/dialpad.fallback
-        content/layouts/de_DE/digits.fallback
-        content/layouts/de_DE/main.qml
-        content/layouts/de_DE/numbers.fallback
-        content/layouts/de_DE/symbols.fallback
-    )
-endif()
-if(FEATURE_vkb_lang_el_GR)
-    list(APPEND LAYOUT_FILES
-        content/layouts/el_GR/dialpad.fallback
-        content/layouts/el_GR/digits.fallback
-        content/layouts/el_GR/main.qml
-        content/layouts/el_GR/numbers.fallback
-        content/layouts/el_GR/symbols.fallback
-    )
-endif()
-if(FEATURE_vkb_lang_es_ES)
-    list(APPEND LAYOUT_FILES
-        content/layouts/es_ES/dialpad.fallback
-        content/layouts/es_ES/digits.fallback
-        content/layouts/es_ES/main.qml
-        content/layouts/es_ES/numbers.fallback
-        content/layouts/es_ES/symbols.qml
-    )
-endif()
-if(FEATURE_vkb_lang_es_MX)
-    list(APPEND LAYOUT_FILES
-        content/layouts/es_MX/dialpad.fallback
-        content/layouts/es_MX/digits.fallback
-        content/layouts/es_MX/main.qml
-        content/layouts/es_MX/numbers.fallback
-        content/layouts/es_MX/symbols.qml
-    )
-endif()
-if(FEATURE_vkb_lang_et_EE)
-    list(APPEND LAYOUT_FILES
-        content/layouts/et_EE/dialpad.fallback
-        content/layouts/et_EE/digits.fallback
-        content/layouts/et_EE/main.qml
-        content/layouts/et_EE/numbers.fallback
-        content/layouts/et_EE/symbols.fallback
-    )
-endif()
-if(FEATURE_vkb_lang_fa_FA)
-    list(APPEND LAYOUT_FILES
-        content/layouts/fa_FA/dialpad.fallback
-        content/layouts/fa_FA/digits.qml
-        content/layouts/fa_FA/main.qml
-        content/layouts/fa_FA/numbers.qml
-        content/layouts/fa_FA/symbols.qml
-    )
-endif()
-if(FEATURE_vkb_lang_fi_FI)
-    list(APPEND LAYOUT_FILES
-        content/layouts/fi_FI/dialpad.fallback
-        content/layouts/fi_FI/digits.fallback
-        content/layouts/fi_FI/main.qml
-        content/layouts/fi_FI/numbers.fallback
-        content/layouts/fi_FI/symbols.fallback
-    )
-endif()
-if(FEATURE_vkb_lang_fr_CA)
-    list(APPEND LAYOUT_FILES
-        content/layouts/fr_CA/dialpad.fallback
-        content/layouts/fr_CA/digits.fallback
-        content/layouts/fr_CA/main.qml
-        content/layouts/fr_CA/numbers.fallback
-        content/layouts/fr_CA/symbols.fallback
-    )
-endif()
-if(FEATURE_vkb_lang_fr_FR)
-    list(APPEND LAYOUT_FILES
-        content/layouts/fr_FR/dialpad.fallback
-        content/layouts/fr_FR/digits.fallback
-        content/layouts/fr_FR/main.qml
-        content/layouts/fr_FR/numbers.fallback
-        content/layouts/fr_FR/symbols.fallback
-    )
-endif()
-if(FEATURE_vkb_lang_he_IL)
-    list(APPEND LAYOUT_FILES
-        content/layouts/he_IL/dialpad.fallback
-        content/layouts/he_IL/digits.fallback
-        content/layouts/he_IL/main.qml
-        content/layouts/he_IL/numbers.fallback
-        content/layouts/he_IL/symbols.qml
-    )
-endif()
-if(FEATURE_vkb_lang_hi_IN)
-    list(APPEND LAYOUT_FILES
-        content/layouts/hi_IN/dialpad.fallback
-        content/layouts/hi_IN/digits.fallback
-        content/layouts/hi_IN/main.qml
-        content/layouts/hi_IN/numbers.fallback
-        content/layouts/hi_IN/symbols.qml
-    )
-endif()
-if(FEATURE_vkb_lang_hr_HR)
-    list(APPEND LAYOUT_FILES
-        content/layouts/hr_HR/dialpad.fallback
-        content/layouts/hr_HR/digits.fallback
-        content/layouts/hr_HR/main.qml
-        content/layouts/hr_HR/numbers.fallback
-        content/layouts/hr_HR/symbols.fallback
-    )
-endif()
-if(FEATURE_vkb_lang_hu_HU)
-    list(APPEND LAYOUT_FILES
-        content/layouts/hu_HU/dialpad.fallback
-        content/layouts/hu_HU/digits.fallback
-        content/layouts/hu_HU/main.qml
-        content/layouts/hu_HU/numbers.fallback
-        content/layouts/hu_HU/symbols.fallback
-    )
-endif()
-if(FEATURE_vkb_lang_id_ID)
-    list(APPEND LAYOUT_FILES
-        content/layouts/id_ID/dialpad.fallback
-        content/layouts/id_ID/digits.fallback
-        content/layouts/id_ID/main.fallback
-        content/layouts/id_ID/numbers.fallback
-        content/layouts/id_ID/symbols.fallback
-    )
-endif()
-if(FEATURE_vkb_lang_it_IT)
-    list(APPEND LAYOUT_FILES
-        content/layouts/it_IT/dialpad.fallback
-        content/layouts/it_IT/digits.fallback
-        content/layouts/it_IT/main.qml
-        content/layouts/it_IT/numbers.fallback
-        content/layouts/it_IT/symbols.fallback
-    )
-endif()
-if(FEATURE_vkb_lang_nb_NO)
-    list(APPEND LAYOUT_FILES
-        content/layouts/nb_NO/dialpad.fallback
-        content/layouts/nb_NO/digits.fallback
-        content/layouts/nb_NO/main.qml
-        content/layouts/nb_NO/numbers.fallback
-        content/layouts/nb_NO/symbols.fallback
-    )
-endif()
-if(FEATURE_vkb_lang_ms_MY)
-    list(APPEND LAYOUT_FILES
-        content/layouts/ms_MY/dialpad.fallback
-        content/layouts/ms_MY/digits.fallback
-        content/layouts/ms_MY/main.fallback
-        content/layouts/ms_MY/numbers.fallback
-        content/layouts/ms_MY/symbols.fallback
-    )
-endif()
-if(FEATURE_vkb_lang_nl_NL)
-    list(APPEND LAYOUT_FILES
-        content/layouts/nl_NL/dialpad.fallback
-        content/layouts/nl_NL/digits.fallback
-        content/layouts/nl_NL/main.fallback
-        content/layouts/nl_NL/numbers.fallback
-        content/layouts/nl_NL/symbols.fallback
-    )
-endif()
-if(FEATURE_vkb_lang_pl_PL)
-    list(APPEND LAYOUT_FILES
-        content/layouts/pl_PL/dialpad.fallback
-        content/layouts/pl_PL/digits.fallback
-        content/layouts/pl_PL/main.qml
-        content/layouts/pl_PL/numbers.fallback
-        content/layouts/pl_PL/symbols.fallback
-    )
-endif()
-if(FEATURE_vkb_lang_pt_BR)
-    list(APPEND LAYOUT_FILES
-        content/layouts/pt_BR/dialpad.fallback
-        content/layouts/pt_BR/digits.fallback
-        content/layouts/pt_BR/main.qml
-        content/layouts/pt_BR/numbers.fallback
-        content/layouts/pt_BR/symbols.fallback
-    )
-endif()
-if(FEATURE_vkb_lang_pt_PT)
-    list(APPEND LAYOUT_FILES
-        content/layouts/pt_PT/dialpad.fallback
-        content/layouts/pt_PT/digits.fallback
-        content/layouts/pt_PT/main.qml
-        content/layouts/pt_PT/numbers.fallback
-        content/layouts/pt_PT/symbols.fallback
-    )
-endif()
-if(FEATURE_vkb_lang_ro_RO)
-    list(APPEND LAYOUT_FILES
-        content/layouts/ro_RO/dialpad.fallback
-        content/layouts/ro_RO/digits.fallback
-        content/layouts/ro_RO/main.qml
-        content/layouts/ro_RO/numbers.fallback
-        content/layouts/ro_RO/symbols.fallback
-    )
-endif()
-if(FEATURE_vkb_lang_ru_RU)
-    list(APPEND LAYOUT_FILES
-        content/layouts/ru_RU/dialpad.fallback
-        content/layouts/ru_RU/digits.fallback
-        content/layouts/ru_RU/main.qml
-        content/layouts/ru_RU/numbers.fallback
-        content/layouts/ru_RU/symbols.fallback
-    )
-endif()
-if(FEATURE_vkb_lang_sk_SK)
-    list(APPEND LAYOUT_FILES
-        content/layouts/sk_SK/dialpad.fallback
-        content/layouts/sk_SK/digits.fallback
-        content/layouts/sk_SK/main.qml
-        content/layouts/sk_SK/numbers.fallback
-        content/layouts/sk_SK/symbols.fallback
-    )
-endif()
-if(FEATURE_vkb_lang_sl_SI)
-    list(APPEND LAYOUT_FILES
-        content/layouts/sl_SI/dialpad.fallback
-        content/layouts/sl_SI/digits.fallback
-        content/layouts/sl_SI/main.qml
-        content/layouts/sl_SI/numbers.fallback
-        content/layouts/sl_SI/symbols.fallback
-    )
-endif()
-if(FEATURE_vkb_lang_sq_AL)
-    list(APPEND LAYOUT_FILES
-        content/layouts/sq_AL/dialpad.fallback
-        content/layouts/sq_AL/digits.fallback
-        content/layouts/sq_AL/main.qml
-        content/layouts/sq_AL/numbers.fallback
-        content/layouts/sq_AL/symbols.fallback
-    )
-endif()
-if(FEATURE_vkb_lang_sr_SP)
-    list(APPEND LAYOUT_FILES
-        content/layouts/sr_SP/dialpad.fallback
-        content/layouts/sr_SP/digits.fallback
-        content/layouts/sr_SP/main.qml
-        content/layouts/sr_SP/numbers.fallback
-        content/layouts/sr_SP/symbols.fallback
-    )
-endif()
-if(FEATURE_vkb_lang_sv_SE)
-    list(APPEND LAYOUT_FILES
-        content/layouts/sv_SE/dialpad.fallback
-        content/layouts/sv_SE/digits.fallback
-        content/layouts/sv_SE/main.qml
-        content/layouts/sv_SE/numbers.fallback
-        content/layouts/sv_SE/symbols.fallback
-    )
-endif()
-if(FEATURE_vkb_lang_tr_TR)
-    list(APPEND LAYOUT_FILES
-        content/layouts/tr_TR/dialpad.fallback
-        content/layouts/tr_TR/digits.fallback
-        content/layouts/tr_TR/main.qml
-        content/layouts/tr_TR/numbers.fallback
-        content/layouts/tr_TR/symbols.fallback
-    )
-endif()
-if(FEATURE_vkb_lang_uk_UA)
-    list(APPEND LAYOUT_FILES
-        content/layouts/uk_UA/dialpad.fallback
-        content/layouts/uk_UA/digits.fallback
-        content/layouts/uk_UA/main.qml
-        content/layouts/uk_UA/numbers.fallback
-        content/layouts/uk_UA/symbols.fallback
-    )
-endif()
-if(FEATURE_vkb_lang_vi_VN)
-    list(APPEND LAYOUT_FILES
-        content/layouts/vi_VN/dialpad.fallback
-        content/layouts/vi_VN/digits.fallback
-        content/layouts/vi_VN/main.qml
-        content/layouts/vi_VN/numbers.fallback
-        content/layouts/vi_VN/symbols.qml
-    )
-endif()
-
-# special case end
-
-#### Keys ignored in scope 4:.:.:virtualkeyboard.pro:QT_FEATURE_vkb_lang_en_GB:
-# LAYOUT_FILES = "content/layouts/en_GB/dialpad.fallback" "content/layouts/en_GB/digits.fallback" "content/layouts/en_GB/main.fallback" "content/layouts/en_GB/numbers.fallback" "content/layouts/en_GB/symbols.fallback"
-
-#### Keys ignored in scope 5:.:.:virtualkeyboard.pro:QT_FEATURE_vkb_lang_en_US:
-# LAYOUT_FILES = "content/layouts/en_US/dialpad.fallback" "content/layouts/en_US/digits.fallback" "content/layouts/en_US/main.fallback" "content/layouts/en_US/numbers.fallback" "content/layouts/en_US/symbols.fallback"
-
-#### Keys ignored in scope 6:.:.:virtualkeyboard.pro:QT_FEATURE_vkb_lang_ar_AR:
-# LAYOUT_FILES = "content/layouts/ar_AR/dialpad.fallback" "content/layouts/ar_AR/digits.qml" "content/layouts/ar_AR/main.qml" "content/layouts/ar_AR/numbers.qml" "content/layouts/ar_AR/symbols.qml"
-
-#### Keys ignored in scope 7:.:.:virtualkeyboard.pro:QT_FEATURE_vkb_lang_bg_BG:
-# LAYOUT_FILES = "content/layouts/bg_BG/dialpad.fallback" "content/layouts/bg_BG/digits.fallback" "content/layouts/bg_BG/main.qml" "content/layouts/bg_BG/numbers.fallback" "content/layouts/bg_BG/symbols.fallback"
-
-#### Keys ignored in scope 8:.:.:virtualkeyboard.pro:QT_FEATURE_vkb_lang_cs_CZ:
-# LAYOUT_FILES = "content/layouts/cs_CZ/dialpad.fallback" "content/layouts/cs_CZ/digits.fallback" "content/layouts/cs_CZ/main.qml" "content/layouts/cs_CZ/numbers.fallback" "content/layouts/cs_CZ/symbols.fallback"
-
-#### Keys ignored in scope 9:.:.:virtualkeyboard.pro:QT_FEATURE_vkb_lang_da_DK:
-# LAYOUT_FILES = "content/layouts/da_DK/dialpad.fallback" "content/layouts/da_DK/digits.fallback" "content/layouts/da_DK/main.qml" "content/layouts/da_DK/numbers.fallback" "content/layouts/da_DK/symbols.fallback"
-
-#### Keys ignored in scope 10:.:.:virtualkeyboard.pro:QT_FEATURE_vkb_lang_de_DE:
-# LAYOUT_FILES = "content/layouts/de_DE/dialpad.fallback" "content/layouts/de_DE/digits.fallback" "content/layouts/de_DE/main.qml" "content/layouts/de_DE/numbers.fallback" "content/layouts/de_DE/symbols.fallback"
-
-#### Keys ignored in scope 11:.:.:virtualkeyboard.pro:QT_FEATURE_vkb_lang_el_GR:
-# LAYOUT_FILES = "content/layouts/el_GR/dialpad.fallback" "content/layouts/el_GR/digits.fallback" "content/layouts/el_GR/main.qml" "content/layouts/el_GR/numbers.fallback" "content/layouts/el_GR/symbols.fallback"
-
-#### Keys ignored in scope 12:.:.:virtualkeyboard.pro:QT_FEATURE_vkb_lang_es_ES:
-# LAYOUT_FILES = "content/layouts/es_ES/dialpad.fallback" "content/layouts/es_ES/digits.fallback" "content/layouts/es_ES/main.qml" "content/layouts/es_ES/numbers.fallback" "content/layouts/es_ES/symbols.qml"
-
-#### Keys ignored in scope 13:.:.:virtualkeyboard.pro:QT_FEATURE_vkb_lang_es_MX:
-# LAYOUT_FILES = "content/layouts/es_MX/dialpad.fallback" "content/layouts/es_MX/digits.fallback" "content/layouts/es_MX/main.qml" "content/layouts/es_MX/numbers.fallback" "content/layouts/es_MX/symbols.qml"
-
-#### Keys ignored in scope 14:.:.:virtualkeyboard.pro:QT_FEATURE_vkb_lang_et_EE:
-# LAYOUT_FILES = "content/layouts/et_EE/dialpad.fallback" "content/layouts/et_EE/digits.fallback" "content/layouts/et_EE/main.qml" "content/layouts/et_EE/numbers.fallback" "content/layouts/et_EE/symbols.fallback"
-
-#### Keys ignored in scope 15:.:.:virtualkeyboard.pro:QT_FEATURE_vkb_lang_fa_FA:
-# LAYOUT_FILES = "content/layouts/fa_FA/dialpad.fallback" "content/layouts/fa_FA/digits.qml" "content/layouts/fa_FA/main.qml" "content/layouts/fa_FA/numbers.qml" "content/layouts/fa_FA/symbols.qml"
-
-#### Keys ignored in scope 16:.:.:virtualkeyboard.pro:QT_FEATURE_vkb_lang_fi_FI:
-# LAYOUT_FILES = "content/layouts/fi_FI/dialpad.fallback" "content/layouts/fi_FI/digits.fallback" "content/layouts/fi_FI/main.qml" "content/layouts/fi_FI/numbers.fallback" "content/layouts/fi_FI/symbols.fallback"
-
-#### Keys ignored in scope 17:.:.:virtualkeyboard.pro:QT_FEATURE_vkb_lang_fr_CA:
-# LAYOUT_FILES = "content/layouts/fr_CA/dialpad.fallback" "content/layouts/fr_CA/digits.fallback" "content/layouts/fr_CA/main.qml" "content/layouts/fr_CA/numbers.fallback" "content/layouts/fr_CA/symbols.fallback"
-
-#### Keys ignored in scope 18:.:.:virtualkeyboard.pro:QT_FEATURE_vkb_lang_fr_FR:
-# LAYOUT_FILES = "content/layouts/fr_FR/dialpad.fallback" "content/layouts/fr_FR/digits.fallback" "content/layouts/fr_FR/main.qml" "content/layouts/fr_FR/numbers.fallback" "content/layouts/fr_FR/symbols.fallback"
-
-#### Keys ignored in scope 19:.:.:virtualkeyboard.pro:QT_FEATURE_vkb_lang_he_IL:
-# LAYOUT_FILES = "content/layouts/he_IL/dialpad.fallback" "content/layouts/he_IL/digits.fallback" "content/layouts/he_IL/main.qml" "content/layouts/he_IL/numbers.fallback" "content/layouts/he_IL/symbols.qml"
-
-#### Keys ignored in scope 20:.:.:virtualkeyboard.pro:QT_FEATURE_vkb_lang_hi_IN:
-# LAYOUT_FILES = "content/layouts/hi_IN/dialpad.fallback" "content/layouts/hi_IN/digits.fallback" "content/layouts/hi_IN/main.qml" "content/layouts/hi_IN/numbers.fallback" "content/layouts/hi_IN/symbols.qml"
-
-#### Keys ignored in scope 21:.:.:virtualkeyboard.pro:QT_FEATURE_vkb_lang_hr_HR:
-# LAYOUT_FILES = "content/layouts/hr_HR/dialpad.fallback" "content/layouts/hr_HR/digits.fallback" "content/layouts/hr_HR/main.qml" "content/layouts/hr_HR/numbers.fallback" "content/layouts/hr_HR/symbols.fallback"
-
-#### Keys ignored in scope 22:.:.:virtualkeyboard.pro:QT_FEATURE_vkb_lang_hu_HU:
-# LAYOUT_FILES = "content/layouts/hu_HU/dialpad.fallback" "content/layouts/hu_HU/digits.fallback" "content/layouts/hu_HU/main.qml" "content/layouts/hu_HU/numbers.fallback" "content/layouts/hu_HU/symbols.fallback"
-
-#### Keys ignored in scope 23:.:.:virtualkeyboard.pro:QT_FEATURE_vkb_lang_id_ID:
-# LAYOUT_FILES = "content/layouts/id_ID/dialpad.fallback" "content/layouts/id_ID/digits.fallback" "content/layouts/id_ID/main.fallback" "content/layouts/id_ID/numbers.fallback" "content/layouts/id_ID/symbols.fallback"
-
-#### Keys ignored in scope 24:.:.:virtualkeyboard.pro:QT_FEATURE_vkb_lang_it_IT:
-# LAYOUT_FILES = "content/layouts/it_IT/dialpad.fallback" "content/layouts/it_IT/digits.fallback" "content/layouts/it_IT/main.qml" "content/layouts/it_IT/numbers.fallback" "content/layouts/it_IT/symbols.fallback"
-
-#### Keys ignored in scope 25:.:.:virtualkeyboard.pro:QT_FEATURE_vkb_lang_nb_NO:
-# LAYOUT_FILES = "content/layouts/nb_NO/dialpad.fallback" "content/layouts/nb_NO/digits.fallback" "content/layouts/nb_NO/main.qml" "content/layouts/nb_NO/numbers.fallback" "content/layouts/nb_NO/symbols.fallback"
-
-#### Keys ignored in scope 26:.:.:virtualkeyboard.pro:QT_FEATURE_vkb_lang_ms_MY:
-# LAYOUT_FILES = "content/layouts/ms_MY/dialpad.fallback" "content/layouts/ms_MY/digits.fallback" "content/layouts/ms_MY/main.fallback" "content/layouts/ms_MY/numbers.fallback" "content/layouts/ms_MY/symbols.fallback"
-
-#### Keys ignored in scope 27:.:.:virtualkeyboard.pro:QT_FEATURE_vkb_lang_nl_NL:
-# LAYOUT_FILES = "content/layouts/nl_NL/dialpad.fallback" "content/layouts/nl_NL/digits.fallback" "content/layouts/nl_NL/main.fallback" "content/layouts/nl_NL/numbers.fallback" "content/layouts/nl_NL/symbols.fallback"
-
-#### Keys ignored in scope 28:.:.:virtualkeyboard.pro:QT_FEATURE_vkb_lang_pl_PL:
-# LAYOUT_FILES = "content/layouts/pl_PL/dialpad.fallback" "content/layouts/pl_PL/digits.fallback" "content/layouts/pl_PL/main.qml" "content/layouts/pl_PL/numbers.fallback" "content/layouts/pl_PL/symbols.fallback"
-
-#### Keys ignored in scope 29:.:.:virtualkeyboard.pro:QT_FEATURE_vkb_lang_pt_BR:
-# LAYOUT_FILES = "content/layouts/pt_BR/dialpad.fallback" "content/layouts/pt_BR/digits.fallback" "content/layouts/pt_BR/main.qml" "content/layouts/pt_BR/numbers.fallback" "content/layouts/pt_BR/symbols.fallback"
-
-#### Keys ignored in scope 30:.:.:virtualkeyboard.pro:QT_FEATURE_vkb_lang_pt_PT:
-# LAYOUT_FILES = "content/layouts/pt_PT/dialpad.fallback" "content/layouts/pt_PT/digits.fallback" "content/layouts/pt_PT/main.qml" "content/layouts/pt_PT/numbers.fallback" "content/layouts/pt_PT/symbols.fallback"
-
-#### Keys ignored in scope 31:.:.:virtualkeyboard.pro:QT_FEATURE_vkb_lang_ro_RO:
-# LAYOUT_FILES = "content/layouts/ro_RO/dialpad.fallback" "content/layouts/ro_RO/digits.fallback" "content/layouts/ro_RO/main.qml" "content/layouts/ro_RO/numbers.fallback" "content/layouts/ro_RO/symbols.fallback"
-
-#### Keys ignored in scope 32:.:.:virtualkeyboard.pro:QT_FEATURE_vkb_lang_ru_RU:
-# LAYOUT_FILES = "content/layouts/ru_RU/dialpad.fallback" "content/layouts/ru_RU/digits.fallback" "content/layouts/ru_RU/main.qml" "content/layouts/ru_RU/numbers.fallback" "content/layouts/ru_RU/symbols.fallback"
-
-#### Keys ignored in scope 33:.:.:virtualkeyboard.pro:QT_FEATURE_vkb_lang_sk_SK:
-# LAYOUT_FILES = "content/layouts/sk_SK/dialpad.fallback" "content/layouts/sk_SK/digits.fallback" "content/layouts/sk_SK/main.qml" "content/layouts/sk_SK/numbers.fallback" "content/layouts/sk_SK/symbols.fallback"
-
-#### Keys ignored in scope 34:.:.:virtualkeyboard.pro:QT_FEATURE_vkb_lang_sl_SI:
-# LAYOUT_FILES = "content/layouts/sl_SI/dialpad.fallback" "content/layouts/sl_SI/digits.fallback" "content/layouts/sl_SI/main.qml" "content/layouts/sl_SI/numbers.fallback" "content/layouts/sl_SI/symbols.fallback"
-
-#### Keys ignored in scope 35:.:.:virtualkeyboard.pro:QT_FEATURE_vkb_lang_sq_AL:
-# LAYOUT_FILES = "content/layouts/sq_AL/dialpad.fallback" "content/layouts/sq_AL/digits.fallback" "content/layouts/sq_AL/main.qml" "content/layouts/sq_AL/numbers.fallback" "content/layouts/sq_AL/symbols.fallback"
-
-#### Keys ignored in scope 36:.:.:virtualkeyboard.pro:QT_FEATURE_vkb_lang_sr_SP:
-# LAYOUT_FILES = "content/layouts/sr_SP/dialpad.fallback" "content/layouts/sr_SP/digits.fallback" "content/layouts/sr_SP/main.qml" "content/layouts/sr_SP/numbers.fallback" "content/layouts/sr_SP/symbols.fallback"
-
-#### Keys ignored in scope 37:.:.:virtualkeyboard.pro:QT_FEATURE_vkb_lang_sv_SE:
-# LAYOUT_FILES = "content/layouts/sv_SE/dialpad.fallback" "content/layouts/sv_SE/digits.fallback" "content/layouts/sv_SE/main.qml" "content/layouts/sv_SE/numbers.fallback" "content/layouts/sv_SE/symbols.fallback"
-
-#### Keys ignored in scope 38:.:.:virtualkeyboard.pro:QT_FEATURE_vkb_lang_tr_TR:
-# LAYOUT_FILES = "content/layouts/tr_TR/dialpad.fallback" "content/layouts/tr_TR/digits.fallback" "content/layouts/tr_TR/main.qml" "content/layouts/tr_TR/numbers.fallback" "content/layouts/tr_TR/symbols.fallback"
-
-#### Keys ignored in scope 39:.:.:virtualkeyboard.pro:QT_FEATURE_vkb_lang_uk_UA:
-# LAYOUT_FILES = "content/layouts/uk_UA/dialpad.fallback" "content/layouts/uk_UA/digits.fallback" "content/layouts/uk_UA/main.qml" "content/layouts/uk_UA/numbers.fallback" "content/layouts/uk_UA/symbols.fallback"
-
-#### Keys ignored in scope 40:.:.:virtualkeyboard.pro:QT_FEATURE_vkb_lang_vi_VN:
-# LAYOUT_FILES = "content/layouts/vi_VN/dialpad.fallback" "content/layouts/vi_VN/digits.fallback" "content/layouts/vi_VN/main.qml" "content/layouts/vi_VN/numbers.fallback" "content/layouts/vi_VN/symbols.qml"
-
-qt_internal_extend_target(VirtualKeyboard CONDITION QT_FEATURE_vkb_no_builtin_style
-    DEFINES
-        QT_VIRTUALKEYBOARD_DEFAULT_STYLE=\\\"\\\"
-)
-
-qt_internal_extend_target(VirtualKeyboard CONDITION QT_FEATURE_vkb_retro_style AND NOT QT_FEATURE_vkb_no_builtin_style
-    DEFINES
-        QT_VIRTUALKEYBOARD_DEFAULT_STYLE=\\\"retro\\\"
-)
-
-qt_internal_extend_target(VirtualKeyboard CONDITION NOT QT_FEATURE_vkb_no_builtin_style AND NOT QT_FEATURE_vkb_retro_style
-    DEFINES
-        QT_VIRTUALKEYBOARD_DEFAULT_STYLE=\\\"default\\\"
-)
-
 qt_internal_extend_target(VirtualKeyboard CONDITION QT_FEATURE_vkb_desktop
     SOURCES
         desktopinputpanel.cpp desktopinputpanel_p.h
@@ -701,24 +112,6 @@ qt_internal_extend_target(VirtualKeyboard CONDITION QT_FEATURE_vkb_arrow_keynavi
         QT_VIRTUALKEYBOARD_ARROW_KEY_NAVIGATION
 )
 
-if(QT_FEATURE_vkb_layouts)
-    # Resources:
-    set(qmake_virtualkeyboard_layouts_resource_files
-        "content/layouts/fallback/dialpad.qml"
-        "content/layouts/fallback/digits.qml"
-        "content/layouts/fallback/main.qml"
-        "content/layouts/fallback/numbers.qml"
-        "content/layouts/fallback/symbols.qml"
-    )
-
-    qt_internal_add_resource(VirtualKeyboard "qmake_virtualkeyboard_layouts"
-        PREFIX
-            "${VKB_LAYOUTS_PREFIX}" #special case
-        FILES
-            ${qmake_virtualkeyboard_layouts_resource_files}
-            ${LAYOUT_FILES} # special case
-    )
-endif()
 qt_internal_add_docs(VirtualKeyboard
     doc/qtvirtualkeyboard.qdocconf
 )
diff --git a/src/plugins/tcime/plugin/tcimeplugin.cpp b/src/virtualkeyboard/EnterKey.qml
index a8ba9a4e..d6846a5f 100644
--- a/src/plugins/tcime/plugin/tcimeplugin.cpp
+++ b/src/virtualkeyboard/EnterKey.qml
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2018 The Qt Company Ltd.
+** Copyright (C) 2022 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit.
@@ -27,17 +27,8 @@
 **
 ****************************************************************************/
 
-#include "tcimeplugin.h"
-#include "tcinputmethod_p.h"
-#include <QtQml>
+import QtQuick.VirtualKeyboard.Components as C
 
-QT_BEGIN_NAMESPACE
+// Qt7: Remove, see QTBUG-102227
 
-using namespace QtVirtualKeyboard;
-
-void QtVirtualKeyboardTCImePlugin::registerTypes(const char *uri) const
-{
-    qmlRegisterType<TCInputMethod>(uri, 2, 0, "TCInputMethod");
-}
-
-QT_END_NAMESPACE
+C.EnterKey {}
diff --git a/src/virtualkeyboard/content/HandwritingInputPanel.qml b/src/virtualkeyboard/HandwritingInputPanel.qml
index 7a3b56f6..92f97fcc 100644
--- a/src/virtualkeyboard/content/HandwritingInputPanel.qml
+++ b/src/virtualkeyboard/HandwritingInputPanel.qml
@@ -32,6 +32,7 @@ import QtQuick
 import QtQml
 import QtQuick.Window
 import QtQuick.VirtualKeyboard
+import QtQuick.VirtualKeyboard.Components
 
 /*!
     \qmltype HandwritingInputPanel
diff --git a/src/virtualkeyboard/content/InputPanel.qml b/src/virtualkeyboard/InputPanel.qml
index 6f1314d8..65be0745 100644
--- a/src/virtualkeyboard/content/InputPanel.qml
+++ b/src/virtualkeyboard/InputPanel.qml
@@ -31,6 +31,7 @@ import QtQuick
 // Deliberately imported after QtQuick to avoid missing restoreMode property in Binding. Fix in Qt 6.
 import QtQml
 import QtQuick.VirtualKeyboard
+import QtQuick.VirtualKeyboard.Components
 
 /*!
     \qmltype InputPanel
diff --git a/src/virtualkeyboard/desktopinputpanel.cpp b/src/virtualkeyboard/desktopinputpanel.cpp
index cdaf1ffd..f9f7e6e4 100644
--- a/src/virtualkeyboard/desktopinputpanel.cpp
+++ b/src/virtualkeyboard/desktopinputpanel.cpp
@@ -155,7 +155,7 @@ void DesktopInputPanel::createView()
             break;
         }
         d->view->setColor(QColor(Qt::transparent));
-        d->view->setSource(QUrl(QLatin1String("qrc:///QtQuick/VirtualKeyboard/content/InputPanel.qml")));
+        d->view->setSource(QUrl(QLatin1String("qrc:///qt-project.org/imports/QtQuick/VirtualKeyboard/InputPanel.qml")));
         if (QGuiApplication *app = qGuiApp)
             connect(app, SIGNAL(aboutToQuit()), SLOT(destroyView()));
     }
diff --git a/src/virtualkeyboard/desktopinputselectioncontrol.cpp b/src/virtualkeyboard/desktopinputselectioncontrol.cpp
index acb7d60e..31dc72d0 100644
--- a/src/virtualkeyboard/desktopinputselectioncontrol.cpp
+++ b/src/virtualkeyboard/desktopinputselectioncontrol.cpp
@@ -160,7 +160,7 @@ void DesktopInputSelectionControl::updateVisibility()
 void DesktopInputSelectionControl::reloadGraphics()
 {
     Settings *settings = Settings::instance();
-    const QString stylePath = QString::fromLatin1(":/QtQuick/VirtualKeyboard/content/styles/%1/images/selectionhandle-bottom.svg")
+    const QString stylePath = QString::fromLatin1(":/qt-project.org/imports/QtQuick/VirtualKeyboard/Styles/Builtin/%1/images/selectionhandle-bottom.svg")
                                 .arg(settings->styleName());
     QImageReader imageReader(stylePath);
     QSize sz = imageReader.size(); // SVG handler will return default size
diff --git a/src/virtualkeyboard/doc/src/deployment-guide.qdoc b/src/virtualkeyboard/doc/src/deployment-guide.qdoc
index c132ed0e..5754f635 100644
--- a/src/virtualkeyboard/doc/src/deployment-guide.qdoc
+++ b/src/virtualkeyboard/doc/src/deployment-guide.qdoc
@@ -262,7 +262,7 @@ There are several environment variables defined by the module that are listed be
             \list
             \li \c QT_VIRTUALKEYBOARD_CERENCE_HWR_DB_PATH
             \li \c {QLibraryInfo::location(QLibraryInfo::DataPath) + "/qtvirtualkeyboard/cerence/handwriting"}
-            \li \c {":/QtQuick/VirtualKeyboard/Cerence/Handwriting"}
+            \li \c {":/qt-project.org/imports/QtQuick/VirtualKeyboard/Cerence/Handwriting"}
             \endlist
 
             The environment variable may contain multiple paths. Multiple paths are separated with
@@ -275,7 +275,7 @@ There are several environment variables defined by the module that are listed be
             \list
             \li \c QT_VIRTUALKEYBOARD_XT9_LDB_PATH
             \li \c {QLibraryInfo::location(QLibraryInfo::DataPath) + "/qtvirtualkeyboard/cerence/xt9"}
-            \li \c {":/QtQuick/VirtualKeyboard/Cerence/Xt9"}
+            \li \c {":/qt-project.org/imports/QtQuick/VirtualKeyboard/Cerence/Xt9"}
             \endlist
 
             Additional search paths can be specified by setting this environment variable. Multiple paths are
diff --git a/src/virtualkeyboard/doc/src/technical-guide.qdoc b/src/virtualkeyboard/doc/src/technical-guide.qdoc
index 10fc28e8..5513cd82 100644
--- a/src/virtualkeyboard/doc/src/technical-guide.qdoc
+++ b/src/virtualkeyboard/doc/src/technical-guide.qdoc
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2022 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
@@ -208,7 +208,7 @@ The plugin can add keyboard layouts for the virtual keyboard by including
 the layout files in the Qt resources of the plugin binary.
 
 The virtual keyboard searches for the keyboard layouts (per language) from a specific
-path \e /QtQuick/VirtualKeyboard/content/layouts/<language_COUNTRY>, so it is essential
+path \e /qt-project.org/imports/QtQuick/VirtualKeyboard/content/layouts/<language_COUNTRY>, so it is essential
 to use this exact path also in the plugin. Qt resource paths can be overlapped, however,
 the plugin cannot override the existing layouts in the virtual keyboard plugin.
 
diff --git a/src/virtualkeyboard/enterkeyaction_p.h b/src/virtualkeyboard/enterkeyaction_p.h
index a3d1c645..fecc24c2 100644
--- a/src/virtualkeyboard/enterkeyaction_p.h
+++ b/src/virtualkeyboard/enterkeyaction_p.h
@@ -41,7 +41,7 @@
 // We mean it.
 //
 
-#include <qqml.h>
+#include <QtQml/qqml.h>
 #include <QtVirtualKeyboard/qvirtualkeyboard_global.h>
 #include <QtCore/private/qglobal_p.h>
 
@@ -53,6 +53,11 @@ class EnterKeyActionAttachedType;
 class Q_VIRTUALKEYBOARD_EXPORT EnterKeyAction : public QObject
 {
     Q_OBJECT
+    QML_NAMED_ELEMENT(EnterKeyAction)
+    QML_UNCREATABLE("EnterKeyAction is an abstract type that is only available as an attached property.")
+    QML_ATTACHED(EnterKeyActionAttachedType)
+    QML_ADDED_IN_VERSION(1, 0)
+    QML_EXTRA_VERSION(2, 0)
 
 public:
     enum Id {
diff --git a/src/virtualkeyboard/enterkeyactionattachedtype_p.h b/src/virtualkeyboard/enterkeyactionattachedtype_p.h
index d5c52b03..f043a0e3 100644
--- a/src/virtualkeyboard/enterkeyactionattachedtype_p.h
+++ b/src/virtualkeyboard/enterkeyactionattachedtype_p.h
@@ -54,6 +54,9 @@ class Q_VIRTUALKEYBOARD_EXPORT EnterKeyActionAttachedType : public QObject
     Q_PROPERTY(int actionId READ actionId WRITE setActionId NOTIFY actionIdChanged)
     Q_PROPERTY(QString label READ label WRITE setLabel NOTIFY labelChanged)
     Q_PROPERTY(bool enabled READ enabled WRITE setEnabled NOTIFY enabledChanged)
+    QML_ANONYMOUS
+    QML_ADDED_IN_VERSION(1, 0)
+    QML_EXTRA_VERSION(2, 0)
 
 public:
     explicit EnterKeyActionAttachedType(QObject *parent);
diff --git a/src/virtualkeyboard/inputmethod_p.h b/src/virtualkeyboard/inputmethod_p.h
index 8be3fcc6..08ba0f3c 100644
--- a/src/virtualkeyboard/inputmethod_p.h
+++ b/src/virtualkeyboard/inputmethod_p.h
@@ -41,6 +41,7 @@
 // We mean it.
 //
 
+#include <QtQml/qqml.h>
 #include <QtVirtualKeyboard/qvirtualkeyboardabstractinputmethod.h>
 #include <QtCore/private/qglobal_p.h>
 
@@ -53,6 +54,9 @@ class Q_VIRTUALKEYBOARD_EXPORT InputMethod : public QVirtualKeyboardAbstractInpu
     Q_PROPERTY(QVirtualKeyboardInputContext *inputContext READ inputContext CONSTANT)
     Q_PROPERTY(QVirtualKeyboardInputEngine *inputEngine READ inputEngine CONSTANT)
     Q_MOC_INCLUDE("qvirtualkeyboardinputcontext.h")
+    QML_NAMED_ELEMENT(InputMethod)
+    QML_ADDED_IN_VERSION(1, 0)
+    QML_EXTRA_VERSION(2, 0)
 
 public:
     explicit InputMethod(QObject *parent = nullptr);
diff --git a/src/virtualkeyboard/plaininputmethod_p.h b/src/virtualkeyboard/plaininputmethod_p.h
index 28dff5ef..4df7b4e1 100644
--- a/src/virtualkeyboard/plaininputmethod_p.h
+++ b/src/virtualkeyboard/plaininputmethod_p.h
@@ -50,6 +50,7 @@ namespace QtVirtualKeyboard {
 class Q_VIRTUALKEYBOARD_EXPORT PlainInputMethod : public QVirtualKeyboardAbstractInputMethod
 {
     Q_OBJECT
+    QML_NAMED_ELEMENT(PlainInputMethod)
 
 public:
     explicit PlainInputMethod(QObject *parent = nullptr);
diff --git a/src/virtualkeyboard/platforminputcontext.cpp b/src/virtualkeyboard/platforminputcontext.cpp
index 392c3d31..11381edc 100644
--- a/src/virtualkeyboard/platforminputcontext.cpp
+++ b/src/virtualkeyboard/platforminputcontext.cpp
@@ -222,16 +222,6 @@ bool PlatformInputContext::eventFilter(QObject *object, QEvent *event)
     return false;
 }
 
-void PlatformInputContext::setInputMethods(const QStringList &inputMethods)
-{
-    m_inputMethods = inputMethods;
-}
-
-QStringList PlatformInputContext::inputMethods() const
-{
-    return m_inputMethods;
-}
-
 void PlatformInputContext::sendEvent(QEvent *event)
 {
     if (m_focusObject) {
diff --git a/src/virtualkeyboard/platforminputcontext_p.h b/src/virtualkeyboard/platforminputcontext_p.h
index bb61a60f..a85a6c18 100644
--- a/src/virtualkeyboard/platforminputcontext_p.h
+++ b/src/virtualkeyboard/platforminputcontext_p.h
@@ -90,9 +90,6 @@ public:
 
     bool eventFilter(QObject *object, QEvent *event) override;
 
-    void setInputMethods(const QStringList &inputMethods);
-    QStringList inputMethods() const;
-
 signals:
     void focusObjectChanged();
 
@@ -111,7 +108,6 @@ private:
     friend class ::QVirtualKeyboardInputContext;
     friend class ::QVirtualKeyboardInputContextPrivate;
     QPointer<QVirtualKeyboardInputContext> m_inputContext;
-    QStringList m_inputMethods;
     QPointer<AbstractInputPanel> m_inputPanel;
     QPointer<DesktopInputSelectionControl> m_selectionControl;
     QPointer<QObject> m_focusObject;
diff --git a/src/virtualkeyboard/qvirtualkeyboard_namespace.h b/src/virtualkeyboard/qvirtualkeyboard_namespace.h
index f04e3a38..c4d7ad4c 100644
--- a/src/virtualkeyboard/qvirtualkeyboard_namespace.h
+++ b/src/virtualkeyboard/qvirtualkeyboard_namespace.h
@@ -31,6 +31,7 @@
 #define QVIRTUALKEYBOARD_NAMESPACE_H
 
 #include <QMetaEnum>
+#include <QtQml/qqml.h>
 #include <QtVirtualKeyboard/qvirtualkeyboard_global.h>
 
 QT_BEGIN_NAMESPACE
@@ -38,6 +39,7 @@ QT_BEGIN_NAMESPACE
 namespace QtVirtualKeyboard {
 
 Q_VIRTUALKEYBOARD_EXPORT Q_NAMESPACE
+QML_NAMED_ELEMENT(QtVirtualKeyboard)
 
 enum class KeyType {
     BaseKey,
diff --git a/src/virtualkeyboard/qvirtualkeyboardabstractinputmethod.h b/src/virtualkeyboard/qvirtualkeyboardabstractinputmethod.h
index 321ef676..57245b7d 100644
--- a/src/virtualkeyboard/qvirtualkeyboardabstractinputmethod.h
+++ b/src/virtualkeyboard/qvirtualkeyboardabstractinputmethod.h
@@ -30,6 +30,7 @@
 #ifndef QVIRTUALKEYBOARDABSTRACTINPUTMETHOD_H
 #define QVIRTUALKEYBOARDABSTRACTINPUTMETHOD_H
 
+#include <QtQml/qqml.h>
 #include <QtVirtualKeyboard/qvirtualkeyboardinputengine.h>
 #include <QtVirtualKeyboard/qvirtualkeyboardselectionlistmodel.h>
 
@@ -41,6 +42,9 @@ class Q_VIRTUALKEYBOARD_EXPORT QVirtualKeyboardAbstractInputMethod : public QObj
 {
     Q_OBJECT
     Q_DECLARE_PRIVATE(QVirtualKeyboardAbstractInputMethod)
+    QML_ANONYMOUS
+    QML_ADDED_IN_VERSION(1, 0)
+    QML_EXTRA_VERSION(2, 0)
 
 protected:
     QVirtualKeyboardAbstractInputMethod(QVirtualKeyboardAbstractInputMethodPrivate &dd, QObject *parent = nullptr);
diff --git a/src/virtualkeyboard/qvirtualkeyboardextensionplugin.cpp b/src/virtualkeyboard/qvirtualkeyboardextensionplugin.cpp
deleted file mode 100644
index 78bf82a1..00000000
--- a/src/virtualkeyboard/qvirtualkeyboardextensionplugin.cpp
+++ /dev/null
@@ -1,68 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2018 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 or (at your option) any later version
-** approved by the KDE Free Qt Foundation. The licenses are as published by
-** the Free Software Foundation and appearing in the file LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <QVirtualKeyboardExtensionPlugin>
-
-QT_BEGIN_NAMESPACE
-
-/*!
-    \class QVirtualKeyboardExtensionPlugin
-    \inmodule QtVirtualKeyboard
-    \brief Extension plugin for the Qt Virtual Keyboard.
-
-    Extension plugin allows customizing and extending the Qt Virtual Keyboard
-    functionality. Extension plugin can provide additional keyboard layouts and
-    input methods.
-
-    Virtual keyboard loads all the extension plugins at startup. It searches for
-    \c plugins/virtualkeyboard directory and matches the metadata found in the
-    plugin. If there are two or more extension plugins with the same \c Name, it
-    loads the one with the highest \c Version number.
-
-    \sa {Virtual Keyboard Extension Plugin}
-*/
-
-QVirtualKeyboardExtensionPlugin::~QVirtualKeyboardExtensionPlugin()
-{
-}
-
-/*!
-    If the plugin metadata contains \c InputMethod field defining an input method
-    name, Qt Virtual Keyboard will call registerTypes() for registering the input
-    method as QML type. The type must be registered with a \a uri if the input method
-    is used by the default keyboard layouts. If the input method type is only used in
-    private layouts (known only by the plugin), the uri can be omitted and chosen
-    freely.
-*/
-void QVirtualKeyboardExtensionPlugin::registerTypes(const char *uri) const
-{
-    Q_UNUSED(uri);
-}
-
-QT_END_NAMESPACE
diff --git a/src/virtualkeyboard/qvirtualkeyboardextensionplugin.h b/src/virtualkeyboard/qvirtualkeyboardextensionplugin.h
deleted file mode 100644
index 40db69da..00000000
--- a/src/virtualkeyboard/qvirtualkeyboardextensionplugin.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2018 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 or (at your option) any later version
-** approved by the KDE Free Qt Foundation. The licenses are as published by
-** the Free Software Foundation and appearing in the file LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QVIRTUALKEYBOARDEXTENSIONPLUGIN_H
-#define QVIRTUALKEYBOARDEXTENSIONPLUGIN_H
-
-#include <QtVirtualKeyboard/qvirtualkeyboard_global.h>
-#include <QtCore/QtPlugin>
-
-QT_BEGIN_NAMESPACE
-
-#define QVirtualKeyboardExtensionPluginFactoryInterface_iid "org.qt-project.qt.virtualkeyboard.plugin/5.12"
-
-class Q_VIRTUALKEYBOARD_EXPORT QVirtualKeyboardExtensionPlugin : public QObject
-{
-    Q_OBJECT
-public:
-    virtual ~QVirtualKeyboardExtensionPlugin();
-
-    virtual void registerTypes(const char *uri) const;
-};
-
-Q_DECLARE_INTERFACE(QVirtualKeyboardExtensionPlugin,
-                    QVirtualKeyboardExtensionPluginFactoryInterface_iid)
-
-QT_END_NAMESPACE
-
-#endif
diff --git a/src/virtualkeyboard/qvirtualkeyboard_staticplugin_p.h b/src/virtualkeyboard/qvirtualkeyboardfeatures_namespace_p.h
index cf14443a..076540b5 100644
--- a/src/virtualkeyboard/qvirtualkeyboard_staticplugin_p.h
+++ b/src/virtualkeyboard/qvirtualkeyboardfeatures_namespace_p.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2018 The Qt Company Ltd.
+** Copyright (C) 2022 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit.
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 
-#ifndef QVIRTUALKEYBOARD_STATICPLUGIN_P_H
-#define QVIRTUALKEYBOARD_STATICPLUGIN_P_H
+#ifndef QVIRTUALKEYBOARDFEATURES_NAMESPACE_P_H
+#define QVIRTUALKEYBOARDFEATURES_NAMESPACE_P_H
 
 //
 //  W A R N I N G
@@ -41,30 +41,31 @@
 // We mean it.
 //
 
-#if defined(QT_STATICPLUGIN)
-#include <QtPlugin>
-#include <QPluginLoader>
-#include <private/qglobal_p.h>
+#include <QMetaEnum>
+#include <QtQml/qqml.h>
+#include <QtVirtualKeyboard/private/qtvirtualkeyboardexports_p.h>
+#include <QtVirtualKeyboard/private/qtvirtualkeyboard-config_p.h>
 
 QT_BEGIN_NAMESPACE
 
-// This macro is similar to Q_IMPORT_PLUGIN, except it does not
-// register duplicate entries as static plugins.
-// The check is required since the application may already have
-// initialized the plugin by its own dependencies.
-#define Q_VKB_IMPORT_PLUGIN(PLUGIN) \
-        extern const QT_PREPEND_NAMESPACE(QStaticPlugin) qt_static_plugin_##PLUGIN(); \
-        class Static##PLUGIN##PluginInstance{ \
-        public: \
-                Static##PLUGIN##PluginInstance() { \
-                    if (!QPluginLoader::staticInstances().contains(qt_static_plugin_##PLUGIN().instance())) \
-                        qRegisterStaticPluginFunction(qt_static_plugin_##PLUGIN()); \
-                } \
-        }; \
-       static Static##PLUGIN##PluginInstance static##PLUGIN##Instance;
+namespace QVirtualKeyboardFeatures {
 
-QT_END_NAMESPACE
+Q_VIRTUALKEYBOARD_PRIVATE_EXPORT Q_NAMESPACE
+QML_NAMED_ELEMENT(VirtualKeyboardFeatures)
 
+enum Feature {
+    Handwriting =
+#if QT_CONFIG(cerence_hwr) || QT_CONFIG(myscript)
+         1
+#else
+         0
 #endif
+     // possibly extend for other things you may want to detect in the future
+};
+Q_ENUM_NS(Feature)
+
+} // namespace QVirtualKeyboardFeatures
+
+QT_END_NAMESPACE
 
-#endif // QVIRTUALKEYBOARD_STATICPLUGIN_P_H
+#endif // QVIRTUALKEYBOARDFEATURES_NAMESPACE_P_H
diff --git a/src/virtualkeyboard/qvirtualkeyboardinputcontext.h b/src/virtualkeyboard/qvirtualkeyboardinputcontext.h
index 7cc86ada..477ff472 100644
--- a/src/virtualkeyboard/qvirtualkeyboardinputcontext.h
+++ b/src/virtualkeyboard/qvirtualkeyboardinputcontext.h
@@ -35,6 +35,7 @@
 #include <QLocale>
 #include <QInputMethodEvent>
 #include <QInputMethod>
+#include <QtQml/qqml.h>
 #include <QtVirtualKeyboard/qvirtualkeyboard_global.h>
 
 QT_BEGIN_NAMESPACE
@@ -75,6 +76,10 @@ class Q_VIRTUALKEYBOARD_EXPORT QVirtualKeyboardInputContext : public QObject
     Q_PROPERTY(QVirtualKeyboardObserver *keyboardObserver READ keyboardObserver CONSTANT REVISION(6, 1))
     Q_MOC_INCLUDE("qvirtualkeyboardinputengine.h")
     Q_MOC_INCLUDE("qvirtualkeyboardinputcontext_p.h")
+    QML_NAMED_ELEMENT(InputContext)
+    QML_SINGLETON
+    QML_ADDED_IN_VERSION(1, 0)
+    QML_EXTRA_VERSION(2, 0)
 
 public:
     explicit QVirtualKeyboardInputContext(QObject *parent = nullptr);
diff --git a/src/virtualkeyboard/qvirtualkeyboardinputcontext_p.cpp b/src/virtualkeyboard/qvirtualkeyboardinputcontext_p.cpp
index 96d80d68..d286d46e 100644
--- a/src/virtualkeyboard/qvirtualkeyboardinputcontext_p.cpp
+++ b/src/virtualkeyboard/qvirtualkeyboardinputcontext_p.cpp
@@ -190,11 +190,6 @@ ShadowInputContext *QVirtualKeyboardInputContextPrivate::shadow() const
     return const_cast<ShadowInputContext *>(&_shadow);
 }
 
-QStringList QVirtualKeyboardInputContextPrivate::inputMethods() const
-{
-    return platformInputContext ? platformInputContext->inputMethods() : QStringList();
-}
-
 void QVirtualKeyboardInputContextPrivate::setKeyboardObserver(QVirtualKeyboardObserver *keyboardObserver)
 {
     if (!this->keyboardObserver.isNull())
diff --git a/src/virtualkeyboard/qvirtualkeyboardinputcontext_p.h b/src/virtualkeyboard/qvirtualkeyboardinputcontext_p.h
index 3409e95e..708dee6a 100644
--- a/src/virtualkeyboard/qvirtualkeyboardinputcontext_p.h
+++ b/src/virtualkeyboard/qvirtualkeyboardinputcontext_p.h
@@ -78,8 +78,10 @@ class Q_VIRTUALKEYBOARD_EXPORT QVirtualKeyboardInputContextPrivate : public QObj
     Q_PROPERTY(QObject *inputItem READ inputItem NOTIFY inputItemChanged)
     Q_PROPERTY(QtVirtualKeyboard::ShiftHandler *shiftHandler READ shiftHandler CONSTANT)
     Q_PROPERTY(QtVirtualKeyboard::ShadowInputContext *shadow READ shadow CONSTANT)
-    Q_PROPERTY(QStringList inputMethods READ inputMethods CONSTANT)
     Q_MOC_INCLUDE("shifthandler_p.h")
+    QML_NAMED_ELEMENT(InputContextPrivate)
+    QML_UNCREATABLE("InputContextPrivate is only available via InputContext.priv")
+    QML_ADDED_IN_VERSION(2, 0)
 
     explicit QVirtualKeyboardInputContextPrivate(QVirtualKeyboardInputContext *q_ptr);
     void init();
@@ -111,7 +113,6 @@ public:
     QObject *inputItem() const;
     QtVirtualKeyboard::ShiftHandler *shiftHandler() const;
     QtVirtualKeyboard::ShadowInputContext *shadow() const;
-    QStringList inputMethods() const;
     Q_INVOKABLE void setKeyboardObserver(QVirtualKeyboardObserver *keyboardObserver);
 
     // Helper functions
diff --git a/src/virtualkeyboard/qvirtualkeyboardinputengine.h b/src/virtualkeyboard/qvirtualkeyboardinputengine.h
index 9f2bbf2e..a4e206ec 100644
--- a/src/virtualkeyboard/qvirtualkeyboardinputengine.h
+++ b/src/virtualkeyboard/qvirtualkeyboardinputengine.h
@@ -32,6 +32,7 @@
 
 #include <QObject>
 #include <QPointer>
+#include <QtQml/qqml.h>
 #include <QtVirtualKeyboard/qvirtualkeyboard_global.h>
 
 QT_BEGIN_NAMESPACE
@@ -56,6 +57,10 @@ class Q_VIRTUALKEYBOARD_EXPORT QVirtualKeyboardInputEngine : public QObject
     Q_PROPERTY(QVirtualKeyboardSelectionListModel *wordCandidateListModel READ wordCandidateListModel NOTIFY wordCandidateListModelChanged)
     Q_PROPERTY(bool wordCandidateListVisibleHint READ wordCandidateListVisibleHint NOTIFY wordCandidateListVisibleHintChanged)
     Q_MOC_INCLUDE("qvirtualkeyboardabstractinputmethod.h")
+    QML_NAMED_ELEMENT(InputEngine)
+    QML_UNCREATABLE("InputEngine is only available via InputContext.inputEngine")
+    QML_ADDED_IN_VERSION(1, 0)
+    QML_EXTRA_VERSION(2, 0)
 
     explicit QVirtualKeyboardInputEngine(QVirtualKeyboardInputContext *parent = nullptr);
     void init();
diff --git a/src/virtualkeyboard/qvirtualkeyboardobserver.h b/src/virtualkeyboard/qvirtualkeyboardobserver.h
index aab1c463..b08755a4 100644
--- a/src/virtualkeyboard/qvirtualkeyboardobserver.h
+++ b/src/virtualkeyboard/qvirtualkeyboardobserver.h
@@ -32,6 +32,7 @@
 
 #include <QObject>
 #include <QVariant>
+#include <QtQml/qqml.h>
 #include <QtVirtualKeyboard/qvirtualkeyboard_global.h>
 
 QT_BEGIN_NAMESPACE
@@ -44,6 +45,8 @@ class Q_VIRTUALKEYBOARD_EXPORT QVirtualKeyboardObserver : public QObject
     Q_DECLARE_PRIVATE(QVirtualKeyboardObserver)
     Q_DISABLE_COPY(QVirtualKeyboardObserver)
     Q_PROPERTY(QVariant layout READ layout NOTIFY layoutChanged)
+    QML_NAMED_ELEMENT(KeyboardObserver)
+    QML_ADDED_IN_VERSION(6, 1)
 
 public:
     explicit QVirtualKeyboardObserver(QObject *parent = nullptr);
diff --git a/src/virtualkeyboard/qvirtualkeyboardselectionlistmodel.h b/src/virtualkeyboard/qvirtualkeyboardselectionlistmodel.h
index c19d9ed1..ff2f4424 100644
--- a/src/virtualkeyboard/qvirtualkeyboardselectionlistmodel.h
+++ b/src/virtualkeyboard/qvirtualkeyboardselectionlistmodel.h
@@ -31,6 +31,7 @@
 #define QVIRTUALKEYBOARDSELECTIONLISTMODEL_H
 
 #include <QAbstractListModel>
+#include <QtQml/qqml.h>
 #include <QtVirtualKeyboard/qvirtualkeyboard_global.h>
 
 QT_BEGIN_NAMESPACE
@@ -44,6 +45,10 @@ class Q_VIRTUALKEYBOARD_EXPORT QVirtualKeyboardSelectionListModel : public QAbst
     Q_OBJECT
     Q_DECLARE_PRIVATE(QVirtualKeyboardSelectionListModel)
     Q_PROPERTY(int count READ count NOTIFY countChanged)
+    QML_NAMED_ELEMENT(SelectionListModel)
+    QML_UNCREATABLE("SelectionListModel is only available via InputEngine.wordCandidateListModel")
+    QML_ADDED_IN_VERSION(1, 0)
+    QML_EXTRA_VERSION(2, 0)
 
     explicit QVirtualKeyboardSelectionListModel(QObject *parent = nullptr);
 
diff --git a/src/virtualkeyboard/qvirtualkeyboardtrace.h b/src/virtualkeyboard/qvirtualkeyboardtrace.h
index ba582421..73f9dfb1 100644
--- a/src/virtualkeyboard/qvirtualkeyboardtrace.h
+++ b/src/virtualkeyboard/qvirtualkeyboardtrace.h
@@ -33,6 +33,7 @@
 #include <QObject>
 #include <QVariant>
 #include <QPointF>
+#include <QtQml/qqml.h>
 #include <QtVirtualKeyboard/qvirtualkeyboard_global.h>
 
 QT_BEGIN_NAMESPACE
@@ -49,6 +50,10 @@ class Q_VIRTUALKEYBOARD_EXPORT QVirtualKeyboardTrace : public QObject
     Q_PROPERTY(bool final READ isFinal WRITE setFinal NOTIFY finalChanged)
     Q_PROPERTY(bool canceled READ isCanceled WRITE setCanceled NOTIFY canceledChanged)
     Q_PROPERTY(qreal opacity READ opacity WRITE setOpacity NOTIFY opacityChanged)
+    QML_NAMED_ELEMENT(Trace)
+    QML_UNCREATABLE("Trace object is created by InputContext.inputEngine.traceBegin() function")
+    QML_ADDED_IN_VERSION(2, 0)
+
 public:
     explicit QVirtualKeyboardTrace(QObject *parent = nullptr);
     ~QVirtualKeyboardTrace();
diff --git a/src/virtualkeyboard/shadowinputcontext_p.h b/src/virtualkeyboard/shadowinputcontext_p.h
index d0e1c63f..562dfdfc 100644
--- a/src/virtualkeyboard/shadowinputcontext_p.h
+++ b/src/virtualkeyboard/shadowinputcontext_p.h
@@ -45,6 +45,7 @@
 #include <QPointer>
 #include <QMetaType>
 #include <QRectF>
+#include <QtQml/qqml.h>
 #include <QtVirtualKeyboard/qvirtualkeyboard_global.h>
 #include <QtCore/private/qglobal_p.h>
 
@@ -68,6 +69,8 @@ class Q_VIRTUALKEYBOARD_EXPORT ShadowInputContext : public QObject
     Q_PROPERTY(bool anchorRectIntersectsClipRect READ anchorRectIntersectsClipRect NOTIFY anchorRectIntersectsClipRectChanged)
     Q_PROPERTY(bool cursorRectIntersectsClipRect READ cursorRectIntersectsClipRect NOTIFY cursorRectIntersectsClipRectChanged)
     Q_PROPERTY(bool selectionControlVisible READ selectionControlVisible NOTIFY selectionControlVisibleChanged)
+    QML_NAMED_ELEMENT(ShadowInputContext)
+    QML_UNCREATABLE("ShadowInputContext is only available via InputContext.priv.shadow")
 
     explicit ShadowInputContext(QObject *parent = nullptr);
 
diff --git a/src/virtualkeyboard/shifthandler_p.h b/src/virtualkeyboard/shifthandler_p.h
index 2b75f4d3..bfb5e2ed 100644
--- a/src/virtualkeyboard/shifthandler_p.h
+++ b/src/virtualkeyboard/shifthandler_p.h
@@ -42,6 +42,7 @@
 //
 
 #include <QObject>
+#include <QtQml/qqml.h>
 #include <QtVirtualKeyboard/qvirtualkeyboard_global.h>
 #include <QtCore/private/qglobal_p.h>
 
@@ -65,6 +66,10 @@ class Q_VIRTUALKEYBOARD_EXPORT ShiftHandler : public QObject
     Q_PROPERTY(bool shiftActive READ isShiftActive WRITE setShiftActive NOTIFY shiftActiveChanged)
     Q_PROPERTY(bool capsLockActive READ isCapsLockActive WRITE setCapsLockActive NOTIFY capsLockActiveChanged)
     Q_PROPERTY(bool uppercase READ isUppercase NOTIFY uppercaseChanged)
+    QML_NAMED_ELEMENT(ShiftHandler)
+    QML_UNCREATABLE("ShiftHandler is only available via InputContextPrivate.shiftHandler")
+    QML_ADDED_IN_VERSION(1, 0)
+    QML_EXTRA_VERSION(2, 0)
 
     explicit ShiftHandler(QVirtualKeyboardInputContext *parent = nullptr);
     void init();
diff --git a/src/virtualkeyboard/virtualkeyboard_p.h b/src/virtualkeyboard/virtualkeyboard_p.h
index b152f248..d3e819e8 100644
--- a/src/virtualkeyboard/virtualkeyboard_p.h
+++ b/src/virtualkeyboard/virtualkeyboard_p.h
@@ -41,7 +41,7 @@
 // We mean it.
 //
 
-#include <qqml.h>
+#include <QtQml/qqml.h>
 #include <QtVirtualKeyboard/qvirtualkeyboard_global.h>
 #include <QtCore/private/qglobal_p.h>
 
@@ -53,6 +53,8 @@ class VirtualKeyboardAttachedType;
 class Q_VIRTUALKEYBOARD_EXPORT VirtualKeyboard : public QObject
 {
     Q_OBJECT
+    QML_ATTACHED(VirtualKeyboardAttachedType)
+    QML_ADDED_IN_VERSION(6, 1)
 
 public:
     static VirtualKeyboardAttachedType *qmlAttachedProperties(QObject *object);
diff --git a/src/virtualkeyboard/virtualkeyboardattachedtype_p.h b/src/virtualkeyboard/virtualkeyboardattachedtype_p.h
index 5a776f87..45710e12 100644
--- a/src/virtualkeyboard/virtualkeyboardattachedtype_p.h
+++ b/src/virtualkeyboard/virtualkeyboardattachedtype_p.h
@@ -52,6 +52,8 @@ class Q_VIRTUALKEYBOARD_EXPORT VirtualKeyboardAttachedType : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(QStringList extraDictionaries READ extraDictionaries WRITE setExtraDictionaries NOTIFY extraDictionariesChanged)
+    QML_ANONYMOUS
+    QML_ADDED_IN_VERSION(6, 1)
 
 public:
     explicit VirtualKeyboardAttachedType(QObject *parent);
diff --git a/sync.profile b/sync.profile
index 476934c8..7dd2647c 100644
--- a/sync.profile
+++ b/sync.profile
@@ -1,6 +1,6 @@
 %modules = ( # path to module name map
     "QtVirtualKeyboard" => "$basedir/src/virtualkeyboard",
-    "QtHunspellInputMethod" => "$basedir/src/plugins/hunspell/hunspellinputmethod",
+    "QtHunspellInputMethod" => "$basedir/src/plugins/hunspell/module",
 );
 %moduleheaders = ( # restrict the module headers to those found in relative path
 );
diff --git a/tests/auto/layoutfilesystem/data/layouts/en_GB/main.qml b/tests/auto/layoutfilesystem/data/layouts/en_GB/main.qml
index 184cf497..e0b32f5e 100644
--- a/tests/auto/layoutfilesystem/data/layouts/en_GB/main.qml
+++ b/tests/auto/layoutfilesystem/data/layouts/en_GB/main.qml
@@ -29,6 +29,7 @@
 
 import QtQuick
 import QtQuick.VirtualKeyboard
+import QtQuick.VirtualKeyboard.Components
 
 KeyboardLayout {
     objectName: "en_GB"
diff --git a/tests/auto/layoutresources/data/layouts/en_GB/main.qml b/tests/auto/layoutresources/data/layouts/en_GB/main.qml
index 184cf497..e0b32f5e 100644
--- a/tests/auto/layoutresources/data/layouts/en_GB/main.qml
+++ b/tests/auto/layoutresources/data/layouts/en_GB/main.qml
@@ -29,6 +29,7 @@
 
 import QtQuick
 import QtQuick.VirtualKeyboard
+import QtQuick.VirtualKeyboard.Components
 
 KeyboardLayout {
     objectName: "en_GB"
diff --git a/tests/auto/styles/data/tst_styles.qml b/tests/auto/styles/data/tst_styles.qml
index 6a2b4e91..cac15664 100644
--- a/tests/auto/styles/data/tst_styles.qml
+++ b/tests/auto/styles/data/tst_styles.qml
@@ -30,6 +30,7 @@
 import QtTest
 import QtQuick
 import QtQuick.VirtualKeyboard.Settings
+import QtQuick.VirtualKeyboard.Styles
 
 Item {