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: (57 commits)
  QNAM: Add a code comment related to the cache
  QtScript: regression with instanceof operator for QMetaObject wrappers
  QNAM HTTP: Fixed a bug when getting empty files with pipelining
  Fix window transparency on Symbian.
  Tweak the 'normalGeometry' of the widget before setting it.
  Use QDesktopWidget as a status pane observer on Symbian.
  Delay creation of S60 screen furniture.
  Don't use setGeometry() in setWindowState() on Symbian.
  Modify setWindowState() on Symbian to create the native window earlier.
  [tst_bic] Fix compilation in non-X11/Mac/Windows platforms
  Compile on symbian:
  QAudioOutput always uses default output device
  symbian: deploy 4.wav test file properly
  QS60Style: Style draws a focus frame to context menus and popups
  Fix accidental change in QtWebKit
  QNAM HTTP: Pipelining improvement
  Context menu for application is differs from native S60 apps
  No repaint when resizing graphics item with an effect.
  fix qmake conditionals
  QtScript: Add translation context test
  ...

1 files changed, 7 insertions, 3 deletions

diff --git a/src/openvg/qpaintengine_vg.cpp b/src/openvg/qpaintengine_vg.cpp
index 5ae69cd..4b4333b 100644
--- a/src/openvg/qpaintengine_vg.cpp
+++ b/src/openvg/qpaintengine_vg.cpp
@@ -3361,9 +3361,13 @@ void QVGPaintEngine::drawStaticTextItem(QStaticTextItem *textItem)
     // Draw the glyphs.  We need to fill with the brush associated with
     // the Qt pen, not the Qt brush.
     d->ensureBrush(state()->pen.brush());
-    vgDrawGlyphs(glyphCache->font, numGlyphs, (VGuint*)glyphs,
-                 NULL, NULL, VG_FILL_PATH, VG_TRUE);
-
+    if (ti.renderFlags() & QTextItem::RightToLeft) {
+        for (int index = numGlyphs - 1; index >= 0; --index)
+            vgDrawGlyph(glyphCache->font, glyphs[index], VG_FILL_PATH, VG_TRUE);
+    } else {
+        vgDrawGlyphs(glyphCache->font, numGlyphs, (VGuint*)glyphs.data(),
+                     NULL, NULL, VG_FILL_PATH, VG_TRUE);
+    }
     return true;
 #else
     Q_UNUSED(numGlyphs);