summaryrefslogtreecommitdiffstats
path: root/src/corelib/tools/qregexp.h
diff options
context:
space:
mode:
authorJustin McPherson <justin.mcpherson@nokia.com>2009-12-14 22:59:42 (GMT)
committerJustin McPherson <justin.mcpherson@nokia.com>2009-12-14 22:59:42 (GMT)
commit33d6cfe679d4374af90598a6003ac5bca3c032ef (patch)
tree734c861a05d9e79bca54ecb8cb7a3c3cb209a576 /src/corelib/tools/qregexp.h
parentcce709287279a8dd5ac17ed4c9dd09ebb78c4f27 (diff)
parent463cd4f6563dc12d8b45bf2e293dc64d583e132c (diff)
downloadQt-33d6cfe679d4374af90598a6003ac5bca3c032ef.zip
Qt-33d6cfe679d4374af90598a6003ac5bca3c032ef.tar.gz
Qt-33d6cfe679d4374af90598a6003ac5bca3c032ef.tar.bz2
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'src/corelib/tools/qregexp.h')
-rw-r--r--src/corelib/tools/qregexp.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/corelib/tools/qregexp.h b/src/corelib/tools/qregexp.h
index 2bad40e..8a46b98 100644
--- a/src/corelib/tools/qregexp.h
+++ b/src/corelib/tools/qregexp.h
@@ -119,7 +119,9 @@ public:
#endif
int matchedLength() const;
#ifndef QT_NO_REGEXP_CAPTURE
+#ifdef QT_DEPRECATED
QT_DEPRECATED int numCaptures() const;
+#endif
int captureCount() const;
QStringList capturedTexts() const;
QStringList capturedTexts();