diff options
| author | Andy Shaw <andy.shaw@qt.io> | 2021-03-26 10:49:45 +0100 |
|---|---|---|
| committer | Andy Shaw <andy.shaw@qt.io> | 2021-03-29 20:47:02 +0100 |
| commit | b050d4867f68c3d35493221d65d343749504c988 (patch) | |
| tree | 3cc5a647586fe31182c82126834bd827ac7d6869 /src/plugins/platforms/ios/qioswindow.mm | |
| parent | ea0ee870c972139c7a07f4019c0267ef4455b502 (diff) | |
iOS: Protect against a possible crash after the window is deleted
If we are in a case where the original window is deleted before a new
one is shown then we need to make sure that we are not still expecting
that the original one has the focus. So we protect against the crash
by only outputting the address of the object that previously had
focus.
A follow-up patch will be done for inclusion from 6.2 that will fix
the root cause of the pointer being invalid when the only window is
deleted before a new one is shown.
Fixes: QTBUG-92173
Pick-to: 6.1 6.0 5.15
Change-Id: Ifdb3fd6b6cb8fb8e8b79d2c325a30c27b298d8a9
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Diffstat (limited to 'src/plugins/platforms/ios/qioswindow.mm')
| -rw-r--r-- | src/plugins/platforms/ios/qioswindow.mm | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/plugins/platforms/ios/qioswindow.mm b/src/plugins/platforms/ios/qioswindow.mm index 1b6a802ca2..864eef3641 100644 --- a/src/plugins/platforms/ios/qioswindow.mm +++ b/src/plugins/platforms/ios/qioswindow.mm @@ -46,6 +46,7 @@ #include "qiosscreen.h" #include "qiosviewcontroller.h" #include "quiview.h" +#include "qiosinputcontext.h" #include <QtGui/private/qwindow_p.h> #include <qpa/qplatformintegration.h> |