diff options
| author | Ritt Konstantin <ritt.ks@gmail.com> | 2011-07-15 04:30:33 +0400 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-08-26 14:14:26 +0200 |
| commit | c400a3433a15adac5ff58898c29900169458d2c1 (patch) | |
| tree | 0267191d3b146b389049d24c4944b6a1d3594076 /src/corelib | |
| parent | 3c48d26c5b297f851615f942b30a3346d8b0df5c (diff) | |
don't build code related to CClass if QT_NO_REGEXP_CCLASS is defined
Change-Id: If86835b1065eeb95e0774f1b42870dcd5225da58
Reviewed-on: http://codereview.qt.nokia.com/3671
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/tools/qregexp.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/corelib/tools/qregexp.cpp b/src/corelib/tools/qregexp.cpp index 325320da12..a93767fc85 100644 --- a/src/corelib/tools/qregexp.cpp +++ b/src/corelib/tools/qregexp.cpp @@ -1252,7 +1252,9 @@ private: friend class Box; +#ifndef QT_NO_REGEXP_CCLASS void setupCategoriesRangeMap(); +#endif /* This is the lexical analyzer for regular expressions. @@ -1293,7 +1295,9 @@ private: int yyTok; // the last token read bool yyMayCapture; // set this to false to disable capturing +#ifndef QT_NO_REGEXP_CCLASS QHash<QByteArray, QPair<int, int> > categoriesRangeMap; // fast lookup hash for xml schema extensions +#endif friend struct QRegExpMatchState; }; @@ -2735,6 +2739,7 @@ void QRegExpEngine::Box::addAnchorsToEngine(const Box &to) const } } +#ifndef QT_NO_REGEXP_CCLASS void QRegExpEngine::setupCategoriesRangeMap() { categoriesRangeMap.insert("IsBasicLatin", qMakePair(0x0000, 0x007F)); @@ -2880,6 +2885,7 @@ void QRegExpEngine::setupCategoriesRangeMap() categoriesRangeMap.insert("IsSupplementaryPrivateUseArea-A", qMakePair(0xF0000, 0xFFFFF)); categoriesRangeMap.insert("IsSupplementaryPrivateUseArea-B", qMakePair(0x100000, 0x10FFFF)); } +#endif int QRegExpEngine::getChar() { |