summaryrefslogtreecommitdiffstats
path: root/src/declarative/graphicsitems/qdeclarativepath_p.h
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-12-09 23:52:56 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-12-09 23:52:56 (GMT)
commit373378b7f477190ebcd43ca0372a40f185522b0b (patch)
tree04e49c13980735f29956f71b0f5cfb1564db2c8f /src/declarative/graphicsitems/qdeclarativepath_p.h
parent3349c76f2f5079736d082b34d834eebf20b5d526 (diff)
parent130e24ae66e4b394ef4c017c67c16d8210aa0bd1 (diff)
downloadQt-373378b7f477190ebcd43ca0372a40f185522b0b.zip
Qt-373378b7f477190ebcd43ca0372a40f185522b0b.tar.gz
Qt-373378b7f477190ebcd43ca0372a40f185522b0b.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 using pure scissor clip in GL 2 engine for rotations. Fixed DeviceCoordinateCache items when using QGraphicsScene::render(). Fixed missing text in GL 2 engine after recreating a context. Fix compilation of qnetworkreply test with namespaces.
Diffstat (limited to 'src/declarative/graphicsitems/qdeclarativepath_p.h')
0 files changed, 0 insertions, 0 deletions