summaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@nokia.com>2009-09-24 15:26:10 (GMT)
committerSimon Hausmann <simon.hausmann@nokia.com>2009-09-24 15:26:10 (GMT)
commit270c374c178ec5a532d37168b018cd7ebc844558 (patch)
treea1f3b19daae4a40c296f127b0f8af64107c2c29a /examples
parent4d593220a8521c75821609560a3f7e09e28988c5 (diff)
parent9e4f5f2133b542cdf6f32f2fc96dccd864e68420 (diff)
downloadQt-270c374c178ec5a532d37168b018cd7ebc844558.zip
Qt-270c374c178ec5a532d37168b018cd7ebc844558.tar.gz
Qt-270c374c178ec5a532d37168b018cd7ebc844558.tar.bz2
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
Diffstat (limited to 'examples')
-rw-r--r--examples/graphicsview/elasticnodes/node.cpp2
-rw-r--r--examples/painting/svgviewer/svgview.cpp1
2 files changed, 2 insertions, 1 deletions
diff --git a/examples/graphicsview/elasticnodes/node.cpp b/examples/graphicsview/elasticnodes/node.cpp
index f8a0f9e..5694756 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 0938ff8..76c6469 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);