diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-09 10:46:43 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-09 10:46:43 (GMT) |
| commit | 0de5087cf17e1c1c37da166b2f531525b9060d71 (patch) | |
| tree | 138a0312bcf5dedc57b51387437cd5c94862f15c /doc/src/diagrams/qrect-intersect.sk | |
| parent | 75c5bc5f7efd5f7055b689a244147e69733280a4 (diff) | |
| parent | 83e3f716c795a8be0a6e5d6aa4d6ff51a994cae1 (diff) | |
| download | Qt-0de5087cf17e1c1c37da166b2f531525b9060d71.zip Qt-0de5087cf17e1c1c37da166b2f531525b9060d71.tar.gz Qt-0de5087cf17e1c1c37da166b2f531525b9060d71.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 qdoc warning.
Fix subfocus when reparenting panels.
Add three new style-hints to QFont to match CSS' generic font families
The forward declaration should have been in the namespace for QImageData
Fixes the sqlite driver bug QTBUG-11904 (pointer aliasing)
Add test and fix style for the SSE2 implementation of ARGB32 conversion
Build fix, the header of QImageData did not declare QImageWriter.
SSE2 implementation of convert_ARGB_to_ARGB_PM_inplace for QImage
Moved primitive SSE2 painting utilities to qdrawingprimitive_sse2_p.h
Move logic for building SIMD extensions to gui.pro
Fix text drawing into alpha pixmap with opengl engine
Diffstat (limited to 'doc/src/diagrams/qrect-intersect.sk')
0 files changed, 0 insertions, 0 deletions