diff options
| author | axis <qt-info@nokia.com> | 2009-12-15 10:01:20 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2009-12-15 10:01:20 (GMT) |
| commit | 9305fba2d3a69c50aad6d6b96a6ca37801d72f9e (patch) | |
| tree | ccb46e94817a90232c414387f8d2e7119bfb1901 | |
| parent | 2fa94ee5569c91435e68f578f29a712dcfd37e4f (diff) | |
| download | Qt-9305fba2d3a69c50aad6d6b96a6ca37801d72f9e.zip Qt-9305fba2d3a69c50aad6d6b96a6ca37801d72f9e.tar.gz Qt-9305fba2d3a69c50aad6d6b96a6ca37801d72f9e.tar.bz2 | |
Enabled input method update code for all platforms.
These don't have to be platform specific.
RevBy: Trust me
| -rw-r--r-- | src/gui/widgets/qlineedit_p.cpp | 2 | ||||
| -rw-r--r-- | src/gui/widgets/qplaintextedit.cpp | 2 | ||||
| -rw-r--r-- | src/gui/widgets/qtextedit.cpp | 3 |
3 files changed, 0 insertions, 7 deletions
diff --git a/src/gui/widgets/qlineedit_p.cpp b/src/gui/widgets/qlineedit_p.cpp index bdf7993..4122bc4 100644 --- a/src/gui/widgets/qlineedit_p.cpp +++ b/src/gui/widgets/qlineedit_p.cpp @@ -150,10 +150,8 @@ void QLineEditPrivate::init(const QString& txt) QObject::connect(control, SIGNAL(cursorPositionChanged(int,int)), q, SLOT(updateMicroFocus())); -#if !defined(QT_NO_IM) && (defined(Q_WS_X11) || defined(Q_WS_QWS) || defined(Q_OS_SYMBIAN)) QObject::connect(control, SIGNAL(textChanged(const QString &)), q, SLOT(updateMicroFocus())); -#endif // for now, going completely overboard with updates. QObject::connect(control, SIGNAL(selectionChanged()), diff --git a/src/gui/widgets/qplaintextedit.cpp b/src/gui/widgets/qplaintextedit.cpp index 31f8bb4..f79931a 100644 --- a/src/gui/widgets/qplaintextedit.cpp +++ b/src/gui/widgets/qplaintextedit.cpp @@ -761,9 +761,7 @@ void QPlainTextEditPrivate::init(const QString &txt) QObject::connect(control, SIGNAL(cursorPositionChanged()), q, SLOT(_q_cursorPositionChanged())); QObject::connect(control, SIGNAL(cursorPositionChanged()), q, SIGNAL(cursorPositionChanged())); -#if !defined(QT_NO_IM) && (defined(Q_WS_X11) || defined(Q_WS_QWS) || defined(Q_OS_SYMBIAN)) QObject::connect(control, SIGNAL(textChanged(const QString &)), q, SLOT(updateMicroFocus())); -#endif // set a null page size initially to avoid any relayouting until the textedit // is shown. relayoutDocument() will take care of setting the page size to the diff --git a/src/gui/widgets/qtextedit.cpp b/src/gui/widgets/qtextedit.cpp index f79c870..63fac2a 100644 --- a/src/gui/widgets/qtextedit.cpp +++ b/src/gui/widgets/qtextedit.cpp @@ -158,11 +158,8 @@ void QTextEditPrivate::init(const QString &html) QObject::connect(control, SIGNAL(selectionChanged()), q, SIGNAL(selectionChanged())); QObject::connect(control, SIGNAL(cursorPositionChanged()), q, SIGNAL(cursorPositionChanged())); -#if !defined(QT_NO_IM) && (defined(Q_WS_X11) || defined(Q_WS_QWS) || defined(Q_OS_SYMBIAN)) QObject::connect(control, SIGNAL(textChanged(const QString &)), q, SLOT(updateMicroFocus())); -#endif - QTextDocument *doc = control->document(); // set a null page size initially to avoid any relayouting until the textedit // is shown. relayoutDocument() will take care of setting the page size to the |