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

* 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: (58 commits)
  Fine-tune the tests being run on the CI system.
  Standardize selection color in visual test
  Use GLIBC functions on any GLIBC architecture.
  tst_qnetworkreply: Fix ugly test
  Fix license text.
  Remove pointSize from visual tests
  Update visuals for X11
  Doc: fix a typo in QML/Qt UI integration
  Added missing symbols in QtCore and QtGui def files needed by fix made to QT-4077
  Fix regression due to 6cf397f7ac35a058096528a7ad8bfaf623b30747
  Remove some excess pngs
  Update qml visual tests
  VisualDataModel::count should be 0 until a valid delegate is set.
  Doc: Remove default from PathView path property
  Record images on more than just the first frame.
  Turn off font antialiasing during tests.
  Shrink size of a visual test
  doc: Fix documentation of QTextEdit::setDocument
  Fixed QGesture autotest for QGesture lazy deletion.
  compile with quintptr instead of intptr_t
  ...

1 files changed, 2 insertions, 33 deletions

diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/font/richtext.qml b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/richtext.qml
index 3670479..a748b68 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativetext/font/richtext.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/richtext.qml
@@ -2,7 +2,7 @@ import QtQuick 1.0
 import "../../shared" 1.0
 
 Rectangle {
-    id: s; width: 620; height: 600; color: "lightsteelblue"
+    id: s; width: 620; height: 300; color: "lightsteelblue"
     property string text: "<b>The</b> <i>quick</i> <u>brown</u> <o>fox</o> <big>jumps</big> <small>over</small> <tt>the</tt> <s>lazy</s> <em>dog</em>."
 
     Column {
@@ -14,7 +14,7 @@ Rectangle {
             text: s.text; font.pixelSize: 18
         }
         TestText {
-            text: s.text; font.pointSize: 18
+            text: s.text; font.pixelSize: 24
         }
         TestText {
             text: s.text; color: "red"; smooth: true
@@ -43,36 +43,5 @@ Rectangle {
         TestText {
             text: s.text; font.overline: true; font.wordSpacing: 25; font.capitalization: "Capitalize"; color: "green"
         }
-        TestText {
-            text: s.text; font.pixelSize: 18; style: Text.Outline; styleColor: "white"
-        }
-        TestText {
-            text: s.text; font.pixelSize: 18; style: Text.Sunken; styleColor: "gray"
-        }
-        TestText {
-            text: s.text; font.pixelSize: 18; style: Text.Raised; styleColor: "yellow"
-        }
-        TestText {
-            text: s.text; horizontalAlignment: Text.AlignLeft; width: s.width
-        }
-        TestText {
-            text: s.text; horizontalAlignment: Text.AlignHCenter; verticalAlignment: Text.AlignVCenter; width: s.width; height: 20
-        }
-        TestText {
-            text: s.text; horizontalAlignment: Text.AlignRight; verticalAlignment: Text.AlignBottom; width: s.width; height: 20
-        }
-        Row{
-            height: childrenRect.height;
-            spacing: 4
-            TestText {
-                text: s.text + " thisisaverylongstringwithnospaces"; width: 150; wrapMode: Text.WrapAnywhere
-            }
-            TestText {
-                text: s.text + " thisisaverylongstringwithnospaces"; width: 150; wrapMode: Text.Wrap
-            }
-            TestText {
-                text: s.text; font.pixelSize: 18; style: Text.Outline; styleColor: "white"; wrapMode: Text.WordWrap; width: 200
-            }
-        }
     }
 }