Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
authorQt Continuous Integration System <qt-info@nokia.com>
Fri, 20 May 2011 06:26:05 +0000 (16:26 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Fri, 20 May 2011 06:26:05 +0000 (16:26 +1000)
commite1ad99f336a6539e0ff481bbd3c18c533650766a
treebf5f441c6c2f6157b4c8bf3c36af329c812f7a22
parent55d846389d81b7b15dbcf9539b1d16242ec57e7c
parenta0b2fc44ff8752193cacde52276b1822741f5374
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
  Notify when the TextInput cursorRectangle property changes within pre-edit
src/declarative/graphicsitems/qdeclarativetextinput.cpp
src/declarative/graphicsitems/qdeclarativetextinput_p.h
tests/auto/declarative/qdeclarativetextinput/tst_qdeclarativetextinput.cpp