x11-libs/qt: delete old extraversions, rebase to current portage ebuilds.
[gentoo-soor-overlay.git] / x11-libs / qt / files / qt-3.3.4-immodule-focus.patch
blobf20c1b135810728b74814df01f8443a967353930
1 --- qt-x11-free-3.3.4/src/kernel/qwidget.cpp 2005-04-03 14:19:26.000000000 +0900
2 +++ qt-x11-free-3.3.4/src/kernel/qwidget.cpp-immqt 2005-04-03 14:27:00.000000000 +0900
3 @@ -3293,7 +3293,10 @@
4 // input context should be survived until focused again. So we
5 // delegate the responsibility to input context via
6 // unfocusInputContext().
7 - if ( prev != this ) {
8 + if ( prev != this && prev->isInputMethodEnabled() &&
9 + (isInputMethodEnabled() || !testWFlags(WType_Popup))) {
10 + // If this is a popup and inputmethod is not enabled, then we
11 + // should not unfocus the current editing widget.
12 #if 0
13 prev->resetInputContext();
14 #else
15 @@ -3307,7 +3310,8 @@
16 }
17 #endif
18 qApp->focus_widget = this;
19 - focusInputContext();
20 + if ( isInputMethodEnabled() )
21 + focusInputContext();
23 #if defined(Q_WS_WIN)
24 if ( !topLevelWidget()->isPopup() )