Merge remote-tracking branch 'origin/5.11' into dev

Change-Id: I391752a6af04671b12f88a5980b1fb7ed62921c6

3 files changed, 17 insertions, 9 deletions

diff --git a/src/virtualkeyboard/content/InputPanel.qml b/src/virtualkeyboard/content/InputPanel.qml
index ec771c4e..e41756a7 100644
--- a/src/virtualkeyboard/content/InputPanel.qml
+++ b/src/virtualkeyboard/content/InputPanel.qml
@@ -111,6 +111,9 @@ Item {
     /*! \internal */
     property alias keyboard: keyboard
 
+    /*! \internal */
+    readonly property bool __isRootItem: inputPanel.parent != null && inputPanel.parent.parent == null
+
     SelectionControl {
         objectName: "selectionControl"
         x: -parent.x
@@ -130,4 +133,15 @@ Item {
         anchors.fill: keyboard
         enabled: active
     }
+
+    Binding {
+        target: InputContext
+        property: "keyboardRectangle"
+        value: mapToItem(null,
+                         __isRootItem ? keyboard.x : x,
+                         (__isRootItem ? keyboard.y : y) + keyboard.wordCandidateView.currentYOffset - (keyboard.shadowInputControl.visible ? keyboard.shadowInputControl.height : 0),
+                         keyboard.width,
+                         keyboard.height - keyboard.wordCandidateView.currentYOffset + (keyboard.shadowInputControl.visible ? keyboard.shadowInputControl.height : 0))
+        when: !InputContext.animating
+    }
 }
diff --git a/src/virtualkeyboard/content/components/Keyboard.qml b/src/virtualkeyboard/content/components/Keyboard.qml
index 5a2e76eb..ce02d406 100644
--- a/src/virtualkeyboard/content/components/Keyboard.qml
+++ b/src/virtualkeyboard/content/components/Keyboard.qml
@@ -40,6 +40,8 @@ Item {
     objectName: "keyboard"
 
     property alias style: styleLoader.item
+    property alias wordCandidateView: wordCandidateView
+    property alias shadowInputControl: shadowInputControl
     property var activeKey: null
     property TouchPoint activeTouchPoint
     property int localeIndex: -1
@@ -470,15 +472,6 @@ Item {
     }
     Binding {
         target: InputContext
-        property: "keyboardRectangle"
-        value: Qt.rect(keyboard.x,
-                       keyboard.y + wordCandidateView.currentYOffset - (shadowInputControl.visible ? shadowInputControl.height : 0),
-                       keyboard.width,
-                       keyboard.height - wordCandidateView.currentYOffset + (shadowInputControl.visible ? shadowInputControl.height : 0))
-        when: keyboard.active && !InputContext.animating
-    }
-    Binding {
-        target: InputContext
         property: "previewRectangle"
         value: characterPreview.previewRect
         when: characterPreview.visible
diff --git a/src/virtualkeyboard/virtualkeyboard.pro b/src/virtualkeyboard/virtualkeyboard.pro
index 3b4a2b96..73b2055a 100644
--- a/src/virtualkeyboard/virtualkeyboard.pro
+++ b/src/virtualkeyboard/virtualkeyboard.pro
@@ -5,6 +5,7 @@ QMAKE_DOCS = $$PWD/doc/qtvirtualkeyboard.qdocconf
 include(doc/doc.pri)
 
 QT += qml quick gui gui-private core-private
+CONFIG += qtquickcompiler
 
 win32 {
     CONFIG += no-pkg-config