1 files changed, 9 insertions, 18 deletions
diff --git a/src/plugins/platforms/ios/qiostextinputoverlay.mm b/src/plugins/platforms/ios/qiostextinputoverlay.mm
index 9b97ce17bb..fe3c29d037 100644
--- a/src/plugins/platforms/ios/qiostextinputoverlay.mm
+++ b/src/plugins/platforms/ios/qiostextinputoverlay.mm
@@ -229,12 +229,6 @@ static void executeBlockWithoutAnimation(Block block)
         borderLayer.cornerRadius = cornerRadius;
         borderLayer.borderColor = [[UIColor lightGrayColor] CGColor];
         [self addSublayer:borderLayer];
-
-        if (QOperatingSystemVersion::current() < QOperatingSystemVersion(QOperatingSystemVersion::IOS, 7)) {
-            // [UIView snapshotViewAfterScreenUpdates:] is available since iOS 7.0.
-            // Just silently ignore showing the loupe for older versions.
-            self.hidden = YES;
-        }
     }
 
     return self;
@@ -278,9 +272,6 @@ static void executeBlockWithoutAnimation(Block block)
 
 - (void)display
 {
-     if (QOperatingSystemVersion::current() < QOperatingSystemVersion(QOperatingSystemVersion::IOS, 7))
-         return;
-
      // Take a snapshow of the target view, magnify the area around the focal
      // point, and add the snapshow layer as a child of the container layer
      // to make it look like a loupe. Then place this layer at the position of
@@ -617,7 +608,7 @@ static void executeBlockWithoutAnimation(Block block)
 - (QIOSLoupeLayer *)createLoupeLayer
 {
     Q_UNREACHABLE();
-    return Q_NULLPTR;
+    return nullptr;
 }
 
 - (void)updateFocalPoint:(QPointF)touchPoint
@@ -993,12 +984,12 @@ static void executeBlockWithoutAnimation(Block block)
 
 QT_BEGIN_NAMESPACE
 
-QIOSEditMenu *QIOSTextInputOverlay::s_editMenu = Q_NULLPTR;
+QIOSEditMenu *QIOSTextInputOverlay::s_editMenu = nullptr;
 
 QIOSTextInputOverlay::QIOSTextInputOverlay()
-    : m_cursorRecognizer(Q_NULLPTR)
-    , m_selectionRecognizer(Q_NULLPTR)
-    , m_openMenuOnTapRecognizer(Q_NULLPTR)
+    : m_cursorRecognizer(nullptr)
+    , m_selectionRecognizer(nullptr)
+    , m_openMenuOnTapRecognizer(nullptr)
 {
     connect(qApp, &QGuiApplication::focusObjectChanged, this, &QIOSTextInputOverlay::updateFocusObject);
 }
@@ -1021,10 +1012,10 @@ void QIOSTextInputOverlay::updateFocusObject()
         [m_selectionRecognizer release];
         [m_openMenuOnTapRecognizer release];
         [s_editMenu release];
-        m_cursorRecognizer = Q_NULLPTR;
-        m_selectionRecognizer = Q_NULLPTR;
-        m_openMenuOnTapRecognizer = Q_NULLPTR;
-        s_editMenu = Q_NULLPTR;
+        m_cursorRecognizer = nullptr;
+        m_selectionRecognizer = nullptr;
+        m_openMenuOnTapRecognizer = nullptr;
+        s_editMenu = nullptr;
     }
 
     if (platformInputContext()->inputMethodAccepted()) {