diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-24 15:15:18 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-24 15:15:18 (GMT) |
| commit | 11c844de157bab85caec3ec0afe01b3f81f53bf0 (patch) | |
| tree | c1ab853f576b9f765376167a2797fdacc919b951 /header.BSD | |
| parent | 1e55b0ecf415d023bbb5f291a2f26ba50c1a508b (diff) | |
| parent | f3771c5d91995b2beaa73bd3e3c783b76a887b50 (diff) | |
| download | Qt-11c844de157bab85caec3ec0afe01b3f81f53bf0.zip Qt-11c844de157bab85caec3ec0afe01b3f81f53bf0.tar.gz Qt-11c844de157bab85caec3ec0afe01b3f81f53bf0.tar.bz2 | |
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:
Fix mispositioned text with QStaticText and OpenVG graphics system
Use binarysort to find items.
QGraphicsView: Fix assert that may occurs if there are 'empty' item to draw, and changed() signal connected
Fix tst_Collections::QTBUG13079_collectionInsideCollection
Fix assignment of a Q(Explicitly)SharedDataPointer included in the data itself
Fix assignment of a container included in the container itself
Diffstat (limited to 'header.BSD')
0 files changed, 0 insertions, 0 deletions