summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTor Arne Vestbø <tor.arne.vestbo@digia.com>2014-11-05 16:37:59 +0100
committerJani Heikkinen <jani.heikkinen@theqtcompany.com>2014-11-12 14:02:48 +0100
commit8ea5b2852e36c93195987a588d893cc8e5b185ef (patch)
treecc85273551ea46f072429b12e6aaf6946fff54ed
parent91e53a7b9cb30e330c86c8bc460159fe14945042 (diff)
iOS: Remove assert when transferring or clearing first-responder
We'd transfer or clear first-responder in a lot more cases than just when transferring to a new Qt window, such as when presenting a new view-controller on top to send an e-mail or take a picture using the camera. Change-Id: I6b2a8a6d9fd99910b96a86cf9847b7ff0128f20a Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
-rw-r--r--src/plugins/platforms/ios/qiostextresponder.mm7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/plugins/platforms/ios/qiostextresponder.mm b/src/plugins/platforms/ios/qiostextresponder.mm
index e3c73f5222..6bd1e711d0 100644
--- a/src/plugins/platforms/ios/qiostextresponder.mm
+++ b/src/plugins/platforms/ios/qiostextresponder.mm
@@ -268,8 +268,11 @@
qImDebug() << "keyboard was closed, clearing focus object";
m_inputContext->clearCurrentFocusObject();
} else {
- // We've lost responder status because another window was made active
- Q_ASSERT(FirstResponderCandidate::currentCandidate());
+ // We've lost responder status because another Qt window was made active,
+ // another QIOSTextResponder was made first-responder, another UIView was
+ // made first-responder, or the first-responder was cleared globally. In
+ // either of these cases we don't have to do anything.
+ qImDebug() << "lost first responder, but not clearing focus object";
}
return YES;