Merge "Merge remote-tracking branch 'origin/dev' into wip/qt6"

1 files changed, 8 insertions, 3 deletions

diff --git a/src/plugins/platforms/ios/qiostextinputoverlay.mm b/src/plugins/platforms/ios/qiostextinputoverlay.mm
index e5419b1766..0561a826c6 100644
--- a/src/plugins/platforms/ios/qiostextinputoverlay.mm
+++ b/src/plugins/platforms/ios/qiostextinputoverlay.mm
@@ -834,9 +834,14 @@ static void executeBlockWithoutAnimation(Block block)
 - (void)updateSelection
 {
     if (!hasSelection()) {
-        _cursorLayer.visible = NO;
-        _anchorLayer.visible = NO;
-        QIOSTextInputOverlay::s_editMenu.visible = NO;
+        if (_cursorLayer.visible) {
+            _cursorLayer.visible = NO;
+            _anchorLayer.visible = NO;
+            // Only hide the edit menu if we had a selection from before, since
+            // the edit menu can also be used for other purposes by others (in
+            // which case we try our best not to interfere).
+            QIOSTextInputOverlay::s_editMenu.visible = NO;
+        }
         return;
     }