Changeset 677

Timestamp:

Mar 11, 2010, 11:11:16 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

gui: QWidget: Fixed 4.6.2 merge typo (broke non-QT_NO_IM builds).

File:

• trunk/src/gui/kernel/qwidget.cpp (modified) (1 diff)

trunk/src/gui/kernel/qwidget.cpp

@@ -10471 +10471 @@
             ic = focusWidget->d_func()->inputContext();
         if (ic) {
-            if (on && hasFocus() && ic->focusWidget() != focusWidget && isEnabled()) {
+            if (on && hasFocus() && ic->focusWidget() != focusWidget && isEnabled()
                 && focusWidget->testAttribute(Qt::WA_InputMethodEnabled)) {
                 ic->setFocusWidget(focusWidget);