diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-26 09:40:11 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-26 09:40:11 (GMT) |
| commit | 2a898e4736dcafbe95dca120b2365bc24b395302 (patch) | |
| tree | 3031380514df8b82e423ded0401610bcbf89b6cf /src/corelib/tools/qregexp.cpp | |
| parent | 8b3fad1f7ac9bef0119fffc67feb5bb153abc647 (diff) | |
| parent | ae13ad51dda7246e73d282165201f637d04a667e (diff) | |
| download | Qt-2a898e4736dcafbe95dca120b2365bc24b395302.zip Qt-2a898e4736dcafbe95dca120b2365bc24b395302.tar.gz Qt-2a898e4736dcafbe95dca120b2365bc24b395302.tar.bz2 | |
Merge remote branch 'qt/master' into qml-master
Conflicts:
tools/qdoc3/cppcodeparser.cpp
tools/qdoc3/htmlgenerator.cpp
tools/qdoc3/htmlgenerator.h
tools/qdoc3/node.cpp
Diffstat (limited to 'src/corelib/tools/qregexp.cpp')
| -rw-r--r-- | src/corelib/tools/qregexp.cpp | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/corelib/tools/qregexp.cpp b/src/corelib/tools/qregexp.cpp index 25255f9..20ad444 100644 --- a/src/corelib/tools/qregexp.cpp +++ b/src/corelib/tools/qregexp.cpp @@ -1466,9 +1466,14 @@ void QRegExpMatchState::match(const QChar *str0, int len0, int pos0, #ifndef QT_NO_REGEXP_CAPTURE for (int i = 0; i < numCaptures; ++i) { int j = eng->captureForOfficialCapture.at(i); - int len = capEnd[j] - capBegin[j]; - *c++ = (len > 0) ? pos + capBegin[j] : 0; - *c++ = len; + if (capBegin[j] != EmptyCapture) { + int len = capEnd[j] - capBegin[j]; + *c++ = (len > 0) ? pos + capBegin[j] : 0; + *c++ = len; + } else { + *c++ = -1; + *c++ = -1; + } } #endif } else { |