diff options
| author | Liang Qi <liang.qi@qt.io> | 2020-04-21 21:22:54 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2020-04-22 17:59:46 +0200 |
| commit | 5b083d89e66082ad50d39b5bc6116e0b0319087e (patch) | |
| tree | 6c1f5f50958acfd1112d75932f1e17e020f03255 /src/quick | |
| parent | 6555642db7b3b992335f98dc01863db4beea3fd4 (diff) | |
| parent | 560bc348d86aba6cef5fdf88bc9d7304dd914bc8 (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Conflicts:
src/imports/labsmodels/qqmltablemodel.cpp
tests/auto/qml/qqmltablemodel/tst_qqmltablemodel.cpp
This follows edc8512580fa16892dc13034e93300cc6a2bba59.
Change-Id: I515d44d5d8309f4d7b911996c0ab65ea803176fa
Diffstat (limited to 'src/quick')
| -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 8f306daed2..06a9f134ac 100644 --- a/src/quick/items/qquicktextinput.cpp +++ b/src/quick/items/qquicktextinput.cpp @@ -2895,8 +2895,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); |