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

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
  QGraphicsView: fix few artefacts that can appear if the changed() signal is connected.
  tst_qmetaobject:  fix compilation, now that wrong NOTIFY property fails
  Fixed autotest compilation issue on solaris
  Fixed build issue on Solaris
  Remove wrong NOTIFY attribute.
  Ignore LayoutDirectionChange event in QTextControl
  Fix an obvious bug in tst_QGL::clipTest()
  moc: Error if the NOTIFY signal is invalid.
  QDateEdit/QTimeEdit:  remove duplicate properties.

1 files changed, 1 insertions, 1 deletions

diff --git a/tests/auto/qgl/tst_qgl.cpp b/tests/auto/qgl/tst_qgl.cpp
index 5bebdf6..e411508 100644
--- a/tests/auto/qgl/tst_qgl.cpp
+++ b/tests/auto/qgl/tst_qgl.cpp
@@ -1836,7 +1836,7 @@ void tst_QGL::clipTest()
     // Sample pixels in a grid pattern which avoids false failures due to
     // off-by-one pixel errors on some buggy GL implementations
     for (int x = 2; x < reference.width(); x += 5) {
-        for (int y = 2; y < reference.width(); y += 5) {
+        for (int y = 2; y < reference.height(); y += 5) {
             QFUZZY_COMPARE_PIXELS(widgetFB.pixel(x, y), reference.pixel(x, y));
         }
     }