diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-14 15:59:59 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-14 15:59:59 (GMT) |
commit | 2e0a2abd1fc451b203be5c10cb44fd6e06e66efd (patch) | |
tree | c66650e4de926a6e0a13890033b43ec4b35a1351 /doc/src/snippets/sqldatabase/sqldatabase.cpp | |
parent | 84066a357e868b7d3f774f4847840014d3bf9e51 (diff) | |
parent | 0ac41424ef143d00461e55087ccceb4b9dc11745 (diff) | |
download | Qt-2e0a2abd1fc451b203be5c10cb44fd6e06e66efd.zip Qt-2e0a2abd1fc451b203be5c10cb44fd6e06e66efd.tar.gz Qt-2e0a2abd1fc451b203be5c10cb44fd6e06e66efd.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:
Fix crash in Mac font loading
fix tiff reader to handle TIFFTAG_SAMPLESPERPIXEL for grayscale images
Diffstat (limited to 'doc/src/snippets/sqldatabase/sqldatabase.cpp')
0 files changed, 0 insertions, 0 deletions