Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev

1 files changed, 5 insertions, 1 deletions

diff --git a/src/plugins/platforms/qnx/qqnxinputcontext_imf.h b/src/plugins/platforms/qnx/qqnxinputcontext_imf.h
index 72c52300bb..1980a99ed9 100644
--- a/src/plugins/platforms/qnx/qqnxinputcontext_imf.h
+++ b/src/plugins/platforms/qnx/qqnxinputcontext_imf.h
@@ -54,21 +54,24 @@
 QT_BEGIN_NAMESPACE
 
 class QQnxAbstractVirtualKeyboard;
+class QQnxIntegration;
 
 class QQnxInputContext : public QPlatformInputContext
 {
     Q_OBJECT
 public:
-    explicit QQnxInputContext(QQnxAbstractVirtualKeyboard &keyboard);
+    explicit QQnxInputContext(QQnxIntegration *integration, QQnxAbstractVirtualKeyboard &keyboard);
     ~QQnxInputContext();
 
     bool isValid() const;
 
     bool filterEvent(const QEvent *event);
+    QRectF keyboardRect() const;
     void reset();
     void update(Qt::InputMethodQueries);
     bool handleKeyboardEvent(int flags, int sym, int mod, int scan, int cap);
 
+
     void showInputPanel();
     void hideInputPanel();
     bool isInputPanelVisible() const;
@@ -125,6 +128,7 @@ private:
     QString m_composingText;
     bool m_inputPanelVisible;
     QLocale m_inputPanelLocale;
+    QQnxIntegration *m_integration;
     QQnxAbstractVirtualKeyboard &m_virtualKeyboad;
 };