Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into master-integr...
authorQt Continuous Integration System <qt-info@nokia.com>
Thu, 18 Aug 2011 18:59:49 +0000 (04:59 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Thu, 18 Aug 2011 18:59:49 +0000 (04:59 +1000)
commitff7f7dd596511de4c629b6c7f97d32a21049bb95
tree2a28048a370fb8b4d404df73cc9e399541231716
parente2abcf0d8e83a9403c57b1504a663310e888e2dd
parent01f651a03fc24c370cf7dca55ed7dce00f60503a
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging:
  uikit: Fixes for Open GL ES 1 and for pre-3GS devices
  uikit: Fix warning.
  Use thumb instructions for uikit
  Fix compilation with thumb2.
  Update uikit README: svg works, warn about thumb
  Fix bidi reordering of RTL text with embedded images
  Fixed infinite loop when loading certain SVGs.