diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-20 16:42:47 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-20 16:42:47 (GMT) |
| commit | eff63c5883c52d55ac2534142aa31634879efb65 (patch) | |
| tree | 77d3307f6764eacd598efeee88121bc7dd4a35a8 /doc/src/snippets/sqldatabase/sqldatabase.cpp | |
| parent | cd2fd21578a80bc5ac121c0419ee00b1799d0a60 (diff) | |
| parent | 6a9fced05be98e7acedc47711e8fce1dc795e764 (diff) | |
| download | Qt-eff63c5883c52d55ac2534142aa31634879efb65.zip Qt-eff63c5883c52d55ac2534142aa31634879efb65.tar.gz Qt-eff63c5883c52d55ac2534142aa31634879efb65.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Make QStaticText honor QPainter::pen() for rich text on X11 w/raster
Fixed qdeclarativetext auto-test to work with raster graphicssystem.
Fixed QStaticText auto-test to work with raster graphicssystem.
Give a warning in QPixmap::handle() if pixmap is not X11 class.
QThreadPool: name pooled threads
Make raster the default graphics system on X11.
Diffstat (limited to 'doc/src/snippets/sqldatabase/sqldatabase.cpp')
0 files changed, 0 insertions, 0 deletions