diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-10-06 19:27:27 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-10-06 19:30:25 +0200 |
| commit | 0af2998cc99e90e3df34f794801340d8a769c735 (patch) | |
| tree | 61e40f82c8ebf6e843f691c085644aa65180247d /src/quickwidgets/qquickwidget.cpp | |
| parent | f07f1e399d5e13671f2f2ef4c55b1e6a1bc37e3b (diff) | |
| parent | 32218c3243fb4f0da83293c5bd6a663d8e3660ee (diff) | |
Merge remote-tracking branch 'origin/5.9.2' into 5.9
Change-Id: Iddce38c1d6cb51e7cccedaff165e21b60d7a85b2
Diffstat (limited to 'src/quickwidgets/qquickwidget.cpp')
| -rw-r--r-- | src/quickwidgets/qquickwidget.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/quickwidgets/qquickwidget.cpp b/src/quickwidgets/qquickwidget.cpp index c23d11ed20..5aff0ee393 100644 --- a/src/quickwidgets/qquickwidget.cpp +++ b/src/quickwidgets/qquickwidget.cpp @@ -1391,8 +1391,6 @@ bool QQuickWidget::event(QEvent *e) Q_D(QQuickWidget); switch (e->type()) { - case QEvent::InputMethod: - case QEvent::InputMethodQuery: case QEvent::TouchBegin: case QEvent::TouchEnd: @@ -1401,6 +1399,10 @@ bool QQuickWidget::event(QEvent *e) // Touch events only have local and global positions, no need to map. return QCoreApplication::sendEvent(d->offscreenWindow, e); + case QEvent::InputMethod: + case QEvent::InputMethodQuery: + return QCoreApplication::sendEvent(d->offscreenWindow->focusObject(), e); + case QEvent::WindowChangeInternal: d->handleWindowChange(); break; |