diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-04-21 09:31:42 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-04-21 09:31:42 +0200 |
| commit | 560bc348d86aba6cef5fdf88bc9d7304dd914bc8 (patch) | |
| tree | 3eaab505c070f61ecf0022d36810dde5becb68d1 /src/quick/items | |
| parent | 7dc0de374300d66ed72f15820a4ebb78849ae0e7 (diff) | |
| parent | 23a000f9a14889753a63cd73de2c61e49bb7e0d8 (diff) | |
Merge remote-tracking branch 'origin/5.14.2' into 5.14
Change-Id: Icc410df82e57ed370ab0b80253074d495fc8c135
Diffstat (limited to 'src/quick/items')
| -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 11a6600b74..ee51711d34 100644 --- a/src/quick/items/qquicktextinput.cpp +++ b/src/quick/items/qquicktextinput.cpp @@ -2901,8 +2901,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); |