diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-26 05:09:59 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-26 05:09:59 (GMT) |
| commit | a4515ec14fdc772eb6b5c4801cddaddc26b94d84 (patch) | |
| tree | ddeb30f0825d2dc6badd49bd680d8ccb03793097 /src/corelib/tools | |
| parent | cde378d2fd716b1853e780fb9db30b38dad4a854 (diff) | |
| parent | 2d0d09b19deb96c5c0761b33fe9114cdf0c4084d (diff) | |
| download | Qt-a4515ec14fdc772eb6b5c4801cddaddc26b94d84.zip Qt-a4515ec14fdc772eb6b5c4801cddaddc26b94d84.tar.gz Qt-a4515ec14fdc772eb6b5c4801cddaddc26b94d84.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Compile bootstrapped tools with QT_NO_DEPRECATED
Diffstat (limited to 'src/corelib/tools')
| -rw-r--r-- | src/corelib/tools/qregexp.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/corelib/tools/qregexp.cpp b/src/corelib/tools/qregexp.cpp index 36827d0..a0df065 100644 --- a/src/corelib/tools/qregexp.cpp +++ b/src/corelib/tools/qregexp.cpp @@ -4172,6 +4172,8 @@ int QRegExp::matchedLength() const } #ifndef QT_NO_REGEXP_CAPTURE + +#ifndef QT_NO_DEPRECATED /*! \obsolete Returns the number of captures contained in the regular expression. @@ -4182,6 +4184,7 @@ int QRegExp::numCaptures() const { return captureCount(); } +#endif /*! \since 4.6 |