diff options
author | Morten Engvoldsen <morten.engvoldsen@nokia.com> | 2010-10-06 12:26:51 (GMT) |
---|---|---|
committer | Morten Engvoldsen <morten.engvoldsen@nokia.com> | 2010-10-06 12:26:51 (GMT) |
commit | 612a7680e10eb434cd6e09a2165ab1b75efdb72a (patch) | |
tree | c0deb1de9b52f466a1d4128094652d8b5e983038 /src/gui/widgets | |
parent | 94cae67da50d68f70d728a7fb231de89d47263db (diff) | |
parent | f6d9c3f0dd014c409c43150b3a10866f47ea54a6 (diff) | |
download | Qt-612a7680e10eb434cd6e09a2165ab1b75efdb72a.zip Qt-612a7680e10eb434cd6e09a2165ab1b75efdb72a.tar.gz Qt-612a7680e10eb434cd6e09a2165ab1b75efdb72a.tar.bz2 |
Merge commit 'origin/4.7' into mimir
Diffstat (limited to 'src/gui/widgets')
-rw-r--r-- | src/gui/widgets/qlineedit.cpp | 5 |
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. |