1 files changed, 16 insertions, 10 deletions
diff --git a/src/plugins/platforms/ios/quiview.mm b/src/plugins/platforms/ios/quiview.mm
index 2a1444e9e5..9966bd50a3 100644
--- a/src/plugins/platforms/ios/quiview.mm
+++ b/src/plugins/platforms/ios/quiview.mm
@@ -48,6 +48,7 @@
 #include "qiosmenu.h"
 #endif
 
+#include <QtCore/qoperatingsystemversion.h>
 #include <QtGui/private/qguiapplication_p.h>
 #include <QtGui/private/qwindow_p.h>
 #include <qpa/qwindowsysteminterface_p.h>
@@ -208,18 +209,23 @@
 
 - (BOOL)becomeFirstResponder
 {
-    FirstResponderCandidate firstResponderCandidate(self);
+    {
+        // Scope for the duration of becoming first responder only, as the window
+        // activation event may trigger new responders, which we don't want to be
+        // blocked by this guard.
+        FirstResponderCandidate firstResponderCandidate(self);
 
-    qImDebug() << "win:" << m_qioswindow->window() << "self:" << self
-        << "first:" << [UIResponder currentFirstResponder];
+        qImDebug() << "win:" << m_qioswindow->window() << "self:" << self
+            << "first:" << [UIResponder currentFirstResponder];
 
-    if (![super becomeFirstResponder]) {
-        qImDebug() << m_qioswindow->window()
-            << "was not allowed to become first responder";
-        return NO;
-    }
+        if (![super becomeFirstResponder]) {
+            qImDebug() << m_qioswindow->window()
+                << "was not allowed to become first responder";
+            return NO;
+        }
 
-    qImDebug() << m_qioswindow->window() << "became first responder";
+        qImDebug() << m_qioswindow->window() << "became first responder";
+    }
 
     if (qGuiApp->focusWindow() != m_qioswindow->window())
         QWindowSystemInterface::handleWindowActivated<QWindowSystemInterface::SynchronousDelivery>(m_qioswindow->window());
@@ -291,7 +297,7 @@
     QTouchDevice *touchDevice = QIOSIntegration::instance()->touchDevice();
     QTouchDevice::Capabilities touchCapabilities = touchDevice->capabilities();
 
-    if (QSysInfo::MacintoshVersion >= QSysInfo::MV_IOS_9_0) {
+    if (QOperatingSystemVersion::current() >= QOperatingSystemVersion(QOperatingSystemVersion::IOS, 9)) {
         if (self.traitCollection.forceTouchCapability == UIForceTouchCapabilityAvailable)
             touchCapabilities |= QTouchDevice::Pressure;
         else