projects / qt:qt.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 8acb902 8ffb49a)
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
authorQt Continuous Integration System <qt-info@nokia.com>
Fri, 7 Jan 2011 20:06:36 +0000 (06:06 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Fri, 7 Jan 2011 20:06:36 +0000 (06:06 +1000)
commit4ad12bb65aa46b3ba1cd8aa43716c2832842a2ae
tree6ac745fc40c41b0ee43824a8211847059157299ctree | snapshot
parent8acb9028787c75682055afe2a5b494c78b8f944dcommit | diff
parent8ffb49a4ac68b1c243b25343053e6e99f97ec2e7commit | diff
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
  Fixes crash in QGraphicsItem's destructor.
  Doc: Fixing typo
src/gui/text/qtextengine.cpp diff1 | diff2 | blob | history
6b46b7419a5aee9bd5fce67b7bfa8afe8e