diff options
| author | artoka <arto.katajasalo@digia.com> | 2011-11-28 12:59:12 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-31 17:31:38 +0100 |
| commit | 40fb4750910e23d3e7128ca8e0f1c5920b05bd5a (patch) | |
| tree | 3ecce1e68f83c1cbb3e22cf3c74a27f515099d5e /src/corelib/tools | |
| parent | 1ac0ae47bd2271149241ae715f03252d7015459c (diff) | |
Various qt documentation fixes (wk 43)
Task-number: QTBUG-12389
Task-number: QTBUG-16667
Task-number: QTBUG-6151
Task-number: QTBUG-8625
Task-number: QTBUG-19808
Task-number: QTBUG-12096
Task-number: QTBUG-1231
Task-number: QTBUG-21073
Task-number: QTBUG-8939
Task-number: QTBUG-20399
Task-number: QTBUG-20944
Task-number: QTBUG-7542
Task-number: QTBUG-22095
Task-number: QTBUG-11278
Task-number: QTBUG-15653
Change-Id: Ibc369998d06e7f2f11b01a1ba4c2fb927e3c065b
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
Diffstat (limited to 'src/corelib/tools')
| -rw-r--r-- | src/corelib/tools/qlocale.qdoc | 1 | ||||
| -rw-r--r-- | src/corelib/tools/qregexp.cpp | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/src/corelib/tools/qlocale.qdoc b/src/corelib/tools/qlocale.qdoc index a4ae146b4e..770ad048e9 100644 --- a/src/corelib/tools/qlocale.qdoc +++ b/src/corelib/tools/qlocale.qdoc @@ -595,7 +595,6 @@ \value Yugoslavia \value Zambia \value Zimbabwe - \value SerbiaAndMontenegro \value Montenegro \value Serbia \value SaintBarthelemy diff --git a/src/corelib/tools/qregexp.cpp b/src/corelib/tools/qregexp.cpp index 109ae949c7..b306fd22bd 100644 --- a/src/corelib/tools/qregexp.cpp +++ b/src/corelib/tools/qregexp.cpp @@ -425,7 +425,7 @@ int qFindString(const QChar *haystack, int haystackLen, int from, For historical reasons, quantifiers (e.g. \bold{*}) that apply to capturing parentheses are more "greedy" than other quantifiers. - For example, \bold{a*(a)*} will match "aaa" with cap(1) == "aaa". + For example, \bold{a*(a*)} will match "aaa" with cap(1) == "aaa". This behavior is different from what other regexp engines do (notably, Perl). To obtain a more intuitive capturing behavior, specify QRegExp::RegExp2 to the QRegExp constructor or call |