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)
  Fixed tst_qpixmap::grabWidget autotest failure on QWS.
  Doc: Fixing typo
  Doc: Fixing typo
  Doc: Fixing typo
  Fixed tst_qwidget::testContentsPropagation auto-test failure.
  Fixed text rendering bug in raster engine when opacity != 1.0.
  Prevented race condition on texture destruction.
  More fix for QTBUG-14640:oci performance problem with qlonglong
  Doc: Fixing typo
  Fixed grabWidget sometimes returning uninitialized memory.
  Fix Malayalam Rendering - 'Ra' is PreBase
  Update .def files for QtGui and QtOpenVG
  Use 32bit textures for alpha textures after all.
  One more fix for dithering.
  Doc: Fixing typo
  Fix QTBUG-14640:oci performance problem with qlonglong
  32bit => 16bit conversion has 4byte-aligned output.
  Fix gcc bug in qReallocAligned
  Prevented threading related crash in OpenGL module.
  Fix possible crash in QStaticText and QDeclarativeTextLayout
  ...

1 files changed, 1 insertions, 1 deletions

diff --git a/src/qt3support/text/q3richtext.cpp b/src/qt3support/text/q3richtext.cpp
index d82d0f0..e24eeb5 100644
--- a/src/qt3support/text/q3richtext.cpp
+++ b/src/qt3support/text/q3richtext.cpp
@@ -2914,7 +2914,7 @@ QString Q3TextDocument::selectedText(int id, bool asRichText) const
         }
     }
     // ### workaround for plain text export until we get proper
-    // mime types: turn unicode line seperators into the more
+    // mime types: turn unicode line separators into the more
     // widely understood \n. Makes copy and pasting code snipplets
     // from within Assistent possible
     QChar* uc = (QChar*) s.unicode();