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: (26 commits)
  Fix FolderListModel test - set folder to one containing files.
  Fix Mac synthesized italic fonts clipping issue for QGLWidget
  Fix openvg compilation on win32.
  Drag over bounds errors when ListView has variable height content
  FolderListModel emitted incorrect rowsRemoved range causing crash.
  fix/improve docs for new QtQuick 1.1 attributes
  Fix test instability.
  Document BorderImage::asynchronous
  Make QtScript support COLLECT_ON_EVERY_ALLOCATION define
  QSortFilterProxyModel::reset() should invalidate.
  Add missing API shims to QScriptValue constructors
  Don't crash when marking arguments object of native context
  Update QtOpenGL def files
  Fix extern usage in qpixmapdata_gl.cpp
  Fix for loading QPixmaps from file in GL graphics system
  Fix code style in qgl_symbian.cpp
  QPixmap::to/fromSymbianCFbsBitmap() in OpenGL graphics system.
  Use the 'convertInPlace' versions of QImage in QGLPixmapData load.
  Recreate GL surface when native window is resized on Symbian
  spelling fixes in extending.qdoc
  ...

1 files changed, 3 insertions, 2 deletions

diff --git a/src/gui/text/qtextengine_mac.cpp b/src/gui/text/qtextengine_mac.cpp
index c0a1e64..97e8c5b 100644
--- a/src/gui/text/qtextengine_mac.cpp
+++ b/src/gui/text/qtextengine_mac.cpp
@@ -607,8 +607,9 @@ void QTextEngine::shapeTextMac(int item) const
     bool stringToCMapFailed = false;
     if (!fe->stringToCMap(str, len, &g, &num_glyphs, flags, log_clusters, attributes())) {
         ensureSpace(num_glyphs);
-        stringToCMapFailed = fe->stringToCMap(str, len, &g, &num_glyphs, flags, log_clusters,
-                                              attributes());
+        g = availableGlyphs(&si);
+        stringToCMapFailed = !fe->stringToCMap(str, len, &g, &num_glyphs, flags, log_clusters,
+                                               attributes());
     }
 
     if (!stringToCMapFailed) {