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>
Tue, 21 Jun 2011 05:07:23 +0000 (15:07 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Tue, 21 Jun 2011 05:07:23 +0000 (15:07 +1000)
commit5e80b137d195625c0d57c1c27e5e8464d1ccfa33
treead1665a6707813037f68ecd174d6e84bbebbbc86
parent61aae4e9a033bfb59664105e5377fd086bacb517
parenta95814e170643d67a682482b08f574e0f1e9fbf1
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:
  Fix crash in PropertyChanges.
  Scroll correctly when cursorPosition is changed within onTextChanged.
src/declarative/graphicsitems/qdeclarativetextinput.cpp
src/declarative/qml/qdeclarativebinding.cpp