aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJarkko Koivikko <jarkko.koivikko@code-q.fi>2019-09-03 22:21:17 +0300
committerJarkko Koivikko <jarkko.koivikko@code-q.fi>2019-09-05 12:34:00 +0300
commit21e5ab030d2f735560b7ab381dfaf8d468c247ff (patch)
tree555a649f50f515a746c464993c8e13d97aa342d5
parent6143eec2525af08e6aab895bcf64c2745a427f13 (diff)
Remove incorrect QML singleton registration
- Commit 5260805b162030a6900bacf46d2a55b69075ae09 added an incorrect QML singleton registration which will cause duplicate instances of the singleton with application using inconsistent QtVirtualKeyboard imports. - This registration is also unnecessary and can be removed, since the version number is already registered with the other components. Change-Id: I7ef9688d08ca2ec0a697f7de4159140951f096a7 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
-rw-r--r--src/import/qtquickvirtualkeyboardplugin.cpp3
1 files changed, 0 insertions, 3 deletions
diff --git a/src/import/qtquickvirtualkeyboardplugin.cpp b/src/import/qtquickvirtualkeyboardplugin.cpp
index 9fa769e8..ba866023 100644
--- a/src/import/qtquickvirtualkeyboardplugin.cpp
+++ b/src/import/qtquickvirtualkeyboardplugin.cpp
@@ -145,9 +145,6 @@ void QtQuickVirtualKeyboardPlugin::registerTypes(const char *uri)
qmlRegisterType(QUrl(componentsPath + QLatin1String("SelectionControl.qml")), uri, 2, 1, "SelectionControl");
qmlRegisterType(QUrl(componentsPath + QLatin1String("InputModeKey.qml")), uri, 2, 3, "InputModeKey");
- // New revisions in 5.12.
- qmlRegisterSingletonType<QVirtualKeyboardInputContext>(uri, 2, 4, "InputContext", createInputContextModule);
-
// Auto-increment the import to stay in sync with ALL future QtQuick minor versions
qmlRegisterModule(uri, 2, QT_VERSION_MINOR);
}