summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-08-23 14:51:35 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-08-23 14:51:35 (GMT)
commit6c0c437962a2638cca162277b14a30dae4fed57b (patch)
tree2c8b8b0e6462981fc92011b384358ad9a28f3450
parent092cd760d5fddf9640a310214fe01929f0fff3a8 (diff)
parent4748be8f436e2bc13b5755f2ffe2428a338f7239 (diff)
downloadQt-6c0c437962a2638cca162277b14a30dae4fed57b.zip
Qt-6c0c437962a2638cca162277b14a30dae4fed57b.tar.gz
Qt-6c0c437962a2638cca162277b14a30dae4fed57b.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: Revert "Avoid calling QInputMethod update when adding or removing QGraphicsItems that don't have focus" Avoid calling QInputMethod update when adding or removing QGraphicsItems that don't have focus
0 files changed, 0 insertions, 0 deletions