diff options
author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2009-11-10 13:40:34 (GMT) |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2009-11-10 13:40:34 (GMT) |
commit | 2c4bbeecd084bf4565643d4cd42de3be1aed5681 (patch) | |
tree | dc40f7bba6c74248c9a0359b05b39bce0e6decb2 /src/corelib/tools/qregexp.h | |
parent | d1c5585faa066a6693c24600cf8a1c42a285fe3b (diff) | |
parent | 7b15c669c336a1d76e3ac001fadde38a294e3e80 (diff) | |
download | Qt-2c4bbeecd084bf4565643d4cd42de3be1aed5681.zip Qt-2c4bbeecd084bf4565643d4cd42de3be1aed5681.tar.gz Qt-2c4bbeecd084bf4565643d4cd42de3be1aed5681.tar.bz2 |
Merge remote branch 'mainline/4.6' into 4.6
Conflicts:
tools/configure/configureapp.cpp
Diffstat (limited to 'src/corelib/tools/qregexp.h')
-rw-r--r-- | src/corelib/tools/qregexp.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/corelib/tools/qregexp.h b/src/corelib/tools/qregexp.h index 1a7cf53..2bad40e 100644 --- a/src/corelib/tools/qregexp.h +++ b/src/corelib/tools/qregexp.h @@ -119,7 +119,8 @@ public: #endif int matchedLength() const; #ifndef QT_NO_REGEXP_CAPTURE - int numCaptures() const; + QT_DEPRECATED int numCaptures() const; + int captureCount() const; QStringList capturedTexts() const; QStringList capturedTexts(); QString cap(int nth = 0) const; |