diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-01-11 08:41:33 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-01-11 08:41:33 (GMT) |
commit | 5d15fe23559e88a61995ad4f0c19795869fc2a0a (patch) | |
tree | 8bc3a62f270aa9112f961d55e56860d3d738f061 /src/scripttools/debugging/qscriptdebuggerstackwidgetinterface.cpp | |
parent | b344f1933252ba34c73d03958550eb73746963e9 (diff) | |
parent | 0f0df28061c399d4d62a518e9a68ddbd1faa4de5 (diff) | |
download | Qt-5d15fe23559e88a61995ad4f0c19795869fc2a0a.zip Qt-5d15fe23559e88a61995ad4f0c19795869fc2a0a.tar.gz Qt-5d15fe23559e88a61995ad4f0c19795869fc2a0a.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/scripttools/debugging/qscriptdebuggerstackwidgetinterface.cpp')
0 files changed, 0 insertions, 0 deletions