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: (123 commits)
  Added missing tests to tests/auto/*.pro
  Compile with DirectFB version >= 1.2.0 && < 1.2.9
  QDirectFBPaintEngine optimization
  Add some warnings when using DISABLE/WARN in DFB
  Fix build with Mesa 7.8's EGL implementatioon
  Reset the byte order in the iconv codec after using it.
  fix "using namespace" recursion crash
  Fix for QTBUG-6659 Parent window accepts pointer events wrongly
  If no IAP defined force IAP dialog
  Fixed key mappings on X11
  QDom: prevent infinite loop when cloning a DTD
  Compile fix for Windows Mobile and OpenGLES2
  QPrintPreviewDialog number of pages is partially blocked from view in OSX
  QS60Style ignores widget palette when drawing highlighted widget text
  Fix for QTBUG-8762 QApplication::setGraphicsSystem("raster") crashes.
  Fixed crash at application exit when QProcess was used in Symbian
  QMessageBox is not stretched to screen width if the content is narrow
  Wrong dirty region after row selection in right-to-left mode in QTableView
  Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( f3110d2f94c825477afac054ed448e45d47f5670 )
  Tab to space fixes to qdilaog.cpp
  ...

2 files changed, 3 insertions, 3 deletions

diff --git a/src/corelib/tools/qregexp.cpp b/src/corelib/tools/qregexp.cpp
index 20ad444..eb104a8 100644
--- a/src/corelib/tools/qregexp.cpp
+++ b/src/corelib/tools/qregexp.cpp
@@ -523,7 +523,7 @@ int qFindString(const QChar *haystack, int haystackLen, int from,
     \endtable
 
     In the mode Wildcard, the wildcard characters cannot be
-    escaped. In the mode WildcardUnix, the character '\' escapes the
+    escaped. In the mode WildcardUnix, the character '\\' escapes the
     wildcard.
 
     For example if we are in wildcard mode and have strings which
@@ -3779,7 +3779,7 @@ static void invalidateEngine(QRegExpPrivate *priv)
 
     \value WildcardUnix This is similar to Wildcard but with the
     behavior of a Unix shell. The wildcard characters can be escaped
-    with the character "\".
+    with the character "\\".
 
     \value FixedString The pattern is a fixed string. This is
     equivalent to using the RegExp pattern on a string in
diff --git a/src/corelib/tools/qstring.cpp b/src/corelib/tools/qstring.cpp
index e9b7b9a..eff87e8 100644
--- a/src/corelib/tools/qstring.cpp
+++ b/src/corelib/tools/qstring.cpp
@@ -3227,7 +3227,7 @@ QString QString::section(const QRegExp &reg, int start, int end, SectionFlags fl
         if (!empty || !(flags & SectionSkipEmpty))
             x++;
     }
-    if((flags & SectionIncludeLeadingSep)) {
+    if((flags & SectionIncludeLeadingSep) && first_i < sections.size()) {
         const qt_section_chunk &section = sections.at(first_i);
         ret.prepend(section.string.left(section.length));
     }