summaryrefslogtreecommitdiffstats
path: root/src/gui/itemviews
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-12-14 00:12:05 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-12-14 00:12:05 (GMT)
commited331fc0bb5e77109d67ca1de45bb978cf045cef (patch)
treedfa528a1e62b30e288d3ad8f52afe3acccd70a82 /src/gui/itemviews
parent3d24bcad7c340e1e164b00424f4fde7fd7922c59 (diff)
parent18e3cd65980e1bc01e6af4807cae0bceca25288c (diff)
downloadQt-ed331fc0bb5e77109d67ca1de45bb978cf045cef.zip
Qt-ed331fc0bb5e77109d67ca1de45bb978cf045cef.tar.gz
Qt-ed331fc0bb5e77109d67ca1de45bb978cf045cef.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: QPointer: thread safety Make sure num_glyphs pass to HarfBuzz is large enough Corrected documentation for QImage::fill(). Fix transformed QPainter::drawGlyphs() for certain paint engines
Diffstat (limited to 'src/gui/itemviews')
0 files changed, 0 insertions, 0 deletions