diff options
| author | Pierre Rossi <pierre.rossi@nokia.com> | 2010-03-18 21:13:30 (GMT) |
|---|---|---|
| committer | Pierre Rossi <pierre.rossi@nokia.com> | 2010-03-31 14:33:21 (GMT) |
| commit | 33a2afa8cccc38302539573f8d3559976bf4cc91 (patch) | |
| tree | 47fad6f37be0650d5f68b5f9a100052c92ffee77 /src/gui/kernel/qkeymapper_x11.cpp | |
| parent | a0df2ac07c75882618b40657e1485dda3204880e (diff) | |
| download | Qt-33a2afa8cccc38302539573f8d3559976bf4cc91.zip Qt-33a2afa8cccc38302539573f8d3559976bf4cc91.tar.gz Qt-33a2afa8cccc38302539573f8d3559976bf4cc91.tar.bz2 | |
Remove the "Insert unicode control character" menu entry on X11.
It's still displayed when it seems to make sense with respect to
the active keyboard layouts. It can also be enabled from qtconfig.
Task-number: QTBUG-9186
Reviewed-by: Denis
Diffstat (limited to 'src/gui/kernel/qkeymapper_x11.cpp')
| -rw-r--r-- | src/gui/kernel/qkeymapper_x11.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/gui/kernel/qkeymapper_x11.cpp b/src/gui/kernel/qkeymapper_x11.cpp index 428ac3e..807959c 100644 --- a/src/gui/kernel/qkeymapper_x11.cpp +++ b/src/gui/kernel/qkeymapper_x11.cpp @@ -80,7 +80,7 @@ QT_BEGIN_NAMESPACE (((KeySym)(keysym) >= 0x11000000) && ((KeySym)(keysym) <= 0x1100FFFF)) #endif -static void getLocaleAndDirection(QLocale *locale, +void q_getLocaleAndDirection(QLocale *locale, Qt::LayoutDirection *direction, const QByteArray &layoutName, const QByteArray &variantName) @@ -523,7 +523,7 @@ void QKeyMapperPrivate::clearMappings() // if (keyboardLayoutName.isEmpty()) // qWarning("Qt: unable to determine keyboard layout, please talk to qt-bugs@trolltech.com"); ? - getLocaleAndDirection(&keyboardInputLocale, + q_getLocaleAndDirection(&keyboardInputLocale, &keyboardInputDirection, layoutName, variantName); @@ -534,7 +534,6 @@ void QKeyMapperPrivate::clearMappings() << "direction =" << keyboardInputDirection; #endif - if (data) XFree(data); } else |