summaryrefslogtreecommitdiffstats
path: root/src/multimedia
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-01-10 15:43:51 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-01-10 15:43:51 (GMT)
commitd3d3f5bc99108b622a93ed54f19ea7285d84f7f9 (patch)
tree995ba13d746d7c317aa2927e8b21a4f6b39c5c78 /src/multimedia
parente5c522d4358bd6c9776c84c7fcfffb120d76725e (diff)
parent44afade51254de33a0f31baf39034af0eb73842f (diff)
downloadQt-d3d3f5bc99108b622a93ed54f19ea7285d84f7f9.zip
Qt-d3d3f5bc99108b622a93ed54f19ea7285d84f7f9.tar.gz
Qt-d3d3f5bc99108b622a93ed54f19ea7285d84f7f9.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: Compile when qreal != double Make application font family names locale sensitive in X11 Rename QTextBlockFormat::AtLeastHeight -> MinimumHeight Add line spacing to QTextBlockFormat, get/set functions, CSS support Optimize texture glyph cache Disable certain GPOS features by default Move advances for control character in Indic syllable shaping
Diffstat (limited to 'src/multimedia')
0 files changed, 0 insertions, 0 deletions