diff options
author | Konstantin Ritt <ritt.ks@gmail.com> | 2013-04-23 12:22:09 +0300 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-04-23 21:02:50 +0200 |
commit | 3821047e6c40485a14f7173c6ded07474997820e (patch) | |
tree | dac3160cf5a9f7a9b3c7bc1b6213268d55100981 /src/plugins/platforminputcontexts/compose | |
parent | 01cbd7e4b5ef841c9e091f54cb7ffa6bb059ac31 (diff) |
Fix memory access violation
The pointer returned by unicode() was deleted right afterwards.
Change-Id: I7cef72386d02c7be42e71134f616926506d37ea6
Reviewed-by: Gatis Paeglis <gatis.paeglis@digia.com>
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
Diffstat (limited to 'src/plugins/platforminputcontexts/compose')
-rw-r--r-- | src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp b/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp index 1113194136..400f7aece8 100644 --- a/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp +++ b/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp @@ -280,8 +280,7 @@ ushort TableGenerator::keysymToUtf8(quint32 sym) qDebug() << QString("keysym - 0x%1 : utf8 - %2").arg(QString::number(sym, 16)) .arg(codec->toUnicode(chars)); #endif - const QChar *ch = QString(chars.data()).unicode(); - return ch->unicode(); + return QString::fromUtf8(chars).at(0).unicode(); } quint32 TableGenerator::stringToKeysym(QString keysymName) |