1 files changed, 9 insertions, 2 deletions
diff --git a/src/plugins/platforms/windows/qwindowsinputcontext.h b/src/plugins/platforms/windows/qwindowsinputcontext.h
index 110986c20c..636d481e70 100644
--- a/src/plugins/platforms/windows/qwindowsinputcontext.h
+++ b/src/plugins/platforms/windows/qwindowsinputcontext.h
@@ -36,12 +36,14 @@
 
 #include "qtwindows_additional.h"
 
+#include <QtCore/QLocale>
 #include <QtCore/QPointer>
 #include <qpa/qplatforminputcontext.h>
 
 QT_BEGIN_NAMESPACE
 
 class QInputMethodEvent;
+class QWindowsWindow;
 
 class QWindowsInputContext : public QPlatformInputContext
 {
@@ -62,14 +64,16 @@ public:
     explicit QWindowsInputContext();
     ~QWindowsInputContext();
 
+    static void setWindowsImeEnabled(QWindowsWindow *platformWindow, bool enabled);
+
     bool hasCapability(Capability capability) const Q_DECL_OVERRIDE;
+    QLocale locale() const Q_DECL_OVERRIDE { return m_locale; }
+
     void reset() Q_DECL_OVERRIDE;
     void update(Qt::InputMethodQueries) Q_DECL_OVERRIDE;
     void invokeAction(QInputMethod::Action, int cursorPosition) Q_DECL_OVERRIDE;
     void setFocusObject(QObject *object) Q_DECL_OVERRIDE;
 
-    static QWindowsInputContext *instance();
-
     bool startComposition(HWND hwnd);
     bool composition(HWND hwnd, LPARAM lParam);
     bool endComposition(HWND hwnd);
@@ -78,6 +82,7 @@ public:
     int reconvertString(RECONVERTSTRING *reconv);
 
     bool handleIME_Request(WPARAM wparam, LPARAM lparam, LRESULT *result);
+    void handleInputLanguageChanged(WPARAM wparam, LPARAM lparam);
 
 private slots:
     void cursorRectChanged();
@@ -93,6 +98,8 @@ private:
     static HIMC m_defaultContext;
     CompositionContext m_compositionContext;
     bool m_endCompositionRecursionGuard;
+    LCID m_languageId;
+    QLocale m_locale;
 };
 
 QT_END_NAMESPACE