diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-04-24 01:00:22 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-04-24 01:00:23 +0200 |
| commit | 03bfdc5425c22ed7a0aa2f901e965813fe0753d0 (patch) | |
| tree | 8c5ad0347ce376e1d45903addccc149a1d90bfaa /src/quick/items/qquicktextinput.cpp | |
| parent | 9fd4160307ab54b89d0145ebde0a91d293fa95a5 (diff) | |
| parent | 7c9a54907f44b7e30ceac1975edcfa7920ffafd8 (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: I77f3400914fbce58f98cb3a5602fd0cebf219ac6
Diffstat (limited to 'src/quick/items/qquicktextinput.cpp')
| -rw-r--r-- | src/quick/items/qquicktextinput.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/quick/items/qquicktextinput.cpp b/src/quick/items/qquicktextinput.cpp index b1c1ad58e5..39424d5f9d 100644 --- a/src/quick/items/qquicktextinput.cpp +++ b/src/quick/items/qquicktextinput.cpp @@ -2894,8 +2894,7 @@ void QQuickTextInputPrivate::updateDisplayText(bool forceUpdate) // characters) QChar* uc = str.data(); for (int i = 0; i < str.length(); ++i) { - if ((uc[i].unicode() < 0x20 && uc[i] != QChar::Tabulation) - || uc[i] == QChar::LineSeparator + if (uc[i] == QChar::LineSeparator || uc[i] == QChar::ParagraphSeparator || uc[i] == QChar::ObjectReplacementCharacter) uc[i] = QChar(0x0020); |