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

* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
  Fix rules for recreating the Makefile in a subdir
  Disable some tests that require high floating point precision.
  Replace the truncate function with fuzzierCompare().
  Rework how Qt handles GL extensions.
  More changelog additions for QtWebKit
  Make compile on symbian/Linux
  Removed pointless image comparison in raster colorize filter.
  Improved performance of translating device coordinate graphics effects.

1 files changed, 3 insertions, 0 deletions

diff --git a/tests/auto/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp b/tests/auto/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp
index 8c8ab81..16a621a 100644
--- a/tests/auto/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp
+++ b/tests/auto/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp
@@ -1669,6 +1669,9 @@ void tst_QGraphicsAnchorLayout::floatConflict()
 
 void tst_QGraphicsAnchorLayout::infiniteMaxSizes()
 {
+    if (sizeof(qreal) <= 4) {
+        QSKIP("qreal has too little precision, result will be wrong", SkipAll);
+    }
     QGraphicsAnchorLayout *l = new QGraphicsAnchorLayout;
     l->setContentsMargins(0, 0, 0, 0);
     l->setSpacing(0);