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)
  Regression: horizontal alignment bug with single line text
  Add 'skip' property that QML visual tests can use
  Almost all visual tests pass on linux
  Disable WebView visualtests
  Clean up repeater visual tests
  Clean up QML Rect visual tests
  Update qdeclarativespringanimation visual tests
  Regression: QML fonts look bad on Mac with font smoothing on
  Clean up qdeclarativesmoothedanimation visual tests
  Clean up qdeclarativepositioner tests
  Update visuals for qdeclarativepathview visual tests
  Clean up qdeclarativeparticles visual test
  Mark qdeclarativegridview autotests as expect-fail
  Clean up qdeclarativeflickable visual tests
  Clean up qdeclarativeboarderimage visual tests
  Add a test for multiline text alignment
  Update when text changes to ""
  Shrink and update qdeclarativetext visual tests
  Clean up package views visual test
  Clean up qmlvisual/qdeclarativetextinput visual tests
  ...

1 files changed, 0 insertions, 0 deletions

diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/usingMultilineEdit.4.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/usingMultilineEdit.4.png
new file mode 100644
index 0000000..04ea496
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/usingMultilineEdit.4.png