summaryrefslogtreecommitdiffstats
path: root/src/script/bridge
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-03-25 00:34:14 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-03-25 00:34:14 (GMT)
commitb763094c5ec554023e75974cfb01d7e287044d40 (patch)
tree647f7b50daefd92eef5edc79cda667964a848e29 /src/script/bridge
parent126849067d3c9d126606afaacecfef5559c2e657 (diff)
parenta26d69478a309b1b10b5879b0df47371da783092 (diff)
downloadQt-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/script/bridge')
0 files changed, 0 insertions, 0 deletions