8 files changed, 73 insertions, 6 deletions
diff --git a/tests/auto/quick/qquicktextinput/data/checkCursorDelegateWhenPaddingChanged.qml b/tests/auto/quick/qquicktextinput/data/checkCursorDelegateWhenPaddingChanged.qml
new file mode 100644
index 0000000000..e6f07b4687
--- /dev/null
+++ b/tests/auto/quick/qquicktextinput/data/checkCursorDelegateWhenPaddingChanged.qml
@@ -0,0 +1,16 @@
+import QtQuick 2.12
+
+Rectangle {
+    width: 200
+    height: 200
+    TextInput {
+        objectName: "textInput"
+        leftPadding: 10
+        focus: true
+        cursorDelegate: Rectangle {
+            objectName: "cursorDelegate"
+            width: 5
+            color: "red"
+        }
+    }
+}
diff --git a/tests/auto/quick/qquicktextinput/data/cursorTest.qml b/tests/auto/quick/qquicktextinput/data/cursorTest.qml
index 363d37174b..44e81f9522 100644
--- a/tests/auto/quick/qquicktextinput/data/cursorTest.qml
+++ b/tests/auto/quick/qquicktextinput/data/cursorTest.qml
@@ -2,7 +2,7 @@ import QtQuick 2.0
 
 Rectangle { id:rect; width: 300; height: 300; color: "white"
     property string contextualProperty: "Hello"
-    TextInput {  text: "Hello world!"; id: textInputObject; objectName: "textInputObject"
+    TextInput {  text: "Hello my wonderful world!"; id: textInputObject; objectName: "textInputObject"
         width: 300; height: 300
         resources: [ Component { id:cursor; Item { id:cursorInstance; objectName: "cursorInstance"; property string localProperty: contextualProperty } } ]
         cursorDelegate: cursor
diff --git a/tests/auto/quick/qquicktextinput/data/cursorTestExternal.qml b/tests/auto/quick/qquicktextinput/data/cursorTestExternal.qml
index 31ee01db99..1e2c91e9cc 100644
--- a/tests/auto/quick/qquicktextinput/data/cursorTestExternal.qml
+++ b/tests/auto/quick/qquicktextinput/data/cursorTestExternal.qml
@@ -3,7 +3,7 @@ import QtQuick 2.0
 Rectangle { width: 300; height: 300; color: "white"
     property string contextualProperty: "Hello"
     TextInput {
-        text: "Hello world!"
+        text: "Hello my wonderful world!"
         id: textInputObject;
         objectName: "textInputObject"
         width: 300; height: 300
diff --git a/tests/auto/quick/qquicktextinput/data/cursorTestInline.qml b/tests/auto/quick/qquicktextinput/data/cursorTestInline.qml
index b699ed2752..b7ad69962e 100644
--- a/tests/auto/quick/qquicktextinput/data/cursorTestInline.qml
+++ b/tests/auto/quick/qquicktextinput/data/cursorTestInline.qml
@@ -3,7 +3,7 @@ import QtQuick 2.0
 Rectangle { width: 300; height: 300; color: "white"
     property string contextualProperty: "Hello"
     TextInput {
-        text: "Hello world!"
+        text: "Hello my wonderful world!"
         id: textInputObject
         objectName: "textInputObject"
         width: 300; height: 300
diff --git a/tests/auto/quick/qquicktextinput/data/focusReason.qml b/tests/auto/quick/qquicktextinput/data/focusReason.qml
new file mode 100644
index 0000000000..7ac913d363
--- /dev/null
+++ b/tests/auto/quick/qquicktextinput/data/focusReason.qml
@@ -0,0 +1,39 @@
+import QtQuick 2.2
+
+Rectangle {
+    width: 400
+    height: 400
+
+    Column {
+        spacing: 5
+        TextInput {
+            id: first
+            objectName: "first"
+            width: 100
+            Rectangle { anchors.fill: parent; color: parent.activeFocus ? "red" : "blue"; opacity: 0.3 }
+            KeyNavigation.backtab: third
+            KeyNavigation.tab: second
+            KeyNavigation.down: second
+        }
+        TextInput {
+            id: second
+            objectName: "second"
+            width: 100
+            Rectangle { anchors.fill: parent; color: parent.activeFocus ? "red" : "blue"; opacity: 0.3 }
+            KeyNavigation.up: first
+            KeyNavigation.backtab: first
+            KeyNavigation.tab: third
+        }
+        TextInput {
+            objectName: "third"
+            id: third
+            width: 100
+            Rectangle { anchors.fill: parent; color: parent.activeFocus ? "red" : "blue"; opacity: 0.3 }
+            KeyNavigation.backtab: second
+            KeyNavigation.tab: first
+        }
+        Component.onCompleted: {
+            first.focus = true
+        }
+    }
+}
diff --git a/tests/auto/quick/qquicktextinput/data/mouseselection_true.qml b/tests/auto/quick/qquicktextinput/data/mouseselection_old_default.qml
index 974041b04a..42ab4931ea 100644
--- a/tests/auto/quick/qquicktextinput/data/mouseselection_true.qml
+++ b/tests/auto/quick/qquicktextinput/data/mouseselection_old_default.qml
@@ -3,5 +3,4 @@ import QtQuick 2.0
 TextInput {
     focus: true
     text: "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"
-    selectByMouse: true
 }
diff --git a/tests/auto/quick/qquicktextinput/data/mouseselectionmode_default.qml b/tests/auto/quick/qquicktextinput/data/mouseselectionmode_default.qml
index 974041b04a..ad19fa8c2a 100644
--- a/tests/auto/quick/qquicktextinput/data/mouseselectionmode_default.qml
+++ b/tests/auto/quick/qquicktextinput/data/mouseselectionmode_default.qml
@@ -1,7 +1,6 @@
-import QtQuick 2.0
+import QtQuick
 
 TextInput {
     focus: true
     text: "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"
-    selectByMouse: true
 }
diff --git a/tests/auto/quick/qquicktextinput/data/twoInAColumn.qml b/tests/auto/quick/qquicktextinput/data/twoInAColumn.qml
new file mode 100644
index 0000000000..dbc70afe4b
--- /dev/null
+++ b/tests/auto/quick/qquicktextinput/data/twoInAColumn.qml
@@ -0,0 +1,14 @@
+import QtQuick
+import QtQuick.Layouts
+
+ColumnLayout {
+    height: 100
+    TextInput {
+        objectName: "top"
+        text: "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+    }
+    TextInput {
+        objectName: "bottom"
+        text: "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+    }
+}