Merge remote branch 'origin/master' into bearermanagement/integration

Conflicts:
	tests/auto/qlineedit/tst_qlineedit.cpp

1 files changed, 19 insertions, 0 deletions

diff --git a/tests/auto/declarative/visual/qmlgraphicstextedit/qt-669.qml b/tests/auto/declarative/visual/qmlgraphicstextedit/qt-669.qml
new file mode 100644
index 0000000..b01ddf8
--- /dev/null
+++ b/tests/auto/declarative/visual/qmlgraphicstextedit/qt-669.qml
@@ -0,0 +1,19 @@
+import Qt 4.6
+
+Rectangle {
+    Component { id: testableCursor
+        //Doesn't blink
+        Rectangle {
+            color:"black"
+            width:1
+        }
+    }
+    color: "green"
+    width:400;
+    height:40;
+    TextEdit {
+        focus: true;
+        cursorDelegate: testableCursor
+        text: "Jackdaws love my big sphinx of Quartz"
+    }
+}