Merge remote-tracking branch 'origin/5.6' into 5.7

Change-Id: I35ca979395620e104e50b06366d0869433a4ffc2

1 files changed, 2 insertions, 1 deletions

diff --git a/src/plugins/platforms/windows/qwindowsinputcontext.h b/src/plugins/platforms/windows/qwindowsinputcontext.h
index f8ff08aa7c..4c08fa0ef2 100644
--- a/src/plugins/platforms/windows/qwindowsinputcontext.h
+++ b/src/plugins/platforms/windows/qwindowsinputcontext.h
@@ -65,6 +65,7 @@ class QWindowsInputContext : public QPlatformInputContext
         int position;
         bool isComposing;
         QPointer<QObject> focusObject;
+        qreal factor;
     };
 public:
     explicit QWindowsInputContext();
@@ -94,7 +95,7 @@ private slots:
     void cursorRectChanged();
 
 private:
-    void initContext(HWND hwnd, QObject *focusObject);
+    void initContext(HWND hwnd, qreal factor, QObject *focusObject);
     void doneContext();
     void startContextComposition();
     void endContextComposition();