1 files changed, 39 insertions, 31 deletions

diff --git a/qmake/tools/qregexp.cpp b/qmake/tools/qregexp.cpp
index 500efed..0c1f060 100644
--- a/qmake/tools/qregexp.cpp
+++ b/qmake/tools/qregexp.cpp
@@ -265,3 +265,3 @@
     \row \i <b>\\d</b>
-         \i This matches a digit (see QChar::isDigit()).
+         \i This matches a digit (QChar::isDigit()).
     \row \i <b>\\D</b>
@@ -269,3 +269,3 @@
     \row \i <b>\\s</b>
-         \i This matches a whitespace (see QChar::isSpace()).
+         \i This matches a whitespace (QChar::isSpace()).
     \row \i <b>\\S</b>
@@ -273,3 +273,3 @@
     \row \i <b>\\w</b>
-         \i This matches a word character (see QChar::isLetterOrNumber()).
+         \i This matches a word character (QChar::isLetterOrNumber() or '_').
     \row \i <b>\\W</b>
@@ -549,3 +549,10 @@
     Perl's extended \c{/x} syntax is not supported, nor are
-    regexp comments (?#comment) or directives, e.g. (?i).
+    directives, e.g. (?i), or regexp comments, e.g. (?#comment). On
+    the other hand, C++'s rules for literal strings can be used to
+    achieve the same:
+    \code
+    QRegExp mark( "\\b" // word boundary
+                  "[Mm]ark" // the word we want to match
+                );
+    \endcode
 
@@ -679,7 +686,7 @@
     \code
-    QRegExp rx( "*.html" );     // invalid regexp: * doesn't quantify anything
-    rx.setWildcard( TRUE );     // now it's a valid wildcard regexp
-    rx.search( "index.html" );  // returns 0 (matched at position 0)
-    rx.search( "default.htm" ); // returns -1 (no match)
-    rx.search( "readme.txt" );  // returns -1 (no match)
+    QRegExp rx( "*.html" );         // invalid regexp: * doesn't quantify anything
+    rx.setWildcard( TRUE );         // now it's a valid wildcard regexp
+    rx.exactMatch( "index.html" );  // returns TRUE
+    rx.exactMatch( "default.htm" ); // returns FALSE
+    rx.exactMatch( "readme.txt" );  // returns FALSE
     \endcode
@@ -717,2 +724,7 @@ const int EOS = -1;
 
+static bool isWord( QChar ch )
+{
+    return ch.isLetterOrNumber() || ch == QChar( '_' );
+}
+
 /*
@@ -1682,5 +1694,5 @@ bool QRegExpEngine::testAnchor( int i, int a, const int *capBegin )
         if ( mmPos + i != 0 )
-            before = mmIn[mmPos + i - 1].isLetterOrNumber();
+            before = isWord( mmIn[mmPos + i - 1] );
         if ( mmPos + i != mmLen )
-            after = mmIn[mmPos + i].isLetterOrNumber();
+            after = isWord( mmIn[mmPos + i] );
         if ( (a & Anchor_Word) != 0 && (before == after) )
@@ -2634,3 +2646,10 @@ int QRegExpEngine::getEscape()
         // see QChar::isLetterOrNumber()
-        yyCharClass->addCategories( 0x7ff07f8f );
+        yyCharClass->addCategories( 0x7fe07f8f );
+        yyCharClass->addRange( 0x203f, 0x2040 );
+        yyCharClass->addSingleton( 0x2040 );
+        yyCharClass->addSingleton( 0x30fb );
+        yyCharClass->addRange( 0xfe33, 0xfe34 );
+        yyCharClass->addRange( 0xfe4d, 0xfe4f );
+        yyCharClass->addSingleton( 0xff3f );
+        yyCharClass->addSingleton( 0xff65 );
         return Tok_CharClass;
@@ -2654,2 +2673,3 @@ int QRegExpEngine::getEscape()
         yyCharClass->addCategories( 0x000f8070 );
+        yyCharClass->addSingleton( 0x005f ); // '_'
         return Tok_CharClass;
@@ -3185,3 +3205,4 @@ static QRegExpEngine *newEngine( const QString& pattern, bool caseSensitive )
 #ifdef QT_THREAD_SUPPORT
-        QMutexLocker locker( qt_global_mutexpool->get( &engineCache ) );
+        QMutexLocker locker( qt_global_mutexpool ?
+                             qt_global_mutexpool->get( &engineCache ) : 0 );
 #endif
@@ -3201,7 +3222,8 @@ static void derefEngine( QRegExpEngine *eng, const QString& pattern )
 {
-    if ( eng != 0 && eng->deref() ) {
-#ifndef QT_NO_REGEXP_OPTIM
 #ifdef QT_THREAD_SUPPORT
-        QMutexLocker locker( qt_global_mutexpool->get( &engineCache ) );
+    QMutexLocker locker( qt_global_mutexpool ?
+                         qt_global_mutexpool->get( &engineCache ) : 0 );
 #endif
+    if ( eng != 0 && eng->deref() ) {
+#ifndef QT_NO_REGEXP_OPTIM
         if ( engineCache == 0 ) {
@@ -3567,9 +3589,2 @@ int QRegExp::match( const QString& str, int index, int *len,
 
-/*!
-    \overload
-
-    This convenience function searches with a \c CaretMode of \c
-    CaretAtZero which is the most common usage.
-*/
-
 int QRegExp::search( const QString& str, int offset ) const
@@ -3627,9 +3642,2 @@ int QRegExp::search( const QString& str, int offset, CaretMode caretMode ) const
 
-/*!
-    \overload
-
-    This convenience function searches with a \c CaretMode of \c
-    CaretAtZero which is the most common usage.
-*/
-
 int QRegExp::searchRev( const QString& str, int offset ) const
@@ -3696,3 +3704,3 @@ int QRegExp::matchedLength() const
 #ifndef QT_NO_REGEXP_CAPTURE
-/*! 
+/*!
   Returns the number of captures contained in the regular expression.