Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt

Conflicts:
	src/gui/inputmethod/qximinputcontext_x11.cpp

4 files changed, 15 insertions, 32 deletions

diff --git a/src/gui/kernel/qapplication.cpp b/src/gui/kernel/qapplication.cpp
index 8ede230..d5a96bd 100644
--- a/src/gui/kernel/qapplication.cpp
+++ b/src/gui/kernel/qapplication.cpp
@@ -2055,9 +2055,13 @@ void QApplicationPrivate::setFocusWidget(QWidget *focus, Qt::FocusReason reason)
         QWidget *prev = focus_widget;
         focus_widget = focus;
 
-        if (prev && reason != Qt::PopupFocusReason && reason != Qt::MenuBarFocusReason &&
-            prev->testAttribute(Qt::WA_InputMethodEnabled)) {
-            QInputContext *qic = prev->inputContext();
+        if (prev && ((reason != Qt::PopupFocusReason && reason != Qt::MenuBarFocusReason
+            && prev->testAttribute(Qt::WA_InputMethodEnabled))
+            // Do reset the input context, in case the new focus widget won't accept keyboard input
+            // or it is not created fully yet.
+            || (focus_widget && (!focus_widget->testAttribute(Qt::WA_InputMethodEnabled)
+            || !focus_widget->testAttribute(Qt::WA_WState_Created))))) {
+             QInputContext *qic = prev->inputContext();
             if(qic) {
                 qic->reset();
                 qic->setFocusWidget(0);
diff --git a/src/gui/kernel/qwidget.cpp b/src/gui/kernel/qwidget.cpp
index 61b4543..8ce0231 100644
--- a/src/gui/kernel/qwidget.cpp
+++ b/src/gui/kernel/qwidget.cpp
@@ -235,28 +235,6 @@ QWindowSurface *QWidgetPrivate::createDefaultWindowSurface()
 
 /*!
     \internal
-    This is an internal function, you should never call this.
-
-    This function is called to focus associated input context. The
-    code intends to eliminate duplicate focus for the context even if
-    the context is shared between widgets
-
-    \sa QInputContext::setFocus()
- */
-void QWidgetPrivate::focusInputContext()
-{
-#ifndef QT_NO_IM
-    Q_Q(QWidget);
-    QInputContext *qic = q->inputContext();
-    if (qic) {
-        if(qic->focusWidget() != q)
-            qic->setFocusWidget(q);
-    }
-#endif // QT_NO_IM
-}
-
-/*!
-    \internal
 */
 void QWidgetPrivate::scrollChildren(int dx, int dy)
 {
@@ -330,20 +308,24 @@ void QWidget::setInputContext(QInputContext *context)
 
 
 /*!
+    \obsolete
+
     This function can be called on the widget that currently has focus
     to reset the input method operating on it.
 
-    \sa QInputContext, QInputContext::reset()
+    This function is providing for convenience, instead you should use
+    \l{QInputContext::}{reset()} on the input context that was
+    returned by inputContext().
+
+    \sa QInputContext, inputContext(), QInputContext::reset()
 */
 void QWidget::resetInputContext()
 {
     if (!hasFocus())
         return;
 #ifndef QT_NO_IM
-    if (!d_func()->ic)
-        return;
     QInputContext *qic = this->inputContext();
-    if( qic )
+    if(qic)
         qic->reset();
 #endif // QT_NO_IM
 }
diff --git a/src/gui/kernel/qwidget_p.h b/src/gui/kernel/qwidget_p.h
index f254c4a..9e93f66 100644
--- a/src/gui/kernel/qwidget_p.h
+++ b/src/gui/kernel/qwidget_p.h
@@ -354,8 +354,6 @@ public:
     void setWindowIcon_sys(bool forceReset = false);
     void setWindowOpacity_sys(qreal opacity);
 
-    void focusInputContext();
-
     void adjustQuitOnCloseAttribute();
 
 #if defined(Q_WS_X11)
diff --git a/src/gui/kernel/qwidget_x11.cpp b/src/gui/kernel/qwidget_x11.cpp
index a12b50c..e71bc2f 100644
--- a/src/gui/kernel/qwidget_x11.cpp
+++ b/src/gui/kernel/qwidget_x11.cpp
@@ -1516,7 +1516,6 @@ void QWidget::activateWindow()
             X11->userTime = X11->time;
         qt_net_update_user_time(tlw, X11->userTime);
         XSetInputFocus(X11->display, tlw->internalWinId(), XRevertToParent, X11->time);
-        d->focusInputContext();
     }
 }