From 56a82e87e654fa9e77bee8956e94e08a77941e4c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= <tor.arne.vestbo@digia.com>
Date: Wed, 7 Jan 2015 15:14:17 +0100
Subject: iOS: Prevent recursion when updating/syncing QIOSViewController
 properties
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: I22f1eaa892cba23c498ae210a9a483e468268581
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@theqtcompany.com>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@theqtcompany.com>
---
 src/plugins/platforms/ios/qiosviewcontroller.mm | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'src/plugins/platforms/ios')

diff --git a/src/plugins/platforms/ios/qiosviewcontroller.mm b/src/plugins/platforms/ios/qiosviewcontroller.mm
index 0afd2bf8ba..01bc84ae68 100644
--- a/src/plugins/platforms/ios/qiosviewcontroller.mm
+++ b/src/plugins/platforms/ios/qiosviewcontroller.mm
@@ -41,6 +41,8 @@
 
 #import "qiosviewcontroller.h"
 
+#include <QtCore/qscopedvaluerollback.h>
+
 #include <QtGui/QGuiApplication>
 #include <QtGui/QWindow>
 #include <QtGui/QScreen>
@@ -121,6 +123,7 @@
 
 @interface QIOSViewController () {
     QIOSScreen *m_screen;
+    BOOL m_updatingProperties;
 }
 @property (nonatomic, assign) BOOL changingOrientation;
 @end
@@ -289,6 +292,15 @@
     if (!isQtApplication())
         return;
 
+    // Prevent recursion caused by updating the status bar appearance (position
+    // or visibility), which in turn may cause a layout of our subviews, and
+    // a reset of window-states, which themselves affect the view controller
+    // properties such as the statusbar visibilty.
+    if (m_updatingProperties)
+        return;
+
+    QScopedValueRollback<BOOL> updateRollback(m_updatingProperties, YES);
+
     QWindow *focusWindow = QGuiApplication::focusWindow();
 
     // If we don't have a focus window we leave the statusbar
-- 
cgit v1.2.3