diff options
| author | João Abecasis <joao.abecasis@nokia.com> | 2011-02-16 18:01:17 (GMT) |
|---|---|---|
| committer | João Abecasis <joao.abecasis@nokia.com> | 2011-02-16 18:01:17 (GMT) |
| commit | 9db05f0b7bf68392dc925d4047aa74dac88b348a (patch) | |
| tree | 3690ea636187c9af9459ff3bfd4cab3e2af97c57 /src/gui/kernel/qkeymapper_p.h | |
| parent | 0df215e5afc780c1fddd9e410f7ef0814ac1307c (diff) | |
| parent | 5a1676af979ab75c8939e53e0223ccbea7708de4 (diff) | |
| download | Qt-9db05f0b7bf68392dc925d4047aa74dac88b348a.zip Qt-9db05f0b7bf68392dc925d4047aa74dac88b348a.tar.gz Qt-9db05f0b7bf68392dc925d4047aa74dac88b348a.tar.bz2 | |
Merge branch earth-team/master into earth-staging
Conflicts:
doc/src/development/qmake-manual.qdoc
Diffstat (limited to 'src/gui/kernel/qkeymapper_p.h')
| -rw-r--r-- | src/gui/kernel/qkeymapper_p.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/gui/kernel/qkeymapper_p.h b/src/gui/kernel/qkeymapper_p.h index 7a7c6a5..ec2d849 100644 --- a/src/gui/kernel/qkeymapper_p.h +++ b/src/gui/kernel/qkeymapper_p.h @@ -213,6 +213,7 @@ public: int mapS60ScanCodesToQt(TUint s60key); int mapQtToS60Key(int qtKey); int mapQtToS60ScanCodes(int qtKey); + void updateInputLanguage(); #endif }; |