diff options
| author | Paul Olav Tvete <paul.tvete@theqtcompany.com> | 2016-06-13 10:24:54 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2016-06-13 11:03:17 +0000 |
| commit | b8d74c81e501f05d7d91c0b236e070729514d866 (patch) | |
| tree | e17614e909cb2f0f41b7ded42db423b623b0b0e3 /src/compositor/compositor_api | |
| parent | 8fb6644c79acdec67f7cc436b9971348b6e202ec (diff) | |
| parent | 83f748ade15c0d85b87c6bde732d847cab826985 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.7' into dev" into refs/staging/dev
Diffstat (limited to 'src/compositor/compositor_api')
| -rw-r--r-- | src/compositor/compositor_api/qwaylandinputmethodcontrol.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/compositor/compositor_api/qwaylandinputmethodcontrol.cpp b/src/compositor/compositor_api/qwaylandinputmethodcontrol.cpp index a82990f3d..122c589da 100644 --- a/src/compositor/compositor_api/qwaylandinputmethodcontrol.cpp +++ b/src/compositor/compositor_api/qwaylandinputmethodcontrol.cpp @@ -50,11 +50,14 @@ QWaylandInputMethodControl::QWaylandInputMethodControl(QWaylandSurface *surface) { connect(d_func()->compositor, &QWaylandCompositor::defaultInputDeviceChanged, this, &QWaylandInputMethodControl::defaultInputDeviceChanged); - connect(d_func()->textInput(), &QWaylandTextInput::surfaceEnabled, this, &QWaylandInputMethodControl::surfaceEnabled); - connect(d_func()->textInput(), &QWaylandTextInput::surfaceDisabled, this, &QWaylandInputMethodControl::surfaceDisabled); + QWaylandTextInput *textInput = d_func()->textInput(); + if (textInput) { + connect(textInput, &QWaylandTextInput::surfaceEnabled, this, &QWaylandInputMethodControl::surfaceEnabled); + connect(textInput, &QWaylandTextInput::surfaceDisabled, this, &QWaylandInputMethodControl::surfaceDisabled); #ifndef QT_NO_IM - connect(d_func()->textInput(), &QWaylandTextInput::updateInputMethod, this, &QWaylandInputMethodControl::updateInputMethod); + connect(textInput, &QWaylandTextInput::updateInputMethod, this, &QWaylandInputMethodControl::updateInputMethod); #endif + } } QVariant QWaylandInputMethodControl::inputMethodQuery(Qt::InputMethodQuery query, QVariant argument) const |