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

* 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration: (44 commits)
  fix translations from some header files being omitted
  Revert changes to syncqt.
  Fix style sheet error with slider handle
  deprecate header files in $$QT_BUILD_TREE/include/Qt
  syncqt: tabs changes to spaces
  Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( d6d6c3821ed111b214a753f1ce8fa969c1a94dc3 )
  fix misleading hint
  support TARGETs with spaces
  propagate code change back to .g source
  double-quote string which contains a single-quote
  Fix the bindTexture() filters on X11 to not rely on mipmap generation.
  Fix QWS build failure
  Removed compiler warnings
  qmake: don't warn about unknown MSVC compiler option /MP
  Window visibility changes update TLW backing store reference count
  Enable visibility change events on all Symbian native windows
  Added reference counting to QWidgetBackingStore
  Added tst_QWidget::destroyBackingStoreWhenHidden
  Windows CE: missing null check added in qapplication_win.cpp
  Clipping with rounded rectangles and QVG_SCISSOR_CLIP
  ...

1 files changed, 2 insertions, 2 deletions

diff --git a/src/gui/text/qtextlayout.cpp b/src/gui/text/qtextlayout.cpp
index 3f67408..f5e252c 100644
--- a/src/gui/text/qtextlayout.cpp
+++ b/src/gui/text/qtextlayout.cpp
@@ -89,9 +89,9 @@ static QFixed alignLine(QTextEngine *eng, const QScriptLine &line)
         if (align & Qt::AlignJustify && eng->option.textDirection() == Qt::RightToLeft)
             align = Qt::AlignRight;
         if (align & Qt::AlignRight)
-            x = line.width - (line.textWidth + leadingSpaceWidth(eng, line));
+            x = line.width - (line.textAdvance + leadingSpaceWidth(eng, line));
         else if (align & Qt::AlignHCenter)
-            x = (line.width - line.textWidth)/2;
+            x = (line.width - line.textAdvance)/2;
     }
     return x;
 }