summaryrefslogtreecommitdiffstats
path: root/src/widgets
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@nokia.com>2011-06-22 10:01:14 +0200
committerLars Knoll <lars.knoll@nokia.com>2011-06-27 14:31:15 +0200
commit80eb461360eb39657ac21ce8070c02f071884e9a (patch)
tree516338ddf364ac0337271db6d15c21eca689709f /src/widgets
parent0584424d5ccc7d1e3b9aa60da46ca1db244ce470 (diff)
ibus IM support for the xcb backend
Test code to check input methods using the ibus backend used on e.g. ubuntu. The IM code is not very sophisticated, but enough to test that things are working. Reviewed-by: Jørgen Lind
Diffstat (limited to 'src/widgets')
-rw-r--r--src/widgets/kernel/qwidget.cpp2
1 files changed, 0 insertions, 2 deletions
diff --git a/src/widgets/kernel/qwidget.cpp b/src/widgets/kernel/qwidget.cpp
index a8bd5ca519..a29a265e5a 100644
--- a/src/widgets/kernel/qwidget.cpp
+++ b/src/widgets/kernel/qwidget.cpp
@@ -11190,7 +11190,6 @@ void QWidget::setShortcutAutoRepeat(int id, bool enable)
*/
void QWidget::updateMicroFocus()
{
-#if !defined(QT_NO_IM) && (defined(Q_WS_X11) || defined(Q_OS_SYMBIAN))
Q_D(QWidget);
// and optimization to update input context only it has already been created.
if (d->assignedInputContext() || qApp->d_func()->inputContext) {
@@ -11198,7 +11197,6 @@ void QWidget::updateMicroFocus()
if (ic)
ic->update();
}
-#endif
#ifndef QT_NO_ACCESSIBILITY
if (isVisible()) {
// ##### is this correct