diff options
| author | Giulio Camuffo <giulio.camuffo@kdab.com> | 2016-07-02 10:57:16 +0200 |
|---|---|---|
| committer | Paul Olav Tvete <paul.tvete@qt.io> | 2016-12-02 15:23:19 +0000 |
| commit | 542c6392ca52f86bd5fffb6141e93ad2a1ab8fcb (patch) | |
| tree | f8d7b711890db3b8857c90914589186985241b64 /src/client/qwaylandinputcontext.cpp | |
| parent | 74e146ac208dcbfc34c99d903e9827ef2b932046 (diff) | |
Add xdg_shell_v6 support for Qt clients
Task-number: QTBUG-56174
Change-Id: I6610905d0c9f29be29e812bcac193ea2a7e4f107
Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
Reviewed-by: Johan Helsing <johan.helsing@qt.io>
Diffstat (limited to 'src/client/qwaylandinputcontext.cpp')
| -rw-r--r-- | src/client/qwaylandinputcontext.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/client/qwaylandinputcontext.cpp b/src/client/qwaylandinputcontext.cpp index 5a58d6d75..dcc4ad5c7 100644 --- a/src/client/qwaylandinputcontext.cpp +++ b/src/client/qwaylandinputcontext.cpp @@ -532,7 +532,8 @@ void QWaylandInputContext::setFocusObject(QObject *) if (mCurrentWindow && mCurrentWindow->handle()) { if (mCurrentWindow.data() != window || !inputMethodAccepted()) { struct ::wl_surface *surface = static_cast<QWaylandWindow *>(mCurrentWindow->handle())->object(); - textInput()->disable(surface); + if (surface) + textInput()->disable(surface); mCurrentWindow.clear(); } } |