diff options
author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-01-19 14:07:39 +0100 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-01-19 14:07:39 +0100 |
commit | 1db1fa1619e718eebdc88899df6c0a8c6d2309b9 (patch) | |
tree | 5fcb4ea759967e906df54c07986111bad2137ea8 /src/client/qwaylandinputcontext_p.h | |
parent | 101698bd0ffa3e51186eb14cfdb317526cc9512b (diff) | |
parent | aaa97d529bbafe9d5637729126701794cbbf0fc1 (diff) |
Merge remote-tracking branch 'origin/5.4' into dev
Conflicts:
.qmake.conf
Change-Id: I65c8503cf632699129ebb6b4f01721b74be78def
Diffstat (limited to 'src/client/qwaylandinputcontext_p.h')
-rw-r--r-- | src/client/qwaylandinputcontext_p.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/client/qwaylandinputcontext_p.h b/src/client/qwaylandinputcontext_p.h index 1f7e4e361..fbb26b9bf 100644 --- a/src/client/qwaylandinputcontext_p.h +++ b/src/client/qwaylandinputcontext_p.h @@ -60,6 +60,7 @@ public: void updateState(); protected: + void text_input_preedit_string(uint32_t serial, const QString &text, const QString &commit) Q_DECL_OVERRIDE; void text_input_commit_string(uint32_t serial, const QString &text) Q_DECL_OVERRIDE; void text_input_enter(wl_surface *surface) Q_DECL_OVERRIDE; void text_input_leave() Q_DECL_OVERRIDE; |