diff options
| author |   Mamoru Komachi <usata@gentoo.org> | 2004-08-16 21:21:00 +0000 |
|---|---|---|
| committer | Mamoru Komachi <usata@gentoo.org> | 2004-08-16 21:21:00 +0000 |
| commit | 9ed4eaad07263b21e9966113ae6cfaccef7d8dd4 (patch) | |
| tree | d5fc5da8b39a0953cdcafbf31b75c66b4536f97a /x11-libs/qt/files | |
| parent | Changing dep per Stuart's note in Bug #60458 (diff) | |
| download | historical-9ed4eaad07263b21e9966113ae6cfaccef7d8dd4.tar.gz historical-9ed4eaad07263b21e9966113ae6cfaccef7d8dd4.tar.bz2 historical-9ed4eaad07263b21e9966113ae6cfaccef7d8dd4.zip | |
Fixed compile error with immodule patch. This closes bug #60576.
Diffstat (limited to 'x11-libs/qt/files')
| -rw-r--r-- | x11-libs/qt/files/qt-3.3.3-complemental-patch-for-immodule-20040814.diff | 44 |
1 files changed, 44 insertions, 0 deletions
diff --git a/x11-libs/qt/files/qt-3.3.3-complemental-patch-for-immodule-20040814.diff b/x11-libs/qt/files/qt-3.3.3-complemental-patch-for-immodule-20040814.diff new file mode 100644 index 000000000000..66dd57541c9d --- /dev/null +++ b/x11-libs/qt/files/qt-3.3.3-complemental-patch-for-immodule-20040814.diff @@ -0,0 +1,44 @@ +--- qt-x11-free-3.3.3/src/kernel/qapplication_x11.cpp.orig Thu Aug 5 23:42:03 2004 ++++ qt-x11-free-3.3.3/src/kernel/qapplication_x11.cpp Sat Aug 14 16:41:54 2004 +@@ -1026,18 +1026,36 @@ + settings.readBoolEntry("/qt/useRtlExtensions", FALSE); + + #ifndef QT_NO_XIM +- if (xim_preferred_style == 0) { ++ if (qt_xim_preferred_style == 0) { + QString ximInputStyle = + settings.readEntry( "/qt/XIMInputStyle", + QObject::trUtf8( "On The Spot" ) ).lower(); + if ( ximInputStyle == "on the spot" ) +- xim_preferred_style = XIMPreeditCallbacks | XIMStatusNothing; ++ qt_xim_preferred_style = XIMPreeditCallbacks | XIMStatusNothing; + else if ( ximInputStyle == "over the spot" ) +- xim_preferred_style = XIMPreeditPosition | XIMStatusNothing; ++ qt_xim_preferred_style = XIMPreeditPosition | XIMStatusNothing; + else if ( ximInputStyle == "off the spot" ) +- xim_preferred_style = XIMPreeditArea | XIMStatusArea; ++ qt_xim_preferred_style = XIMPreeditArea | XIMStatusArea; + else if ( ximInputStyle == "root" ) +- xim_preferred_style = XIMPreeditNothing | XIMStatusNothing; ++ qt_xim_preferred_style = XIMPreeditNothing | XIMStatusNothing; ++ } ++ ++ /* ++ The identifier name of an input method is acquired from the ++ configuration file as a default. If a environment variable ++ "QT_IM_SWITCHER" is not empty it will overwrite the ++ configuration file. The "imsw-multi" becomes the default if the entry ++ is not configured. ++ */ ++ if ( getenv( "QT_IM_SWITCHER" ) ) ++ defaultIM = getenv( "QT_IM_SWITCHER" ); ++ else ++ defaultIM = settings.readEntry( "/qt/DefaultInputMethodSwitcher", "imsw-multi" ); ++ ++ // defaultIM is restricted to be an IM-switcher. An IM-switcher ++ // has a 'imsw-' prefix ++ if ( defaultIM.find( "imsw-" ) != 0 ) { ++ defaultIM = "imsw-multi"; + } + #endif + |