summaryrefslogtreecommitdiffstats
path: root/src/kernel/qapplication_x11.cpp
diff options
context:
space:
mode:
authorAlexander Golubev <fatzer2@gmail.com>2024-03-02 06:57:42 +0300
committerAlexander Golubev <fatzer2@gmail.com>2024-03-02 07:26:45 +0300
commit34587584ab80fd696cc9d73dda1326f175125ddf (patch)
tree11fc4b98724b1606e38db9e402c1479a7c7e54ee /src/kernel/qapplication_x11.cpp
parent7578fa552bfa738c7cfb84584ef2423f49c7c422 (diff)
downloadtqt3-34587584ab80fd696cc9d73dda1326f175125ddf.tar.gz
tqt3-34587584ab80fd696cc9d73dda1326f175125ddf.zip
avoid translating the /qt/XIMInputStyle options when saving into config
Also use "On The Spot" as the default when the setting in the config is incorrect. Signed-off-by: Alexander Golubev <fatzer2@gmail.com>
Diffstat (limited to 'src/kernel/qapplication_x11.cpp')
-rw-r--r--src/kernel/qapplication_x11.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/kernel/qapplication_x11.cpp b/src/kernel/qapplication_x11.cpp
index e224f17ad..2cda2b8b3 100644
--- a/src/kernel/qapplication_x11.cpp
+++ b/src/kernel/qapplication_x11.cpp
@@ -1112,15 +1112,15 @@ bool TQApplication::x11_apply_settings()
if (qt_xim_preferred_style == 0) {
TQString ximInputStyle =
settings.readEntry( "/qt/XIMInputStyle",
- TQObject::trUtf8( "On The Spot" ) ).lower();
- if ( ximInputStyle == "on the spot" )
- qt_xim_preferred_style = XIMPreeditCallbacks | XIMStatusNothing;
- else if ( ximInputStyle == "over the spot" )
+ TQString::fromLatin1( "On The Spot" ) ).lower();
+ if ( ximInputStyle == "over the spot" )
qt_xim_preferred_style = XIMPreeditPosition | XIMStatusNothing;
else if ( ximInputStyle == "off the spot" )
qt_xim_preferred_style = XIMPreeditArea | XIMStatusArea;
else if ( ximInputStyle == "root" )
qt_xim_preferred_style = XIMPreeditNothing | XIMStatusNothing;
+ else // ximInputStyle == "on the spot" or others
+ qt_xim_preferred_style = XIMPreeditCallbacks | XIMStatusNothing;
}
#endif