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: (28 commits)
  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
  Largely rewrite the Using QML in C++ Applications documentation. It
  Document list type operations
  Fix regression in 648eb76c and update visual tests.
  Don't emit xChanged()/yChanged() twice.
  ...

1 files changed, 2 insertions, 1 deletions

diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/align/multilineAlign.qml b/tests/auto/declarative/qmlvisual/qdeclarativetext/align/multilineAlign.qml
index 976f0b0..a427719 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativetext/align/multilineAlign.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/align/multilineAlign.qml
@@ -1,4 +1,5 @@
 import QtQuick 1.0
+import "../../shared" 1.0
 
 /*Tests both the alignments of multiline text, and that
   it can deal with changing them properly
@@ -8,7 +9,7 @@ Item{
     height: 80
     property int stage: 0
     onStageChanged: if(stage == 6) Qt.quit();
-    Text{
+    TestText{
         text: "I am the very model of a modern major general."
         anchors.fill: parent;
         wrapMode: Text.WordWrap