Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration

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:
  Doc: Fixing typo
  Only test control character handling in X11
  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