diff options
| author | Andy Nichols <andy.nichols@qt.io> | 2016-04-26 11:55:04 +0200 |
|---|---|---|
| committer | Andy Nichols <andy.nichols@qt.io> | 2016-04-26 11:55:12 +0200 |
| commit | e4d56b01b30ad6c8482dab3dab6600676a9d6632 (patch) | |
| tree | 6502d7459ec5a44d428e003ff15c6b498fc7f29f /src/quick | |
| parent | ed62c8f668bb0f7f17946764d510e286f111688a (diff) | |
| parent | 26ecc82374c476ee417ab04c455022f76909ba51 (diff) | |
Merge remote-tracking branch 'origin/dev' into scenegraphng
Change-Id: Ib990cfbd43d4a8c0ca412b492d507424cd9e58d4
Diffstat (limited to 'src/quick')
| -rw-r--r-- | src/quick/items/qquicktextinput.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/quick/items/qquicktextinput.cpp b/src/quick/items/qquicktextinput.cpp index fec9beedf6..8bf854aac2 100644 --- a/src/quick/items/qquicktextinput.cpp +++ b/src/quick/items/qquicktextinput.cpp @@ -2809,7 +2809,7 @@ void QQuickTextInputPrivate::updateDisplayText(bool forceUpdate) // characters) QChar* uc = str.data(); for (int i = 0; i < (int)str.length(); ++i) { - if ((uc[i] < 0x20 && uc[i] != 0x09) + if ((uc[i].unicode() < 0x20 && uc[i] != QChar::Tabulation) || uc[i] == QChar::LineSeparator || uc[i] == QChar::ParagraphSeparator || uc[i] == QChar::ObjectReplacementCharacter) |