summaryrefslogtreecommitdiffstats
path: root/src/corelib/tools/qregexp.cpp
diff options
context:
space:
mode:
authorMitch Curtis <mitch.curtis@digia.com>2014-03-31 17:45:37 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-03-31 17:45:37 +0200
commitbd822bedfea5126b12c32523a68c3a1ac7a8931d (patch)
tree0fafd5ac037e3b62ad45e8808989ec89155618b4 /src/corelib/tools/qregexp.cpp
parent84c10500b1730e8d947732728d190fde612fc840 (diff)
parent3b5c0bc0780f1749fed7c07bd8b691400a0282b7 (diff)
Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
Diffstat (limited to 'src/corelib/tools/qregexp.cpp')
-rw-r--r--src/corelib/tools/qregexp.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/tools/qregexp.cpp b/src/corelib/tools/qregexp.cpp
index d2b5adc974..cadf2da019 100644
--- a/src/corelib/tools/qregexp.cpp
+++ b/src/corelib/tools/qregexp.cpp
@@ -133,8 +133,8 @@ int qFindString(const QChar *haystack, int haystackLen, int from,
or \b{5}. An expression can also be a set of characters
enclosed in square brackets. \b{[ABCD]} will match an \b{A}
or a \b{B} or a \b{C} or a \b{D}. We can write this same
- expression as \b{[A-D]}, and an experession to match any
- captital letter in the English alphabet is written as
+ expression as \b{[A-D]}, and an expression to match any
+ capital letter in the English alphabet is written as
\b{[A-Z]}.
A quantifier specifies the number of occurrences of an expression