diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-08 13:32:48 +0100 |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-08 13:32:48 +0100 |
commit | 466ac1c7d93d3f5dea35f1a6e214907899772ae3 (patch) | |
tree | 8253e96351c5620e390a2d68fdb1520e2f2725bd /src/gui/widgets/qplaintextedit_p.h | |
parent | c2d213becf8f96257789ebeb3ab074733da36424 (diff) | |
parent | 7724c474a941ea3516da6102a16b30ca254afe53 (diff) | |
download | qt4-tools-466ac1c7d93d3f5dea35f1a6e214907899772ae3.tar.gz |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
QGraphicsItem: Do not crash at exit if there is static QGraphicsItem.
Make QTextCodec reentrant.
Diffstat (limited to 'src/gui/widgets/qplaintextedit_p.h')
0 files changed, 0 insertions, 0 deletions