diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-11-15 09:51:41 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-11-15 09:58:16 +0100 |
| commit | 9808b53fde1dfc65ad3757cc6720e430c3cc89a2 (patch) | |
| tree | a0517ae1e290e7bbdb118c9f01f4e6e5d744998c /src/plugins/platforms/ios/qiostextresponder.mm | |
| parent | c214379156e4c75dcfe59cf73d69b912f4293303 (diff) | |
| parent | 246fe271878dbe586b5f3222a78d67dfecd1ca83 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
configure
src/plugins/platforms/eglfs/qeglfsintegration.cpp
src/plugins/platforms/linuxfb/qlinuxfbintegration.cpp
Change-Id: Id2da7c775439adb62646d5b741ee7c638042b34b
Diffstat (limited to 'src/plugins/platforms/ios/qiostextresponder.mm')
| -rw-r--r-- | src/plugins/platforms/ios/qiostextresponder.mm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/platforms/ios/qiostextresponder.mm b/src/plugins/platforms/ios/qiostextresponder.mm index e31584d581..009f3f8a20 100644 --- a/src/plugins/platforms/ios/qiostextresponder.mm +++ b/src/plugins/platforms/ios/qiostextresponder.mm @@ -625,7 +625,7 @@ - (id<UITextInputTokenizer>)tokenizer { - return [[[UITextInputStringTokenizer alloc] initWithTextInput:id<UITextInput>(self)] autorelease]; + return [[[UITextInputStringTokenizer alloc] initWithTextInput:self] autorelease]; } - (UITextPosition *)beginningOfDocument |