Merge branch '4.5' of scm.dev.nokia.troll.no:qt/qt into 4.6

Conflicts:
	examples/webkit/formextractor/formextractor.pro
	mkspecs/features/qt.prf
	src/gui/painting/qpaintengineex.cpp

2 files changed, 2 insertions, 1 deletions

diff --git a/examples/graphicsview/elasticnodes/node.cpp b/examples/graphicsview/elasticnodes/node.cpp
index f8a0f9e99b..5694756d97 100644
--- a/examples/graphicsview/elasticnodes/node.cpp
+++ b/examples/graphicsview/elasticnodes/node.cpp
@@ -54,7 +54,7 @@ Node::Node(GraphWidget *graphWidget)
     setFlag(ItemIsMovable);
     setFlag(ItemSendsGeometryChanges);
     setCacheMode(DeviceCoordinateCache);
-    setZValue(1);
+    setZValue(-1);
 }
 
 void Node::addEdge(Edge *edge)
diff --git a/examples/painting/svgviewer/svgview.cpp b/examples/painting/svgviewer/svgview.cpp
index 0938ff8b23..76c6469d5d 100644
--- a/examples/painting/svgviewer/svgview.cpp
+++ b/examples/painting/svgviewer/svgview.cpp
@@ -62,6 +62,7 @@ SvgView::SvgView(QWidget *parent)
     setScene(new QGraphicsScene(this));
     setTransformationAnchor(AnchorUnderMouse);
     setDragMode(ScrollHandDrag);
+    setViewportUpdateMode(FullViewportUpdate);
 
     // Prepare background check-board pattern
     QPixmap tilePixmap(64, 64);