aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-12-07 03:00:55 +0100
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-12-07 03:00:55 +0100
commite0bbba4b9ccf10db9df92add0b86aa25e982339d (patch)
tree4d47727d359c97a20f3f8adfb23a289d307a22d6
parent6ca59d925a4f5d04004abd47bde662c08dd15a07 (diff)
parentfe5aeead7bebda08b4bd3ad29aa472bf6794fb29 (diff)
Merge remote-tracking branch 'origin/5.14' into 5.15
-rw-r--r--src/plugin/plugin.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/plugin/plugin.cpp b/src/plugin/plugin.cpp
index 9d5be9bf..2c50d324 100644
--- a/src/plugin/plugin.cpp
+++ b/src/plugin/plugin.cpp
@@ -100,6 +100,9 @@ QPlatformInputContext *QVirtualKeyboardPlugin::create(const QString &system, con
}
}
+ // 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;