diff options
| author | Gatis Paeglis <gatis.paeglis@digia.com> | 2013-08-13 22:13:30 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-08-14 19:41:11 +0200 |
| commit | 5b32132762cdaeb558833d5e36629b4248d4be48 (patch) | |
| tree | 73ed73daa1a7c72e7ea34293b9a194e55347506c | |
| parent | 7510aad98ec4a44335257ccc932381c1f61f9ce6 (diff) | |
Fix escaped compose key parsing
This patch fixes the issue when the escape '\' character was
interpreted as a compose value.
On the whole en_US.UTF-8 Compose file it only affects the following
sequences:
<dead_diaeresis> <space> : "\"" quotedbl # REVERSE SOLIDUS
<Multi_key> <slash> <slash> : "\\" backslash # REVERSE SOLIDUS
<Multi_key> <slash> <less> : "\\" backslash # REVERSE SOLIDUS
<Multi_key> <less> <slash> : "\\" backslash # REVERSE SOLIDUS
By coincidence the last 3 sequences were working even before this fix.
Task-number: QTBUG-32972
Change-Id: Ia4fc2156d982cf2918d0d1be6ee07706cfbfd091
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
| -rw-r--r-- | src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp b/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp index f746207cc0..803faaf08a 100644 --- a/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp +++ b/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp @@ -342,7 +342,8 @@ void TableGenerator::parseKeySequence(QString line) } } else { // handle direct text encoded in the locale - elem.value = valueType.unicode(); + const QChar localeValueType = (valueType == '\\') ? line.at(composeValueIndex + 1) : valueType; + elem.value = localeValueType.unicode(); } // find the comment |