diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-25 00:34:14 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-25 00:34:14 (GMT) |
| commit | b763094c5ec554023e75974cfb01d7e287044d40 (patch) | |
| tree | 647f7b50daefd92eef5edc79cda667964a848e29 /src/multimedia | |
| parent | 126849067d3c9d126606afaacecfef5559c2e657 (diff) | |
| parent | a26d69478a309b1b10b5879b0df47371da783092 (diff) | |
| download | Qt-b763094c5ec554023e75974cfb01d7e287044d40.zip Qt-b763094c5ec554023e75974cfb01d7e287044d40.tar.gz Qt-b763094c5ec554023e75974cfb01d7e287044d40.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Stabilize QGraphicsEffect test on X11
Add a children private property needed for QML to support QGraphicsObject
Invalidate the cache of QGraphicsEffect if a child becomes visible.
Fix a crash when reparenting an item in QGraphicsView.
Diffstat (limited to 'src/multimedia')
0 files changed, 0 insertions, 0 deletions