diff options
| author | Gatis Paeglis <gatis.paeglis@digia.com> | 2014-06-11 11:37:58 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-06-11 15:01:06 +0200 |
| commit | d06c6d8a51c9bd79396471f4131ac67f1d11e2c2 (patch) | |
| tree | 4aa99154056ee1e3828fba8652d6bb54772d2596 /src/plugins/platforminputcontexts/compose/generator/qtablegenerator.h | |
| parent | 857c82f8a4a29399733218f783241b839b939f58 (diff) | |
Compose key plugin: expand "%L" to full path.
According to [1] "%L" should expand to a full path for the
default (based on system's locale) Compose file.
[1] http://www.x.org/archive/current/doc/man/man5/Compose.5.xhtml
Task-number: QTBUG-35943
Change-Id: Ie803a89742d9c0aa3b2d759bea28ed403dc68c9c
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/plugins/platforminputcontexts/compose/generator/qtablegenerator.h')
| -rw-r--r-- | src/plugins/platforminputcontexts/compose/generator/qtablegenerator.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.h b/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.h index 248c09f3ea..6ce89cfe77 100644 --- a/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.h +++ b/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.h @@ -118,13 +118,14 @@ protected: void findComposeFile(); bool findSystemComposeDir(); QString systemComposeDir(); + QString composeTableForLocale(); ushort keysymToUtf8(quint32 sym); QString readLocaleMappings(const QByteArray &locale); QByteArray readLocaleAliases(const QByteArray &locale); void initPossibleLocations(); - bool cleanState() const { return ((m_state & NoErrors) == NoErrors); } + bool cleanState() const { return m_state == NoErrors; } QString locale() const; private: |