Merge branch 4.7 into qt-4.8-from-4.7
authorQt Continuous Integration System <qt-info@nokia.com>
Wed, 7 Sep 2011 16:13:46 +0000 (02:13 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Wed, 7 Sep 2011 16:13:46 +0000 (02:13 +1000)
commit4aed0ed39de64990df28e72082cd79f799297369
tree57c5b1e7c771a0fd5976a0ba0a51e131b4646707
parent4cb429ce1e1ce5f1cecaceafbe74e6ebde2b6372
parentef5eabdd58a9f584cff8b4e70b7eea583957114c
Merge branch 4.7 into qt-4.8-from-4.7
src/declarative/graphicsitems/qdeclarativeflickable.cpp
src/declarative/graphicsitems/qdeclarativetextedit.cpp