Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration

* 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: (48 commits)
  Fix CI by recreating reference bitmaps for text comparison
  tst_qdeclarativetext: Regenerate the baselines after the merge.
  Giving Qt a default app server when Avkon is removed
  TextInput autoscroll now scrolls when the cursor moves
  Fix samegame tutorial js
  Make minehunt less cheerful
  Add new behavior example.
  Fix autotest on windows
  Added --remove-destination to qmake_emulator_deployment.flm
  Fix worker ListModels to property emit countChanged()
  Update color type docs to mention transparency
  Update reference bitmaps used in bitmap comparison tests to follow changes in Text painting
  Fix alignment bugs in Text element
  Remove debug code added by 650a0078e2cef43eff107fe8d2505f64a0bfedf0
  Compile on WinCE
  Remove obsolete tweak in QFontEngineS60::alphaMapForGlyph
  Optimize QFontEngineS60::recalcAdvances()
  Delete qtdemoapps.iby.
  Added bearer plugin deployment to qt.iby
  Implement QFontEngineS60::emSquareSize()
  ...

1 files changed, 2 insertions, 4 deletions

diff --git a/src/gui/painting/qpaintengine_raster.cpp b/src/gui/painting/qpaintengine_raster.cpp
index 23be51b..38d7d2f 100644
--- a/src/gui/painting/qpaintengine_raster.cpp
+++ b/src/gui/painting/qpaintengine_raster.cpp
@@ -3153,10 +3153,8 @@ void QRasterPaintEngine::drawGlyphsS60(const QPointF &p, const QTextItemInt &ti)
         const TUint8 *glyphBitmapBytes;
         TSize glyphBitmapSize;
         fe->getCharacterData(glyphs[i], tmetrics, glyphBitmapBytes, glyphBitmapSize);
-        const glyph_metrics_t metrics = ti.fontEngine->boundingBox(glyphs[i]);
-        const int x = qFloor(positions[i].x + metrics.x);
-        const int y = qFloor(positions[i].y + metrics.y);
-
+        const int x = qFloor(positions[i].x + tmetrics.HorizBearingX());
+        const int y = qFloor(positions[i].y - tmetrics.HorizBearingY());
         alphaPenBlt(glyphBitmapBytes, glyphBitmapSize.iWidth, 8, x, y, glyphBitmapSize.iWidth, glyphBitmapSize.iHeight);
     }