diff options
| author | Gabriel de Dietrich <gabriel.dedietrich@digia.com> | 2014-02-03 13:08:48 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-02-07 16:43:23 +0100 |
| commit | 3f5060a60129225d8860b16953038fc9a214c1c1 (patch) | |
| tree | e7ba72e4a4d33247b152fb604cd987db32f9b4a7 | |
| parent | 6adf515e331e101deb906cfae41cdb2812c62bc7 (diff) | |
| download | qtbase-3f5060a60129225d8860b16953038fc9a214c1c1.tar.gz qtbase-3f5060a60129225d8860b16953038fc9a214c1c1.tar.bz2 qtbase-3f5060a60129225d8860b16953038fc9a214c1c1.zip | |
Compose: Fix assert for non-UTF8 locales in table generator
Task-number: QTBUG-35770
Change-Id: I8aaea66e8d70edf7ab401f2c6dfb849d309ff6af
Reviewed-by: Gatis Paeglis <gatis.paeglis@digia.com>
| -rw-r--r-- | src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp b/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp index 11545b16c3..817c3f11bc 100644 --- a/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp +++ b/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp @@ -350,7 +350,7 @@ ushort TableGenerator::keysymToUtf8(quint32 sym) qDebug() << QString("keysym - 0x%1 : utf8 - %2").arg(QString::number(sym, 16)) .arg(codec->toUnicode(chars)); #endif - return QString::fromLocal8Bit(chars).at(0).unicode(); + return QString::fromUtf8(chars).at(0).unicode(); } static inline int fromBase8(const char *s, const char *end) |