Merge remote-tracking branch 'origin/tqtc/lts-5.15.9' into tqtc/lts-5.15-opensourcev5.15.9-lts-lgpl

Change-Id: I3f20c46733904bc81d361a8165cd381cf3573e03

1 files changed, 9 insertions, 0 deletions

diff --git a/src/plugin/plugin.cpp b/src/plugin/plugin.cpp
index 122a671d..d5762fe0 100644
--- a/src/plugin/plugin.cpp
+++ b/src/plugin/plugin.cpp
@@ -34,6 +34,9 @@
 #include <QtVirtualKeyboard/private/qvirtualkeyboard_staticplugin_p.h>
 #include <QLoggingCategory>
 #include <QtQml>
+#if defined(Q_OS_WIN)
+#include <qt_windows.h>
+#endif
 
 QT_BEGIN_NAMESPACE
 
@@ -73,6 +76,12 @@ QPlatformInputContext *QVirtualKeyboardPlugin::create(const QString &system, con
 
     if (system.compare(system, QLatin1String(pluginName), Qt::CaseInsensitive) != 0)
         return Q_NULLPTR;
+
+#if defined(Q_OS_WIN)
+    // QTBUG-93042
+    ImmDisableIME(0);
+#endif
+
     PlatformInputContext *platformInputContext = new PlatformInputContext();
 
     QStringList inputMethodList;