5 files changed, 84 insertions, 9 deletions

diff --git a/src/plugins/platforms/ios/qiosinputcontext.h b/src/plugins/platforms/ios/qiosinputcontext.h
index 82bcf48855..2b0643f26e 100644
--- a/src/plugins/platforms/ios/qiosinputcontext.h
+++ b/src/plugins/platforms/ios/qiosinputcontext.h
@@ -42,6 +42,7 @@
 
 #include <UIKit/UIKit.h>
 
+#include <QtCore/qlocale.h>
 #include <QtGui/qevent.h>
 #include <QtGui/qtransform.h>
 #include <qpa/qplatforminputcontext.h>
@@ -52,6 +53,7 @@ const char kImePlatformDataReturnKeyType[] = "returnKeyType";
 
 QT_BEGIN_NAMESPACE
 
+@class QIOSLocaleListener;
 @class QIOSKeyboardListener;
 @class QIOSTextInputResponder;
 @protocol KeyboardState;
@@ -98,6 +100,8 @@ public:
     void reset() Q_DECL_OVERRIDE;
     void commit() Q_DECL_OVERRIDE;
 
+    QLocale locale() const Q_DECL_OVERRIDE;
+
     void clearCurrentFocusObject();
 
     void setFocusObject(QObject *object) Q_DECL_OVERRIDE;
@@ -118,6 +122,7 @@ public:
 private:
     UIView* scrollableRootView();
 
+    QIOSLocaleListener *m_localeListener;
     QIOSKeyboardListener *m_keyboardHideGesture;
     QIOSTextInputResponder *m_textResponder;
     KeyboardState m_keyboardState;
diff --git a/src/plugins/platforms/ios/qiosinputcontext.mm b/src/plugins/platforms/ios/qiosinputcontext.mm
index a1c51b6968..c6cbb9b101 100644
--- a/src/plugins/platforms/ios/qiosinputcontext.mm
+++ b/src/plugins/platforms/ios/qiosinputcontext.mm
@@ -62,6 +62,39 @@ static QUIView *focusView()
 
 // -------------------------------------------------------------------------
 
+@interface QIOSLocaleListener : NSObject
+@end
+
+@implementation QIOSLocaleListener
+
+- (id)init
+{
+    if (self = [super init]) {
+        NSNotificationCenter *notificationCenter = [NSNotificationCenter defaultCenter];
+        [notificationCenter addObserver:self
+            selector:@selector(localeDidChange:)
+            name:NSCurrentLocaleDidChangeNotification object:nil];
+    }
+
+    return self;
+}
+
+- (void)dealloc
+{
+    [[NSNotificationCenter defaultCenter] removeObserver:self];
+    [super dealloc];
+}
+
+- (void)localeDidChange:(NSNotification *)notification
+{
+    Q_UNUSED(notification);
+    QIOSInputContext::instance()->emitLocaleChanged();
+}
+
+@end
+
+// -------------------------------------------------------------------------
+
 @interface QIOSKeyboardListener : UIGestureRecognizer <UIGestureRecognizerDelegate> {
   @private
     QIOSInputContext *m_context;
@@ -293,6 +326,7 @@ QIOSInputContext *QIOSInputContext::instance()
 
 QIOSInputContext::QIOSInputContext()
     : QPlatformInputContext()
+    , m_localeListener([QIOSLocaleListener new])
     , m_keyboardHideGesture([[QIOSKeyboardListener alloc] initWithQIOSInputContext:this])
     , m_textResponder(0)
 {
@@ -306,6 +340,7 @@ QIOSInputContext::QIOSInputContext()
 
 QIOSInputContext::~QIOSInputContext()
 {
+    [m_localeListener release];
     [m_keyboardHideGesture.view removeGestureRecognizer:m_keyboardHideGesture];
     [m_keyboardHideGesture release];
 
@@ -673,3 +708,8 @@ void QIOSInputContext::commit()
     [m_textResponder unmarkText];
     [m_textResponder notifyInputDelegate:Qt::ImSurroundingText];
 }
+
+QLocale QIOSInputContext::locale() const
+{
+    return QLocale(QString::fromNSString([[NSLocale currentLocale] objectForKey:NSLocaleIdentifier]));
+}
diff --git a/src/plugins/platforms/ios/qiostextinputoverlay.mm b/src/plugins/platforms/ios/qiostextinputoverlay.mm
index 655e457664..94d82c3eb9 100644
--- a/src/plugins/platforms/ios/qiostextinputoverlay.mm
+++ b/src/plugins/platforms/ios/qiostextinputoverlay.mm
@@ -45,6 +45,7 @@
 #include "qiostextinputoverlay.h"
 
 typedef QPair<int, int> SelectionPair;
+typedef void (^Block)(void);
 
 static const CGFloat kKnobWidth = 10;
 
@@ -68,7 +69,7 @@ static bool hasSelection()
     return selection.first != selection.second;
 }
 
-static void executeBlockWithoutAnimation(void (^block)(void))
+static void executeBlockWithoutAnimation(Block block)
 {
     [CATransaction begin];
     [CATransaction setValue:(id)kCFBooleanTrue forKey:kCATransactionDisableActions];
@@ -306,6 +307,7 @@ static void executeBlockWithoutAnimation(void (^block)(void))
 @property (nonatomic, assign) CGRect cursorRectangle;
 @property (nonatomic, assign) CGFloat handleScale;
 @property (nonatomic, assign) BOOL visible;
+@property (nonatomic, copy) Block onAnimationDidStop;
 @end
 
 @implementation QIOSHandleLayer
@@ -359,7 +361,8 @@ static void executeBlockWithoutAnimation(void (^block)(void))
                 [NSNumber numberWithFloat:1], nil];
             return animation;
         } else {
-            CABasicAnimation * animation = [CABasicAnimation animationWithKeyPath:key];
+            CABasicAnimation *animation = [CABasicAnimation animationWithKeyPath:key];
+            [animation setDelegate:self];
             animation.fromValue = [self valueForKey:key];
             [animation setDuration:0.2];
             return animation;
@@ -368,6 +371,14 @@ static void executeBlockWithoutAnimation(void (^block)(void))
     return [super actionForKey:key];
 }
 
