summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJerome Pasion <jerome.pasion@nokia.com>2010-10-06 09:47:11 (GMT)
committerJerome Pasion <jerome.pasion@nokia.com>2010-10-06 09:47:11 (GMT)
commitc0b6331fb891bcd5c95d9a64943ea4abf30d2285 (patch)
tree7f904edd7676ffd7a81b63a16d66711933e37456 /src
parentcbd26879cb942a2c4ee7ccd919ee18a45b5b87bb (diff)
parent30b2a2669c03a3a0fc6a0cbb82ae1875121e2fb4 (diff)
downloadQt-c0b6331fb891bcd5c95d9a64943ea4abf30d2285.zip
Qt-c0b6331fb891bcd5c95d9a64943ea4abf30d2285.tar.gz
Qt-c0b6331fb891bcd5c95d9a64943ea4abf30d2285.tar.bz2
Merge branch '13092010doc' into 4.7
Diffstat (limited to 'src')
-rw-r--r--src/gui/widgets/qlineedit.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/gui/widgets/qlineedit.cpp b/src/gui/widgets/qlineedit.cpp
index caaef68..0a33220 100644
--- a/src/gui/widgets/qlineedit.cpp
+++ b/src/gui/widgets/qlineedit.cpp
@@ -139,7 +139,10 @@ void QLineEdit::initStyleOption(QStyleOptionFrame *option) const
The length of the text can be constrained to maxLength(). The text
can be arbitrarily constrained using a validator() or an
- inputMask(), or both.
+ inputMask(), or both. When switching between a validator and an input mask
+ on the same line edit, it is best to clear the validator or input mask to
+ prevent undefined behavior.
+
A related class is QTextEdit which allows multi-line, rich text
editing.