summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDenis Dzyubenko <denis.dzyubenko@nokia.com>2009-03-31 11:40:34 (GMT)
committerDenis Dzyubenko <denis.dzyubenko@nokia.com>2009-04-01 13:10:27 (GMT)
commitb224b6006e823435297c2f0b82c835f5987f9b10 (patch)
tree92b364a20fd9b455d968c58ea8a85e81d84cc9d1
parentf6830ef93552005b5dc9fee2d9649f9915842615 (diff)
downloadQt-b224b6006e823435297c2f0b82c835f5987f9b10.zip
Qt-b224b6006e823435297c2f0b82c835f5987f9b10.tar.gz
Qt-b224b6006e823435297c2f0b82c835f5987f9b10.tar.bz2
Input Method cannot be enabled in License Wizard and Class Wizard
Input methods didn't work properly wor widgets inside QWizardPage because the widget got focus before it was shown and input context wasn't initialized properly. The fix is to postpone qinputcontext->setFocusWidget call until the widget is created (input context will be initialized in the QWidget::create_sys function). Task-number: 244604 Reviewed-by: Prasanth Ullattil
-rw-r--r--src/gui/inputmethod/qximinputcontext_x11.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gui/inputmethod/qximinputcontext_x11.cpp b/src/gui/inputmethod/qximinputcontext_x11.cpp
index 1c8560f..c320fb4 100644
--- a/src/gui/inputmethod/qximinputcontext_x11.cpp
+++ b/src/gui/inputmethod/qximinputcontext_x11.cpp
@@ -437,7 +437,8 @@ void QXIMInputContext::create_xim()
// reinitialize input context after the input method
// server (like SCIM) has been launched without
// requiring the user to manually switch focus.
- if (focusWidget->testAttribute(Qt::WA_InputMethodEnabled))
+ if (focusWidget->testAttribute(Qt::WA_InputMethodEnabled)
+ && focusWidget->testAttribute(Qt::WA_WState_Created))
setFocusWidget(focusWidget);
}
// following code fragment is not required for immodule