diff options
author | Tasuku Suzuki <stasuku@gmail.com> | 2012-11-23 02:47:45 +0900 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-11-26 18:47:36 +0100 |
commit | e9e49c6157f7cfb84faeaab0438b0a30380f68f8 (patch) | |
tree | 3bbf70c61e46b808db18a3258025da260fc2c13b /src/quick/items/qquickwindow.cpp | |
parent | cedaf867421f4c43a2da712f00e9626e64c8b250 (diff) |
Enable module build with QT_NO_IM
Change-Id: I90f8ec7e6357db7b4038bb1646fe9d3835821556
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Alan Alpert (RIM) <aalpert@rim.com>
Diffstat (limited to 'src/quick/items/qquickwindow.cpp')
-rw-r--r-- | src/quick/items/qquickwindow.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/quick/items/qquickwindow.cpp b/src/quick/items/qquickwindow.cpp index 99db98d222..2ce91cdc2c 100644 --- a/src/quick/items/qquickwindow.cpp +++ b/src/quick/items/qquickwindow.cpp @@ -75,9 +75,11 @@ QT_BEGIN_NAMESPACE void QQuickWindowPrivate::updateFocusItemTransform() { Q_Q(QQuickWindow); +#ifndef QT_NO_IM QQuickItem *focus = q->activeFocusItem(); if (focus && qApp->focusObject() == focus) qApp->inputMethod()->setInputItemTransform(QQuickItemPrivate::get(focus)->itemToWindowTransform()); +#endif } @@ -1146,8 +1148,10 @@ bool QQuickWindow::event(QEvent *e) contentItem()->windowDeactivateEvent(); break; case QEvent::FocusAboutToChange: +#ifndef QT_NO_IM if (d->activeFocusItem) qGuiApp->inputMethod()->commit(); +#endif break; default: break; |