projects / qt:qt.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: d5716c0 81351f2)
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
authorQt Continuous Integration System <qt-info@nokia.com>
Mon, 17 Jan 2011 14:25:36 +0000 (00:25 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Mon, 17 Jan 2011 14:25:36 +0000 (00:25 +1000)
commit2479c1b17ca2399c9df94dd7e1b66d3a3a896a5c
tree1658c65acdb674d1865511cb4c8fafb39049b17dtree | snapshot
parentd5716c0b27bcddfea0f1787aa59a08e340d64e30commit | diff
parent81351f2c6f9a939e4c34cb3be6280d396c21941fcommit | diff
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
  Fix one character displacement for cursor in line edits
  Fix header not found build error
  QTBUG-16110 updating the softkeys when app comes to foreground
  Workaround crash when multiple QNetworkAccessManager instances are used
6b46b7419a5aee9bd5fce67b7bfa8afe8e