projects / qt:qt.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 55b84a0 5184d55)
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>
Wed, 20 Apr 2011 13:24:42 +0000 (23:24 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Wed, 20 Apr 2011 13:24:42 +0000 (23:24 +1000)
commite1ffbc04131dc6f76fa76821c297d08162e4b1ee
tree3759931edbad1f7dfbcdc11dc05cb0c161cf1073tree | snapshot
parent55b84a03e33b87e44b2e65ed1c02f93aa553c323commit | diff
parent5184d55d434296710041812976656ed6825447eccommit | diff
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:
  QDeclarativeDebug: Fix endless loop for property with SCRITABLE false
  Fix Symbian/Linux compilation breakage in plugins/qmltooling
  Make QMLViewer startup animation stop after a while
  Fix excessive scrolling in TextInput with mid string pre-edit text.
src/declarative/graphicsitems/qdeclarativemousearea.cpp diff1 | diff2 | blob | history
6b46b7419a5aee9bd5fce67b7bfa8afe8e