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

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (21 commits)
  Doc: Fixed an off-by-one error in an example.
  Fix QT_NO_TEXTHTMLPARSER
  Fix QT_NO_DOM
  Fix QT_NO_TEXTSTREAM compilation errors.
  Fix QT_NO_VALIDATOR compilation.
  Doc: Removed a misleading sentence about a class constructor.
  Doc: correcting docs in QDrag::exec
  Doc: Adding note about  QDrag::exec()
  Revert behavior of QTextLayout::boundingRect() when line width is set
  Fix unreasonably large width of QTextLayout::boundingRect()
  Doc: replacing old image
  Fix compilation with stricts compilers.
  Fix QT_NO_DIRMODEL build error in QtDeclarative.
  Revert "Added native key support to QSharedMemory API."
  Revert "Improved documentation for QSharedMemory's key/setKey functions."
  Fix a simple mistake in QXmlStreamReader::atEnd() docs.
  Improved documentation for QSharedMemory's key/setKey functions.
  Added native key support to QSharedMemory API.
  Make test work with shadow builds again.
  Doc: Corrected the documentation about the compression threshold.
  ...

1 files changed, 2 insertions, 1 deletions

diff --git a/src/gui/text/qtextlayout.cpp b/src/gui/text/qtextlayout.cpp
index ce7915d..3f67408 100644
--- a/src/gui/text/qtextlayout.cpp
+++ b/src/gui/text/qtextlayout.cpp
@@ -858,7 +858,8 @@ QRectF QTextLayout::boundingRect() const
         const QScriptLine &si = d->lines[i];
         xmin = qMin(xmin, si.x);
         ymin = qMin(ymin, si.y);
-        xmax = qMax(xmax, si.x+qMax(si.width, si.textWidth));
+        QFixed lineWidth = si.width < QFIXED_MAX ? qMax(si.width, si.textWidth) : si.textWidth;
+        xmax = qMax(xmax, si.x+lineWidth);
         // ### shouldn't the ascent be used in ymin???
         ymax = qMax(ymax, si.y+si.height());
     }