diff options
| author | Harald Fernengel <harald.fernengel@nokia.com> | 2010-08-25 14:32:37 (GMT) |
|---|---|---|
| committer | Harald Fernengel <harald.fernengel@nokia.com> | 2010-08-25 14:32:37 (GMT) |
| commit | 2d0d09b19deb96c5c0761b33fe9114cdf0c4084d (patch) | |
| tree | c6b11bcdd4656d6957d087cce7281742ed003348 /src/corelib/tools/qregexp.cpp | |
| parent | 4284942fabd5ba8bb6299bff1f788ff566ff3fc2 (diff) | |
| download | Qt-2d0d09b19deb96c5c0761b33fe9114cdf0c4084d.zip Qt-2d0d09b19deb96c5c0761b33fe9114cdf0c4084d.tar.gz Qt-2d0d09b19deb96c5c0761b33fe9114cdf0c4084d.tar.bz2 | |
Compile bootstrapped tools with QT_NO_DEPRECATED
This removes extra baggage from our bootstapped tools, and also
ensures that we can compile it with host-g++ on Maemo which has a
problem parsing our deprecated macros inside templates.
Reviewed-by: Robert Griebl
Diffstat (limited to 'src/corelib/tools/qregexp.cpp')
| -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 |