diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-23 07:25:18 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-23 07:25:18 (GMT) |
| commit | 932e67e3e817f0e2625ff60594e6e536920a329a (patch) | |
| tree | c63afe16124bb3af2429b7cf04afaa65760ad600 /src/gui/widgets/qlabel_p.h | |
| parent | 979ab9bf9394210dc4812082fe40b083155447c5 (diff) | |
| parent | 4f24b2fbe7fbbdae95b27381e258ec7b665445c5 (diff) | |
| download | Qt-932e67e3e817f0e2625ff60594e6e536920a329a.zip Qt-932e67e3e817f0e2625ff60594e6e536920a329a.tar.gz Qt-932e67e3e817f0e2625ff60594e6e536920a329a.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:
QPainter not restored correctly in Graphics View.
Setting QGraphicsItem::ItemClipsChildrenToShape forces ItemClipsToShape
Fix compilation
Fixed drawing of QPixmaps with masks in the GL 2 and X11 engines.
Fix warning on MSVC
QThread: make sure start works even if called after exit
Revert "Fixed painter path drawing on FBO without stencil buffer."
Fix a crash with D&d on mingw
Revert "Keep other text format with QTextOption::SuppressColors tag on"
Fixed stencil buffer on FBOs with OpenGL ES.
Keep other text format with QTextOption::SuppressColors tag on
QTreeView: do not scroll to top if last item is removed
Diffstat (limited to 'src/gui/widgets/qlabel_p.h')
0 files changed, 0 insertions, 0 deletions