summaryrefslogtreecommitdiffstats
path: root/src/corelib/tools/qregexp.h
diff options
context:
space:
mode:
authorDenis Dzyubenko <denis.dzyubenko@nokia.com>2009-11-09 18:32:04 (GMT)
committerDenis Dzyubenko <denis.dzyubenko@nokia.com>2009-11-09 18:32:04 (GMT)
commit81f3b28f2f82b15f9d255ec38abdc5f749b8809c (patch)
tree7e41a16587d903498fbb1ca71cd286a9ba156241 /src/corelib/tools/qregexp.h
parentf656909791819b3f033f9ec1bd0de524b92919e2 (diff)
parentb770abdd564f28a8d9dde816f72f73e6b15984af (diff)
downloadQt-81f3b28f2f82b15f9d255ec38abdc5f749b8809c.zip
Qt-81f3b28f2f82b15f9d255ec38abdc5f749b8809c.tar.gz
Qt-81f3b28f2f82b15f9d255ec38abdc5f749b8809c.tar.bz2
Merge remote branch 'origin/4.6' into 4.6-platform
Diffstat (limited to 'src/corelib/tools/qregexp.h')
-rw-r--r--src/corelib/tools/qregexp.h3
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;