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:
  Update tests following QDeclarativeFlickable::viewport() -> contentIem()
  Prevent value source animations from being registered to start twice.
  Make compile.
  More script benchmarking.
  Expose the Flickable's internal contentItem
  Script benchmarking.
  Update lupdate to recognize concatenated text in QML files.
  Ensure sourcesize is in pixmap cache key.
  Use ugly but reliable bitmaps fonts in test.
  doc: note that calling methods before component completion may have no effect
  Fix unstable qdeclarativeviewer tests
  Use Pen with Qt::MiterJoin when drawing Rectangles with gradients
  Update screenshot
  Fix and better test Text / TextEdit alignments.
  Ensure the view is correctly positioned at component complete.
  Support for non-literal plural arguments to qsTr() in lupdate (QML).
  References to undefined variables throws a ReferenceError

1 files changed, 43 insertions, 0 deletions

diff --git a/tests/auto/declarative/qdeclarativetextedit/data/alignments.qml b/tests/auto/declarative/qdeclarativetextedit/data/alignments.qml
new file mode 100644
index 0000000..b10c335
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativetextedit/data/alignments.qml
@@ -0,0 +1,43 @@
+import Qt 4.7
+
+Rectangle {
+    id: top
+    width: 70; height: 70;
+
+    property alias horizontalAlignment: t.horizontalAlignment
+    property alias verticalAlignment: t.verticalAlignment
+    property alias wrapMode: t.wrapMode
+    property alias running: timer.running
+    property string txt: "Test"
+
+    Rectangle {
+        anchors.centerIn: parent
+        width: 40
+        height: 40
+        color: "green"
+
+        Text {
+            id: t
+
+            anchors.fill: parent
+            font.family: "Misc Fixed"
+            font.pixelSize: 8
+            horizontalAlignment: TextEdit.AlignRight
+            verticalAlignment: TextEdit.AlignBottom
+            wrapMode: TextEdit.WordWrap
+            text: top.txt
+        }
+        Timer {
+            id: timer
+
+            interval: 1
+            running: true
+            repeat: true
+            onTriggered: {
+                top.txt = top.txt + "<br>more " + top.txt.length;
+                if (top.txt.length > 50)
+                    running = false
+            }
+        }
+    }
+}