summaryrefslogtreecommitdiffstats
path: root/src/corelib/tools/qregexp.h
diff options
context:
space:
mode:
authorJanne Koskinen <janne.p.koskinen@digia.com>2009-12-22 09:04:22 (GMT)
committerJanne Koskinen <janne.p.koskinen@digia.com>2009-12-22 09:04:22 (GMT)
commitec19758c28efc6e1c712d44a6cb32ace38d3178d (patch)
treeb50b2058b7f3a566e31dbc6b86dc947273720bdd /src/corelib/tools/qregexp.h
parent2a20705f874ddad55282f22fabfe30927729ae50 (diff)
parentf61a32948da3cac4b83123267ae8c5d2fa0525f6 (diff)
downloadQt-ec19758c28efc6e1c712d44a6cb32ace38d3178d.zip
Qt-ec19758c28efc6e1c712d44a6cb32ace38d3178d.tar.gz
Qt-ec19758c28efc6e1c712d44a6cb32ace38d3178d.tar.bz2
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public 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();