2 files changed, 17 insertions, 20 deletions
diff --git a/src/plugins/platforms/ios/qioswindow.h b/src/plugins/platforms/ios/qioswindow.h
index 88afee80c32..86bcc111d35 100644
--- a/src/plugins/platforms/ios/qioswindow.h
+++ b/src/plugins/platforms/ios/qioswindow.h
@@ -71,10 +71,9 @@ private:
     UIView *m_view;
 
     QRect m_normalGeometry;
-    int m_windowLevel;
 
     void raiseOrLower(bool raise);
-    void updateWindowLevel();
+    int windowLevel() const;
     bool blockedByModal();
 
     friend class QIOSScreen;
diff --git a/src/plugins/platforms/ios/qioswindow.mm b/src/plugins/platforms/ios/qioswindow.mm
index 60bebd144f5..7cd3d5f0b08 100644
--- a/src/plugins/platforms/ios/qioswindow.mm
+++ b/src/plugins/platforms/ios/qioswindow.mm
@@ -36,7 +36,6 @@ enum {
 
 QIOSWindow::QIOSWindow(QWindow *window, WId nativeHandle)
     : QPlatformWindow(window)
-    , m_windowLevel(0)
 {
     if (nativeHandle) {
         m_view = reinterpret_cast<UIView *>(nativeHandle);
@@ -127,11 +126,6 @@ void QIOSWindow::setVisible(bool visible)
     if (!isQtApplication() || !window()->isTopLevel())
         return;
 
-    // Since iOS doesn't do window management the way a Qt application
-    // expects, we need to raise and activate windows ourselves:
-    if (visible)
-        updateWindowLevel();
-
     if (blockedByModal()) {
         if (visible)
             raise();
@@ -343,8 +337,8 @@ void QIOSWindow::raiseOrLower(bool raise)
             UIView *view = static_cast<UIView *>([subviews objectAtIndex:i]);
             if (view.hidden || view == m_view || !view.qwindow)
                 continue;
-            int level = static_cast<QIOSWindow *>(view.qwindow->handle())->m_windowLevel;
-            if (m_windowLevel > level || (raise && m_windowLevel == level)) {
+            int level = static_cast<QIOSWindow *>(view.qwindow->handle())->windowLevel();
+            if (windowLevel() > level || (raise && windowLevel() == level)) {
                 [m_view.superview insertSubview:m_view aboveSubview:view];
                 return;
             }
@@ -359,30 +353,34 @@ void QIOSWindow::raiseOrLower(bool raise)
     }
 }
 
-void QIOSWindow::updateWindowLevel()
+int QIOSWindow::windowLevel() const
 {
     Qt::WindowType type = window()->type();
 
+    int level = 0;
+
     if (type == Qt::ToolTip)
-        m_windowLevel = 120;
+        level = 120;
     else if (window()->flags() & Qt::WindowStaysOnTopHint)
-        m_windowLevel = 100;
+        level = 100;
     else if (window()->isModal())
-        m_windowLevel = 40;
+        level = 40;
     else if (type == Qt::Popup)
-        m_windowLevel = 30;
+        level = 30;
     else if (type == Qt::SplashScreen)
-        m_windowLevel = 20;
+        level = 20;
     else if (type == Qt::Tool)
-        m_windowLevel = 10;
+        level = 10;
     else
-        m_windowLevel = 0;
+        level = 0;
 
-    // A window should be in at least the same m_windowLevel as its parent:
+    // A window should be in at least the same window level as its parent
     QWindow *transientParent = window()->transientParent();
     QIOSWindow *transientParentWindow = transientParent ? static_cast<QIOSWindow *>(transientParent->handle()) : 0;
     if (transientParentWindow)
-        m_windowLevel = qMax(transientParentWindow->m_windowLevel, m_windowLevel);
+        level = qMax(transientParentWindow->windowLevel(), level);
+
+    return level;
 }
 
 void QIOSWindow::applicationStateChanged(Qt::ApplicationState)