summaryrefslogtreecommitdiffstats
path: root/src/plugins
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins')
-rw-r--r--src/plugins/platforms/ios/qioswindow.mm9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/plugins/platforms/ios/qioswindow.mm b/src/plugins/platforms/ios/qioswindow.mm
index 1d682ff897..db72bdfc80 100644
--- a/src/plugins/platforms/ios/qioswindow.mm
+++ b/src/plugins/platforms/ios/qioswindow.mm
@@ -90,11 +90,12 @@ QIOSWindow::~QIOSWindow()
clearAccessibleCache();
- quiview_cast(m_view).platformWindow = 0;
+ quiview_cast(m_view).platformWindow = nullptr;
- // Remove from superview only if we have a Qt window parent,
- // as we don't want to affect window container foreign windows.
- if (QPlatformWindow::parent())
+ // Remove from superview, unless we're a foreign window without a
+ // Qt window parent, in which case the foreign window is used as
+ // a window container for a Qt UI hierarchy inside a native UI.
+ if (!(isForeignWindow() && !QPlatformWindow::parent()))
[m_view removeFromSuperview];
[m_view release];