diff options
authorTor Arne Vestbø <>2015-01-16 17:54:47 +0100
committerTor Arne Vestbø <>2015-01-23 03:05:17 +0100
commitd4fd619b1088f885878381508918d933c7c226e1 (patch)
parented950a8ec194eb35a1035c417aa99de7d38b433d (diff)
iOS: Don't re-apply window state during QIOSWindow construction
We set the parent of the window as part of constructing it, which will cause a layout of the QIOSDesktopManagerView's subviews, but in this case we don't need to re-set the window state as that's taken care of later on in the QIOSWindow constructor. Change-Id: Ic197c9a50394908c8aa2155abdc97bc322937a85 Reviewed-by: Richard Moe Gustavsen <> Reviewed-by: Tor Arne Vestbø <>
1 files changed, 5 insertions, 1 deletions
diff --git a/src/plugins/platforms/ios/ b/src/plugins/platforms/ios/
index 01bc84ae68..164b58d63e 100644
--- a/src/plugins/platforms/ios/
+++ b/src/plugins/platforms/ios/
@@ -75,7 +75,11 @@
- (void)layoutView:(QUIView *)view
QWindow *window = view.qwindow;
- Q_ASSERT(window->handle());
+ // Return early if the QIOSWindow is still constructing, as we'll
+ // take care of setting the correct window state in the constructor.
+ if (!window->handle())
+ return;
// Re-apply window states to update geometry
if (window->windowState() & (Qt::WindowFullScreen | Qt::WindowMaximized))