Changeset 569 for trunk/src/gui/kernel/qwidget.cpp

Timestamp:

Feb 13, 2010, 6:36:55 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

gui: Adopted to 4.6.1 changes.

File:

• trunk/src/gui/kernel/qwidget.cpp (modified) (3 diffs)

trunk/src/gui/kernel/qwidget.cpp

@@ -7272 +7272 @@
     // hidden.
     if (wasVisible) {
-#if defined(Q_WS_WIN) || defined(Q_WS_X11) || defined (Q_WS_QWS) || defined(Q_WS_PM) 
+#if defined(Q_WS_WIN) || defined(Q_WS_X11) || defined (Q_WS_QWS) || defined(Q_WS_PM)
         qApp->d_func()->sendSyntheticEnterLeave(q);
 #endif
@@ -9011 +9011 @@
 Qt::InputMethodHints QWidget::inputMethodHints() const
 {
+
     Q_D(const QWidget);
-#ifndef QT_NO_IM
     return d->imHints;
 #else //QT_NO_IM
@@ -10409 +10409 @@
         if (on && !internalWinId() && testAttribute(Qt::WA_WState_Created))
             d->createWinId();
+
         if (ic && isEnabled())
             ic->setFocusWidget(focusWidget);