Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (32 commits)
  Fix Text::elide docs.
  Fix Rectangle painting at small sizes.
  Fix QML ecmascript autotest.
  Fix QtQuick import.
  Export QDeclarativeDebugHelper on Symbian for QTBUG-13762
  Don't use stdint.h in our headers since it is a C99 header.
  Text alignment is broken with multi-line text and implicit size.
  Update QtOpenVg def files for bug QT-3589
  Image bounding rect should always include the area being painted
  Fix minehunt.pro (minehunt is no longer a plugin)
  Don't allow flagging of flipped tiles in Minehunt
  Remove Snake demo from QtDemo
  Fix samegame text input focus
  Whitespace fixes
  Update visual tests for Mac.
  Run all QML visual tests now.
  Make qmlvisual tests more stable
  Add documentation about script evaluation context and allowed types
  Maintain passing visualtests on X11
  Fix errors in example code. Also reverts the example code to the old
  ...

1 files changed, 6 insertions, 5 deletions

diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/LineEdit.qml b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/LineEdit.qml
index 74c16e2..50c3cb4 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/LineEdit.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/LineEdit.qml
@@ -1,4 +1,5 @@
 import QtQuick 1.0
+import "../shared" 1.0
 
 Item {
     id:lineedit
@@ -7,16 +8,16 @@ Item {
     width: textInp.width + 11 
     height: 13 + 11 
 
-    Rectangle{
+    Rectangle {
         color: 'lightsteelblue'
         anchors.fill: parent
     }
     clip: true
     Component.onCompleted: textInp.cursorPosition = 0;
-    TextInput{
+    TestTextInput {
         id:textInp
-        cursorDelegate: Item{
-            Rectangle{
+        cursorDelegate: Item {
+            Rectangle {
                 visible: parent.parent.focus
                 color: "#009BCE"
                 height: 13
@@ -42,7 +43,7 @@ Item {
         horizontalAlignment: TextInput.AlignLeft
         font.pixelSize:15
     }
-    MouseArea{
+    MouseArea {
         //Implements all line edit mouse handling
         id: mainMouseArea
         anchors.fill: parent;