Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
authorMartin Jones <martin.jones@nokia.com>
Wed, 7 Apr 2010 00:12:56 +0000 (10:12 +1000)
committerMartin Jones <martin.jones@nokia.com>
Wed, 7 Apr 2010 00:12:56 +0000 (10:12 +1000)
commit4ef710944991e1c3ec448b3525376f5cefe310a2
tree2e6a19f9f71b979b81a261cbf64f7594192504cd
parent01cd0bdf7e08f537b1e9b46e70653761145f8720
parent71a328397720af7229fd6ee48acaa19f7339a8de
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
src/declarative/graphicsitems/qdeclarativemousearea.cpp