1 files changed, 36 insertions, 13 deletions

diff --git a/src/plugins/platforms/ios/qiostextresponder.mm b/src/plugins/platforms/ios/qiostextresponder.mm
index 52336a4e69..d86f545154 100644
--- a/src/plugins/platforms/ios/qiostextresponder.mm
+++ b/src/plugins/platforms/ios/qiostextresponder.mm
@@ -92,12 +92,12 @@
     return [QUITextPosition positionWithIndex:(self.range.location + self.range.length)];
 }
 
-- (NSRange) range
+- (NSRange)range
 {
     return _range;
 }
 
--(BOOL)isEmpty
+- (BOOL)isEmpty
 {
     return (self.range.length == 0);
 }
@@ -111,7 +111,7 @@
 
 @implementation WrapperView
 
--(id)initWithView:(UIView *)view
+- (id)initWithView:(UIView *)view
 {
     if (self = [self init]) {
         [self addSubview:view];
@@ -143,7 +143,7 @@
 // retained, we ensure that all messages sent to the view during
 // its lifetime in a window hierarcy will be able to traverse the
 // responder chain.
--(void)willMoveToWindow:(UIWindow *)window
+- (void)willMoveToWindow:(UIWindow *)window
 {
     if (window)
         [[self nextResponder] retain];
@@ -170,9 +170,31 @@
     QVariantMap platformData = m_configuredImeState->value(Qt::ImPlatformData).toMap();
     Qt::InputMethodHints hints = Qt::InputMethodHints(m_configuredImeState->value(Qt::ImHints).toUInt());
 
-    self.returnKeyType = platformData.value(kImePlatformDataReturnKeyType).isValid() ?
-        UIReturnKeyType(platformData.value(kImePlatformDataReturnKeyType).toInt()) :
-        (hints & Qt::ImhMultiLine) ? UIReturnKeyDefault : UIReturnKeyDone;
+    Qt::EnterKeyType enterKeyType = Qt::EnterKeyType(m_configuredImeState->value(Qt::ImEnterKeyType).toUInt());
+
+    switch (enterKeyType) {
+    case Qt::EnterKeyReturn:
+        self.returnKeyType = UIReturnKeyDefault;
+        break;
+    case Qt::EnterKeyDone:
+        self.returnKeyType = UIReturnKeyDone;
+        break;
+    case Qt::EnterKeyGo:
+        self.returnKeyType = UIReturnKeyGo;
+        break;
+    case Qt::EnterKeySend:
+        self.returnKeyType = UIReturnKeySend;
+        break;
+    case Qt::EnterKeySearch:
+        self.returnKeyType = UIReturnKeySearch;
+        break;
+    case Qt::EnterKeyNext:
+        self.returnKeyType = UIReturnKeyNext;
+        break;
+    default:
+        self.returnKeyType = (hints & Qt::ImhMultiLine) ? UIReturnKeyDefault : UIReturnKeyDone;
+        break;
+    }
 
     self.secureTextEntry = BOOL(hints & Qt::ImhHiddenText);
     self.autocorrectionType = (hints & Qt::ImhNoPredictiveText) ?
@@ -233,7 +255,7 @@
     }
 
     // Based on what we set up in initWithInputContext above
-    updatedProperties &= (Qt::ImHints | Qt::ImPlatformData);
+    updatedProperties &= (Qt::ImHints | Qt::ImEnterKeyType | Qt::ImPlatformData);
 
     if (!updatedProperties)
         return NO;
@@ -361,17 +383,17 @@
     return m_inputContext->imeState().currentState.value(query);
 }
 
--(id<UITextInputTokenizer>)tokenizer
+- (id<UITextInputTokenizer>)tokenizer
 {
     return [[[UITextInputStringTokenizer alloc] initWithTextInput:id<UITextInput>(self)] autorelease];
 }
 
--(UITextPosition *)beginningOfDocument
+- (UITextPosition *)beginningOfDocument
 {
     return [QUITextPosition positionWithIndex:0];
 }
 
--(UITextPosition *)endOfDocument
+- (UITextPosition *)endOfDocument
 {
     int endPosition = [self currentImeState:Qt::ImSurroundingText].toString().length();
     return [QUITextPosition positionWithIndex:endPosition];
@@ -637,7 +659,7 @@
     return [NSDictionary dictionaryWithObject:uifont forKey:UITextInputTextFontKey];
 }
 
--(NSDictionary *)markedTextStyle
+- (NSDictionary *)markedTextStyle
 {
     return [NSDictionary dictionary];
 }
@@ -659,7 +681,8 @@
         [self sendEventToFocusObject:press];
         [self sendEventToFocusObject:release];
 
-        if (self.returnKeyType == UIReturnKeyDone)
+        if (self.returnKeyType == UIReturnKeyDone || self.returnKeyType == UIReturnKeyGo
+            || self.returnKeyType == UIReturnKeySend || self.returnKeyType == UIReturnKeySearch)
             [self resignFirstResponder];
 
         return;