summaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-04-22 22:22:50 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-04-22 22:22:50 (GMT)
commitb2ca05031381103e6916c63677e9eaff51c76055 (patch)
tree2034d1c7defc6d7e3a344453a724acbfac6052c1 /examples
parent4894e6dd57c31e0196c6fdae4d1b2fb16b9f1b16 (diff)
parent5f63f95def838ce72af99dc697ecce092fe7eb69 (diff)
downloadQt-b2ca05031381103e6916c63677e9eaff51c76055.zip
Qt-b2ca05031381103e6916c63677e9eaff51c76055.tar.gz
Qt-b2ca05031381103e6916c63677e9eaff51c76055.tar.bz2
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: Try to use multisampled opengl graphicssystem on all platforms Make sure recreateEglSurface creates a surface if there isn't one QX11GL: Implement QX11GLWindowSurface::grabWidget QX11GL: Cleanup the window surface & remove some synchronisation QX11GL: Move the shared context ownership into a seperate class QX11GL: Don't do glFinish in endPaint Implement QGLPaintDevice::metric() Remove dead code left after a merge conflict resolution Fixed autotest failures in tst_QPainterPath. Removed bezier intersection code in path clipper. Diagram scene example (graphicsview/diagramscene) refresh problem. When using Qt::BypassGraphicsProxyWidget with QMenu the application is not stuck anymore
Diffstat (limited to 'examples')
-rw-r--r--examples/graphicsview/diagramscene/diagramitem.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/examples/graphicsview/diagramscene/diagramitem.cpp b/examples/graphicsview/diagramscene/diagramitem.cpp
index ee028bb..41534d1 100644
--- a/examples/graphicsview/diagramscene/diagramitem.cpp
+++ b/examples/graphicsview/diagramscene/diagramitem.cpp
@@ -82,6 +82,7 @@ DiagramItem::DiagramItem(DiagramType diagramType, QMenu *contextMenu,
setPolygon(myPolygon);
setFlag(QGraphicsItem::ItemIsMovable, true);
setFlag(QGraphicsItem::ItemIsSelectable, true);
+ setFlag(QGraphicsItem::ItemSendsGeometryChanges, true);
}
//! [0]