+- (void)animationDidStop:(CAAnimation *)animation finished:(BOOL)flag
+{
+    Q_UNUSED(animation);
+    Q_UNUSED(flag);
+    if (self.onAnimationDidStop)
+        self.onAnimationDidStop();
+}
+
 - (void)setVisible:(BOOL)visible
 {
     if (visible == _visible)
@@ -679,7 +690,7 @@ static void executeBlockWithoutAnimation(void (^block)(void))
 
     if (enabled) {
         // Create a layer that clips the handles inside the input field
-        _clipRectLayer = [[CALayer new] autorelease];
+        _clipRectLayer = [CALayer new];
         _clipRectLayer.masksToBounds = YES;
         [self.focusView.layer addSublayer:_clipRectLayer];
 
@@ -705,7 +716,26 @@ static void executeBlockWithoutAnimation(void (^block)(void))
 
         [self updateSelection];
     } else {
-        [_clipRectLayer removeFromSuperlayer];
+        // Fade out the handles by setting visible to NO, and wait for the animations
+        // to finish before removing the clip rect layer, including the handles.
+        // Create a local variable to hold the clipRectLayer while the animation is
+        // ongoing to ensure that any subsequent calls to setEnabled does not interfere.
+        // Also, declare it as __block to stop it from being automatically retained, which
+        // would cause a cyclic dependency between clipRectLayer and the block.
+        __block CALayer *clipRectLayer = _clipRectLayer;
+        __block int handleCount = 2;
+        Block block = ^{
+            if (--handleCount == 0) {
+                [clipRectLayer removeFromSuperlayer];
+                [clipRectLayer release];
+            }
+        };
+
+        _cursorLayer.onAnimationDidStop = block;
+        _anchorLayer.onAnimationDidStop = block;
+        _cursorLayer.visible = NO;
+        _anchorLayer.visible = NO;
+
         _clipRectLayer = 0;
         _cursorLayer = 0;
         _anchorLayer = 0;
diff --git a/src/plugins/platforms/ios/qiostextresponder.mm b/src/plugins/platforms/ios/qiostextresponder.mm
index 031cd90828..5ec05ec8ce 100644
--- a/src/plugins/platforms/ios/qiostextresponder.mm
+++ b/src/plugins/platforms/ios/qiostextresponder.mm
@@ -359,6 +359,7 @@
 
 - (void)sendKeyPressRelease:(Qt::Key)key modifiers:(Qt::KeyboardModifiers)modifiers
 {
+    QScopedValueRollback<BOOL> rollback(m_inSendEventToFocusObject, true);
     QWindowSystemInterface::handleKeyEvent(qApp->focusWindow(), QEvent::KeyPress, key, modifiers);
     QWindowSystemInterface::handleKeyEvent(qApp->focusWindow(), QEvent::KeyRelease, key, modifiers);
     QWindowSystemInterface::flushWindowSystemEvents();
diff --git a/src/plugins/platforms/ios/qiosviewcontroller.mm b/src/plugins/platforms/ios/qiosviewcontroller.mm
index 643192797a..c8c07bd298 100644
--- a/src/plugins/platforms/ios/qiosviewcontroller.mm
+++ b/src/plugins/platforms/ios/qiosviewcontroller.mm
@@ -310,17 +310,16 @@
 
 - (void)willRotateToInterfaceOrientation:(UIInterfaceOrientation)orientation duration:(NSTimeInterval)duration
 {
-    Q_UNUSED(orientation);
-    Q_UNUSED(duration);
-
     self.changingOrientation = YES;
+
+    [super willRotateToInterfaceOrientation:orientation duration:duration];
 }
 
 - (void)didRotateFromInterfaceOrientation:(UIInterfaceOrientation)orientation
 {
-    Q_UNUSED(orientation);
-
     self.changingOrientation = NO;
+
+    [super didRotateFromInterfaceOrientation:orientation];
 }
 
 - (void)willChangeStatusBarFrame:(NSNotification*)notification