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

* 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration: (69 commits)
  re-add overriding of tool paths to configure
  fix regexp
  Support linked fonts (.ltt) from standard font locations.
  fix path separators in install targets for MinGW+sh
  fix QMAKE_QMAKE path separator under mingw+sh in the qmake spec
  define qtPrepareTool() function and use it throughout
  QS60Style: In S60 3.x and 5.0 Qt itemviews behaviour is not nativelike
  QNAM HTTP: And one more testcase
  QNetworkAccessManager: Backends were tried in wrong order
  Fix QUrl::isValid if the host contains invalid caracter.
  Fix anomaly demo control strip icon placement
  QUrl: parsing of host name with an undercore.
  Fixed race condition compiling xmlpatterns tests.
  Remove qdbusserver from tests/auto/dbus.pro
  QNAM HTTP: Preemptive anti crash if() statement
  QNAM HTTP: More testcases
  Fixing compiling issues.
  Remove garbage test.
  OpenVG blending modes from VG_KHR_advanced_blending extension
  Fix spurious mouse click when dismissing a native menu
  ...

1 files changed, 12 insertions, 0 deletions

diff --git a/src/gui/graphicsview/qgraphicswidget_p.cpp b/src/gui/graphicsview/qgraphicswidget_p.cpp
index 50b315a..076e8626 100644
--- a/src/gui/graphicsview/qgraphicswidget_p.cpp
+++ b/src/gui/graphicsview/qgraphicswidget_p.cpp
@@ -879,6 +879,18 @@ void QGraphicsWidgetPrivate::resetHeight()
     q->setGeometry(QRectF(q->x(), q->y(), width(), 0));
 }
 
+void QGraphicsWidgetPrivate::setGeometryFromSetPos()
+{
+    if (inSetGeometry)
+        return;
+    Q_Q(QGraphicsWidget);
+    inSetPos = 1;
+    // Ensure setGeometry is called (avoid recursion when setPos is
+    // called from within setGeometry).
+    q->setGeometry(QRectF(pos, q->size()));
+    inSetPos = 0 ;
+}
+
 QT_END_NAMESPACE
 
 #endif //QT_NO_GRAPHICSVIEW